bump(net-dns/bind-tools): sync with upstream

This commit is contained in:
Michael Marineau 2015-08-05 18:55:16 -07:00
parent aacb55823e
commit ac4d3aadc6
9 changed files with 1751 additions and 0 deletions

View File

@ -0,0 +1,15 @@
DEFINED_PHASES=compile configure install prepare
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 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
EAPI=5
HOMEPAGE=http://www.isc.org/software/bind
IUSE=doc gost gssapi idn ipv6 readline ssl urandom xml
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
LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
RDEPEND=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 )
REQUIRED_USE=gost? ( ssl )
RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.1-P1/bind-9.10.1-P1.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=bd3d2745f98f155770cadf011986dbf7

View File

@ -0,0 +1,15 @@
DEFINED_PHASES=compile configure install prepare
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 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
EAPI=5
HOMEPAGE=http://www.isc.org/software/bind
IUSE=doc gost gssapi idn ipv6 readline seccomp ssl urandom xml
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
LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl
RDEPEND=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 ) !<net-dns/bind-9.10.2
REQUIRED_USE=gost? ( ssl )
RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.2-P2/bind-9.10.2-P2.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=3860dc87bb0c014fbd6f7d3cd4999032

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,28 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX bind-tools-9.10.2-openssl.patch 3480 SHA256 67e45c17a88efd3b0daafc1dec0d13cb5cd1628534e3312b3ddf2324087f0068 SHA512 6acd1bd906429abe27ecb28d64f6837d4f11c2906cc4b750c454357056083a1afb078b4e76477b777e9b6eece173442a729ca73cc345bb6a964e6bb6acdbbc67 WHIRLPOOL 4f4d5f197804f89490305e389cf3afae3b40e330fcb04d355355f5da7a45121c9cd7af7d53b3ebeb99c11c7c12bfb446255e868f5cc24d2cf79e8f60413544d9
AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc WHIRLPOOL 01365d359cd7a6e1e2e8015a041df3747c58b3942a0c586c9db6f2cde36351e95ee8650483ba0439b9a748a354e134145945217a44e38e11722fad5f21278972
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
EBUILD bind-tools-9.10.1_p1.ebuild 2932 SHA256 831a2bdf6d6e9417393b01a7ad94b0facd62be46ba0faf554a6c8d135e04b68c SHA512 1129915a8e440f996ce7b5402b67c8f683a205aaf0451f4d3d9908f0ddb01a9978d2ebcd89399ec9da1aab8ff46012e5c0bea1a71eba8f6f4e57704fefccd1f6 WHIRLPOOL 0762764b4d5f4320af4d551c7ebcd4a9145e9fc8645b33fcd8ec8d82e0a596650278e4447b8795f7f7064de2f642e3ac392d975578d341cade1d6ac58cb4362c
EBUILD bind-tools-9.10.2_p2.ebuild 3052 SHA256 e0f3d7b19e4e2cf4a0441cb41ccf5391118bc840f76131b54f2735b5d804a454 SHA512 2775b5e42a2c39a0a34e0ed33b43536d97fc1f6052374f3de72e0c4f87b338ddd9954563986815a07e67985cc7c4b7920afe7045f5bcc5a751733e7d081ae95e WHIRLPOOL ee3d418806a352ec994cb8b3ff535bb8d75dfd3ea4f8eea922878263fc7c816adf1f2fc60e500fddd02d4b4409316e73ef46fbeb102c8d1edc1d9fcdc6721c40
MISC ChangeLog 42396 SHA256 1f35ddc61ee04e1eb7cb0d99f4c49ff665477d456ba1ea08e039eea4b76bdc77 SHA512 c1b8720a91aa51ad540ac28a86579e3f1d7d40d37d08c9046dce84347baed49e5113c2773d2b438d59331aa0d4cbe7e3fd5bf6cb606bd4f7135f9c6b86a949a0 WHIRLPOOL 7c1c9d016271064542b7a7826453f8d25316bcd3a14de15a3a041d34587ac3063e2f1dcff2149e50f5ac60e7554ef0a76bbd889bf9eb2ade67fc163967086b1e
MISC metadata.xml 499 SHA256 8d5d4d0257735d89c3435d0c595aa743e08e79cc8345996a00f1cd0744d92c3e SHA512 d6c960b12a25d46a767131b94712d643c6fcd9508cf9dc02eaff1681749819a0a11615d8fb2b76ba6b78252fa14d21755f05b4f9a7157e16a97a52bdbb688301 WHIRLPOOL d7d8ddf46cfcc638c539d7eea0212086923fdd866b4f9b4c6d1808ead5ccd9bfce63736ede94163998fc50a99664ce36ee923cbdd133dcc033448edb4f7ec0bc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJVsLVkAAoJELp701BxlEWfFqcP/1hANLhhU0xY4De6vKf/Tu6y
yYKw6gN1J+AUW4s7CJv3iOeKRy/1omd9Wz7R/61+nt6A0CNlZ/zTv44yoO7BQYFV
JicJG6pyQz2DW1XsZSAOpUiEoozrIY2tmJlPwfzpek5VYB9xFrUxz/rnIdeb9mfV
UQSQjPMEzMmil0/J/xiPY+m6icPWpzaniU8RK4GM7t2qA6uMnflDpuvvQ4BUSbi7
muTbyClG3/ZDFsN4agjmuFGuqQJlT69dLvNZFfO2ExBlcJz08uZMeDd3dSGvHMJ+
PplW885IGJSUj6GdkQ8zkk/g60Xbpry7Z9dpQotKmuweplsdYSMNwcDkT/tiRaqe
uSEKOeiYB3sCfFEk9X8MrU5Ricnb8dPlDzWQEVsQQqe2SoRuHzBlf+AH7JiQkqrH
G8MWidVpLu0fcwzMRe/OTJDzMi07OHMbCgCszBCsQwL6BJ4es9LoUBbkMwMUDHZY
cIIw/LiGh7vTZxFcSB0HmjOKbkIIstN1e6DNnwOy6nXRjq4X+2xET3Yjkld3VM2C
R+bkE8JbL14dE8PxCa1agAMfZzMbKPql42JIT3TMlZP5MHtIdB1naRrEBc81e6Kp
orBi3v3ZZwCTieNoYP/VK0b5FiHsfgXQu6V3m8qiYKGlNipHalSkoIfM07e4daIF
m5zyCE9e+H5r62UH0Fdf
=kIEw
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,119 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild,v 1.10 2015/05/26 01:53:40 vapier Exp $
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
}

View File

@ -0,0 +1,125 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild,v 1.9 2015/07/23 09:35:31 ago Exp $
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
}

View File

@ -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

View File

@ -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)

View File

@ -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>