update findutils selinux patch for 4.3.7.

Package-Manager: portage-2.1.2.9

4 files changed, 486 insertions, 15 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 2e9303374c91..682e75329e52 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.121 2007/06/11 16:49:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.122 2007/06/11 18:09:27 pebenito Exp $
+
+  11 Jun 2007; Chris PeBenito <pebenito@gentoo.org>
+  +files/findutils-4.3.7-selinux.diff, findutils-4.3.7.ebuild:
+  Update SELinux patch for 4.3.7.
 
   11 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   findutils-4.2.31.ebuild:
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 5a29c0417719..3dc4cf28ae3e 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -25,6 +25,10 @@ AUX findutils-4.3.6-sv-bug-20005.patch 2991 RMD160 cbf23f48bc6ab8af12125cae7aa43
 MD5 54f2e3a55b98ba9052e563b52910b7fb files/findutils-4.3.6-sv-bug-20005.patch 2991
 RMD160 cbf23f48bc6ab8af12125cae7aa4347690c96d97 files/findutils-4.3.6-sv-bug-20005.patch 2991
 SHA256 1701698efae64dc26b76aff7f184d054d618cc2c7eb9a057bfef1dc3bcce11f5 files/findutils-4.3.6-sv-bug-20005.patch 2991
+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
+SHA256 04ce6089ca013939560b76109378f91aa2fb616540f9cb9ed30e48f02584be02 files/findutils-4.3.7-selinux.diff 15748
 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
@@ -55,14 +59,14 @@ EBUILD findutils-4.3.6-r1.ebuild 1705 RMD160 6c92a74edf2d687b3337bf99ce739fa089e
 MD5 3403f9c799ba93e34e7fe9fc59389e8b findutils-4.3.6-r1.ebuild 1705
 RMD160 6c92a74edf2d687b3337bf99ce739fa089e993d7 findutils-4.3.6-r1.ebuild 1705
 SHA256 a48b36ba55241543ede6483741e8b34b9c05f961a1e939fcf0cc33f88f92ee5f findutils-4.3.6-r1.ebuild 1705
-EBUILD findutils-4.3.7.ebuild 1655 RMD160 8b399386513bac240b37a697c76dc8943e20b53b SHA1 d93977975a421fe169a7cf10f0c719116147e2b5 SHA256 5acb4f78906ae71a178db2bad0661cc1db72c10c56e29d97867505bb552cde7e
-MD5 706320d593c6ae5ff9994f2fa5416f62 findutils-4.3.7.ebuild 1655
-RMD160 8b399386513bac240b37a697c76dc8943e20b53b findutils-4.3.7.ebuild 1655
-SHA256 5acb4f78906ae71a178db2bad0661cc1db72c10c56e29d97867505bb552cde7e findutils-4.3.7.ebuild 1655
-MISC ChangeLog 17836 RMD160 a471b3c813400ddebb797f805ebbf641e5c5e171 SHA1 1b645951fbe1ddc302f1431d35a3ea504f5cf8fb SHA256 7d831bb6f2a6e74d72536a548ad877d729d1d80d918b6dfaecf3bc038df13144
-MD5 f30a186b13b76d2a6aa65b3f497622c4 ChangeLog 17836
-RMD160 a471b3c813400ddebb797f805ebbf641e5c5e171 ChangeLog 17836
-SHA256 7d831bb6f2a6e74d72536a548ad877d729d1d80d918b6dfaecf3bc038df13144 ChangeLog 17836
+EBUILD findutils-4.3.7.ebuild 1657 RMD160 2111c82c8e52f5ecfda5d579b669190379809066 SHA1 39c3fea063b78c58472628d1b911c244cbd9bb1d SHA256 756066f5a974ecf53722b485a738281d7d66e10524bd47910f9cfe87c074f254
+MD5 ffee3ea8a8783bc2dd82313b0166fbf7 findutils-4.3.7.ebuild 1657
+RMD160 2111c82c8e52f5ecfda5d579b669190379809066 findutils-4.3.7.ebuild 1657
+SHA256 756066f5a974ecf53722b485a738281d7d66e10524bd47910f9cfe87c074f254 findutils-4.3.7.ebuild 1657
+MISC ChangeLog 17986 RMD160 14d39a4eebac34fd8e849787f4a417697695cc58 SHA1 daf809173336abad0a5c1efd5b7bd685dc318f32 SHA256 4df77b8a451ef6fceabc6ca2b8b346d9af4592a4c99a68ba8b5b8b555c9dd6da
+MD5 50a0a49d3a18e0b155f2fa8d7b888f7f ChangeLog 17986
+RMD160 14d39a4eebac34fd8e849787f4a417697695cc58 ChangeLog 17986
+SHA256 4df77b8a451ef6fceabc6ca2b8b346d9af4592a4c99a68ba8b5b8b555c9dd6da ChangeLog 17986
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -86,9 +90,9 @@ MD5 afae49f90b2d9bf29225c77ec7f3049d files/digest-findutils-4.3.7 250
 RMD160 ddb923c015c3c380ff23f77a2a74eff1a7393e95 files/digest-findutils-4.3.7 250
 SHA256 19af16a0ce0ca2713b309af1a996676e6eebcab4b4df01c85cdca67cf3363185 files/digest-findutils-4.3.7 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbX0kKRy60XGEcJIRAsYgAKCSaMcSPEUc5+sa8pGVJtPE9Ph1dgCgmKlx
-FKCU+gabPjjR+JPFx8Gpwt8=
-=Z5J1
+iD8DBQFGbY/hj3aojXnnRpoRAs7LAJ9tkcRIZ0ZbPNpP53VKypeBotxMNQCgkBQz
+nMCBbxZf+RAzSWHpJcmS3e4=
+=avTh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.7-selinux.diff b/sys-apps/findutils/files/findutils-4.3.7-selinux.diff
new file mode 100644
index 000000000000..09e9a6fd1ac5
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.7-selinux.diff
@@ -0,0 +1,463 @@
+diff -purN findutils-4.3.7.orig/find/Makefile.am findutils-4.3.7/find/Makefile.am
+--- findutils-4.3.7.orig/find/Makefile.am	2007-05-24 03:10:08.000000000 -0400
++++ findutils-4.3.7/find/Makefile.am	2007-06-11 14:03:23.753990893 -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@ @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.7.orig/find/Makefile.in findutils-4.3.7/find/Makefile.in
+--- findutils-4.3.7.orig/find/Makefile.in	2007-06-09 14:17:00.000000000 -0400
++++ findutils-4.3.7/find/Makefile.in	2007-06-11 14:03:39.214209729 -0400
+@@ -272,7 +272,7 @@ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
+ DEPDIR = @DEPDIR@
+ DIRENT_H = @DIRENT_H@
+ ECHO_C = @ECHO_C@
+@@ -516,7 +516,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.7.orig/find/defs.h findutils-4.3.7/find/defs.h
+--- findutils-4.3.7.orig/find/defs.h	2007-06-09 08:09:26.000000000 -0400
++++ findutils-4.3.7/find/defs.h	2007-06-11 14:01:35.048452187 -0400
+@@ -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,
+@@ -457,7 +463,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,
+@@ -594,10 +602,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.7.orig/find/find.1 findutils-4.3.7/find/find.1
+--- findutils-4.3.7.orig/find/find.1	2007-05-27 06:59:28.000000000 -0400
++++ findutils-4.3.7/find/find.1	2007-06-11 14:01:35.052452243 -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"
+@@ -955,6 +958,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.7.orig/find/find.c findutils-4.3.7/find/find.c
+--- findutils-4.3.7.orig/find/find.c	2007-06-09 08:14:35.000000000 -0400
++++ findutils-4.3.7/find/find.c	2007-06-11 14:01:35.052452243 -0400
+@@ -1252,7 +1252,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.7.orig/find/parser.c findutils-4.3.7/find/parser.c
+--- findutils-4.3.7.orig/find/parser.c	2007-06-09 08:12:06.000000000 -0400
++++ findutils-4.3.7/find/parser.c	2007-06-11 14:01:35.056452300 -0400
+@@ -57,6 +57,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)
+@@ -160,6 +167,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));
+ 
+@@ -326,6 +336,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}
+ };
+ 
+@@ -395,10 +407,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
+ 	   */
+@@ -407,6 +425,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;
+@@ -606,6 +627,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)
+@@ -1060,6 +1169,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\
+@@ -2426,6 +2539,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)
+ {
+@@ -2675,7 +2811,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.7.orig/find/pred.c findutils-4.3.7/find/pred.c
+--- findutils-4.3.7.orig/find/pred.c	2007-06-09 08:12:35.000000000 -0400
++++ findutils-4.3.7/find/pred.c	2007-06-11 14:01:35.056452300 -0400
+@@ -48,6 +48,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)
+@@ -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
+@@ -1024,6 +1035,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;
+@@ -1801,6 +1832,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.7.orig/find/tree.c findutils-4.3.7/find/tree.c
+--- findutils-4.3.7.orig/find/tree.c	2007-06-09 08:13:09.000000000 -0400
++++ findutils-4.3.7/find/tree.c	2007-06-11 14:01:35.060452357 -0400
+@@ -1197,6 +1197,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
+@@ -1232,6 +1236,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)
+ 	{
+@@ -1435,6 +1449,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.7.ebuild b/sys-apps/findutils/findutils-4.3.7.ebuild
index 21056db1a99d..743399d32128 100644
--- a/sys-apps/findutils/findutils-4.3.7.ebuild
+++ b/sys-apps/findutils/findutils-4.3.7.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.7.ebuild,v 1.1 2007/06/11 05:43:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.7.ebuild,v 1.2 2007/06/11 18:09:27 pebenito Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
-SELINUX_PATCH="findutils-4.3.6-selinux.diff"
+SELINUX_PATCH="findutils-4.3.7-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"