Add uclibc fix (bug 230091), add CONFIG_CHECK for TUN.

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

4 files changed, 45 insertions, 8 deletions

diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index 357f80094ec7..91ed9f44de3e 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/aiccu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.33 2012/08/01 09:37:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.34 2012/08/01 13:32:14 xmw Exp $
+
+  01 Aug 2012; Michael Weber <xmw@gentoo.org>
+  +files/aiccu-2007.01.15-uclibc.patch, aiccu-2007.01.15-r2.ebuild:
+  Add uclibc fix (bug 230091), add CONFIG_CHECK for TUN.
 
   01 Aug 2012; Michael Weber <xmw@gentoo.org> metadata.xml:
   Add Maciej Grela as maintainer.
diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest
index 4e6b9c5459a5..1687d2df5023 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-misc/aiccu/Manifest
@@ -4,16 +4,17 @@ Hash: SHA256
 AUX aiccu-2007.01.15-Makefile.patch 2128 SHA256 8e282eb8004da15927cb4811e3a3c007cbfb39fab15483b5b918f78e0cfbfcd6 SHA512 bafc7d397edcfc24138fc32137dc0ee6eb2afedd5e14656e3b769ff50790619a421b5dc3860c316e4c2150890154ded1149eaa5e23734dd0e2471464ff032544 WHIRLPOOL ec96c82ef7b2058a82fe4ec2c2a0217a5bd9447eb6b392b9b77db6d9527b393cff2b6892f34d6645728d181cc754dfb66ba27ab687843c82d9cca315e0acfa48
 AUX aiccu-2007.01.15-r2-init.gentoo.patch 677 SHA256 80f1503eb963484ffc8c7dd5a4ef132721439695f5fef77eed0220edc1927a47 SHA512 06ca8ca7d860fddf3c1f30eecbfcb7fb8b2e62b66ea3fbdba25af16b03fd91d47c26c54f9b5589c1e91b3a2dc7efeeb457b98db7dde85484402f6c24db0e2570 WHIRLPOOL 1a039cfdc006023ff48f6d37833c37a73bee1ca86fbbdabe079454b1c205064e3c9bd8dfccae246e7db5b161dbf93a5a1810f42b6caa889f4668f9321bd9447c
 AUX aiccu-2007.01.15-setupscript.patch 414 SHA256 f1bcc87aac41d1c9bbb667c3a26097bf8939279f983245a76c1f7224a1f5c675 SHA512 6170c9c52516d58ea68f2acd61c78379f21a1810a9c19867c57249547aa07ca35b1281ae4dea905ac4600d2b2643b3a1c7050e3adbad963efb3554688dc4ac0a WHIRLPOOL f6257d70de47c9003da2fc9afa7367d770f9b1a9793aca6c847b238acf6f353d6f18a35ec9611dd0db9fbc4eae59c340ad0d1aecd95a45bdff278e61d3eac55b
+AUX aiccu-2007.01.15-uclibc.patch 790 SHA256 221f6ca988595ab183eeb09cd50ae2cec2f7c5eaf6aad9a8b1a781aabfdb092b SHA512 fe2382db103f1cda397dfdd02b97e44e1b54b256d87a81fc04e46b999ed5692a077f15a974414f7cbddf6e22c5ba975da0d0fa96e5de516c3741d9121deafca6 WHIRLPOOL cd6fb97e889cc02940146aaf55d7235b916ea63e38ed73a0fc8a1812bd46682078dac64f52452e7d95a47565736fcc6af0e4ff7b500f3fc9d3bd9da26554b27b
 AUX aiccu.init.gentoo.patch 651 SHA256 bcb1e6f002b83c519fed4dd54012a20828e86e82e54d1f0142fe1b50c1a59011 SHA512 bfc40346453cb1aad7ae326e3b4ebf66f540817c3a3666ba3b2485af727e2f7f998a306030b3811dd4aa4af1589cf0c940cd72e47e258986946a22bf338a69c2 WHIRLPOOL 9df742b071d25060a7a433e4276673ba463bdf7f4d6c4aca0a6842b37b6d9671c37559608467ae14024e625fa146c822e89be898d48d193326e8c480d3aa7742
 DIST aiccu_20070115.tar.gz 70056 SHA256 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 WHIRLPOOL a5743e9c28ec3b9f6bc43f1b715553842a13872f18281239ed76d3b322e3a4c3c3e0f0c5d80b47694bbedaf831d1b3feed285af9f37174cac323b2c1814813d7
 EBUILD aiccu-2007.01.15-r1.ebuild 1303 SHA256 bf9f24609d68678a9c6aecf0c37326d38cb8d0e06356d60af4829ab4fea60050 SHA512 0df7ba7db6d161ee0722d94ca3174fffd0ab5147efbd3d69e3dedf993742fe84c333155ecb385e6e014a7812717bfa32098cb05e00ec78e25a89ba5bc828a89c WHIRLPOOL a96f43eb049063b44b299d4a6352c9455cb7dfce397c1d603ade4f8bf908233cecb4d2d69695326232cbea5d2bd8a0f11d4e4cd61a829e8a1000bdb36a980da1
-EBUILD aiccu-2007.01.15-r2.ebuild 1103 SHA256 fcf1cbc3189b02c5eee0a35d7ad08ad3f11168f2ee11afdd2d80d439428f7614 SHA512 eaa792ac8485daa5b1e1558f9e00abe02fdee470274c0f2082141ffc7bd303f307e7241733b20c3455fd60e03253c187bea6ef0580fe895d91e3fe2075e196bb WHIRLPOOL 41ae029b6f66560a8a0f38e6477932675e35208365b4e0272768eb7a21730efac3244b1eaef4ae6014c7821ecb7ee24e91979fa388dcc5607dbadd015360cde0
-MISC ChangeLog 5050 SHA256 f79ade7b48b6a72a25dcf3c0e5890490c08e46cca1f59b001774d49f40141802 SHA512 e8f8e2bee6435e53b49aceb98f03640ae64e65e2320f9d3640207f33e54f527ae159b43798c978f52b4f3095f381d594c6d92ef21aa292af6f35ee177d9ba11d WHIRLPOOL d23b79590678d418fd3a1465518f6d0f069cc7304c62014eba2a34177fbe18a9399b6227af7c1a564f14f00d3a7d8d19eec5e9baca987dcaafb65e96a267eda4
+EBUILD aiccu-2007.01.15-r2.ebuild 1175 SHA256 236409cd488328f82c89d03f851546079a181ffa391dfe863060d3521c9208c4 SHA512 3ff4edc39d10ee06e30204d3f82209556bef18d4cb0796ed7b6727b683ce6a80e2af624ca048fa22dbac43de9881457b866233d47ce2660dedc8d2c6d2369793 WHIRLPOOL 892aa6188797348f2809cada7daea16b89f28a642cbd2d47dd950f56beb879c1be2b66692ecfbdad05b640acc9a2bed7e0aebec37e84003526f3782afabfd69a
+MISC ChangeLog 5222 SHA256 2805a31765d4643eefb6d7258fe4f4851a1bd5c6a2cddb82a7862237e4665f08 SHA512 ad8b73a2aeb03a9e44fc064c281ef6460864894f69fad4af1fadaafc2337ee7d90920cdbd18a697fdb75ec62bbfc37d4523ddc97c04075bc2966f5c61783b2fa WHIRLPOOL 1f5d576fa797675ee676064768566686bbb77ea642878dcf5d359d1822c0dba46ecd827b726491315998eaf3e53961a39a7cd2c5abf1b74b1175a9c21b06272b
 MISC metadata.xml 314 SHA256 815a7ffa50ffcb968845dc47b40c85688272900b4102d1e287930b8d2b60b605 SHA512 3ba7f59520ef6c1d52c66f05205766af9066e271bc2b07942e9edc10d60455076bb5cb44dc37c28592f6997c606d829453c33ce5677cb41846fca65ff4a6bd17 WHIRLPOOL a64c94caaadf2af3c2667e77bee92abe7ad97bbfb1cd84620d9d1aeb3800df43fcafef3618a542b47d0bfd10464a04b9b0c7c2aede640d60ae3a2b24621189dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAY+JwACgkQknrdDGLu8JC59gD+Mf4vj55t/qQ9pzlTNA2Qmqtr
-Z5nRrCGL3k1ZeFZhF/cA+gLNYG6J2ZJHe4Tg6RL3CD0doxAvw3kUZn4Vd9Koslkv
-=6b/G
+iF4EAREIAAYFAlAZL5gACgkQknrdDGLu8JBFcwD/WJPEZ7dyTNKuXryOBq17s4oo
+16Kr2noW2ubVtXMLnPcA/34iuFXTuEiFIj52a9B7qzCmde/ORen3FGG45ki2lwtp
+=FoPF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild
index 3203ddd82e98..2fabdecd399f 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild,v 1.1 2012/08/01 06:39:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2007.01.15-r2.ebuild,v 1.2 2012/08/01 13:32:14 xmw Exp $
 
 EAPI=4
 
-inherit toolchain-funcs eutils
+inherit eutils linux-info toolchain-funcs
 
 DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS"
 HOMEPAGE="http://www.sixxs.net/tools/aiccu"
@@ -21,10 +21,13 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/aiccu
 
+CONFIG_CHECK="~TUN"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PF}-init.gentoo.patch
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 	epatch "${FILESDIR}"/${P}-setupscript.patch
+	epatch "${FILESDIR}"/${P}-uclibc.patch
 }
 
 src_compile() {
diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch b/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch
new file mode 100644
index 000000000000..56341dea72f4
--- /dev/null
+++ b/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch
@@ -0,0 +1,29 @@
+--- aiccu/common/resolver.c
++++ aiccu/common/resolver.c
+@@ -26,7 +26,7 @@
+ 
+ int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
+ {
+-#ifdef _LINUX
++#if defined(_LINUX) && ! defined(__UCLIBC__)
+ 	struct __res_state	res;
+ #endif
+ 	unsigned char		answer[8192];
+@@ -38,7 +38,7 @@
+ 	uint16_t		type = 0, class = 0;
+ 	uint32_t		ttl = 0;
+ 
+-#ifdef _LINUX
++#if defined(_LINUX) && ! defined(__UCLIBC__)
+ 	memset(&res, 0, sizeof(res));
+ 	res.options = RES_DEBUG;
+ 	res_ninit(&res);
+@@ -47,7 +47,7 @@
+ #endif
+ 
+ 	memset(answer, 0, sizeof(answer));
+-#ifdef _LINUX
++#if defined(_LINUX) && ! defined(__UCLIBC__)
+ 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
+ #else
+ 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));