update selinux patch on findutils 4.3.4.

Package-Manager: portage-2.1.2.7

4 files changed, 484 insertions, 14 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index daac4417efb0..b1a1a17996df 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.100 2007/05/12 17:00:07 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.101 2007/05/13 02:27:23 pebenito Exp $
+
+  13 May 2007; Chris PeBenito <pebenito@gentoo.org>
+  +files/findutils-4.3.4-selinux.diff, findutils-4.3.4.ebuild:
+  Update SELinux patch for 4.3.4.
 
   12 May 2007; Timothy Redaelli <drizzt@gentoo.org>
   findutils-4.3.2-r1.ebuild, findutils-4.3.4.ebuild:
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index b7fc255535b5..f1910ee2b771 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -17,6 +17,10 @@ AUX findutils-4.3.2-check-insert-num-ret.patch 1659 RMD160 912f83c868dcf56453af2
 MD5 596b56ea812bfda9da3088a998aeeaef files/findutils-4.3.2-check-insert-num-ret.patch 1659
 RMD160 912f83c868dcf56453af2970d7fdf08211d9f457 files/findutils-4.3.2-check-insert-num-ret.patch 1659
 SHA256 815e02b792f8dd5fe8729319b3c98cf806cef127dab787b41e3a86dfefeabb47 files/findutils-4.3.2-check-insert-num-ret.patch 1659
+AUX findutils-4.3.4-selinux.diff 15890 RMD160 e2c978d09582379443eed82c2e9ea29772e66e9b SHA1 8486229e0b0eb438dfa120896046445df2c5e69b SHA256 4aa982fd9891f1204537e8f10c20a26dca1b8104b02eef7edc2f74cd4ee3c3bf
+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-env-size.patch 672 RMD160 8a88bf1346d7c54bf9936a037975558e4490e5c2 SHA1 0eb4276b7ef05529938a84696f6565f35d36811c SHA256 5d83294b209acbe6dc12b941becc0556e86a80d5f4de4ab3af4dd1c182b7af95
 MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
 RMD160 8a88bf1346d7c54bf9936a037975558e4490e5c2 files/findutils-env-size.patch 672
@@ -42,14 +46,14 @@ EBUILD findutils-4.3.2-r1.ebuild 1785 RMD160 410c9f71d808806670c056a8a23e59db3de
 MD5 efa75306b132a85e421115b06f70d9b2 findutils-4.3.2-r1.ebuild 1785
 RMD160 410c9f71d808806670c056a8a23e59db3de5f652 findutils-4.3.2-r1.ebuild 1785
 SHA256 a836d055bfd78e17970ac462da9143bc108d872abf400a3e40e3b11caac0f4bb findutils-4.3.2-r1.ebuild 1785
-EBUILD findutils-4.3.4.ebuild 1732 RMD160 5591673e6ed200bb2aa962c40aa65b9cf37f5041 SHA1 86e5e1498892fe195a99156ec9d4f7e98d0dda50 SHA256 0e0415ce1a812d97d152f63f52cf18fe65043c3175a98e4ca105625d6bab8e56
-MD5 b93a8b2c6c74c454992c633e057ded18 findutils-4.3.4.ebuild 1732
-RMD160 5591673e6ed200bb2aa962c40aa65b9cf37f5041 findutils-4.3.4.ebuild 1732
-SHA256 0e0415ce1a812d97d152f63f52cf18fe65043c3175a98e4ca105625d6bab8e56 findutils-4.3.4.ebuild 1732
-MISC ChangeLog 15025 RMD160 46860d88a39b64c0e4a130a40ac148ac84085ba5 SHA1 1e0a8889dcf530e86de8453ed10d7010d9c0afbd SHA256 00b322419e45e4767ae64ea0c7662bcecd9bed9c417bc67cefb3d3578393f8df
-MD5 6f4db0a849e773dcadf94d9b8982fc82 ChangeLog 15025
-RMD160 46860d88a39b64c0e4a130a40ac148ac84085ba5 ChangeLog 15025
-SHA256 00b322419e45e4767ae64ea0c7662bcecd9bed9c417bc67cefb3d3578393f8df ChangeLog 15025
+EBUILD findutils-4.3.4.ebuild 1734 RMD160 ae453f2a68f5a390f16b89b5e03db625174b628c SHA1 5eb129690cb0feb2b7eca157cdab6e6624db6498 SHA256 e047b32a4e7023ceb3c38f5c2af3c0dd8ae17ea8af6086d0a177528953c7a007
+MD5 0a8d717211f5d35003df2aad3f4c4e4a findutils-4.3.4.ebuild 1734
+RMD160 ae453f2a68f5a390f16b89b5e03db625174b628c findutils-4.3.4.ebuild 1734
+SHA256 e047b32a4e7023ceb3c38f5c2af3c0dd8ae17ea8af6086d0a177528953c7a007 findutils-4.3.4.ebuild 1734
+MISC ChangeLog 15177 RMD160 16ecb774a04ea47d0df51d54f899c92940076909 SHA1 3163cddbaffb369bccfc6716d40cce16f70aa227 SHA256 ac492842e3c04bf6bbd77d4dc6653104077647b698a76ef57b12499b4daa43ec
+MD5 743df60ed0bbbdaad4dffc606f3dc6bc ChangeLog 15177
+RMD160 16ecb774a04ea47d0df51d54f899c92940076909 ChangeLog 15177
+SHA256 ac492842e3c04bf6bbd77d4dc6653104077647b698a76ef57b12499b4daa43ec ChangeLog 15177
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -72,7 +76,7 @@ SHA256 1c2a4bde0dda10ea69c4113f728549cb1afcb7dd64b460b2b7b1d28dd93e0282 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGRfKgjJyKLBkBVroRAoBSAJwMyQiP3CFENBuwsoIcSUrVDxbHtgCgyZQW
-jUT8WOHDbAqmyjdQtyKb9Ow=
-=PMDM
+iD8DBQFGRnicj3aojXnnRpoRAkt1AJ4+fHnR6j2WPyJ6KtmSoy8H8hc+MgCeKkMy
+SWc7PRhJGtdrtwOJe8n69vk=
+=wjVc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.4-selinux.diff b/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
new file mode 100644
index 000000000000..176c30cabc28
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
@@ -0,0 +1,462 @@
+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/findutils-4.3.4.ebuild b/sys-apps/findutils/findutils-4.3.4.ebuild
index 818abb7951cb..7ba9d7e7be9a 100644
--- a/sys-apps/findutils/findutils-4.3.4.ebuild
+++ b/sys-apps/findutils/findutils-4.3.4.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.4.ebuild,v 1.2 2007/05/12 17:00:07 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.4.ebuild,v 1.3 2007/05/13 02:27:23 pebenito Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
-SELINUX_PATCH="findutils-4.3.1-selinux.diff"
+SELINUX_PATCH="findutils-4.3.4-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"