update findutils selinux patch.

Package-Manager: portage-2.1.2.9

4 files changed, 492 insertions, 11 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 80427d801a3a..7bd280f30265 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.116 2007/06/02 19:15:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.117 2007/06/10 04:41:43 pebenito Exp $
+
+  10 Jun 2007; Chris PeBenito <pebenito@gentoo.org>
+  +files/findutils-4.3.6-selinux.diff, findutils-4.3.6-r1.ebuild:
+  Update SELinux patch.
 
   02 Jun 2007; Luca Barbato <lu_zero@gentoo.org> findutils-4.2.31.ebuild:
   Marked ppc and ppc64
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 6f00e3371184..a9fa198faf61 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX findutils-4.1.20-selinux.diff 10392 RMD160 8b17d8de81c8e40a6e558de7ff0e4e8174717320 SHA1 c23a941d9000e0dfce0fb65fbc97d9c2f92e6b56 SHA256 4a6c0d238b31d51cb9cbc1fd918ff5e66d314783ae6a9628c981a6368b6c44d0
 MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
 RMD160 8b17d8de81c8e40a6e558de7ff0e4e8174717320 files/findutils-4.1.20-selinux.diff 10392
@@ -18,6 +21,10 @@ AUX findutils-4.3.4-selinux.diff 15890 RMD160 e2c978d09582379443eed82c2e9ea29772
 MD5 480f401c6801b26daab78931f7643862 files/findutils-4.3.4-selinux.diff 15890
 RMD160 e2c978d09582379443eed82c2e9ea29772e66e9b files/findutils-4.3.4-selinux.diff 15890
 SHA256 4aa982fd9891f1204537e8f10c20a26dca1b8104b02eef7edc2f74cd4ee3c3bf files/findutils-4.3.4-selinux.diff 15890
+AUX findutils-4.3.6-selinux.diff 15700 RMD160 bb4a7fcc3b0fc3a55cd21eaf33f50101f9ca277e SHA1 4415cd5a66ac2ea8da9dbff270b4b081e39c2b4d SHA256 eb2589a2fb21cf2783849ca32b783bf5ea33e7dbb23530d911036eb9465952b7
+MD5 185d5a08c9a54c70e02b6e9ff4ee6e11 files/findutils-4.3.6-selinux.diff 15700
+RMD160 bb4a7fcc3b0fc3a55cd21eaf33f50101f9ca277e files/findutils-4.3.6-selinux.diff 15700
+SHA256 eb2589a2fb21cf2783849ca32b783bf5ea33e7dbb23530d911036eb9465952b7 files/findutils-4.3.6-selinux.diff 15700
 AUX findutils-4.3.6-sv-bug-20005.patch 2991 RMD160 cbf23f48bc6ab8af12125cae7aa4347690c96d97 SHA1 6211d9becca9e62408b41922289185261acc48c7 SHA256 1701698efae64dc26b76aff7f184d054d618cc2c7eb9a057bfef1dc3bcce11f5
 MD5 54f2e3a55b98ba9052e563b52910b7fb files/findutils-4.3.6-sv-bug-20005.patch 2991
 RMD160 cbf23f48bc6ab8af12125cae7aa4347690c96d97 files/findutils-4.3.6-sv-bug-20005.patch 2991
@@ -57,14 +64,14 @@ EBUILD findutils-4.3.4.ebuild 1720 RMD160 128f5c1507e69cd199425b4e2ebedac1f8cc56
 MD5 65c4c2a860c200e69abd3743ee18abe3 findutils-4.3.4.ebuild 1720
 RMD160 128f5c1507e69cd199425b4e2ebedac1f8cc568f findutils-4.3.4.ebuild 1720
 SHA256 e4ed69e2d57715d6ed02ea0ab3a632e71448220ae30d9197b5573f4858dd6c40 findutils-4.3.4.ebuild 1720
-EBUILD findutils-4.3.6-r1.ebuild 1789 RMD160 bfba35e6a33776504138a2b9c185efce81868e82 SHA1 e00a813c74e3819ff2e4dd4c8d730b7e460d6a04 SHA256 f97af53cd11412d4401c7941947e0be6ef52429f2fa85bc6e2c04e0656097a5f
-MD5 b013adb078f954d1c4ae6e667ee4d409 findutils-4.3.6-r1.ebuild 1789
-RMD160 bfba35e6a33776504138a2b9c185efce81868e82 findutils-4.3.6-r1.ebuild 1789
-SHA256 f97af53cd11412d4401c7941947e0be6ef52429f2fa85bc6e2c04e0656097a5f findutils-4.3.6-r1.ebuild 1789
-MISC ChangeLog 17144 RMD160 79c1d2072e453ca18c3457d30124cdf1a42c48f2 SHA1 11714065273bfea5d9dfbc300d8cd876ca8d159f SHA256 9ccf2538bf8bf42ed9e5b1d69cd9827bb901d4257540c7a7a9c381c5d2b171ee
-MD5 46e9f9fe94947630e1ea701c52565bb8 ChangeLog 17144
-RMD160 79c1d2072e453ca18c3457d30124cdf1a42c48f2 ChangeLog 17144
-SHA256 9ccf2538bf8bf42ed9e5b1d69cd9827bb901d4257540c7a7a9c381c5d2b171ee ChangeLog 17144
+EBUILD findutils-4.3.6-r1.ebuild 1791 RMD160 a3e829896c355482cd0a998c5db18a89b7d7091a SHA1 1d1a21dff4793d948faf4a549d1860c8e82590e2 SHA256 58a30ac5d850038af38f53ee4e03d5c870a78bb7345de0b441bb31dce9dd2ab9
+MD5 bbfdb7abd8a636d5fce1b26be07fcaf0 findutils-4.3.6-r1.ebuild 1791
+RMD160 a3e829896c355482cd0a998c5db18a89b7d7091a findutils-4.3.6-r1.ebuild 1791
+SHA256 58a30ac5d850038af38f53ee4e03d5c870a78bb7345de0b441bb31dce9dd2ab9 findutils-4.3.6-r1.ebuild 1791
+MISC ChangeLog 17288 RMD160 b9fc626c25edfc3a02c44b7a748d57159dc02a80 SHA1 8cc0430f670f182126b284865a281b04e206a0e8 SHA256 4dbc4afd9a1a1ce192129d4f41ccb3c9c8725fb873f223cb63927ab1e8a02577
+MD5 d99b651822054f6120beb8f223a84c45 ChangeLog 17288
+RMD160 b9fc626c25edfc3a02c44b7a748d57159dc02a80 ChangeLog 17288
+SHA256 4dbc4afd9a1a1ce192129d4f41ccb3c9c8725fb873f223cb63927ab1e8a02577 ChangeLog 17288
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -90,3 +97,10 @@ SHA256 1c2a4bde0dda10ea69c4113f728549cb1afcb7dd64b460b2b7b1d28dd93e0282 files/di
 MD5 b0aabbae16ed5cf98e4b30d01502bce9 files/digest-findutils-4.3.6-r1 250
 RMD160 ff0a5dce33d57392d62e5db88350cf51ceffa683 files/digest-findutils-4.3.6-r1 250
 SHA256 c103a7b4436890f6e83e17da483a40d1e98c2d1aa34ed8226ae1ea312bcb7db6 files/digest-findutils-4.3.6-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGa4Esj3aojXnnRpoRAhkuAKCZpKtQUIW9yZtraW6HZvtR5Yzi2wCgs2kQ
+2Zbfm/EzytcN3Dp1q/FwSS8=
+=wNG/
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.6-selinux.diff b/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
new file mode 100644
index 000000000000..ed2905b64ebf
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
@@ -0,0 +1,463 @@
+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/findutils-4.3.6-r1.ebuild b/sys-apps/findutils/findutils-4.3.6-r1.ebuild
index d8cd93dc4e30..9e54c687a518 100644
--- a/sys-apps/findutils/findutils-4.3.6-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.3.6-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.6-r1.ebuild,v 1.1 2007/06/02 13:33:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.6-r1.ebuild,v 1.2 2007/06/10 04:41:43 pebenito Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
-SELINUX_PATCH="findutils-4.3.4-selinux.diff"
+SELINUX_PATCH="findutils-4.3.6-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"