Patch configure.ac to search for arpg in glibc or libargp, bug #292191

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 97 insertions, 20 deletions

diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index be86146bd29e..048974e0a46b 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/rng-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.30 2010/11/08 12:18:52 nelchael Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.31 2012/07/19 10:44:13 blueness Exp $
+
+*rng-tools-3-r1 (19 Jul 2012)
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +rng-tools-3-r1.ebuild,
+  +files/test-for-argp.patch:
+  Patch configure.ac to search for arpg in glibc or libargp, bug #292191
 
 *rng-tools-3 (08 Nov 2010)
 
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6de0360913df..b5944da85b24 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 2/rngd 1488 RMD160 eb3628986ba3896deb8dfaf6765c052cb2d673ae SHA1 ce333b36be8144f24d55397c06dbf0eea4f3563d SHA256 00f8d05292565feb750d20af4ff6ff8ee20a14ae09c0164ec7b6b4b1ee67028d
-AUX 2/rngd-conf 259 RMD160 278957b8acad462fd5c888344fb21a52dffd1c6b SHA1 a3fe13793fffe10577f94398946b20142eae0771 SHA256 4dff7a0c8406f5344f71d236e755877388e93ff6728eedfdfe6921b3de41d137
-AUX rngd-confd-3 714 RMD160 68a896a6ac5af055c4d8938b4e69e9e638c43eca SHA1 e7a4b3bab3c4fa4216d08d4e543a3cab31794c78 SHA256 542ef931152a71888b8d1ebb2c1f5d43edefcd2902d616d635e1d15a0e742519
-AUX rngd-initd-3 1822 RMD160 117ab8ef733d2b5442a74b04513e53319e103aa9 SHA1 a872e855ad1939707543e75182fbe71bda81f54b SHA256 39ddbbe1caaa1404799b535ef2af63ccefc9150aa0cfa7ae43716f7f890f84fd
+AUX 2/rngd 1488 SHA256 00f8d05292565feb750d20af4ff6ff8ee20a14ae09c0164ec7b6b4b1ee67028d SHA512 8cd36378028c8e62e8e0b3f8afac155b65a0751c62f69f939f8273958eed6d53e450ae71ab4c400d41efdba3b76c1f08247560e8cc798d6d0e4175bdb4398464 WHIRLPOOL 1bbe2c0f47a66534b40d3ed12896d569774f4d3fa4d1fdd0a36fe91c34bdc51efb71603eb4030ee6b464c50acd51792f97b08e77d84ebdf4698d6770e3775a39
+AUX 2/rngd-conf 259 SHA256 4dff7a0c8406f5344f71d236e755877388e93ff6728eedfdfe6921b3de41d137 SHA512 68e08ff2dbcbb6b4dc6235ba86070b296aa6439f17dbf61d8d992e08790a57d52cece0fc2c3b384b10df66868676ae2202621eb2fc18154eb2c7ba2cd8f74ee5 WHIRLPOOL 58f6e9e8975bf8abee0ef944ce48e4eced5c0d06e157b3e3fafdb55dee218399a47d2f7bbd04376e6d4d20e426ec7d2f75e1729f854e8062c997b3a972d801e8
+AUX rngd-confd-3 714 SHA256 542ef931152a71888b8d1ebb2c1f5d43edefcd2902d616d635e1d15a0e742519 SHA512 398c31775d10e8f54717c05228bfc9166d260ae51e90c9819109ffd6086d41c7b48236e3c56dd71e0dacb6f10a881349bb14cf02e942933093fd15ca0068bd0a WHIRLPOOL 0e2d71c005452c865dee38bded6a9ddea048e28c09ee17160fd7da51913987d38e7a96d4ff517105b567e6f25783441834ca4621f590227747a4b55e29519b85
+AUX rngd-initd-3 1822 SHA256 39ddbbe1caaa1404799b535ef2af63ccefc9150aa0cfa7ae43716f7f890f84fd SHA512 f21b850db5098cdf64dbfdba3c22198bfbd3d513db9c217c6a3242c85d6374d8c66697b61aef4f7536e95dce8f639ee224d0a517f2d85cddae661419e7b1f5b7 WHIRLPOOL d99393693d6034b6d2a49c3d0ae2cff7bf14632e132a69470dc2a339efaa53ac8f600410b50c2f744d0dd17fa90271f72fcae04da437f23af9efe872a7127af3
+AUX test-for-argp.patch 1318 SHA256 222ee3b8bfbe4827140a67af4b8d170aaa135d5317e3a40b236f8d79a06c4274 SHA512 9418bea246052391e9dab1583a7e44c47f87c34d39860c76bf11090fd397ea70ec76cb7e4c91afbe1f18a19c6f8767e0e6ceec02fbd7ef8204e8ab168f3077d8 WHIRLPOOL a54d1e8f4d3e1070cda067120318d775f0a768836984c831cc84929801d29e5f7c694e90e96926e52af57d509a52d4340c3cf9ee847782927d3dfa16fa3f758b
 DIST rng-tools-2.tar.gz 86429 RMD160 c40bc13068ffb48e28e1a8da274c0be40deb0a8a SHA1 45f43b0992b9978f9e0633d31d7f4b2a3643d293 SHA256 1126f0ecc8cab3af14a562cddc5d8ffeef47df7eba34a7aadcdee35a25ec2b1e
-DIST rng-tools-3.tar.gz 102366 RMD160 39d1085aef770e901b89add28cd06a66a2f15f1b SHA1 018d69523ab8d1ed5c06575d7a61499c2a952ff1 SHA256 27f8041836f74342268aed4acdc28bcc0438b8461695d277cb81096d7ecaf4cc
-EBUILD rng-tools-2-r1.ebuild 780 RMD160 04c419c84306e79aab5a9220a3657a3bbe73641e SHA1 c8b1b7113993f9d3605e982d3cc2e7e369c886ac SHA256 c807a02a07216dfbe879742ae75cc33d3870d11f07cc8a9c5de43da0b8c98e21
-EBUILD rng-tools-3.ebuild 760 RMD160 c8c268d323acd672bb96bdd9ff7eea810b8cbf75 SHA1 27f2870b4e069d8a88d447f46632a6c58a094e16 SHA256 643394e8733c3004af0326658d6a0795f69d9fa65b39ee9e63ed0ce19a472206
-MISC ChangeLog 4254 RMD160 b43c121829af8c179f8e2ff825bba283d9fe832f SHA1 81215596a577f3143a4943783bd3149ec2ff912e SHA256 87e322e983a6be23c6b759fd9bb118ec1589850e02e84881311f58d1d704e900
-MISC metadata.xml 231 RMD160 984878f0848eaa1ef84b38196bb704d218277437 SHA1 6015bdc80c95314a6250c06380f316ca4c753770 SHA256 c9a6ce79e19aa9257b980bda6f6b6332d0fcb81f50800bb12c1a1c6d2f5cd443
+DIST rng-tools-3.tar.gz 102366 SHA256 27f8041836f74342268aed4acdc28bcc0438b8461695d277cb81096d7ecaf4cc SHA512 37818c4c77627828e7d6527d18b7fb3a810dc68e6c2138bbccd470ceba0e497e91d2f1b96af2264494f36216eb81efd79a1eb35f3134dca9928d838db585e295 WHIRLPOOL 716258c1fb24ac129e7041d619560029bf0b1a68d1587374e8057af429d08b58f0563d2ea693980185a2828b67a24bc9b4febf4d3279e22710948c817678f96e
+EBUILD rng-tools-2-r1.ebuild 780 SHA256 c807a02a07216dfbe879742ae75cc33d3870d11f07cc8a9c5de43da0b8c98e21 SHA512 0eafa1f6f50d319d0d093c4ffad98cbae9d654a45da5923670537c19e54f2d6d373a8922cb61007efbeb413d15d61b8b71db1cfafbecbd241891d68dd28da7d2 WHIRLPOOL 1732fc34c476d647f3e456a0aeed96df9e4fb62567d21fadbbb00beca4f95913b8654a65353bdfed5d8970c8820922560d03bfe8c377153275a4f4609a7af53f
+EBUILD rng-tools-3-r1.ebuild 812 SHA256 2dfc702529144467a9c468fc82c9c4dc95dd5cd78d321564db48af0ae2bc18c4 SHA512 d5fb6c4eb68514a2a0aabe64179485593b39ec97bd3b9e861868c31ea9a625240740f7c897a4063ec6b6a82c33951be89045424cc2254e529cc9d628b2aec430 WHIRLPOOL 5a771061b9ce65f25a799719110e49e95a7e2b76528e2ad7be61778f8e605c0759cf030fc101a7c47f54649a94ff7fdab64ed9da97a04089548501a206641f80
+EBUILD rng-tools-3.ebuild 760 SHA256 643394e8733c3004af0326658d6a0795f69d9fa65b39ee9e63ed0ce19a472206 SHA512 254406e4647b4ea176bc12e822916e2b807852731c7ab932181e7c65dbb447b827840fe7f8bdf79f450cb261d6e1a3226e923110ea20c547d1907e2ff21ba21b WHIRLPOOL 08e6099eb5194ab5e28ba7ac8af7ed5907bb8c374fd9a28b53e2c42c64c2a20d9814d3c50b44a858827fc8fc8d52b3e6551353ac992cba657a7a3f3868c02105
+MISC ChangeLog 4468 SHA256 0291f8657443c0037e75bd582367cdb4c9cdcdb120b7b4e64d3f111b13f7d9e3 SHA512 5ea4c5b04f3d797a0e9de3387036fb2df16c64fbc3ab569c6ae3efe7da408fc3fc8406180fe2d6e54b115473938a8140410c5a39a24768b34a52ea5713a20734 WHIRLPOOL 05657d2cebe52a0e4a3b487587d15b542b2e06b162531d6f2b2e0e0e480a3e8f209e3933a2716f479fbf0127df0d2f56528ee4ae54ab74865ed9d5d143b6726a
+MISC metadata.xml 231 SHA256 c9a6ce79e19aa9257b980bda6f6b6332d0fcb81f50800bb12c1a1c6d2f5cd443 SHA512 60fdef1bbdc210aae5795ea43b2c115ca6fd32012cd7c68295574469c9649b89d7fd48800565fe3eb55f0e1228cbabd5ef4e401fed71a1ea563c9d903ff0c35a WHIRLPOOL 665a14a2e7310ba9704744038162bd870185c61b7af8e884e39a001866d14545b618ab554a27d09995b7d7510550aad4e7d6701f7d441cffe78e23994c8257dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM1+qyAAoJEBZyv1r2qA5GXKYH/iMBf4okRbwNcPry1O9vR6Z+
-5NFJ4Z3ylXg4gVBZXAVkgCwHE0bkAIWE5nJyJnjyuxTI5akrBvGq729VG6KXepFo
-eOm886vhkETwmuYiVlmGrG/isivYNw3yaJt25TNKPPMOM6beFeEOY6z1SUPFcrJz
-yQFERWu2CBm3cK9GNBikqcNULMoiU7L4MGoRGJkVtPfzm9gcF6qrrkmTnDbAl8sm
-Y7Uyw5n0G2UQEJFrYctZMhCPm5mSEL6xwNDSgTZx1vnQpbhV0Zd54LTzhjCl/943
-jI3/wXdf/TiVJ5xI/PxZwA5NlCdgQPSqgyHdH1/6yWdL9/8AiWCOlUnbxedNzdc=
-=pF2e
+iEYEAREIAAYFAlAH5QkACgkQl5yvQNBFVTW3WgCeIhVVtNAlxT7u2Mx/Z3fXwIjx
+qj4An0UQ0UqconiAKuhuL/mNJ7NMDsyY
+=E/iA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch
new file mode 100644
index 000000000000..129a522e5686
--- /dev/null
+++ b/sys-apps/rng-tools/files/test-for-argp.patch
@@ -0,0 +1,43 @@
+On glibc systems, argp is provided by libc.  However, on
+uclibc and other systems which lack argp in their C library,
+argp might be provided by a stand alone library, libargp.
+This patch adds tests to the build system to find who provides
+argp.
+
+X-Gentoo-Bug: 292191
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191
+Reported-by: Ed Wildgoose <gentoo@wildgooses.com>
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+
+--- configure.ac.orig	2012-05-26 22:45:42.753478198 +0000
++++ configure.ac	2012-05-27 00:36:23.175844081 +0000
+@@ -47,6 +47,28 @@
+ dnl Checks for optional library functions
+ dnl -------------------------------------
+ 
++dnl First check if we have argp available from libc
++AC_LINK_IFELSE(
++	[AC_LANG_PROGRAM(
++		[#include <argp.h>],
++		[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
++		)],
++	[libc_has_argp="true"],
++	[libc_has_argp="false"]
++)
++
++dnl If libc doesn't provide argp, then test for libargp
++if test "$libc_has_argp" = "false" ; then
++	AC_MSG_WARN("libc does not have argp")
++	AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
++
++	if test "$have_argp" = "false"; then
++		AC_MSG_ERROR("no libargp found")
++	else
++		LIBS+=" -largp"
++	fi
++fi
++
+ dnl -----------------
+ dnl Configure options
+ dnl -----------------
diff --git a/sys-apps/rng-tools/rng-tools-3-r1.ebuild b/sys-apps/rng-tools/rng-tools-3-r1.ebuild
new file mode 100644
index 000000000000..2fbc435488f0
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-3-r1.ebuild,v 1.1 2012/07/19 10:44:13 blueness Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="Daemon to use hardware random number generators."
+HOMEPAGE="http://gkernel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am
+	epatch "${FILESDIR}"/test-for-argp.patch
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog
+	newinitd "${FILESDIR}/rngd-initd-${PV}" rngd
+	newconfd "${FILESDIR}/rngd-confd-${PV}" rngd
+}