gentoo resync : 22.01.2019

5 files changed, 0 insertions, 605 deletions

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 30047aee1a03..de0db59c8977 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,12 +1,6 @@
-AUX findutils-4.4.2-gnulib-date-x32.patch 1210 BLAKE2B 21c799083621d06e0505b8dba2a166d9136b4dd8b7be8053850d6051008300c601c28301f4932e17188ab24dbfff7c580a92954aab50adcc6ea7ac3b6d525266 SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60
-AUX findutils-4.4.2-selinux.diff 15603 BLAKE2B 9fac4cb7a522cdce1c13ed4a7b60bba5d1778b0ec4b07e8e8b77461eece3373d516b4711749e531f951b5d95f9bf0594b569dbc54778b7ba305fa3add120608d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9
 AUX findutils-4.6.0-glibc228.patch 14434 BLAKE2B b125febb478b1abd7db298b6faaab139f6efb0ccd975d7f0abb1270eddc9e8cef20461d8f2aecb15adb74af54cfa6672c3b6b3eb13d8e7a2f502028c0060880c SHA512 ee02f9664e7f59dbd8a57e307f09ffbc8a383cef6ab4ddf0a1e79baa860ef5740120aaebeff7fdded1adc8b1d16b79bd4aec04d05653fa4f5f73619271ae7cab
 AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
-DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc465c884417531d56bda6dcf35746ec9c25f940ec660d83431787b88a3cb6931382326fdc3ab82575f236e9543163 SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1
-DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
-EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
-EBUILD findutils-4.5.18.ebuild 1554 BLAKE2B c2fb2c7c3c49673adde0b9dfb136a05fa980cf47e0d5b8ff677883b580fe10e759ab87f808f249d5ea385645913f8a8cbc0e1f18cc8885e3aa57e9dd4e2d7bf9 SHA512 87e20215836682aaa186507908548737c25befa31d600dc144f5e1be93a580e63b467bbd24a483a2ba393324cdc91f399584a225d427e616417b056f952a875c
 EBUILD findutils-4.6.0-r1.ebuild 1954 BLAKE2B a7e0dcd9564f3a2f4c5bd744acd131105898ee3f18e667c427bd2a411da9773fbd198f3ca8eeb14dba735546ddb962fcebc058a1077bb192d3274e0678a81a58 SHA512 319fccfcb878b2db2b9d5845ecaa0e447253c9e5df2ecdadb2d57d089a9b71be7e7497e9872e4d44e232110e0d7ee534ef4dc60414553d14a71cc2395bac5a61
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
deleted file mode 100644
index 9ff86f6b84a6..000000000000
--- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-newer gnulib has rewritten these checks in a way that works for the x32,
-and for the targets we care about, these checks won't return false.  so
-just drop them to make our life simpler.
-
-https://sites.google.com/site/x32abi/x32-patches
-
---- findutils-4.4.2/gnulib/lib/getdate.c.x32	2009-05-10 14:23:57.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/getdate.c	2011-12-05 11:41:18.130675712 -0800
-@@ -114,7 +114,6 @@
-    wraps around, but there's no portable way to check for that at
-    compile-time.  */
- verify (TYPE_IS_INTEGER (time_t));
--verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
- 
- /* An integer value, and the number of digits in its textual
-    representation.  */
---- findutils-4.4.2/gnulib/lib/mktime.c.x32	2009-05-10 14:25:13.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/mktime.c	2011-12-05 11:49:38.368589386 -0800
-@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda
- {
-   verify (C99_integer_division, -1 / 2 == 0);
--  verify (long_int_year_and_yday_are_wide_enough,
--	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
- 
-   /* Compute intervening leap days correctly even if year is negative.
-      Take care to avoid integer overflow here.  */
diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
deleted file mode 100644
index 66c9c412a0af..000000000000
--- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
+++ /dev/null
@@ -1,464 +0,0 @@
-diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am
---- findutils-4.4.2.orig/find/Makefile.am	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.am	2010-04-25 03:58:33.762402367 +0000
-@@ -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
-@@ -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.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in
---- findutils-4.4.2.orig/find/Makefile.in	2009-05-16 15:28:13.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.in	2010-04-25 03:58:33.762402367 +0000
-@@ -275,7 +275,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- DIRENT_H = @DIRENT_H@
- ECHO_C = @ECHO_C@
-@@ -607,7 +607,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.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
---- findutils-4.4.2.orig/find/defs.h	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/defs.h	2010-04-25 03:58:33.762402367 +0000
-@@ -91,6 +91,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;
-@@ -315,6 +318,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,
-@@ -459,7 +465,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,
-@@ -605,10 +613,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.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
---- findutils-4.4.2.orig/find/find.1	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.1	2010-04-25 03:58:33.762402367 +0000
-@@ -934,6 +934,10 @@ checks the type of the file that 
- .B \-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"
- Delete files; true if removal succeeded.  If the removal failed, an
-@@ -1354,6 +1358,8 @@ File's type (like in 
- 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.4.2.orig/find/find.c findutils-4.4.2/find/find.c
---- findutils-4.4.2.orig/find/find.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.c	2010-04-25 03:58:33.764899827 +0000
-@@ -1270,7 +1270,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.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
---- findutils-4.4.2.orig/find/parser.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/parser.c	2010-04-25 03:58:33.764899827 +0000
-@@ -53,6 +53,13 @@
- #include <unistd.h>
- #include <sys/stat.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)
-@@ -155,6 +162,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));
- 
-@@ -340,6 +350,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}
- };
- 
-@@ -451,10 +463,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
- 	   */
-@@ -463,6 +481,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;
-@@ -670,6 +691,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)
-@@ -1128,6 +1237,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\
-@@ -2552,6 +2665,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)
- {
-@@ -2803,7 +2939,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.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c
---- findutils-4.4.2.orig/find/pred.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/pred.c	2010-04-25 03:58:33.764899827 +0000
-@@ -48,6 +48,14 @@
- #include "error.h"
- #include "verify.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
-@@ -1054,6 +1065,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;
-@@ -1844,6 +1875,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.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c
---- findutils-4.4.2.orig/find/tree.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/tree.c	2010-04-25 03:58:33.764899827 +0000
-@@ -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)
- 	{
-@@ -1434,6 +1448,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/findutils-4.4.2-r2.ebuild b/sys-apps/findutils/findutils-4.4.2-r2.ebuild
deleted file mode 100644
index 3208b910b590..000000000000
--- a/sys-apps/findutils/findutils-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.4.2-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
-	mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch
-
-	# 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_configure() {
-	use static && append-ldflags -static
-
-	program_prefix=$(usex userland_GNU '' g)
-	econf \
-		--program-prefix=${program_prefix} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		--libexecdir='$(libdir)'/find
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# We don't need this, so punt it.
-	rm "${ED}"/usr/bin/${program_prefix}oldfind || die
-}
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
deleted file mode 100644
index 355715d5cb12..000000000000
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls selinux static test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	program_prefix=$(usex userland_GNU '' g)
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		--program-prefix=${program_prefix} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_with selinux) \
-		--libexecdir='$(libdir)'/find
-}
-
-src_compile() {
-	# We don't build locate, but the docs want a file in there.
-	emake -C locate dblocation.texi
-	default
-}