sys-apps/findutils: Fix SELinux patch, bug #263478.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 472 insertions, 7 deletions

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 20b9d3998162..a335330d3983 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX findutils-4.3.12-selinux.diff 15641 RMD160 36948882affd7e80a9a2e8052a79fe84b04ec113 SHA1 e0d37e0bfadb7dbb87a9eb136c14d816b34895dd SHA256 211686a97ebfae840f83ce4b6d21dc8c47157128adaf3fd60787dcdfe0ff5f66
 AUX findutils-4.5.3-curdepth.patch 841 RMD160 5ba2849e578227d62eb286962582d791cbc0f002 SHA1 41b4838c67980745c472622e2578398e75e92e88 SHA256 a24353c2286a0badb660d9b9042c682d71abf4fba7a3716fa3bf29f0cd8d7f40
 AUX findutils-4.5.3-fts-assert.patch 597 RMD160 d90999eb3c5728a189a401abdf31d8cc830f3608 SHA1 05b4d66c4011a4f0acd1b20c92e71cc0f44a53ad SHA256 bddcafb6630fcae25ed9d494b9054ee1abfbe461d9e078db2441a66e38bcb0d6
+AUX findutils-4.5.4-selinux.diff 15641 RMD160 ab312382beac710d4b70981f08868c9b80f84e32 SHA1 0ce8f07671f0141c9fb664c786c35c3938907311 SHA256 d73a3716ab9586905feda47b260300598a8ee438ff0b589a0674f60c9d6d11ae
 DIST findutils-4.4.0.tar.gz 2029809 RMD160 0ea2b03f4d49902b64c2028abfba3a870c892420 SHA1 25e3d4dec40cec0165ffeff50acc4d4523ec3e07 SHA256 fb108c2959f17baf3559da9b3854495b9bb69fb13309fdd05576c66feb661ea9
 DIST findutils-4.5.2.tar.gz 2109947 RMD160 411fae22e0e0cd000809916525f5994decf976e9 SHA1 ca1bcb988d1cb36f1e2ba039282c0579cbc1b4ad SHA256 18785897642d962eebbeb9dba602df2020b6687da459c67ee21c2323ab758440
 DIST findutils-4.5.3.tar.gz 2199630 RMD160 ed46edffafe5ab6a9641074b1cad5d8faa5fab70 SHA1 da902815347c15bf1ebba345672b2549dc871299 SHA256 24c0970b7c421361c0a1344ee4b7ae3940c1fa0912c57d02924e6c27e6f8ec16
@@ -12,13 +13,13 @@ EBUILD findutils-4.4.0.ebuild 1501 RMD160 14f26d92d950710fd28ac8ef83ff3b33cbf44a
 EBUILD findutils-4.5.2.ebuild 1514 RMD160 a335d25661620e9eea12a86c5c39f173ff3ccc1b SHA1 374ef7f6b26f8d21b9888be2820792d14b50bec1 SHA256 5401a4a2ff85e5d94eb31aa1b1221d1d693d745c430b1261fa5b116e633520b9
 EBUILD findutils-4.5.3-r1.ebuild 1619 RMD160 7d464aa293c6a064fd81a6eb5e469ed79dc055d7 SHA1 8c48a3b145390573e31700e7b0a4fc6979ce276c SHA256 a281af9e88162929d1ce0253070abcae3a701a6615553113797c4e9793dc51ce
 EBUILD findutils-4.5.3.ebuild 1514 RMD160 e2072df3635a3244849e2f54137d75de83e2559d SHA1 c97e42384f637f33e0d1e62e157a77027be5bae9 SHA256 96a209ed7e0612e30efde7dab4dc51992285561e53f78d3c44f850882461b5bc
-EBUILD findutils-4.5.4.ebuild 1516 RMD160 6b0d6039a5f6605aed0b392e316168a3e0689ac6 SHA1 415c8ec0b9917fd8de02c1d4fd96c81b8ff36ad2 SHA256 8233276c727361ef78f4d28bb2d41cd52e4edc1e5ebd255000e5b8b59e31f965
+EBUILD findutils-4.5.4.ebuild 1517 RMD160 c7aa45673e7d264989cef357ee37cbc0abcad8db SHA1 f0ac2810c109eeb3414bb275d2b1f87addbded9a SHA256 9a9181897ad8d6bd70996352efe9d0e574dc30c4d442e7e1f4eb8291e27104ad
 MISC ChangeLog 25003 RMD160 93cb7e7d35b8638ee88a0033e5bb8d6eae3acf83 SHA1 62550433baa0c2a901f7ff9d153bd1f1a0de381b SHA256 0a1f826ddfee41f1d5e0e402475d838f06e7b16a0a9e490d2a1d3988ff0ef1d5
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm9bbEACgkQn/5bYzqsSmGRDQCfQ8BmcAweGRdsSfy0GKqPRDZp
-y5wAoIHfpt7TFiBd2M+qcS39iPQ3Rzkn
-=ykVw
+iEYEARECAAYFAkoZpC4ACgkQXifbxvYVSbStDgCeKL9ux4S9eUXgk32IJ8jLTaVD
+qtUAnR+3t2Yf22heHnb3odjrPrxLnpmH
+=oSx0
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.5.4-selinux.diff b/sys-apps/findutils/files/findutils-4.5.4-selinux.diff
new file mode 100644
index 000000000000..88962b6f4a7f
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.5.4-selinux.diff
@@ -0,0 +1,464 @@
+diff -purN findutils-4.5.4.orig/find/Makefile.am findutils-4.5.4/find/Makefile.am
+--- findutils-4.5.4.orig/find/Makefile.am	2009-03-07 09:42:57.000000000 -0500
++++ findutils-4.5.4/find/Makefile.am	2009-05-24 15:17:50.545064532 -0400
+@@ -3,6 +3,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ 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
+@@ -27,7 +28,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 $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_CLOSE) @FINDLIBS@
++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_CLOSE) @FINDLIBS@ -lselinux
+ man_MANS = find.1
+ SUBDIRS = . testsuite
+ 
+diff -purN findutils-4.5.4.orig/find/Makefile.in findutils-4.5.4/find/Makefile.in
+--- findutils-4.5.4.orig/find/Makefile.in	2009-03-10 05:57:46.000000000 -0400
++++ findutils-4.5.4/find/Makefile.in	2009-05-24 15:17:50.548981891 -0400
+@@ -297,7 +297,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@
+@@ -773,7 +773,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 $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_CLOSE) @FINDLIBS@
++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_CLOSE) @FINDLIBS@ -lselinux
+ man_MANS = find.1
+ SUBDIRS = . testsuite
+ all: all-recursive
+diff -purN findutils-4.5.4.orig/find/defs.h findutils-4.5.4/find/defs.h
+--- findutils-4.5.4.orig/find/defs.h	2009-03-08 09:34:20.000000000 -0400
++++ findutils-4.5.4/find/defs.h	2009-05-24 15:17:50.548981891 -0400
+@@ -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;
+@@ -319,6 +322,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,
+@@ -463,7 +469,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,
+@@ -609,10 +617,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.5.4.orig/find/find.1 findutils-4.5.4/find/find.1
+--- findutils-4.5.4.orig/find/find.1	2009-03-07 09:42:57.000000000 -0500
++++ findutils-4.5.4/find/find.1	2009-05-24 15:17:50.548981891 -0400
+@@ -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.5.4.orig/find/find.c findutils-4.5.4/find/find.c
+--- findutils-4.5.4.orig/find/find.c	2009-03-09 21:01:17.000000000 -0400
++++ findutils-4.5.4/find/find.c	2009-05-24 15:17:50.552981245 -0400
+@@ -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.5.4.orig/find/parser.c findutils-4.5.4/find/parser.c
+--- findutils-4.5.4.orig/find/parser.c	2009-03-08 09:34:20.000000000 -0400
++++ findutils-4.5.4/find/parser.c	2009-05-24 15:19:18.424993499 -0400
+@@ -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\
+@@ -2556,6 +2669,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)
+ {
+@@ -2807,7 +2943,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.5.4.orig/find/pred.c findutils-4.5.4/find/pred.c
+--- findutils-4.5.4.orig/find/pred.c	2009-03-08 09:34:20.000000000 -0400
++++ findutils-4.5.4/find/pred.c	2009-05-24 15:37:54.196981844 -0400
+@@ -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, "getfilecon(%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;
+@@ -1864,6 +1895,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)(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.5.4.orig/find/tree.c findutils-4.5.4/find/tree.c
+--- findutils-4.5.4.orig/find/tree.c	2009-03-08 09:34:20.000000000 -0400
++++ findutils-4.5.4/find/tree.c	2009-05-24 15:17:50.556981157 -0400
+@@ -1201,6 +1201,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
+@@ -1236,6 +1240,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)
+ 	{
+@@ -1441,6 +1455,9 @@ get_new_pred (const struct parser_table 
+   last_pred->need_type = true;
+   last_pred->need_inum = false;
+   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.5.4.ebuild b/sys-apps/findutils/findutils-4.5.4.ebuild
index 7a832d9a4248..640e404bb1bc 100644
--- a/sys-apps/findutils/findutils-4.5.4.ebuild
+++ b/sys-apps/findutils/findutils-4.5.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.4.ebuild,v 1.1 2009/03/15 21:05:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.4.ebuild,v 1.2 2009/05/24 19:46:44 pebenito Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
-SELINUX_PATCH="findutils-4.3.12-selinux.diff"
+SELINUX_PATCH="findutils-4.5.4-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/"