sys-apps/findutils: Update SELinux patch for 4.3.11.

Package-Manager: portage-2.1.4_rc10

4 files changed, 485 insertions, 14 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 4d9f6e75d966..de880358af35 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.146 2007/12/16 20:36:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.147 2007/12/18 16:35:51 pebenito Exp $
+
+  18 Dec 2007; Chris PeBenito <pebenito@gentoo.org>
+  +files/findutils-4.3.11-selinux.diff, findutils-4.3.11.ebuild:
+  Update SELinux patch for 4.3.11.
 
 *findutils-4.3.11 (16 Dec 2007)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c403d2ce1ed9..eb89b900fb06 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -9,6 +9,10 @@ AUX findutils-4.2.24-selinux.diff 14356 RMD160 d9e28cacdfd7cec1f766d2465466c4728
 MD5 0b8c5e1bc2e54e46c292ad6a90729f75 files/findutils-4.2.24-selinux.diff 14356
 RMD160 d9e28cacdfd7cec1f766d2465466c472847df056 files/findutils-4.2.24-selinux.diff 14356
 SHA256 4e5df1395f80328c750d980ecb356aedd989b517e98cc52810ef03fe4f362bef files/findutils-4.2.24-selinux.diff 14356
+AUX findutils-4.3.11-selinux.diff 15774 RMD160 103b20347d96b33d68ae67c9295dd0c565f4aeea SHA1 27bc71ccb9031fc0c60c6e11712a2da3d37afb5e SHA256 e599d86f1787def865014d7e79a89c7fbff3c2a0492ae325d847a8adf8afdd24
+MD5 d9fcba070a3cd85d2bbbe6890ba262e8 files/findutils-4.3.11-selinux.diff 15774
+RMD160 103b20347d96b33d68ae67c9295dd0c565f4aeea files/findutils-4.3.11-selinux.diff 15774
+SHA256 e599d86f1787def865014d7e79a89c7fbff3c2a0492ae325d847a8adf8afdd24 files/findutils-4.3.11-selinux.diff 15774
 AUX findutils-4.3.7-selinux.diff 15748 RMD160 1e50f8833150366213b17db3ddf53f378d582180 SHA1 704f341547b744dccc3494aa0e54293517a96821 SHA256 04ce6089ca013939560b76109378f91aa2fb616540f9cb9ed30e48f02584be02
 MD5 26794a548a780ef231981e622f7f4a01 files/findutils-4.3.7-selinux.diff 15748
 RMD160 1e50f8833150366213b17db3ddf53f378d582180 files/findutils-4.3.7-selinux.diff 15748
@@ -37,18 +41,18 @@ EBUILD findutils-4.2.31.ebuild 1912 RMD160 628f655456dfdaeaa601e4417a0dac79d7092
 MD5 40c50d6f248a3899da6da131a51eee68 findutils-4.2.31.ebuild 1912
 RMD160 628f655456dfdaeaa601e4417a0dac79d7092d03 findutils-4.2.31.ebuild 1912
 SHA256 74de821fdb9e0b744d9c538df995feeed146dadea4bb8b135c38bb95d7aed749 findutils-4.2.31.ebuild 1912
-EBUILD findutils-4.3.11.ebuild 1553 RMD160 2f513a6d4eccea8ee7bbcc5c68e07a242203535f SHA1 5fe5aed46a7c4389f762dd460c61c15e11ad4559 SHA256 287c0c1d3037ce9e0358c825ebc8643b6c76141d65b667969b925e0c04438326
-MD5 03585dc544ac1e871984ed483e48ce8a findutils-4.3.11.ebuild 1553
-RMD160 2f513a6d4eccea8ee7bbcc5c68e07a242203535f findutils-4.3.11.ebuild 1553
-SHA256 287c0c1d3037ce9e0358c825ebc8643b6c76141d65b667969b925e0c04438326 findutils-4.3.11.ebuild 1553
+EBUILD findutils-4.3.11.ebuild 1556 RMD160 f2976fc9b2dbf243a97f554ac0f23b4a129cf851 SHA1 c5df1ee3fa641d19a4736f150c88dcd5430dd2d9 SHA256 c6f6564b4d3233dccb748c891b720dec2e056d4c0b78c36d611c069e203ace27
+MD5 b2bf4e080cf09c09f5c5af91bd75f0ea findutils-4.3.11.ebuild 1556
+RMD160 f2976fc9b2dbf243a97f554ac0f23b4a129cf851 findutils-4.3.11.ebuild 1556
+SHA256 c6f6564b4d3233dccb748c891b720dec2e056d4c0b78c36d611c069e203ace27 findutils-4.3.11.ebuild 1556
 EBUILD findutils-4.3.8-r1.ebuild 1652 RMD160 5c6dc566db50c4e6dfe7f101e3ac1b3d6bdcbb74 SHA1 a37570e5bddf36a05baf9acc13ad1d17b70bc822 SHA256 12c9647978b8011429f94fd8ab8b6f4f65c93dc3c86c1c62916cbba50b6480a2
 MD5 25df5ce1eaa94275ee2538e5afa365bf findutils-4.3.8-r1.ebuild 1652
 RMD160 5c6dc566db50c4e6dfe7f101e3ac1b3d6bdcbb74 findutils-4.3.8-r1.ebuild 1652
 SHA256 12c9647978b8011429f94fd8ab8b6f4f65c93dc3c86c1c62916cbba50b6480a2 findutils-4.3.8-r1.ebuild 1652
-MISC ChangeLog 20756 RMD160 6571302f90ca33ecdb1c679441cc17fbd7350db8 SHA1 f3248747a8c47be6b3bcaf2f744d5e083c76680d SHA256 cfb333b845c20c8fe313c9558dcee78f594aff09f008399f41c008b67e3fe107
-MD5 622be995c29c4f4f38b5fbe7122b4b52 ChangeLog 20756
-RMD160 6571302f90ca33ecdb1c679441cc17fbd7350db8 ChangeLog 20756
-SHA256 cfb333b845c20c8fe313c9558dcee78f594aff09f008399f41c008b67e3fe107 ChangeLog 20756
+MISC ChangeLog 20911 RMD160 dc90cd1ad80a144d7958a3d279068a7eaf92b046 SHA1 7bba56aa5aa2a76bf0d6e20617ad38e476b202a4 SHA256 5913014dcfaa16856584836ddfabb45a551b9858cf4d5ea0650e73e8c050cd78
+MD5 5e22b75cc753fcbc5928aa086927df4e ChangeLog 20911
+RMD160 dc90cd1ad80a144d7958a3d279068a7eaf92b046 ChangeLog 20911
+SHA256 5913014dcfaa16856584836ddfabb45a551b9858cf4d5ea0650e73e8c050cd78 ChangeLog 20911
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -68,7 +72,7 @@ SHA256 19198b3f2d31e72df648a63e7c9cd11f370ceabdc047c488e6014d09a148b5fe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHZYwip/wUKkr7RBoRAjohAJ92pNV2JK87r7W68DyypdhMiOtXxwCgpoqR
-4Rm+1fsaSVoJjf+cEg3oqoA=
-=R3Ft
+iD8DBQFHZ/bw1wYvhvBeaEYRAlyyAKDS17q4/TfA8DaRdkX7NqrYnkRZ5QCeJs1n
+aVROJnUmlB22L0q1g7r0WwE=
+=rdMB
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.11-selinux.diff b/sys-apps/findutils/files/findutils-4.3.11-selinux.diff
new file mode 100644
index 000000000000..aaf9349db4d2
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.11-selinux.diff
@@ -0,0 +1,463 @@
+diff -purN findutils-4.3.11.orig/find/Makefile.am findutils-4.3.11/find/Makefile.am
+--- findutils-4.3.11.orig/find/Makefile.am	2007-07-22 08:29:31.000000000 -0400
++++ findutils-4.3.11/find/Makefile.am	2007-12-18 11:17:19.184032698 -0500
+@@ -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.3.11.orig/find/Makefile.in findutils-4.3.11/find/Makefile.in
+--- findutils-4.3.11.orig/find/Makefile.in	2007-12-02 08:14:50.000000000 -0500
++++ findutils-4.3.11/find/Makefile.in	2007-12-18 11:18:33.088244259 -0500
+@@ -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@
+@@ -601,7 +601,7 @@ libfindtools_a_SOURCES = finddata.c fsty
+ @WITH_FTS_TRUE@oldfind_SOURCES = find.c
+ @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
+ EXTRA_DIST = defs.h $(man_MANS)
+-LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
+ man_MANS = find.1
+ SUBDIRS = . testsuite
+ all: all-recursive
+diff -purN findutils-4.3.11.orig/find/defs.h findutils-4.3.11/find/defs.h
+--- findutils-4.3.11.orig/find/defs.h	2007-11-30 05:19:58.000000000 -0500
++++ findutils-4.3.11/find/defs.h	2007-12-18 11:17:19.184032698 -0500
+@@ -90,6 +90,9 @@ int get_statinfo PARAMS((const char *pat
+ #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
+ #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
+ 
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif /*WITH_SELINUX*/
+ 
+ struct predicate;
+ struct options;
+@@ -314,6 +317,9 @@ struct predicate
+     struct samefile_file_id samefileid; /* samefile */
+     mode_t type;		/* type */
+     struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
++#ifdef WITH_SELINUX
++    security_context_t scontext; /* scontext */
++#endif /*WITH_SELINUX*/
+   } args;
+ 
+   /* The next predicate in the user input sequence,
+@@ -458,7 +464,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.3.11.orig/find/find.1 findutils-4.3.11/find/find.1
+--- findutils-4.3.11.orig/find/find.1	2007-12-02 06:41:55.000000000 -0500
++++ findutils-4.3.11/find/find.1	2007-12-18 11:17:19.184032698 -0500
+@@ -740,6 +740,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"
+@@ -1103,6 +1106,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.11.orig/find/find.c findutils-4.3.11/find/find.c
+--- findutils-4.3.11.orig/find/find.c	2007-11-22 03:22:10.000000000 -0500
++++ findutils-4.3.11/find/find.c	2007-12-18 11:17:19.188032926 -0500
+@@ -1248,7 +1248,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.11.orig/find/parser.c findutils-4.3.11/find/parser.c
+--- findutils-4.3.11.orig/find/parser.c	2007-11-30 05:19:58.000000000 -0500
++++ findutils-4.3.11/find/parser.c	2007-12-18 11:17:19.188032926 -0500
+@@ -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)
+@@ -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));
+ 
+@@ -341,6 +351,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}
+ };
+ 
+@@ -452,10 +464,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
+ 	   */
+@@ -464,6 +482,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;
+@@ -667,6 +688,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)
+@@ -1124,6 +1233,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\
+@@ -2519,6 +2632,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)
+ {
+@@ -2770,7 +2906,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.11.orig/find/pred.c findutils-4.3.11/find/pred.c
+--- findutils-4.3.11.orig/find/pred.c	2007-12-02 06:41:55.000000000 -0500
++++ findutils-4.3.11/find/pred.c	2007-12-18 11:17:19.192033154 -0500
+@@ -47,6 +47,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)
+@@ -229,6 +237,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
+@@ -1040,6 +1051,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;
+@@ -1829,6 +1860,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.11.orig/find/tree.c findutils-4.3.11/find/tree.c
+--- findutils-4.3.11.orig/find/tree.c	2007-11-30 05:19:58.000000000 -0500
++++ findutils-4.3.11/find/tree.c	2007-12-18 11:17:19.192033154 -0500
+@@ -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.3.11.ebuild b/sys-apps/findutils/findutils-4.3.11.ebuild
index accbaa0a5539..68a2a38e75c5 100644
--- a/sys-apps/findutils/findutils-4.3.11.ebuild
+++ b/sys-apps/findutils/findutils-4.3.11.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.11.ebuild,v 1.1 2007/12/16 20:36:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.11.ebuild,v 1.2 2007/12/18 16:35:51 pebenito Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
-SELINUX_PATCH="findutils-4.3.7-selinux.diff"
+SELINUX_PATCH="findutils-4.3.11-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/"