Fixup building on uClibc #203711.

(Portage version: 2.1.4_rc14)

5 files changed, 88 insertions, 10 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/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
 }