diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-dns/bind-tools | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-dns/bind-tools')
-rw-r--r-- | net-dns/bind-tools/Manifest | 2 | ||||
-rw-r--r-- | net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild | 119 | ||||
-rw-r--r-- | net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild | 125 | ||||
-rw-r--r-- | net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch | 145 | ||||
-rw-r--r-- | net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch | 63 | ||||
-rw-r--r-- | net-dns/bind-tools/metadata.xml | 14 |
6 files changed, 468 insertions, 0 deletions
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest new file mode 100644 index 000000000000..15de6564f82e --- /dev/null +++ b/net-dns/bind-tools/Manifest @@ -0,0 +1,2 @@ +DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb +DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798 diff --git a/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild b/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild new file mode 100644 index 000000000000..1c50debf7bcf --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="http://www.isc.org/software/bind" +SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE="gost? ( ssl )" + +DEPEND="ssl? ( dev-libs/openssl:0 ) + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/idnkit ) + gssapi? ( virtual/krb5 ) + readline? ( sys-libs/readline )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + # bug 231247 + epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 + rm -rf libtool.m4/ + eautoreconf +} + +src_configure() { + local myconf= + + if use urandom; then + myconf="${myconf} --with-randomdev=/dev/urandom" + else + myconf="${myconf} --with-randomdev=/dev/random" + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf \ + --localstatedir=/var \ + --without-python \ + --disable-seccomp \ + --without-libjson \ + $(use_enable ipv6) \ + $(use_with idn) \ + $(usex idn --with-idnlib=-lidnkit '') \ + $(use_with ssl openssl "${EPREFIX}"/usr) \ + $(use_with xml libxml2) \ + $(use_with gssapi) \ + $(use_with readline) \ + $(use_with gost) \ + ${myconf} + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR=$AR -C lib/ || die "emake lib failed" + emake AR=$AR -C bin/delv/ || die "emake bin/delv failed" + emake AR=$AR -C bin/dig/ || die "emake bin/dig failed" + emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed" + emake AR=$AR -C bin/dnssec/ || die "emake bin/dnssec failed" +} + +src_install() { + dodoc README CHANGES FAQ + + cd "${S}"/bin/delv + dobin delv + doman delv.1 + + cd "${S}"/bin/dig + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate + dobin nsupdate + doman nsupdate.1 + if use doc; then + dohtml nsupdate.html + fi + + cd "${S}"/bin/dnssec + dobin dnssec-keygen + doman dnssec-keygen.8 + if use doc; then + dohtml dnssec-keygen.html + fi +} diff --git a/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild new file mode 100644 index 000000000000..6db6fe9a3b81 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils autotools flag-o-matic toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="http://www.isc.org/software/bind" +SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc gost gssapi idn ipv6 readline seccomp ssl urandom xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE="gost? ( ssl )" + +DEPEND="ssl? ( dev-libs/openssl:0 ) + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/idnkit ) + gssapi? ( virtual/krb5 ) + readline? ( sys-libs/readline:0= ) + seccomp? ( sys-libs/libseccomp )" +RDEPEND="${DEPEND} + !<net-dns/bind-9.10.2" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247 + epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129 + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 + rm -rf libtool.m4/ + eautoreconf +} + +src_configure() { + local myconf= + + if use urandom; then + myconf="${myconf} --with-randomdev=/dev/urandom" + else + myconf="${myconf} --with-randomdev=/dev/random" + fi + + # bug 344029 + append-cflags "-DDIG_SIGCHASE" + + # localstatedir for nsupdate -l, bug 395785 + tc-export BUILD_CC + econf \ + --localstatedir=/var \ + --without-python \ + --without-libjson \ + --disable-openssl-version-check \ + $(use_enable ipv6) \ + $(use_with idn) \ + $(usex idn --with-idnlib=-lidnkit '') \ + $(use_enable seccomp) \ + $(use_with ssl openssl) \ + $(use_with xml libxml2) \ + $(use_with gssapi) \ + $(use_with readline) \ + $(use_with gost) \ + ${myconf} + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_compile() { + local AR=$(tc-getAR) + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ +} + +src_install() { + dodoc README CHANGES FAQ + + cd "${S}"/bin/delv + dobin delv + doman delv.1 + + cd "${S}"/bin/dig + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate + dobin nsupdate + doman nsupdate.1 + if use doc; then + dohtml nsupdate.html + fi + + cd "${S}"/bin/dnssec + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + dohtml dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch b/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch new file mode 100644 index 000000000000..deeb1096162e --- /dev/null +++ b/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch @@ -0,0 +1,145 @@ +https://bugs.gentoo.org/417129 + +fix openssl build logic: +* do not probe direct filesystem paths (including hardcoding things like /usr) +* use pkg-config to locate proper openssl libraries +* turn dsa check into a header one +* turn ecdsa check into a link one +* have gost/aes actually default to --with-xxx value when cross-compiling + +Patch by Mike Frysinger <vapier@chromium.org> + +--- a/configure.in ++++ b/configure.in +@@ -1442,16 +1442,21 @@ case "$use_openssl" in + OPENSSLLINKOBJS="" + OPENSSLLINKSRCS="" + ;; +- auto) +- DST_OPENSSL_INC="" +- CRYPTO="" ++ yes|auto) ++ CRYPTO="" ++ PKG_CHECK_MODULES([OPENSSL], [libcrypto], [CRYPTO='-DOPENSSL'], [ ++ if test "$use_openssl" = "yes"; then ++ AC_MSG_ERROR(openssl not found) ++ fi ++ use_openssl="no" ++ ]) ++ ++ DST_OPENSSL_INC=$OPENSSL_CFLAGS ++ DST_OPENSSL_LIBS=$OPENSSL_LIBS + OPENSSLGOSTLINKOBJS="" + OPENSSLGOSTLINKSRS="" + OPENSSLLINKOBJS="" + OPENSSLLINKSRCS="" +- AC_MSG_ERROR( +-[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path +-If you don't want OpenSSL, use --without-openssl]) + ;; + *) + if test "$want_native_pkcs11" = "yes" +@@ -1588,27 +1593,39 @@ no) + ;; + esac + ++ CC="$saved_cc" ++ CFLAGS="$saved_cflags" ++ LIBS="$saved_libs" ++ OPENSSLLINKOBJS='${OPENSSLLINKOBJS}' ++ OPENSSLLINKSRCS='${OPENSSLLINKSRCS}' ++ ;; ++esac ++ ++if test "$use_openssl" = "yes"; then ++ saved_cc="$CC" ++ saved_cflags="$CFLAGS" ++ saved_libs="$LIBS" ++ CFLAGS="$CFLAGS $DST_OPENSSL_INC" ++ LIBS="$LIBS $DST_OPENSSL_LIBS" ++ +- AC_MSG_CHECKING(for OpenSSL DSA support) +- if test -f $use_openssl/include/openssl/dsa.h +- then ++ AC_CHECK_HEADERS([openssl/dsa.h]) ++ if test "$ac_cv_header_openssl_dsa_h" = yes; then + AC_DEFINE(HAVE_OPENSSL_DSA) +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) + fi + + AC_CHECK_FUNCS(EVP_sha256 EVP_sha384 EVP_sha512) + + AC_MSG_CHECKING(for OpenSSL ECDSA support) + have_ecdsa="" +- AC_TRY_RUN([ ++ AC_TRY_LINK([ + #include <openssl/ecdsa.h> + #include <openssl/objects.h> ++],[ + int main() { + EC_KEY *ec256, *ec384; + + #if !defined(HAVE_EVP_SHA256) || !defined(HAVE_EVP_SHA384) +- return (1); ++#error choke + #endif + ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + ec384 = EC_KEY_new_by_curve_name(NID_secp384r1); +@@ -1637,24 +1654,7 @@ int main() { + [AC_MSG_RESULT(yes) + have_ecdsa="yes"], + [AC_MSG_RESULT(no) +- have_ecdsa="no"], ++ have_ecdsa="no"]) +- [AC_MSG_RESULT(using --with-ecdsa)]) +- case "$with_ecdsa" in +- yes) +- case "$have_ecdsa" in +- no) AC_MSG_ERROR([ecdsa not supported]) ;; +- *) have_ecdsa=yes ;; +- esac +- ;; +- no) +- have_ecdsa=no ;; +- *) +- case "$have_ecdsa" in +- yes|no) ;; +- *) AC_MSG_ERROR([need --with-ecdsa=[[yes or no]]]) ;; +- esac +- ;; +- esac + case $have_ecdsa in + yes) + OPENSSL_ECDSA="yes" +@@ -1702,7 +1702,8 @@ int main() { + have_gost="yes"], + [AC_MSG_RESULT(no) + have_gost="no"], +- [AC_MSG_RESULT(using --with-gost)]) ++ [AC_MSG_RESULT(using --with-gost) ++ have_gost=$with_gost]) + case "$with_gost" in + yes) + case "$have_gost" in +@@ -1752,7 +1753,8 @@ int main() { + [AC_MSG_RESULT(yes) + have_aes="yes"], + [AC_MSG_RESULT(no)])], +- [AC_MSG_RESULT(using --with-aes)]) ++ [AC_MSG_RESULT(using --with-aes) ++ have_aes=$with_aes]) + + ISC_OPENSSL_INC="" + ISC_OPENSSL_LIBS="" +@@ -1765,8 +1767,7 @@ int main() { + OPENSSLLINKOBJS='${OPENSSLLINKOBJS}' + OPENSSLLINKSRCS='${OPENSSLLINKSRCS}' + +- ;; +-esac ++fi + + # + # This would include the system openssl path (and linker options to use diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch new file mode 100644 index 000000000000..7aa1d16e92cd --- /dev/null +++ b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch @@ -0,0 +1,63 @@ +--- lib/lwres/lwconfig.c.old 2007-06-20 01:47:22.000000000 +0200 ++++ lib/lwres/lwconfig.c 2008-06-15 02:57:02.000000000 +0200 +@@ -175,13 +175,8 @@ + REQUIRE(buffer != NULL); + REQUIRE(size > 0U); + +- *p = '\0'; +- + ch = eatwhite(fp); + +- if (ch == EOF) +- return (EOF); +- + do { + *p = '\0'; + +@@ -592,23 +587,37 @@ + if (strlen(word) == 0U) + rval = LWRES_R_SUCCESS; + else if (strcmp(word, "nameserver") == 0) +- rval = lwres_conf_parsenameserver(ctx, fp); ++ rval = (stopchar != '\n')? /* fail instantly if EOL is reached */ ++ lwres_conf_parsenameserver(ctx, fp) ++ : LWRES_R_FAILURE; + else if (strcmp(word, "lwserver") == 0) +- rval = lwres_conf_parselwserver(ctx, fp); ++ rval = (stopchar != '\n')? ++ lwres_conf_parselwserver(ctx, fp) ++ : LWRES_R_FAILURE; + else if (strcmp(word, "domain") == 0) +- rval = lwres_conf_parsedomain(ctx, fp); ++ rval = (stopchar != '\n')? ++ lwres_conf_parsedomain(ctx, fp) ++ : LWRES_R_FAILURE; + else if (strcmp(word, "search") == 0) +- rval = lwres_conf_parsesearch(ctx, fp); ++ rval = (stopchar != '\n')? ++ lwres_conf_parsesearch(ctx, fp) ++ : LWRES_R_FAILURE; + else if (strcmp(word, "sortlist") == 0) +- rval = lwres_conf_parsesortlist(ctx, fp); ++ rval = (stopchar != '\n')? ++ lwres_conf_parsesortlist(ctx, fp) ++ : LWRES_R_FAILURE; + else if (strcmp(word, "options") == 0) +- rval = lwres_conf_parseoption(ctx, fp); ++ rval = (stopchar != '\n')? ++ lwres_conf_parseoption(ctx, fp) ++ : LWRES_R_FAILURE; + else { + /* unrecognised word. Ignore entire line */ + rval = LWRES_R_SUCCESS; +- stopchar = eatline(fp); +- if (stopchar == EOF) { +- break; ++ if (stopchar != '\n') { /* do not eat the next line */ ++ stopchar = eatline(fp); ++ if (stopchar == EOF) { ++ break; ++ } + } + } + if (ret == LWRES_R_SUCCESS && rval != LWRES_R_SUCCESS) diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml new file mode 100644 index 000000000000..fb31564a3fa8 --- /dev/null +++ b/net-dns/bind-tools/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>idl0r@gentoo.org</email> + <name>Christian Ruppert</name> + </maintainer> + <use> + <flag name="urandom">Use /dev/urandom instead of /dev/random</flag> + <flag name="gssapi">Enable gssapi support</flag> + <flag name="gost">Enables gost OpenSSL engine support</flag> + </use> + <longdescription>ISC's Bind DNS' server tools</longdescription> +</pkgmetadata> |