Clean up openssl logic to fix cross-compiling #417129 by Bertrand Jacquin.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 293 insertions, 15 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 4f5c641916cf..27a2536f0de0 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.284 2015/05/26 01:53:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.285 2015/05/26 03:01:00 vapier Exp $
+
+*bind-tools-9.10.2-r1 (26 May 2015)
+
+  26 May 2015; Mike Frysinger <vapier@gentoo.org> +bind-tools-9.10.2-r1.ebuild,
+  +files/bind-tools-9.10.2-openssl.patch:
+  Clean up openssl logic to fix cross-compiling #417129 by Bertrand Jacquin.
 
   26 May 2015; Mike Frysinger <vapier@gentoo.org> bind-tools-9.10.1_p1.ebuild:
   Mark s390/sh stable.
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index f64a47f72943..413b0d8f0e41 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,29 +1,31 @@
 -----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.tar.gz 8481111 SHA256 6f9bb7908aa45c1edfa391e356fc0afc1ded175386cdefb6cf9e1289f7457a98 SHA512 e4c72fe52641a515620930d0e1c149e6f0d9cec2e1a64cbfd510829d908ccab7293197dbbe603c863168f9ea9ded57b27b32cbad02f8b60abc91acb035c2e79f WHIRLPOOL 6b1df7b711fd6d7bba0aad533a11cc979d9e06ea43d4c160536306945e18ece8e622077f75be0bf6a077dd6b40789377e443d92d7dbabdb528b3bdd24aec0553
 DIST bind-9.9.5.tar.gz 7729695 SHA256 d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1 SHA512 2639e73c0b57a6a34727e65e44a6d4c90e8682145f92a0a543f80fe0d3cdf707287b67d7ff9f1da5cf91a3c23861033b542871bc909ce0f538b4d3d368932574 WHIRLPOOL ad25df5dfebe06db950755d46531ceb36ae5f8dde38d1a53a3ca593bbd62161535b8a611c6a89701ff5853c740a5a2ff5e7f83da3841ea5482718e569b9f9c71
 EBUILD bind-tools-9.10.1_p1.ebuild 2932 SHA256 831a2bdf6d6e9417393b01a7ad94b0facd62be46ba0faf554a6c8d135e04b68c SHA512 1129915a8e440f996ce7b5402b67c8f683a205aaf0451f4d3d9908f0ddb01a9978d2ebcd89399ec9da1aab8ff46012e5c0bea1a71eba8f6f4e57704fefccd1f6 WHIRLPOOL 0762764b4d5f4320af4d551c7ebcd4a9145e9fc8645b33fcd8ec8d82e0a596650278e4447b8795f7f7064de2f642e3ac392d975578d341cade1d6ac58cb4362c
+EBUILD bind-tools-9.10.2-r1.ebuild 3064 SHA256 ca8f7d29400f4a57f63e5ed1cb0e61348ae43c07376ce2e59d7e25788a9f8950 SHA512 0f5160a549a973640f5f3e6cd24a3cc317132cbf4f73520805d305757b8e75c2c05717eaea6fce69dd90ecfe639e85bf0305d0f9d4af40891a5fc8d72db976c4 WHIRLPOOL 725684a3d7d206d2dc8fa4ae39c27330246947e52a4ca99925b146601ad96cd7ca5357becf333713708ebf897315547384ac1bb3c97fc641833be677e567a913
 EBUILD bind-tools-9.10.2.ebuild 3077 SHA256 f954a64f4b29d6e6f6b20a8ffc80f16433f1583c56a7a843c20af949eda7c066 SHA512 7da8c5c307e783341849e0417abae984640c90df00bed4e718385f48d3950eba848bce20074a6d3d55964e2080bf4b3a51da987f0e273b7a1c312ad4b9ce1f31 WHIRLPOOL 37732efdf9ad4f78508cc2532811f9f1d109656d3590981ac945687392decb07b77d4572cd8e45b1665f92cefbf86d22c216009d90c849509013f038d65c55d7
 EBUILD bind-tools-9.9.5.ebuild 2725 SHA256 ee0c2ad62f49fd08b907c3d4eac80867226603902b0280c323457b51f11b7739 SHA512 44eb686d6390f1320757dd31c1eab84fcd524acf3323e2ac909561937652438febfc515619584070ced40628182d7deb68c69621c39460b1d8f0f204ad54cc33 WHIRLPOOL 22e3a13da29727f6894fff6c33e8ccb5257d1690ae12948e6130ccbeee6921a38af90b7cfd729de38bf2bb030bea7501ee05283f334339c68647f9f5aafedbe8
-MISC ChangeLog 41029 SHA256 c8956a41102eefb82b831587ac462987bcfb43902844657a5504b58c18e8514b SHA512 add0a7310656386d3f220de4b6d7809b2d2fd31471636e6550b568607d49565b2f2a7d3e8a5ccee0eb0318064404ce68c5f2a90e40c51e425dc3a8bff6ad2531 WHIRLPOOL 4724a080b914ad0dff468ed0e6a5726ee379beebda9969ac018f04799690b9bf0776d0f3edd7fbcc01403b3b0cb782142d03087d0a9ef249ca96ced83ca940f5
+MISC ChangeLog 41266 SHA256 63e0abdf2ae5094771ac1be26ce8f984b1b0d2396524b35f26e04c0136d6454a SHA512 fb68bc6d781d72c68d2a9d2242422a9304f3370183e73569fa6392994b1b4ee98546966126ed397b5fbf322077a85ffe3dc3123370a68e345fe458c0e63a5509 WHIRLPOOL a9c6f72ab2bd5f244b8068ef4a2ec35645c078e22233eabd2fde079719b9d450cd74f1d16b4c9c79d5f0733d4455c6823b869a3c5c3a243bb09d73ae3d9f68e7
 MISC metadata.xml 499 SHA256 8d5d4d0257735d89c3435d0c595aa743e08e79cc8345996a00f1cd0744d92c3e SHA512 d6c960b12a25d46a767131b94712d643c6fcd9508cf9dc02eaff1681749819a0a11615d8fb2b76ba6b78252fa14d21755f05b4f9a7157e16a97a52bdbb688301 WHIRLPOOL d7d8ddf46cfcc638c539d7eea0212086923fdd866b4f9b4c6d1808ead5ccd9bfce63736ede94163998fc50a99664ce36ee923cbdd133dcc033448edb4f7ec0bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVY9ImAAoJEPGu1DbS6WIA9MQQAJWSM/1Endb7zdbRtWHnGH/m
-AmjO9Vsi+KqOSdxWUMvjC8NqQh4k76IbAytdzaHbMHRIFLzWeFPxHL2QEbY44BLy
-R9WBTL/aiaEmSu4nSViroC2Mfa3SSPtlSpwA4tRQKbm3ABsi5kgQTuvQGATLQEC2
-F7kCeLZRxExYJ9hwDKwFay0V0LfVagzkXG05RaAhce/i8Lh/w5Ff++hxN54zxi0o
-7PZXisrQ1Sry2fx06l13VWsOCT1CvzLVaiVGjIN/Om/5Y0z3sx06yHJeFqR/ym8w
-yikaARIzwOYbApTdb5jYgx221Ibx5IgLpHDjyQDOSpkpnCgq1SPGl47J8ng7Fbr1
-OBl5pAiwa3ZbmLnFIShtjYiYYrTWOrtO+AxMk14WSc2SANPybzsPyj5ZsElzRIS7
-4+aExN9oblsy670vFPk22MwVx4RQOnQxQErKqIJvcEUVMbSiX9l15VF0UfySSTxi
-gWvS/rJ8TAI1JIZuROWNAPtBHFQjQjG5c8mF1p0MZQZJYJ/RyTQxNiOiDK6FqONG
-EdoAVW7EvGs10AxtWVj8ExYJI0H73OYfdbgOT8mFIuIfgTfMNwgvsM6b7nEyi7aW
-za8TDTGrlvexxm/0cJE6d3c86ZticlQsaaPECMuAoD6xkNIdLzXfm8Rj2nTD1mqD
-KnAxIuTZpzxzzc7TZac4
-=xe5N
+iQIcBAEBCAAGBQJVY+HuAAoJEPGu1DbS6WIAm/sP/R4qxgig72lUQuvAucwoNC09
+bLJkSJSp4A9D07TVMsOram9OopoMYFIkaEUEeidcrwitfPevj/rN9zLZGYJyEQkC
+JePTX7ht6CNnap6QqE84N69iZEkCg10ZwY6dd8WloVo9jlPopkQEvWxHn+wRmPBO
+k0J3ENK92VCexN6qsCY9e7sN1y8QHWiCQqJpnl2yGP2Inh778sxzZxoqXOgV2OgZ
+USBVVgNClm6W7jG2/g7um22gAI6jDpugSvmKxg62Q4WeZh6CVrss1yuLsiC9NQmh
+NV97RrYJp/H6G2l5CWFERnk/z2IeiJAhpxV8zqpaDumj5nfu0f82xV3Jo+I/zt0W
+bWU8RYksWBP6+AZgjd3JEM6zsXpGIvqlQsw+yTacl5arsej0WL7jfui5nwsoTOsN
+eNFx0foBYubm6UxEJ9PH55y0UxsY1VD4grNOmRQh0RSI8p7Oj3cfww6MoANwOGGp
++vxZRkfWV0k792M4wII2xFdXI7abLgd4q4JDIi7WEojNTBEBF+8xJGcf89xLozjw
+StyX/8SJKsv2SbE9epZbx+ikKBzy3dvbBT0wHrUiLkRj7DNRSVMTVtt/Z791G8s4
+qhqQxZbenj6I+wyHCLCc82KtzGxaMsUiBzSajusRAPuZMPRirSY5pww3weYLQc2g
+G5KX3nJ8JOxI/ftwnYkE
+=T/h6
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.10.2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.10.2-r1.ebuild
new file mode 100644
index 000000000000..b0e61f3ad904
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.10.2-r1.ebuild
@@ -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-r1.ebuild,v 1.1 2015/05/26 03:01:00 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 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