old

13 files changed, 0 insertions, 956 deletions

diff --git a/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch b/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch
deleted file mode 100644
index fe2838dbf1ae..000000000000
--- a/sys-apps/util-linux/files/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/279054
-
-From 92cf3ab964266603cf36272d0eec96cd07fa083c Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 13 Aug 2009 21:55:43 +0200
-Subject: [PATCH] libblkid: fix ext2 detection on systems with ext4 only
-
-Address-Red-Hat-Bug: #513104
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- shlibs/blkid/src/probers/ext.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
-index 671e556..a4d35d1 100644
---- a/shlibs/blkid/src/probers/ext.c
-+++ b/shlibs/blkid/src/probers/ext.c
-@@ -483,11 +483,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
- 	if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
- 		return -BLKID_ERR_PARAM;
- 
--	/* Ext4 has at least one feature which ext3 doesn't understand */
--	if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
--	    !(fi  & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
--		return -BLKID_ERR_PARAM;
--
- 	/*
- 	 * If the filesystem does not have a journal and ext2 is not
- 	 * present, then force this to be detected as an ext2
-@@ -498,6 +493,12 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
- 	    get_linux_version() >= EXT4_SUPPORTS_EXT2)
- 		goto force_ext4;
- 
-+	/* Ext4 has at least one feature which ext3 doesn't understand */
-+	if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) &&
-+	    !(fi  & EXT3_FEATURE_INCOMPAT_UNSUPPORTED))
-+		return -BLKID_ERR_PARAM;
-+
-+force_ext4:
- 	/*
- 	 * If the filesystem is a OK for use by in-development
- 	 * filesystem code, and ext4dev is supported or ext4 is not
-@@ -513,7 +514,6 @@ static int probe_ext4(blkid_probe pr, const struct blkid_idmag *mag)
- 			return -BLKID_ERR_PARAM;
- 	}
- 
--force_ext4:
- 	ext_get_info(pr, 4, es);
- 	return 0;
- }
--- 
-1.6.3.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch b/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch
deleted file mode 100644
index f558ff6d1a8f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13-ioprio-syscalls.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Just stub this cruft for crappy arches
-
-http://bugs.gentoo.org/190613
-
---- schedutils/ionice.c
-+++ schedutils/ionice.c
-@@ -39,7 +39,8 @@
- #  define __NR_ioprio_set		196
- #  define __NR_ioprio_get		218
- # else
--#  error "Unsupported arch"
-+#  define __NR_ioprio_set		-1
-+#  define __NR_ioprio_get		-1
- # endif
- 
- # define SYS_ioprio_get		__NR_ioprio_get
diff --git a/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch b/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch
deleted file mode 100644
index a3758ddbd64d..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Thu, 20 Sep 2007 12:57:20 +0000 (+0200)
-Subject: mount: doesn't drop privileges properly when calling helpers
-X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=ebbeb2c7ac1b00b6083905957837a271e80b187e
-
-mount: doesn't drop privileges properly when calling helpers
-
-{,u}mount calls setuid() and setgid() in the wrong order and doesn't checking
-the return value of set{u,g}id(() when running helpers like mount.nfs.
-
-Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
-
-diff --git a/mount/mount.c b/mount/mount.c
-index 40699f3..5bc2b30 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -634,8 +634,12 @@ check_special_mountprog(const char *spec, const char *node, const char *type, in
- 		 char *oo, *mountargs[10];
- 		 int i = 0;
- 
--		 setuid(getuid());
--		 setgid(getgid());
-+		 if(setgid(getgid()) < 0)
-+			 die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno));
-+
-+		 if(setuid(getuid()) < 0)
-+			 die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
-+
- 		 oo = fix_opts_string (flags, extra_opts, NULL);
- 		 mountargs[i++] = mountprog;				/* 1 */
- 		 mountargs[i++] = (char *) spec;			/* 2 */
-diff --git a/mount/umount.c b/mount/umount.c
-index b3100c9..3221619 100644
---- a/mount/umount.c
-+++ b/mount/umount.c
-@@ -102,8 +102,12 @@ check_special_umountprog(const char *spec, const char *node,
- 				char *umountargs[8];
- 				int i = 0;
- 
--				setuid(getuid());
--				setgid(getgid());
-+				if(setgid(getgid()) < 0)
-+					die(EX_FAIL, _("umount: cannot set group id: %s"), strerror(errno));
-+
-+				if(setuid(getuid()) < 0)
-+					die(EX_FAIL, _("umount: cannot set user id: %s"), strerror(errno));
-+
- 				umountargs[i++] = umountprog;
- 				umountargs[i++] = xstrdup(node);
- 				if (nomtab)
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
deleted file mode 100644
index 237e126e0dbd..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13-uclibc.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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/files/util-linux-2.13.1-no-a.out.patch b/sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch
deleted file mode 100644
index d871575e4a3d..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.gentoo.org/221939
-http://article.gmane.org/gmane.linux.utilities.util-linux-ng/1463
-
---- a/text-utils/more.c
-+++ b/text-utils/more.c
-@@ -54,7 +54,6 @@
- #include <sys/stat.h>
- #include <sys/file.h>
- #include <sys/wait.h>
--#include <a.out.h>
- #include "xstrncpy.h"
- #include "nls.h"
- #include "widechar.h"
-@@ -546,9 +545,9 @@ magic(f, fs)
- 
- 	if (fread(twobytes, 2, 1, f) == 1) {
- 		switch(twobytes[0] + (twobytes[1]<<8)) {
--		case OMAGIC:	/* 0407 */
--		case NMAGIC:	/* 0410 */
--		case ZMAGIC:	/* 0413 */
-+		case 0407:	/* a.out obj */
-+		case 0410:	/* a.out exec */
-+		case 0413:	/* a.out demand exec */
- 		case 0405:
- 		case 0411:
- 		case 0177545:
diff --git a/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch b/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch
deleted file mode 100644
index beff6b84fd6c..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-patch configure to avoid running autotools
-
-commit 43f2d5bcbc61d2fb4731a7a28908fee20132727f
-Author: Karel Zak <kzak@redhat.com>
-Date:   Fri Dec 5 14:01:12 2008 +0100
-
-build-sys: add missing AC_C_BIGENDIAN
-
-This configure test is required in include/bitops.h.
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
---- configure
-+++ configure
-@@ -5157,6 +5157,243 @@ fi
- done
- 
- 
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # See if sys/param.h defines the BYTE_ORDER macro.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
-+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-+ bogus endian macros
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  # It does; now see whether it defined to BIG_ENDIAN or not.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_c_bigendian=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_c_bigendian=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	# It does not; compile a test program.
-+if test "$cross_compiling" = yes; then
-+  # try to guess the endianness by grepping values into an object file
-+  ac_cv_c_bigendian=unknown
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+int
-+main ()
-+{
-+ _ascii (); _ebcdic ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-+  ac_cv_c_bigendian=yes
-+fi
-+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+  if test "$ac_cv_c_bigendian" = unknown; then
-+    ac_cv_c_bigendian=no
-+  else
-+    # finding both strings is unlikely to happen, but who knows?
-+    ac_cv_c_bigendian=unknown
-+  fi
-+fi
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+
-+  /* Are we little or big endian?  From Harbison&Steele.  */
-+  union
-+  {
-+    long int l;
-+    char c[sizeof (long int)];
-+  } u;
-+  u.l = 1;
-+  return u.c[sizeof (long int) - 1] == 1;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_c_bigendian=no
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_c_bigendian=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-+case $ac_cv_c_bigendian in
-+  yes)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+ ;;
-+  no)
-+     ;;
-+  *)
-+    { { echo "$as_me:$LINENO: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+echo "$as_me: error: unknown endianness
-+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+esac
-+
-+
- 
- 
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch b/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch
deleted file mode 100644
index feaa1af8e37f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.15-cpuid-pic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/269001
-http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/2203
-
-From 89dbd3ee8678bc43de027a99974451acbfc04cf3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 10 May 2009 16:34:33 -0400
-Subject: [PATCH] lscpu: fix cpuid code on x86/PIC
-
-If we build lscpu as PIE, we currently get a build failure:
-lscpu.c: In function 'main':
-lscpu.c:333: error: can't find a register in class 'BREG' while reloading 'asm'
-lscpu.c:333: error: 'asm' operand has impossible constraints
-make[2]: *** [lscpu.o] Error 1
-
-So we need a little bit of register shuffling to keep gcc happy.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- sys-utils/lscpu.c |   16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
-index 3e3fbbe..6b6082f 100644
---- a/sys-utils/lscpu.c
-+++ b/sys-utils/lscpu.c
-@@ -330,9 +330,19 @@ static inline void
- cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
- 			 unsigned int *ecx, unsigned int *edx)
- {
--	__asm__("cpuid"
--		: "=a" (*eax),
--		  "=b" (*ebx),
-+	__asm__(
-+#if defined(__PIC__) && defined(__i386__)
-+		/* x86 PIC cannot clobber ebx -- gcc bitches */
-+		"pushl %%ebx;"
-+		"cpuid;"
-+		"movl %%ebx, %%esi;"
-+		"popl %%ebx;"
-+		: "=S" (*ebx),
-+#else
-+		"cpuid;"
-+		: "=b" (*ebx),
-+#endif
-+		  "=a" (*eax),
- 		  "=c" (*ecx),
- 		  "=d" (*edx)
- 		: "0" (op), "c"(0));
--- 
-1.6.2.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.15-locale.patch b/sys-apps/util-linux/files/util-linux-2.15-locale.patch
deleted file mode 100644
index 43f5d9463e60..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.15-locale.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/271154
-
-From a88057d9a329c11a5d4eaf7e15ce25b09be800e5 Mon Sep 17 00:00:00 2001
-From: Tom Prince <tom.prince@ualberta.net>
-Date: Thu, 14 May 2009 22:43:02 -0400
-Subject: [PATCH] cal: uClibc has langinfo.h but not _NL_TIME_WEEK_1STDAY.
-
-Signed-off-by: Tom Prince <cougar@hermes>
----
- configure.ac     |    2 ++
- misc-utils/cal.c |    2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1abf688..af946a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -105,6 +105,8 @@ AC_CHECK_HEADERS([linux/raw.h],
- 		 [AM_CONDITIONAL([HAVE_RAW], [true])],
- 		 [AM_CONDITIONAL([HAVE_RAW], [false])])
- 
-+AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include <langinfo.h>]])
-+
- AC_CHECK_FUNCS(
- 	[inet_aton \
- 	fsync \
-diff --git a/misc-utils/cal.c b/misc-utils/cal.c
-index f2d52e8..a8534b8 100644
---- a/misc-utils/cal.c
-+++ b/misc-utils/cal.c
-@@ -291,7 +291,7 @@ main(int argc, char **argv) {
-  * the locale database, which can be overridden with the
-  * -s (Sunday) or -m (Monday) options.
-  */
--#ifdef HAVE_LANGINFO_H
-+#if HAVE_DECL__NL_TIME_WEEK_1STDAY
- 	/*
- 	 * You need to use 2 locale variables to get the first day of the week.
- 	 * This is needed to support first_weekday=2 and first_workday=1 for
--- 
-1.6.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch
deleted file mode 100644
index 8dbd3288a42f..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.15-losetup-symlinks.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/269264
-
-From 72f6902e435612f848cbe9993ce6298da8af996c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 10 May 2009 16:57:31 -0400
-Subject: [PATCH] losetup: handle symlinks in /dev/loop/
-
-The loop_scandir() expects all the files in /dev/loop/ to be actual
-devices and not symlinks to devices.  However, udev by default sets up
-symlinks in /dev/loop/ thereby breaking the fallback scan logic when
-looking for devices more than the default number of 8.
-
-Simple way to reproduce is:
- - <detach all devices>
- - cd /dev/loop
- - rm -f [2-7]
- - losetup 0 autogen.sh
- - mv 1 8
- - for n in {1..7} ; do ln -s 0 $n ; done
- - losetup -f
-	<error but should have found /dev/loop/8>
-
-[kay.sievers@vrfy.org:
-       just a note, udev does not do that by default. It is
-       devfs-nonsense, which the "default" never did.]
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Reported-by: Mario Bachmann <grafgrimm77@gmx.de>
----
- mount/lomount.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mount/lomount.c b/mount/lomount.c
-index d62198e..c173409 100644
---- a/mount/lomount.c
-+++ b/mount/lomount.c
-@@ -256,7 +256,7 @@ loop_scandir(const char *dirname, int **ary, int hasprefix)
- 	*ary = NULL;
- 
- 	while((d = readdir(dir))) {
--		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN)
-+		if (d->d_type != DT_BLK && d->d_type != DT_UNKNOWN && d->d_type != DT_LNK)
- 			continue;
- 		n = name2minor(hasprefix, d->d_name);
- 		if (n == -1 || n < NLOOPS_DEFAULT)
--- 
-1.6.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch b/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch
deleted file mode 100644
index 337e54327ae8..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.15-old-libselinux.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://bugs.gentoo.org/270168
-
-From 28d39b6dd71e6a054aa06c66f683a1e15439e56b Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 21 May 2009 13:20:10 +0200
-Subject: [PATCH] mount: fix undefined reference to `security_get_initial_context'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-> Gentoo-hardened stable have: sys-libs/libselinux-1.34.14
-> I have:
-> mount.c:(.text+0x12ce): undefined reference to `security_get_initial_context'
-
-Reported-by: Максим Бритов <maxim.britov@gmail.com>
-Addresses-Gentoo-Bug: #270168
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- configure.ac  |    5 +++++
- mount/mount.c |    2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index af946a1..b174bce 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -656,6 +656,11 @@ fi
- if test "x$have_selinux" = xyes; then
-   SELINUX_LIBS="-lselinux -lsepol"
-   SELINUX_LIBS_STATIC="-lselinux -lsepol"
-+  old_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $SELINUX_LIBS"
-+  # This function is missing in old libselinux 1.xx versions
-+  AC_CHECK_FUNCS([security_get_initial_context])
-+  LDFLAGS="$old_LDFLAGS"
- fi
- AC_SUBST([SELINUX_LIBS])
- AC_SUBST([SELINUX_LIBS_STATIC])
-diff --git a/mount/mount.c b/mount/mount.c
-index f48f9d4..cc5b88a 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -1561,7 +1561,7 @@ mount_retry:
- 
-  out:
- 
--#ifdef HAVE_LIBSELINUX
-+#if defined(HAVE_LIBSELINUX) && defined(HAVE_SECURITY_GET_INITIAL_CONTEXT)
-   if (res != EX_FAIL && verbose && is_selinux_enabled() > 0) {
-       security_context_t raw = NULL, def = NULL;
- 
--- 
-1.6.3
-
diff --git a/sys-apps/util-linux/util-linux-2.14.2.ebuild b/sys-apps/util-linux/util-linux-2.14.2.ebuild
deleted file mode 100644
index f3f6c7d7a12e..000000000000
--- a/sys-apps/util-linux/util-linux-2.14.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 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.14.2.ebuild,v 1.12 2009/07/26 20:41:50 zmedico Exp $
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils autotools
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-ng-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14.2-20090214.diff.bz2 )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="crypt loop-aes nls old-linux selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-libs/e2fsprogs-libs-1.41
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-		cd "${S}"
-		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
-		epatch "${FILESDIR}"/${PN}-2.15-old-libselinux.patch #270168
-		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
-		eautoreconf
-	fi
-	if use uclibc ; then
-		sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-		sed -i -e 's/program_invocation_short_name/"scriptreplay"/' misc-utils/scriptreplay.c
-		sed -i -e 's/program_invocation_short_name/"setarch"/' sys-utils/setarch.c
-		sed -i -e 's/program_invocation_short_name/"ldattach"/' sys-utils/ldattach.c
-		sed -i -e 's:test = SYS_sched_getaffinity:LSDJFLSKDF = asdfasdf:' configure
-	fi
-}
-
-src_compile() {
-	econf \
-		--with-fsprobe=blkid \
-		$(use_enable nls) \
-		--enable-agetty \
-		--enable-cramfs \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rdev \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use unicode || echo --with-ncurses) \
-		$(use_with selinux) \
-		$(use_with slang) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "The loop-aes code has been split out of USE=crypt and into USE=loop-aes."
-	ewarn "If you need support for it, make sure to update your USE accordingly."
-}
diff --git a/sys-apps/util-linux/util-linux-2.15.1.ebuild b/sys-apps/util-linux/util-linux-2.15.1.ebuild
deleted file mode 100644
index f8a0741872c9..000000000000
--- a/sys-apps/util-linux/util-linux-2.15.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 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.15.1.ebuild,v 1.2 2009/06/28 16:21:52 vapier Exp $
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils autotools
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-ng-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.15.1-20090624.diff.bz2 )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="crypt loop-aes nls old-linux selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-libs/e2fsprogs-libs-1.41
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-		cd "${S}"
-		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
-		if use loop-aes ; then
-			epatch "${WORKDIR}"/util-linux-ng-*.diff
-			eautoreconf
-		fi
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-}
-
-src_compile() {
-	econf \
-		--with-fsprobe=blkid \
-		$(use_enable nls) \
-		--enable-agetty \
-		--enable-cramfs \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rdev \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use unicode || echo --with-ncurses) \
-		$(use_with selinux) \
-		$(use_with slang) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}
-
-pkg_postinst() {
-	ewarn "The loop-aes code has been split out of USE=crypt and into USE=loop-aes."
-	ewarn "If you need support for it, make sure to update your USE accordingly."
-}
diff --git a/sys-apps/util-linux/util-linux-2.16-r1.ebuild b/sys-apps/util-linux/util-linux-2.16-r1.ebuild
deleted file mode 100644
index 6750721a0c50..000000000000
--- a/sys-apps/util-linux/util-linux-2.16-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 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.16-r1.ebuild,v 1.2 2009/08/31 08:16:05 vapier Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils toolchain-funcs
-[[ ${PV} == "9999" ]] && inherit git autotools
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-ng-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.16-20090725.diff.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="crypt loop-aes nls old-linux selinux slang uclibc unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	>=sys-libs/ncurses-5.2-r2
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autopoint --force
-		eautoreconf
-	else
-		epatch "${FILESDIR}"/0001-libblkid-fix-ext2-detection-on-systems-with-ext4-onl.patch #279054
-		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-*.diff
-	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-agetty \
-		--enable-cramfs \
-		$(use_enable old-linux elvtune) \
-		--disable-init \
-		--disable-kill \
-		--disable-last \
-		--disable-mesg \
-		--enable-partx \
-		--enable-raw \
-		--enable-rdev \
-		--enable-rename \
-		--disable-reset \
-		--disable-login-utils \
-		--enable-schedutils \
-		--disable-wall \
-		--enable-write \
-		--without-pam \
-		$(use unicode || echo --with-ncurses) \
-		$(use_with selinux) \
-		$(use_with slang)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid uuid
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${D}"/usr/$(get_libdir)/*.la
-
-	if use crypt ; then
-		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
-		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
-	fi
-}