Fixup building on uClibc #203711.

Package-Manager: portage-2.1.4_rc14

6 files changed, 118 insertions, 25 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 33ce46501932..490b3ddee237 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.219 2008/01/11 19:08:37 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.220 2008/01/12 10:50:31 vapier Exp $
+
+  12 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.13-uclibc.patch, util-linux-2.13-r2.ebuild,
+  util-linux-2.13-r3.ebuild:
+  Fixup building on uClibc #203711.
 
   11 Jan 2008; Richard Freeman <rich0@gentoo.org> util-linux-2.13-r2.ebuild:
   amd64 stable - #202181
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9052ae315e84..c82579dd7af5 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 MD5 d481354b916628f42634cebe8f10f464 files/crypto-loop.confd 412
 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b files/crypto-loop.confd 412
@@ -166,11 +169,16 @@ AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4
 MD5 a03d42a8a617b87e344735644a80ec5a files/util-linux-2.13-setuid-checks.patch 1860
 RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 files/util-linux-2.13-setuid-checks.patch 1860
 SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a files/util-linux-2.13-setuid-checks.patch 1860
+AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392
+MD5 69910b26908f68c1b5fddf52a91a7b7a files/util-linux-2.13-uclibc.patch 1627
+RMD160 3c52bac5b792c3ee6ccf69324729793314f279af files/util-linux-2.13-uclibc.patch 1627
+SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392 files/util-linux-2.13-uclibc.patch 1627
 AUX util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 SHA1 7152a9596d9f81fcb6b2ac867d5ce1ad679ebee7 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 files/util-linux-no-kill.patch 642
 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf files/util-linux-no-kill.patch 642
 DIST loop-AES-v3.1f.tar.bz2 173423 RMD160 7490e3d90727621fde3052fd1747af338518b158 SHA1 abcc9c29c16596923a0c50a9190025a08b069ef4 SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7
+DIST loop-AES-v3.2b.tar.bz2 222018 RMD160 638d86ca21298ca0a939aca263c6fbcf1fe17029 SHA1 2d417922ef298bae379533a726cff36fd9517093 SHA256 603854463078d24a66da30e474851c55e40c761f38af521294866b16e5319a6b
 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f
 DIST util-linux-2.12i.tar.gz 1975468 RMD160 f055a94ad247dc59293f7b933c12bdda135159fc SHA1 deb940cb61d9ae0b481b6469ea496f762a2581a8 SHA256 28e2fc70d7507e158d8861c958461aef1c4bbf4157a8ebbc237943944e5a8c4a
 DIST util-linux-2.12r.tar.bz2 1370907 RMD160 51950aafd5cbcb574e69fbd6b28d15a106147e64 SHA1 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b
@@ -188,22 +196,22 @@ EBUILD util-linux-2.13-r1.ebuild 1939 RMD160 fa606800880368364fccafdbb4b5d6ba799
 MD5 9506411fc3065fe4666139c74e469458 util-linux-2.13-r1.ebuild 1939
 RMD160 fa606800880368364fccafdbb4b5d6ba79992cc2 util-linux-2.13-r1.ebuild 1939
 SHA256 7f77607b1a4689666d596378b9fff5af76a4cac84bf62e302cdb167a2e5d3061 util-linux-2.13-r1.ebuild 1939
-EBUILD util-linux-2.13-r2.ebuild 2369 RMD160 f705e93e64cf45026ba7322973ffd3b19843929b SHA1 1d5e3c6a84bb8e2226ab98c152f3ca0aff5c73d7 SHA256 5b51c75a40b195265c7aa25d2480e099023328fe3955faa4b5010681ae1c136f
-MD5 4a38f105730988ebdefd9036e1c4a9ee util-linux-2.13-r2.ebuild 2369
-RMD160 f705e93e64cf45026ba7322973ffd3b19843929b util-linux-2.13-r2.ebuild 2369
-SHA256 5b51c75a40b195265c7aa25d2480e099023328fe3955faa4b5010681ae1c136f util-linux-2.13-r2.ebuild 2369
-EBUILD util-linux-2.13-r3.ebuild 2479 RMD160 48143daff6d24d5473b388f633ee3e8a4f79e9e6 SHA1 17087c2046fc0e661934969e417e3681cf287c41 SHA256 101305d02b02a00158345d0cc2e2361ba66a711df3ab975631cbe60b2965074c
-MD5 cc90a5c2645dab9fbd8db3d82fc85f34 util-linux-2.13-r3.ebuild 2479
-RMD160 48143daff6d24d5473b388f633ee3e8a4f79e9e6 util-linux-2.13-r3.ebuild 2479
-SHA256 101305d02b02a00158345d0cc2e2361ba66a711df3ab975631cbe60b2965074c util-linux-2.13-r3.ebuild 2479
+EBUILD util-linux-2.13-r2.ebuild 2420 RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 SHA1 434720501c11f981ed2a22df866b3bce5095351f SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e
+MD5 2ea8f28bf33b9c6da7fe376b2823f652 util-linux-2.13-r2.ebuild 2420
+RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 util-linux-2.13-r2.ebuild 2420
+SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e util-linux-2.13-r2.ebuild 2420
+EBUILD util-linux-2.13-r3.ebuild 2529 RMD160 ebb64e2177be3211bf6c338997c092b236a9b9b2 SHA1 a97bce3f0f35a3ab92e90ac6c333b1462c610424 SHA256 69ecf7b393758ccdf99ba68bee84fb92f50f5e230eef12cc23011a3096f33fea
+MD5 17b9617dc317e710c63f7b71e063eb47 util-linux-2.13-r3.ebuild 2529
+RMD160 ebb64e2177be3211bf6c338997c092b236a9b9b2 util-linux-2.13-r3.ebuild 2529
+SHA256 69ecf7b393758ccdf99ba68bee84fb92f50f5e230eef12cc23011a3096f33fea util-linux-2.13-r3.ebuild 2529
 EBUILD util-linux-9999.ebuild 1695 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 SHA1 e51e149f937d0bc3d2b7cc4897ae454f0767d217 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3
 MD5 3358b9404df679e4004ddfc1f0706fbc util-linux-9999.ebuild 1695
 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 util-linux-9999.ebuild 1695
 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3 util-linux-9999.ebuild 1695
-MISC ChangeLog 34183 RMD160 7aff5c4735603729fc49dc11031a8ea5690913a3 SHA1 5ab6be51684f372e8d2f054dc6e042c2422281cb SHA256 16c1f1643505035b3c7a0aef9945565d332f8074acdfb5918f6f374f6b879321
-MD5 8fa052666be6420fd39f89c44a36264d ChangeLog 34183
-RMD160 7aff5c4735603729fc49dc11031a8ea5690913a3 ChangeLog 34183
-SHA256 16c1f1643505035b3c7a0aef9945565d332f8074acdfb5918f6f374f6b879321 ChangeLog 34183
+MISC ChangeLog 34366 RMD160 4e0c79b3fa3399f01d790b63db205625b0b252c8 SHA1 77f3d199ccef8550991967ca200b15e24bc5ceab SHA256 0b85f9546109237889c98ab95ddbb47dfeb06de9a412e163439ae360c5855cef
+MD5 df6cd222af5bfbcce84cf51bfc564319 ChangeLog 34366
+RMD160 4e0c79b3fa3399f01d790b63db205625b0b252c8 ChangeLog 34366
+SHA256 0b85f9546109237889c98ab95ddbb47dfeb06de9a412e163439ae360c5855cef ChangeLog 34366
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -220,9 +228,16 @@ SHA256 5ef76e2b126dec2a44a83b45afecd748869c337733d1d0167cb418a69c7f6853 files/di
 MD5 4186a662d6ee50db80a1c9cf2dd171a9 files/digest-util-linux-2.13-r2 527
 RMD160 20a4700f7250f9138eb296421bc58acf852a30e8 files/digest-util-linux-2.13-r2 527
 SHA256 23cad3dd4dad96298070df7d75f7a574c279618378f393c2a85c7af8a9014c82 files/digest-util-linux-2.13-r2 527
-MD5 4186a662d6ee50db80a1c9cf2dd171a9 files/digest-util-linux-2.13-r3 527
-RMD160 20a4700f7250f9138eb296421bc58acf852a30e8 files/digest-util-linux-2.13-r3 527
-SHA256 23cad3dd4dad96298070df7d75f7a574c279618378f393c2a85c7af8a9014c82 files/digest-util-linux-2.13-r3 527
+MD5 e88d6d6daa5d74dbae373e5fc75f1346 files/digest-util-linux-2.13-r3 509
+RMD160 0c5aafdd7e046333c2752ea0ab57647f5e1d9223 files/digest-util-linux-2.13-r3 509
+SHA256 f5f6f45bbbf14e595afc0b14be8c7c4f914729f4d6e88cf6ef299a2397567592 files/digest-util-linux-2.13-r3 509
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-util-linux-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-util-linux-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-util-linux-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeIm30ACgkQj9hvisErhMJQRACeKFUbob3H+wE2CUhhzKR6oIXH
+LsEAoLjGzChE+tFdR8ImM1g3zKLJ5exf
+=rakv
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/digest-util-linux-2.13-r3 b/sys-apps/util-linux/files/digest-util-linux-2.13-r3
index 35f8c626232c..b4965c6b038f 100644
--- a/sys-apps/util-linux/files/digest-util-linux-2.13-r3
+++ b/sys-apps/util-linux/files/digest-util-linux-2.13-r3
@@ -1,6 +1,6 @@
-MD5 601caadc3248fcd6b5911fc6339451e9 util-linux-ng-2.13-1.diff.bz2 40468
-RMD160 defb0fa7abb39963d1d168c4fbf8352ceb2a916c util-linux-ng-2.13-1.diff.bz2 40468
-SHA256 6606666808f510cc8aeead408e14d3226b06219b0752ca3badea7acd154929cd util-linux-ng-2.13-1.diff.bz2 40468
+MD5 2c5642ccfa1a780ef4bd76eb873076aa loop-AES-v3.2b.tar.bz2 222018
+RMD160 638d86ca21298ca0a939aca263c6fbcf1fe17029 loop-AES-v3.2b.tar.bz2 222018
+SHA256 603854463078d24a66da30e474851c55e40c761f38af521294866b16e5319a6b loop-AES-v3.2b.tar.bz2 222018
 MD5 2175a6e64ba0cf8ff05402eaee33e4b0 util-linux-ng-2.13.tar.bz2 2702618
 RMD160 499b1c5c2060b23d8bf504122a22122af99eb7fa util-linux-ng-2.13.tar.bz2 2702618
 SHA256 002412e93d8e85b1796fdbe65bbb0a4d193d0317a7155fda4270667e08bdfbfc util-linux-ng-2.13.tar.bz2 2702618
diff --git a/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch b/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch
new file mode 100644
index 000000000000..237e126e0dbd
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch
@@ -0,0 +1,71 @@
+--- login-utils/agetty.c
++++ login-utils/agetty.c
+@@ -884,7 +884,7 @@
+ 
+ 		  case 'o':
+ 		   {
+-		     char domainname[HOST_NAME_MAX+1];
++		     char domainname[HOSTNAME_LENGTH+1];
+ #ifdef HAVE_GETDOMAINNAME
+ 		     if (getdomainname(domainname, sizeof(domainname)))
+ #endif
+@@ -897,7 +897,7 @@
+ 		  case 'O':
+ 		   {
+ 			char *dom = "unknown_domain";
+-			char host[HOST_NAME_MAX + 1];
++			char host[HOSTNAME_LENGTH + 1];
+ 			struct addrinfo hints, *info = NULL;
+ 
+ 			memset(&hints, 0, sizeof(hints));
+@@ -992,7 +992,7 @@
+     }
+ #endif
+     {
+-	char hn[HOST_NAME_MAX+1];
++	char hn[HOSTNAME_LENGTH+1];
+ 	if (gethostname(hn, sizeof(hn)) == 0)
+ 	    write(1, hn, strlen(hn));
+     }
+--- configure
++++ configure
+@@ -7663,7 +7663,10 @@
+ main ()
+ {
+ 
+-int test = SYS_sched_getaffinity;
++#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28
++#error taskset unusable
++#endif
++int test = SYS_sched_getaffinity;
+ 
+   ;
+   return 0;
+--- sys-utils/setarch.c
++++ sys-utils/setarch.c
+@@ -39,6 +39,10 @@
+ #include <sys/utsname.h>
+ #include "nls.h"
+ 
++#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28
++static const char *program_invocation_short_name;
++#endif
++
+ #define set_pers(pers) ((long)syscall(SYS_personality, pers))
+ 
+ struct {
+@@ -184,6 +188,14 @@
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
+ 
++#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ <= 28
++  program_invocation_short_name = strrchr(argv[0],'/');
++  if (program_invocation_short_name)
++    program_invocation_short_name++;
++  else
++    program_invocation_short_name = argv[0];
++#endif
++
+   if (argc < 1)
+     show_usage(_("Not enough arguments"));
+ 
diff --git a/sys-apps/util-linux/util-linux-2.13-r2.ebuild b/sys-apps/util-linux/util-linux-2.13-r2.ebuild
index 6c143bb1954a..0f2981a0b668 100644
--- a/sys-apps/util-linux/util-linux-2.13-r2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r2.ebuild,v 1.9 2008/01/11 19:08:38 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r2.ebuild,v 1.10 2008/01/12 10:50:31 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -41,6 +41,7 @@ src_unpack() {
 	else
 		unpack ${A}
 		cd "${S}"
+		epatch "${FILESDIR}"/${P}-uclibc.patch #203711
 		epatch "${FILESDIR}"/${P}-locale.patch #191111
 		epatch "${FILESDIR}"/${P}-ioprio-syscalls.patch #190613
 		epatch "${FILESDIR}"/${P}-setuid-checks.patch
diff --git a/sys-apps/util-linux/util-linux-2.13-r3.ebuild b/sys-apps/util-linux/util-linux-2.13-r3.ebuild
index ae458c69ed0a..e0399bccacdf 100644
--- a/sys-apps/util-linux/util-linux-2.13-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.13-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r3.ebuild,v 1.1 2007/12/14 03:18:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13-r3.ebuild,v 1.2 2008/01/12 10:50:31 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -16,13 +16,13 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		crypt? ( http://loop-aes.sourceforge.net/updates/${MY_P}-1.diff.bz2 )"
+		loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2b.tar.bz2 )"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="crypt nls old-linux selinux"
+IUSE="crypt loop-aes nls old-linux selinux"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -41,12 +41,13 @@ src_unpack() {
 	else
 		unpack ${A}
 		cd "${S}"
+		epatch "${FILESDIR}"/${P}-uclibc.patch #203711
 		epatch "${FILESDIR}"/${P}-locale.patch #191111
 		epatch "${FILESDIR}"/${P}-ioprio-syscalls.patch #190613
 		epatch "${FILESDIR}"/${P}-setuid-checks.patch
 		epatch "${FILESDIR}"/${P}-script-SIGWINCH.patch #191452
 		epatch "${FILESDIR}"/${P}-hwclock-rtc.patch #179780
-		use crypt && epatch "${WORKDIR}"/${MY_P}-1.diff "${FILESDIR}"/${P}-losetup-P.patch #201981
+		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-2.13.0.1.diff
 		sed -i '/#include <asm\/page.h>/d' mount/swapon.c || die
 	fi
 }