old

Package-Manager: portage-2.1.3_rc6

6 files changed, 0 insertions, 1018 deletions

diff --git a/sys-apps/findutils/files/digest-findutils-4.2.30 b/sys-apps/findutils/files/digest-findutils-4.2.30
deleted file mode 100644
index 0610d01b91f1..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.2.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c35ff6502e0b3514c99089cb5d333c25 findutils-4.2.30.tar.gz 1188123
-RMD160 bd0079088e65b90c16897f8f3a64ad8a0d1d040f findutils-4.2.30.tar.gz 1188123
-SHA256 344b9cbb4034907f80398c6a6d3724507ff4b519036f13bb811d12f702043af4 findutils-4.2.30.tar.gz 1188123
diff --git a/sys-apps/findutils/files/digest-findutils-4.3.4 b/sys-apps/findutils/files/digest-findutils-4.3.4
deleted file mode 100644
index 9b15373e463b..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26914bd1d57cbe806bba9d3a1b9e544a findutils-4.3.4.tar.gz 1705441
-RMD160 be50a51b049a282b4ef14d2e61d2e35ec452bf2e findutils-4.3.4.tar.gz 1705441
-SHA256 086ab11c86818ba9c78c080b84c28e00f73d60dd1633f669bc6b01da8a8ccf32 findutils-4.3.4.tar.gz 1705441
diff --git a/sys-apps/findutils/files/digest-findutils-4.3.6-r1 b/sys-apps/findutils/files/digest-findutils-4.3.6-r1
deleted file mode 100644
index b503a9057ede..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.3.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21c054db0812a48b8f79f6449f55f77d findutils-4.3.6.tar.gz 1751567
-RMD160 c133485a18654054fb8f5bf715173e94bd3e250a findutils-4.3.6.tar.gz 1751567
-SHA256 8002e96c91c23c2424ec377442b4acaf0fa293dbfec6132db9b95f5d3559437b findutils-4.3.6.tar.gz 1751567
diff --git a/sys-apps/findutils/files/findutils-4.3.4-selinux.diff b/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
deleted file mode 100644
index 176c30cabc28..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
+++ /dev/null
@@ -1,462 +0,0 @@
-diff -purN findutils-4.3.4.orig/find/Makefile.am findutils-4.3.4/find/Makefile.am
---- findutils-4.3.4.orig/find/Makefile.am	2007-03-07 17:55:47.000000000 -0500
-+++ findutils-4.3.4/find/Makefile.am	2007-05-12 22:07:47.498816252 -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@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- 
-diff -purN findutils-4.3.4.orig/find/Makefile.in findutils-4.3.4/find/Makefile.in
---- findutils-4.3.4.orig/find/Makefile.in	2007-04-21 09:04:48.000000000 -0400
-+++ findutils-4.3.4/find/Makefile.in	2007-05-12 22:08:43.029980793 -0400
-@@ -273,7 +273,7 @@ CPPFLAGS = @CPPFLAGS@
- CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
- CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -502,7 +502,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@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- all: all-recursive
-diff -purN findutils-4.3.4.orig/find/defs.h findutils-4.3.4/find/defs.h
---- findutils-4.3.4.orig/find/defs.h	2007-04-15 09:09:58.000000000 -0400
-+++ findutils-4.3.4/find/defs.h	2007-05-12 22:06:42.675122161 -0400
-@@ -140,6 +140,10 @@ 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*/
-+
- #if 1
- #include <stdbool.h>
- typedef bool boolean;
-@@ -357,6 +361,9 @@ struct predicate
-     struct dir_id   fileid;	/* samefile */
-     mode_t type;		/* type */
-     FILE *stream;		/* ls fls fprint0 */
-+#ifdef WITH_SELINUX
-+    security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
-     struct format_val printf_vec; /* printf fprintf fprint  */
-   } args;
- 
-@@ -520,6 +527,9 @@ boolean pred_used PARAMS((char *pathname
- boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
- boolean pred_writable PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
- boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
-+#ifdef WITH_SELINUX
-+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
-+#endif /* WITH_SELINUX */
- 
- 
- 
-@@ -642,6 +652,10 @@ struct options
-   /* Optimisation level.  One is the default. 
-    */
-   unsigned short optimisation_level;
-+
-+#ifdef WITH_SELINUX
-+  int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
- 
-diff -purN findutils-4.3.4.orig/find/find.1 findutils-4.3.4/find/find.1
---- findutils-4.3.4.orig/find/find.1	2007-04-15 15:02:19.000000000 -0400
-+++ findutils-4.3.4/find/find.1	2007-05-12 22:06:42.679122388 -0400
-@@ -641,6 +641,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"
-@@ -951,6 +954,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.4.orig/find/find.c findutils-4.3.4/find/find.c
---- findutils-4.3.4.orig/find/find.c	2007-04-17 05:04:27.000000000 -0400
-+++ findutils-4.3.4/find/find.c	2007-05-12 22:06:42.679122388 -0400
-@@ -1250,7 +1250,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.4.orig/find/parser.c findutils-4.3.4/find/parser.c
---- findutils-4.3.4.orig/find/parser.c	2007-04-15 09:04:26.000000000 -0400
-+++ findutils-4.3.4/find/parser.c	2007-05-12 22:23:07.675254119 -0400
-@@ -53,6 +53,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)
-@@ -156,6 +163,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));
- 
-@@ -314,6 +324,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}
- };
- 
-@@ -383,10 +395,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
- 	   */
-@@ -395,6 +413,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;
-@@ -555,6 +576,94 @@ estimate_timestamp_success_rate(time_t w
-  
-    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)
-@@ -927,6 +1036,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\
-@@ -2130,6 +2243,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)
- {
-@@ -2387,7 +2523,11 @@ insert_fprintf (FILE *fp, const struct p
- 	  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.4.orig/find/pred.c findutils-4.3.4/find/pred.c
---- findutils-4.3.4.orig/find/pred.c	2007-04-15 11:48:31.000000000 -0400
-+++ findutils-4.3.4/find/pred.c	2007-05-12 22:06:42.683122616 -0400
-@@ -44,6 +44,14 @@
- #include "stat-time.h"
- #include "dircallback.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)
-@@ -226,6 +234,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
-@@ -929,6 +940,26 @@ do_fprintf(FILE *fp,
- 		     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 ) {
-+            (void) fprintf(stderr, "getfileconf(%s): %s",
-+                           pathname, strerror(errno));
-+            (void) fflush(stderr);
-+          }
-+          else {
-+	      segment->text[segment->text_len] = 's';
-+	      (void) fprintf (fp, segment->text, scontext);
-+	      freecon(scontext);
-+          }
-+        }
-+        break ;
-+#endif /* WITH_SELINUX */
- 	}
-       break;
-     }
-@@ -1705,6 +1736,34 @@ pred_xtype (char *pathname, struct stat 
-    */
-   return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+  
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext ( pathname, stat_buf, pred_ptr )
-+     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.4.orig/find/tree.c findutils-4.3.4/find/tree.c
---- findutils-4.3.4.orig/find/tree.c	2007-03-31 14:11:29.000000000 -0400
-+++ findutils-4.3.4/find/tree.c	2007-05-12 22:06:42.687122844 -0400
-@@ -1285,6 +1285,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
-@@ -1320,6 +1324,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)
- 	{
-@@ -1518,6 +1532,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.6-selinux.diff b/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
deleted file mode 100644
index ed2905b64ebf..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
+++ /dev/null
@@ -1,463 +0,0 @@
-diff -purN findutils-4.3.6.orig/find/Makefile.am findutils-4.3.6/find/Makefile.am
---- findutils-4.3.6.orig/find/Makefile.am	2007-05-19 08:41:16.000000000 -0400
-+++ findutils-4.3.6/find/Makefile.am	2007-06-10 00:13:46.127258621 -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@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- 
-diff -purN findutils-4.3.6.orig/find/Makefile.in findutils-4.3.6/find/Makefile.in
---- findutils-4.3.6.orig/find/Makefile.in	2007-05-21 17:45:37.000000000 -0400
-+++ findutils-4.3.6/find/Makefile.in	2007-06-10 00:13:46.129258259 -0400
-@@ -268,7 +268,7 @@ CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -501,7 +501,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@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- all: all-recursive
-diff -purN findutils-4.3.6.orig/find/defs.h findutils-4.3.6/find/defs.h
---- findutils-4.3.6.orig/find/defs.h	2007-05-07 07:10:14.000000000 -0400
-+++ findutils-4.3.6/find/defs.h	2007-06-10 00:18:00.769039629 -0400
-@@ -76,6 +76,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;
-@@ -300,6 +303,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,
-@@ -443,7 +449,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,
-@@ -580,10 +588,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.6.orig/find/find.1 findutils-4.3.6/find/find.1
---- findutils-4.3.6.orig/find/find.1	2007-05-19 08:53:09.000000000 -0400
-+++ findutils-4.3.6/find/find.1	2007-06-10 00:13:46.132257714 -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"
-@@ -954,6 +957,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.6.orig/find/find.c findutils-4.3.6/find/find.c
---- findutils-4.3.6.orig/find/find.c	2007-04-30 18:57:02.000000000 -0400
-+++ findutils-4.3.6/find/find.c	2007-06-10 00:13:46.134257351 -0400
-@@ -1251,7 +1251,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.6.orig/find/parser.c findutils-4.3.6/find/parser.c
---- findutils-4.3.6.orig/find/parser.c	2007-05-07 14:56:48.000000000 -0400
-+++ findutils-4.3.6/find/parser.c	2007-06-10 00:13:46.165251725 -0400
-@@ -55,6 +55,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)
-@@ -158,6 +165,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));
- 
-@@ -324,6 +334,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}
- };
- 
-@@ -393,10 +405,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
- 	   */
-@@ -405,6 +423,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;
-@@ -604,6 +625,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)
-@@ -1004,6 +1113,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\
-@@ -2349,6 +2462,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)
- {
-@@ -2598,7 +2734,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.6.orig/find/pred.c findutils-4.3.6/find/pred.c
---- findutils-4.3.6.orig/find/pred.c	2007-05-06 16:03:48.000000000 -0400
-+++ findutils-4.3.6/find/pred.c	2007-06-10 00:34:55.525855254 -0400
-@@ -46,6 +46,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)
-@@ -228,6 +236,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
-@@ -1003,6 +1014,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;
-@@ -1780,6 +1811,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.6.orig/find/tree.c findutils-4.3.6/find/tree.c
---- findutils-4.3.6.orig/find/tree.c	2007-05-06 07:17:23.000000000 -0400
-+++ findutils-4.3.6/find/tree.c	2007-06-10 00:13:46.176249729 -0400
-@@ -1195,6 +1195,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
-@@ -1230,6 +1234,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)
- 	{
-@@ -1433,6 +1447,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.6-sv-bug-20005.patch b/sys-apps/findutils/files/findutils-4.3.6-sv-bug-20005.patch
deleted file mode 100644
index f002f00a655a..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.6-sv-bug-20005.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-fix from upstream
-
-http://bugs.gentoo.org/180334
-
-Index: parser.c
-===================================================================
-RCS file: /sources/findutils/findutils/find/parser.c,v
-retrieving revision 1.122
-diff -u -p -r1.122 parser.c
---- find/parser.c	31 May 2007 08:15:05 -0000	1.122
-+++ find/parser.c	31 May 2007 09:01:07 -0000
-@@ -3175,19 +3175,22 @@ parse_time (const struct parser_table* e
-   struct predicate *our_pred;
-   struct time_val tval;
-   enum comparison_type comp;
--  const char *timearg;
-+  const char *timearg, *orig_timearg;
-   const char *errmsg = "arithmetic overflow while converting %s days to a number of seconds";
-   time_t origin;
- 
-   if (!collect_arg(argv, arg_ptr, &timearg))
-     return false;
-+  orig_timearg = timearg;
- 
-   /* Decide the origin by previewing the comparison type. */
-   origin = options.cur_day_start;
- 
-   if (get_comp_type(&timearg, &comp))
-     {
--      /* Remember, we invert the sense of the comparison, so this tests against COMP_LT instead of COMP_GT... */
-+      /* Remember, we invert the sense of the comparison, so this tests 
-+       * against COMP_LT instead of COMP_GT... 
-+       */
-       if (COMP_LT == tval.kind)      
- 	{
- 	  uintmax_t expected = origin + (DAYSECS-1);
-@@ -3198,11 +3201,14 @@ parse_time (const struct parser_table* e
- 		    _("arithmetic overflow when trying to calculate the end of today"));
- 	    }
- 	}
--      /* We discard the value of comp here, as get_relative_timestamp
--       * will set tval.kind. 
--       */
-     }
--  
-+  /* We discard the value of comp here, as get_relative_timestamp
-+   * will set tval.kind.  For that to work, we have to restore
-+   * timearg so that it points to the +/- prefix, if any.  get_comp_type()
-+   * will have advanced timearg, so we restore it.
-+   */
-+  timearg = orig_timearg;
-+
-   if (!get_relative_timestamp(timearg, &tval, origin, DAYSECS, errmsg))
-     return false;
- 
-@@ -3224,10 +3230,9 @@ parse_time (const struct parser_table* e
-       fprintf (stderr, "%ju %s", (uintmax_t) our_pred->args.reftime.ts.tv_sec, ctime (&t));
-       if (tval.kind == COMP_EQ)
- 	{
--	  t = our_pred->args.reftime.ts.tv_sec += DAYSECS;
-+	  t = our_pred->args.reftime.ts.tv_sec + DAYSECS;
- 	  fprintf (stderr, "                 <  %ju %s",
--		   (uintmax_t) our_pred->args.reftime.ts.tv_sec, ctime (&t));
--	  our_pred->args.reftime.ts.tv_sec -= DAYSECS;
-+		   (uintmax_t) t, ctime (&t));
- 	}
-     }
-   
-Index: pred.c
-===================================================================
-RCS file: /sources/findutils/findutils/find/pred.c,v
-retrieving revision 1.97
-diff -u -p -r1.97 pred.c
---- find/pred.c	27 May 2007 11:04:23 -0000	1.97
-+++ find/pred.c	31 May 2007 09:01:08 -0000
-@@ -2207,7 +2207,7 @@ print_list (FILE *fp, struct predicate *
-   cur = node;
-   while (cur != NULL)
-     {
--      fprintf (fp, "%s ", blank_rtrim (cur->p_name, name));
-+      fprintf (fp, "[%s] ", blank_rtrim (cur->p_name, name));
-       cur = cur->pred_next;
-     }
-   fprintf (fp, "\n");