old

(Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64)

6 files changed, 0 insertions, 719 deletions

diff --git a/sys-apps/findutils/files/findutils-4.3.7-selinux.diff b/sys-apps/findutils/files/findutils-4.3.7-selinux.diff
deleted file mode 100644
index 09e9a6fd1ac5..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.7-selinux.diff
+++ /dev/null
@@ -1,463 +0,0 @@
-diff -purN findutils-4.3.7.orig/find/Makefile.am findutils-4.3.7/find/Makefile.am
---- findutils-4.3.7.orig/find/Makefile.am	2007-05-24 03:10:08.000000000 -0400
-+++ findutils-4.3.7/find/Makefile.am	2007-06-11 14:03:23.753990893 -0400
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- 
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c version.c
-@@ -26,7 +27,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- 
-diff -purN findutils-4.3.7.orig/find/Makefile.in findutils-4.3.7/find/Makefile.in
---- findutils-4.3.7.orig/find/Makefile.in	2007-06-09 14:17:00.000000000 -0400
-+++ findutils-4.3.7/find/Makefile.in	2007-06-11 14:03:39.214209729 -0400
-@@ -272,7 +272,7 @@ CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- DIRENT_H = @DIRENT_H@
- ECHO_C = @ECHO_C@
-@@ -516,7 +516,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- all: all-recursive
-diff -purN findutils-4.3.7.orig/find/defs.h findutils-4.3.7/find/defs.h
---- findutils-4.3.7.orig/find/defs.h	2007-06-09 08:09:26.000000000 -0400
-+++ findutils-4.3.7/find/defs.h	2007-06-11 14:01:35.048452187 -0400
-@@ -90,6 +90,9 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
- 
- struct predicate;
- struct options;
-@@ -314,6 +317,9 @@ struct predicate
-     struct samefile_file_id samefileid; /* samefile */
-     mode_t type;		/* type */
-     struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
-+#ifdef WITH_SELINUX
-+    security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
-   } args;
- 
-   /* The next predicate in the user input sequence,
-@@ -457,7 +463,9 @@ PREDICATEFUNCTION pred_used;
- PREDICATEFUNCTION pred_user;
- PREDICATEFUNCTION pred_writable;
- PREDICATEFUNCTION pred_xtype;
--
-+#ifdef WITH_SELINUX
-+PREDICATEFUNCTION pred_scontext;
-+#endif /* WITH_SELINUX */
- 
- 
- int launch PARAMS((const struct buildcmd_control *ctl,
-@@ -594,10 +602,13 @@ struct options
-    */
-   unsigned short optimisation_level;
- 
--
-   /* How should we quote filenames in error messages and so forth?
-    */
-   enum quoting_style err_quoting_style;
-+
-+#ifdef WITH_SELINUX
-+  int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
- 
-diff -purN findutils-4.3.7.orig/find/find.1 findutils-4.3.7/find/find.1
---- findutils-4.3.7.orig/find/find.1	2007-05-27 06:59:28.000000000 -0400
-+++ findutils-4.3.7/find/find.1	2007-06-11 14:01:35.052452243 -0400
-@@ -644,6 +644,9 @@ links: if the \-H or \-P option was spec
- link to a file of type \fIc\fR; if the \-L option has been given, true
- if \fIc\fR is `l'.  In other words, for symbolic links, \-xtype checks
- the type of the file that \-type does not check.
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
- 
- .SS ACTIONS
- .IP "\-delete\fR"
-@@ -955,6 +958,8 @@ File's numeric user ID.
- File's type (like in ls \-l), U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.3.7.orig/find/find.c findutils-4.3.7/find/find.c
---- findutils-4.3.7.orig/find/find.c	2007-06-09 08:14:35.000000000 -0400
-+++ findutils-4.3.7/find/find.c	2007-06-11 14:01:35.052452243 -0400
-@@ -1252,7 +1252,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
--  int subdirs_left;		/* Number of unexamined subdirs in PATHNAME. */
-+  int subdirs_left=0;		/* Number of unexamined subdirs in PATHNAME. */
-   boolean subdirs_unreliable;	/* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
-   unsigned int idx;		/* Which entry are we on? */
-   struct stat stat_buf;
-diff -purN findutils-4.3.7.orig/find/parser.c findutils-4.3.7/find/parser.c
---- findutils-4.3.7.orig/find/parser.c	2007-06-09 08:12:06.000000000 -0400
-+++ findutils-4.3.7/find/parser.c	2007-06-11 14:01:35.056452300 -0400
-@@ -57,6 +57,13 @@
- /* We need <unistd.h> for isatty(). */
- #include <unistd.h> 
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -160,6 +167,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype         PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext      PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
- 
- boolean parse_print             PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- 
-@@ -326,6 +336,8 @@ static struct parser_table const parse_t
-   {ARG_TEST, "-help",                 parse_help,    NULL},       /* GNU */
-   {ARG_TEST, "version",               parse_version, NULL},	  /* GNU */
-   {ARG_TEST, "-version",              parse_version, NULL},	  /* GNU */
-+  {ARG_TEST, "context",               parse_scontext, pred_scontext},	/* SELinux */
-+  {ARG_TEST, "-context",              parse_scontext, pred_scontext},	/* SELinux */
-   {0, 0, 0, 0}
- };
- 
-@@ -395,10 +407,16 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_ALWAYS_DEREF:  /* -L */
- 	  options.xstat = optionl_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  break;
- 	  
- 	case SYMLINK_NEVER_DEREF:	/* -P (default) */
- 	  options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  /* Can't turn no_leaf_check off because the user might have specified 
- 	   * -noleaf anyway
- 	   */
-@@ -407,6 +425,9 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_DEREF_ARGSONLY: /* -H */
- 	  options.xstat = optionh_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- 	}
-     }
-   options.symlink_handling = opt;
-@@ -606,6 +627,94 @@ collect_arg_stat_info(char **argv, int *
-  
-    The predicate structure is updated with the new information. */
- 
-+#ifdef WITH_SELINUX
-+
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+  /* Our original getfilecon() call failed.  Perhaps we can't follow a
-+   * symbolic link.  If that might be the problem, lgetfilecon() the link. 
-+   * Otherwise, admit defeat. 
-+   */
-+  switch (errno)
-+    {
-+    case ENOENT:
-+    case ENOTDIR:
-+#ifdef DEBUG_STAT
-+      fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+      return lgetfilecon(name, p);
-+
-+    case EACCES:
-+    case EIO:
-+    case ELOOP:
-+    case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+    case EOVERFLOW:	    /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+    default:
-+      return prev_rv;	       
-+    }
-+}
-+
-+
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ * 
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links.  If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int 
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+  if (0 == state.curdepth) 
-+    {
-+      /* This file is from the command line; deference the link (if it
-+       * is a link).  
-+       */
-+      int rv = getfilecon(name, p);
-+      if (0 == rv)
-+	return 0;		/* success */
-+      else
-+	return fallback_getfilecon(name, p, rv);
-+    }
-+  else
-+    {
-+      /* Not a file on the command line; do not derefernce the link.
-+       */
-+      return lgetfilecon(name, p);
-+    }
-+}
-+
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect.  That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int 
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+  int rv = getfilecon(name, p);
-+  if (0 == rv)
-+    return 0;			/* normal case. */
-+  else
-+    return fallback_getfilecon(name, p, rv);
-+}
-+
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default).  That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int 
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+  return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- 
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -1060,6 +1169,10 @@ tests (N can be +N or -N or N): -amin N 
-       -readable -writable -executable\n\
-       -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
-       -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+  puts (_("\
-+      -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
-   puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-       -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2426,6 +2539,29 @@ parse_version (const struct parser_table
-   exit (0);
- }
- 
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+  struct predicate *our_pred;
-+
-+  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+    return( false );
-+
-+  our_pred = insert_primary(entry);
-+  our_pred->need_stat = false;
-+#ifdef DEBUG
-+  our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+  our_pred->args.scontext = argv[*arg_ptr];;
-+
-+  (*arg_ptr)++;
-+  return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2675,7 +2811,11 @@ insert_fprintf (struct format_val *vec,
- 	  if (*scan2 == '.')
- 	    for (scan2++; ISDIGIT (*scan2); scan2++)
- 	      /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- 	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- 	    {
- 	      segmentp = make_segment (segmentp, format, scan2 - format,
- 				       KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.3.7.orig/find/pred.c findutils-4.3.7/find/pred.c
---- findutils-4.3.7.orig/find/pred.c	2007-06-09 08:12:35.000000000 -0400
-+++ findutils-4.3.7/find/pred.c	2007-06-11 14:01:35.056452300 -0400
-@@ -48,6 +48,14 @@
- #include "dircallback.h"
- #include "error.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif  /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] =
-   {pred_user, "user    "},
-   {pred_writable, "writable "},
-   {pred_xtype, "xtype   "},
-+#ifdef WITH_SELINUX
-+  {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
-   {0, "none    "}
- };
- #endif
-@@ -1024,6 +1035,26 @@ do_fprintf(struct format_val *dest,
- 			     mode_to_filetype(stat_buf->st_mode & S_IFMT));
- 	  }
- 	  break;
-+#ifdef WITH_SELINUX
-+      case 'Z':               /* SELinux security context */
-+        {
-+          security_context_t scontext;
-+          int rv;
-+          rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+          if ( rv < 0 ) {
-+            fprintf(stderr, "getfileconf(%s): %s",
-+                           pathname, strerror(errno));
-+            fflush(stderr);
-+          }
-+          else {
-+	      segment->text[segment->text_len] = 's';
-+	      checked_fprintf (dest, segment->text, scontext);
-+	      freecon(scontext);
-+          }
-+        }
-+        break ;
-+#endif /* WITH_SELINUX */
- 	}
-       /* end of KIND_FORMAT case */
-       break;
-@@ -1801,6 +1832,31 @@ pred_xtype (const char *pathname, struct
-    */
-   return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+  
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
-+{
-+  int rv;
-+  security_context_t scontext;
-+
-+  rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+  if ( rv < 0 ) {
-+    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+    (void) fflush(stderr);
-+    return ( false );
-+  }
-+
-+  rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+  freecon(scontext);
-+  return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- 
- /*  1) fork to get a child; parent remembers the child pid
-     2) child execs the command requested
-diff -purN findutils-4.3.7.orig/find/tree.c findutils-4.3.7/find/tree.c
---- findutils-4.3.7.orig/find/tree.c	2007-06-09 08:13:09.000000000 -0400
-+++ findutils-4.3.7/find/tree.c	2007-06-11 14:01:35.060452357 -0400
-@@ -1197,6 +1197,10 @@ build_expression_tree(int argc, char *ar
-   const struct parser_table *entry_close, *entry_print, *entry_open;
-   int i, oldi;
- 
-+#ifdef WITH_SELINUX
-+  int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
-   predicates = NULL;
-   
-   /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1232,6 +1236,16 @@ build_expression_tree(int argc, char *ar
- 	}
- 
-       predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+      if (! is_selinux_enabled_flag) {
-+	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+	  error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+	}
-+      }
-+#endif
-+
-       parse_entry = find_parser (predicate_name);
-       if (parse_entry == NULL)
- 	{
-@@ -1435,6 +1449,9 @@ get_new_pred (const struct parser_table 
-   last_pred->need_stat = true;
-   last_pred->need_type = true;
-   last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+  last_pred->args.scontext = NULL;
-+#endif
-   last_pred->pred_next = NULL;
-   last_pred->pred_left = NULL;
-   last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
deleted file mode 100644
index 1f17bea5b50c..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/197326
-
-2007-06-10  Bruno Haible  <bruno@clisp.org>
- 
-	* lib/mbiter.h: Include <stddef.h>, needed for ptrdiff_t.
-	* lib/mbuiter.h: Likewise.
-
-diff --git a/gnulib/lib/mbuiter.h b/gnulib/lib/mbuiter.h
-index e6ad488..c4ceddb 100644
---- a/gnulib/lib/mbuiter.h
-+++ b/gnulib/lib/mbuiter.h
-@@ -92,6 +92,7 @@
- 
- #include <assert.h>
- #include <stdbool.h>
-+#include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- 
diff --git a/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch b/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch
deleted file mode 100644
index d715c6ad0bb9..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-http://bugs.gentoo.org/188249
-
-RCS file: /sources/findutils/findutils/lib/listfile.c,v
-Working file: lib/listfile.c
-head: 1.27
-branch:
-locks: strict
-access list:
-keyword substitution: kv
-total revisions: 35;	selected revisions: 1
-description:
-----------------------------
-revision 1.27
-date: 2007-08-22 22:33:31 -0400;  author: ericb;  state: Exp;  lines: +2 -5;  commitid: 0LN4VaUTK67hWOus;
-Update to recent gnulib addition of idcache.h.
-* lib/listfile.c (getuser, getgroup): Use header rather than
-declaring things ourself.
-* po/POTFILES.in (locate/frcode.c): Add missing file.
-=============================================================================
-
-Index: lib/listfile.c
-===================================================================
-RCS file: /sources/findutils/findutils/lib/listfile.c,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -p -r1.25 -r1.26
---- lib/listfile.c	2 Jul 2007 08:25:43 -0000	1.25
-+++ lib/listfile.c	19 Aug 2007 15:31:38 -0000	1.26
-@@ -196,7 +196,7 @@ list_file (const char *name,
- 	   int literal_control_chars,
- 	   FILE *stream)
- {
--  char modebuf[11];
-+  char modebuf[12];
-   struct tm const *when_local;
-   char const *user_name;
-   char const *group_name;
-@@ -208,7 +208,6 @@ list_file (const char *name,
- #else
-   strmode (statp->st_mode, modebuf);
- #endif
--  modebuf[10] = '\0';
- 
-   fprintf (stream, "%6s ",
- 	   human_readable ((uintmax_t) statp->st_ino, hbuf,
-@@ -221,9 +220,9 @@ list_file (const char *name,
- 			   ST_NBLOCKSIZE, output_block_size));
- 
- 
--  /* The space between the mode and the number of links is the POSIX
--     "optional alternate access method flag".  */
--  fprintf (stream, "%s %3lu ", modebuf, (unsigned long) statp->st_nlink);
-+  /* modebuf includes the space between the mode and the number of links,
-+     as the POSIX "optional alternate access method flag".  */
-+  fprintf (stream, "%s%3lu ", modebuf, (unsigned long) statp->st_nlink);
- 
-   user_name = getuser (statp->st_uid);
-   if (user_name)
diff --git a/sys-apps/findutils/findutils-4.2.32.ebuild b/sys-apps/findutils/findutils-4.2.32.ebuild
deleted file mode 100644
index 18300beefad2..000000000000
--- a/sys-apps/findutils/findutils-4.2.32.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.32.ebuild,v 1.1 2008/01/26 06:10:52 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.2.24-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls build selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Patches for selinux
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-
-	if [[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]]; then
-		# Use the system-provided regex.h, bug #114747
-		echo "#include_next <regex.h>" > gnulib/lib/regex.h
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	[[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]] && \
-		myconf="${myconf} --without-included-regex"
-
-	econf $(use_enable nls) ${myconf} || die "configure failed"
-	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" libexecdir="${D}/usr/lib/find" install || die
-
-	rm -rf "${D}"/usr/var
-	use build \
-		&& rm -rf "${D}"/usr/share \
-		|| dodoc NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are now provided by slocate, not findutils."
-}
diff --git a/sys-apps/findutils/findutils-4.3.12.ebuild b/sys-apps/findutils/findutils-4.3.12.ebuild
deleted file mode 100644
index 8034b5c91a8d..000000000000
--- a/sys-apps/findutils/findutils-4.3.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.12.ebuild,v 1.2 2008/01/30 14:02:04 pebenito Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SELINUX_PATCH="findutils-4.3.12-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
-		myconf="${myconf} --without-included-regex"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--libexecdir=/usr/$(get_libdir)/find \
-		${myconf} \
-		|| die "configure failed"
-	emake AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README TODO ChangeLog
-}
diff --git a/sys-apps/findutils/findutils-4.3.8-r1.ebuild b/sys-apps/findutils/findutils-4.3.8-r1.ebuild
deleted file mode 100644
index 4c60bb5db8b5..000000000000
--- a/sys-apps/findutils/findutils-4.3.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.8-r1.ebuild,v 1.9 2007/10/28 21:21:25 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SELINUX_PATCH="findutils-4.3.7-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	epatch "${FILESDIR}"/${P}-gnulib-stddef.patch #197326
-	epatch "${FILESDIR}"/${P}-listfile-segv.patch #188249
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
-		myconf="${myconf} --without-included-regex"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--libexecdir=/usr/$(get_libdir)/find \
-		${myconf} \
-		|| die "configure failed"
-	emake AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README TODO ChangeLog
-}