diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/findutils/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.1.20-selinux.diff | 336 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.2.24-selinux.diff | 445 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.11-selinux.diff | 463 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.12-selinux.diff | 464 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.7-selinux.diff | 463 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch | 19 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch | 58 | ||||
| -rw-r--r-- | sys-apps/findutils/files/findutils-env-size.patch | 15 | ||||
| -rw-r--r-- | sys-apps/findutils/findutils-4.3.13.ebuild | 60 |
10 files changed, 0 insertions, 2333 deletions
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest deleted file mode 100644 index e6e4ee60..00000000 --- a/sys-apps/findutils/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX findutils-4.1.20-selinux.diff 10392 RMD160 8b17d8de81c8e40a6e558de7ff0e4e8174717320 SHA1 c23a941d9000e0dfce0fb65fbc97d9c2f92e6b56 SHA256 4a6c0d238b31d51cb9cbc1fd918ff5e66d314783ae6a9628c981a6368b6c44d0 -AUX findutils-4.2.24-selinux.diff 14356 RMD160 d9e28cacdfd7cec1f766d2465466c472847df056 SHA1 4025e771fd39761992c7dc8503e3bed973ef26f6 SHA256 4e5df1395f80328c750d980ecb356aedd989b517e98cc52810ef03fe4f362bef -AUX findutils-4.3.11-selinux.diff 15774 RMD160 103b20347d96b33d68ae67c9295dd0c565f4aeea SHA1 27bc71ccb9031fc0c60c6e11712a2da3d37afb5e SHA256 e599d86f1787def865014d7e79a89c7fbff3c2a0492ae325d847a8adf8afdd24 -AUX findutils-4.3.12-selinux.diff 15641 RMD160 36948882affd7e80a9a2e8052a79fe84b04ec113 SHA1 e0d37e0bfadb7dbb87a9eb136c14d816b34895dd SHA256 211686a97ebfae840f83ce4b6d21dc8c47157128adaf3fd60787dcdfe0ff5f66 -AUX findutils-4.3.7-selinux.diff 15748 RMD160 1e50f8833150366213b17db3ddf53f378d582180 SHA1 704f341547b744dccc3494aa0e54293517a96821 SHA256 04ce6089ca013939560b76109378f91aa2fb616540f9cb9ed30e48f02584be02 -AUX findutils-4.3.8-gnulib-stddef.patch 435 RMD160 4eb6e5e07e4124383875efff9ea8b5d47c18f81a SHA1 d85901e8eee3c2c708865a969be847421b02465f SHA256 d15754dfea82f6c8b7d1c377ffc184f759b903ef650aa856560f1fa243a9d08d -AUX findutils-4.3.8-listfile-segv.patch 1985 RMD160 f6d01e698d96d755df11da606b74d2a4e2133049 SHA1 f5d5126f28c0125bf15e642a377d01d147961334 SHA256 31eeb7c3e3ba076cbf8649942d42509eadf1cec29c9ad60ae52b4853055e35fc -AUX findutils-env-size.patch 672 RMD160 8a88bf1346d7c54bf9936a037975558e4490e5c2 SHA1 0eb4276b7ef05529938a84696f6565f35d36811c SHA256 5d83294b209acbe6dc12b941becc0556e86a80d5f4de4ab3af4dd1c182b7af95 -DIST findutils-4.3.13.tar.gz 2054988 RMD160 e75ca08435e80d02f188739d5862f431b4d8f8d6 SHA1 e4ba80c195b517236fe28afcded9639ccda9639e SHA256 077205f7b85f6e354b56010fbb1d69cc0a48d50828ff14f487a091559d144397 -EBUILD findutils-4.3.13.ebuild 1630 RMD160 260bceb85d56dde409a9fe58609c8e97d3543940 SHA1 702fc5b63d61693200b19df0da292dc6b3cb8dbb SHA256 d8843beb995afc96c3305e141b38c67a95181c1af03da244d8fd3a794a69a329 diff --git a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff deleted file mode 100644 index e66d1269..00000000 --- a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff +++ /dev/null @@ -1,336 +0,0 @@ -diff -urN findutils-4.1.20.orig/find/Makefile.am findutils-4.1.20/find/Makefile.am ---- findutils-4.1.20.orig/find/Makefile.am 2003-05-26 13:02:34.000000000 -0500 -+++ findutils-4.1.20/find/Makefile.am 2003-09-28 15:40:28.000000000 -0500 -@@ -3,8 +3,9 @@ - bin_PROGRAMS = find - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - -diff -urN findutils-4.1.20.orig/find/Makefile.in findutils-4.1.20/find/Makefile.in ---- findutils-4.1.20.orig/find/Makefile.in 2003-05-26 13:18:11.000000000 -0500 -+++ findutils-4.1.20/find/Makefile.in 2003-09-28 15:42:44.000000000 -0500 -@@ -54,7 +54,7 @@ - CPPFLAGS = @CPPFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -DWITH_SELINUX - DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -145,7 +145,7 @@ - bin_PROGRAMS = find - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - subdir = find -diff -urN findutils-4.1.20.orig/find/defs.h findutils-4.1.20/find/defs.h ---- findutils-4.1.20.orig/find/defs.h 2003-05-26 08:37:29.000000000 -0500 -+++ findutils-4.1.20/find/defs.h 2003-09-28 15:25:41.000000000 -0500 -@@ -127,6 +127,10 @@ - #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*/ -+ - /* Not char because of type promotion; NeXT gcc can't handle it. */ - typedef int boolean; - #define true 1 -@@ -274,6 +278,9 @@ - struct perm_val perm; /* perm */ - mode_t type; /* type */ - FILE *stream; /* fprint fprint0 */ -+#ifdef WITH_SELINUX -+ security_context_t scontext; /* scontext */ -+#endif /*WITH_SELINUX*/ - struct format_val printf_vec; /* printf fprintf */ - } args; - -@@ -319,6 +326,11 @@ - VOID *xmalloc PARAMS((size_t n)); - VOID *xrealloc PARAMS((VOID *p, size_t n)); - -+#ifdef WITH_SELINUX -+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); -+extern int (*x_getfilecon) (); -+#endif /*WITH_SELINUX*/ -+ - /* xstrdup.c */ - char *xstrdup PARAMS((char *string)); - -diff -urN findutils-4.1.20.orig/find/find.1 findutils-4.1.20/find/find.1 ---- findutils-4.1.20.orig/find/find.1 2001-05-20 14:42:07.000000000 -0500 -+++ findutils-4.1.20/find/find.1 2003-09-28 15:25:41.000000000 -0500 -@@ -230,6 +230,9 @@ - file of type \fIc\fR; if \-follow 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 "\-exec \fIcommand\fR ;" - Execute \fIcommand\fR; true if 0 status is returned. All following -@@ -417,6 +420,8 @@ - File's user name, or numeric user ID if the user has no name. - .IP %U - File's numeric user ID. -+.IP %C -+(SELInux only) file's security context. - .PP - A `%' character followed by any other character is discarded (but the - other character is printed). -diff -urN findutils-4.1.20.orig/find/find.c findutils-4.1.20/find/find.c ---- findutils-4.1.20.orig/find/find.c 2003-05-24 13:36:25.000000000 -0500 -+++ findutils-4.1.20/find/find.c 2003-09-28 15:25:41.000000000 -0500 -@@ -136,6 +136,9 @@ - - /* Pointer to the function used to stat files. */ - int (*xstat) (); -+#ifdef WITH_SELINUX -+int (*x_getfilecon) (); -+#endif /* WITH_SELINUX */ - - /* Status value to return to system. */ - int exit_status; -@@ -182,6 +185,10 @@ - xstat = debug_stat; - #else /* !DEBUG_STAT */ - xstat = lstat; -+#ifdef WITH_SELINUX -+ int is_selinux_enabled_flag = is_selinux_enabled(); -+ x_getfilecon = lgetfilecon; -+#endif /* WITH_SELINUX */ - #endif /* !DEBUG_STAT */ - - human_block_size (getenv ("FIND_BLOCK_SIZE"), 0, &output_block_size); -@@ -203,6 +210,14 @@ - if (strchr ("-!(),", argv[i][0]) == NULL) - usage (_("paths must precede expression")); - 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_function = find_parser (predicate_name); - if (parse_function == NULL) - /* Command line option not recognized */ -diff -urN findutils-4.1.20.orig/find/parser.c findutils-4.1.20/find/parser.c ---- findutils-4.1.20.orig/find/parser.c 2003-05-24 13:36:25.000000000 -0500 -+++ findutils-4.1.20/find/parser.c 2003-09-28 15:25:41.000000000 -0500 -@@ -25,6 +25,10 @@ - #include "modetype.h" - #include "xstrtol.h" - -+#ifdef WITH_SELINUX -+#include <selinux/selinux.h> -+#endif /*WITH_SELINUX*/ -+ - #if ENABLE_NLS - # include <libintl.h> - # define _(Text) gettext (Text) -@@ -115,6 +119,9 @@ - static boolean parse_version PARAMS((char *argv[], int *arg_ptr)); - static boolean parse_xdev PARAMS((char *argv[], int *arg_ptr)); - static boolean parse_xtype PARAMS((char *argv[], int *arg_ptr)); -+#ifdef WITH_SELINUX -+static boolean parse_scontext PARAMS((char *argv[], int *arg_ptr)); -+#endif /*WITH_SELINUX*/ - - static boolean insert_regex PARAMS((char *argv[], int *arg_ptr, boolean ignore_case)); - static boolean insert_type PARAMS((char *argv[], int *arg_ptr, boolean (*which_pred )())); -@@ -217,7 +224,11 @@ - {"-version", parse_version}, /* GNU */ - {"xdev", parse_xdev}, - {"xtype", parse_xtype}, /* GNU */ -- {0, 0} -+#ifdef WITH_SELINUX -+ {"context", parse_scontext}, /* SELINUX */ -+ {"-context", parse_scontext}, /* SELINUX */ -+#endif /*WITH_SELINUX*/ -+ {0, 0} - }; - - /* Return a pointer to the parser function to invoke for predicate -@@ -467,7 +478,10 @@ - { - dereference = true; - xstat = stat; -- no_leaf_check = true; -+#ifdef WITH_SELINUX -+ x_getfilecon = getfilecon; -+#endif /* WITH_SELINUX */ -+ no_leaf_check = true; - return (true); - } - -@@ -572,6 +586,10 @@ - -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ - -size N[bckw] -true -type [bcdpfls] -uid N -used N -user NAME\n\ - -xtype [bcdpfls]\n")); -+#ifdef WITH_SELINUX -+ puts (_("\ -+ -context CONTEXT\n")); -+#endif /*WITH_SELINUX*/ - puts (_("\ - actions: -exec COMMAND ; -fprint FILE -fprint0 FILE -fprintf FILE FORMAT\n\ - -ok COMMAND ; -print -print0 -printf FORMAT -prune -ls\n")); -@@ -1202,6 +1220,32 @@ - return true; - } - -+#ifdef WITH_SELINUX -+ -+static boolean -+parse_scontext ( argv, arg_ptr ) -+ char *argv[]; -+ int *arg_ptr; -+{ -+ struct predicate *our_pred; -+ -+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) ) -+ return( false ); -+ -+ our_pred = insert_primary(pred_scontext); -+ 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_xtype (char **argv, int *arg_ptr) - { -@@ -1360,7 +1404,11 @@ - if (*scan2 == '.') - for (scan2++; ISDIGIT (*scan2); scan2++) - /* Do nothing. */ ; -- if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2)) -+#ifdef WITH_SELINUX -+ if (strchr ("abcdfFgGhHiklmnpPstuUC", *scan2)) -+#else /* WITH_SELINUX */ -+ if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2)) -+#endif /* WITH_SELINUX */ - { - segmentp = make_segment (segmentp, format, scan2 - format, - (int) *scan2); -diff -urN findutils-4.1.20.orig/find/pred.c findutils-4.1.20/find/pred.c ---- findutils-4.1.20.orig/find/pred.c 2003-05-24 13:36:25.000000000 -0500 -+++ findutils-4.1.20/find/pred.c 2003-09-28 15:25:41.000000000 -0500 -@@ -29,6 +29,14 @@ - #include "modetype.h" - #include "wait.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) -@@ -71,7 +79,6 @@ - - extern int yesno (); - -- - /* Get or fake the disk device blocksize. - Usually defined by sys/param.h (if at all). */ - #ifndef DEV_BSIZE -@@ -198,6 +205,9 @@ - {pred_used, "used "}, - {pred_user, "user "}, - {pred_xtype, "xtype "}, -+#ifdef WITH_SELINUX -+ {pred_scontext, "context"}, -+#endif /*WITH_SELINUX*/ - {0, "none "} - }; - -@@ -721,6 +731,25 @@ - fprintf (fp, segment->text, - human_readable ((uintmax_t) stat_buf->st_uid, hbuf, 1, 1)); - break; -+#ifdef WITH_SELINUX -+ case 'C': /* SELinux security context */ -+ { -+ security_context_t scontext; -+ int rv; -+ rv = (*x_getfilecon)(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); -+ } -+ } -+ break ; -+#endif /* WITH_SELINUX */ - } - } - return (true); -@@ -1222,6 +1251,35 @@ - } - 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 = (* x_getfilecon)(rel_pathname, &scontext); -+ -+ if ( rv < 0 ) { -+ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno)); -+ (void) fflush(stderr); -+ return ( false ); -+ } -+ -+ -+ rv= (strcmp( scontext,pred_ptr->args.scontext) == 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 --git a/sys-apps/findutils/files/findutils-4.2.24-selinux.diff b/sys-apps/findutils/files/findutils-4.2.24-selinux.diff deleted file mode 100644 index ebe7a1a3..00000000 --- a/sys-apps/findutils/files/findutils-4.2.24-selinux.diff +++ /dev/null @@ -1,445 +0,0 @@ -diff -urN findutils-4.2.24.orig/find/Makefile.am findutils-4.2.24/find/Makefile.am ---- findutils-4.2.24.orig/find/Makefile.am 2005-07-03 12:07:16.000000000 -0400 -+++ findutils-4.2.24/find/Makefile.am 2005-09-28 23:46:09.953863889 -0400 -@@ -5,8 +5,9 @@ - # regexprops_SOURCES = regexprops.c - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - -diff -urN findutils-4.2.24.orig/find/Makefile.in findutils-4.2.24/find/Makefile.in ---- findutils-4.2.24.orig/find/Makefile.in 2005-07-29 18:13:56.000000000 -0400 -+++ findutils-4.2.24/find/Makefile.in 2005-09-28 23:46:09.972862142 -0400 -@@ -177,7 +177,7 @@ - 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@ -@@ -272,7 +272,7 @@ - # regexprops_SOURCES = regexprops.c - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - all: all-recursive -diff -urN findutils-4.2.24.orig/find/defs.h findutils-4.2.24/find/defs.h ---- findutils-4.2.24.orig/find/defs.h 2005-07-27 06:30:36.000000000 -0400 -+++ findutils-4.2.24/find/defs.h 2005-09-28 23:46:09.850873361 -0400 -@@ -131,6 +131,10 @@ - #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; -@@ -320,6 +324,9 @@ - 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; - -@@ -479,6 +486,9 @@ - boolean pred_used PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); - boolean pred_user 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 */ - - - -@@ -557,6 +567,9 @@ - /* Pointer to the function used to stat files. */ - int (*xstat) (const char *name, struct stat *statbuf); - -+#ifdef WITH_SELINUX -+ int (*x_getfilecon) (); -+#endif /* WITH_SELINUX */ - - /* Indicate if we can implement safely_chdir() using the O_NOFOLLOW - * flag to open(2). -diff -urN findutils-4.2.24.orig/find/find.1 findutils-4.2.24/find/find.1 ---- findutils-4.2.24.orig/find/find.1 2005-07-29 18:04:53.000000000 -0400 -+++ findutils-4.2.24/find/find.1 2005-09-28 23:46:09.883870326 -0400 -@@ -452,6 +452,9 @@ - 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" -@@ -749,6 +752,8 @@ - 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). -diff -urN findutils-4.2.24.orig/find/find.c findutils-4.2.24/find/find.c ---- findutils-4.2.24.orig/find/find.c 2005-07-27 06:52:22.000000000 -0400 -+++ findutils-4.2.24/find/find.c 2005-09-28 23:49:17.625591032 -0400 -@@ -244,6 +244,93 @@ - { - return lstat(name, p); - } -+#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 */ - - #ifdef DEBUG_STAT - static uintmax_t stat_count = 0u; -@@ -272,11 +359,17 @@ - { - case SYMLINK_ALWAYS_DEREF: /* -L */ - options.xstat = optionl_stat; -+#ifdef WITH_SELINUX -+ options.x_getfilecon = optionl_getfilecon; -+#endif /* WITH_SELINUX */ - options.no_leaf_check = true; - 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 - */ -@@ -284,6 +377,9 @@ - - case SYMLINK_DEREF_ARGSONLY: /* -H */ - options.xstat = optionh_stat; -+#ifdef WITH_SELINUX -+ options.x_getfilecon = optionh_getfilecon; -+#endif /* WITH_SELINUX */ - options.no_leaf_check = true; - } - -@@ -389,6 +485,9 @@ - int - main (int argc, char **argv) - { -+#ifdef WITH_SELINUX -+ int is_selinux_enabled_flag = is_selinux_enabled()>0; -+#endif /* WITH_SELINUX */ - int i; - const struct parser_table *parse_entry; /* Pointer to the parsing table entry for this expression. */ - struct predicate *cur_pred; -@@ -537,6 +636,14 @@ - if (strchr ("-!(),", argv[i][0]) == NULL) - usage (_("paths must precede expression")); - 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) - { -diff -urN findutils-4.2.24.orig/find/parser.c findutils-4.2.24/find/parser.c ---- findutils-4.2.24.orig/find/parser.c 2005-07-27 06:28:15.000000000 -0400 -+++ findutils-4.2.24/find/parser.c 2005-10-10 19:28:59.297008465 -0400 -@@ -47,6 +47,10 @@ - /* We need <unistd.h> for isatty(). */ - #include <unistd.h> - -+#ifdef WITH_SELINUX -+#include <selinux/selinux.h> -+#endif /*WITH_SELINUX*/ -+ - #if ENABLE_NLS - # include <libintl.h> - # define _(Text) gettext (Text) -@@ -147,8 +151,9 @@ - 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((char *argv[], int *arg_ptr)); -+#endif /*WITH_SELINUX*/ - - boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - boolean parse_open PARAMS((const struct parser_table* entry, char *argv[], int *arg_ptr)); -@@ -280,6 +285,8 @@ - PARSE_TEST_NP ("wholename", wholename), /* GNU, replaces -path */ - PARSE_OPTION ("xdev", xdev), - PARSE_TEST ("xtype", xtype), /* GNU */ -+ PARSE_TEST ("context", scontext), -+ PARSE_TEST ("-context", scontext), - #ifdef UNIMPLEMENTED_UNIX - /* It's pretty ugly for find to know about archive formats. - Plus what it could do with cpio archives is very limited. -@@ -803,6 +810,10 @@ - -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\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\ -@@ -1650,6 +1661,32 @@ - return true; - } - -+#ifdef WITH_SELINUX -+ -+static boolean -+parse_scontext ( argv, arg_ptr ) -+ char *argv[]; -+ int *arg_ptr; -+{ -+ struct predicate *our_pred; -+ -+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) ) -+ return( false ); -+ -+ our_pred = insert_primary(pred_scontext); -+ our_pred->need_stat = 0; -+#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_version (const struct parser_table* entry, char **argv, int *arg_ptr) - { -@@ -1937,7 +1974,11 @@ - if (*scan2 == '.') - for (scan2++; ISDIGIT (*scan2); scan2++) - /* Do nothing. */ ; -+#ifdef WITH_SELINUX -+ if (strchr ("abcdDfFgGhHiklmMnpPstuUyYZ", *scan2)) -+#else /* WITH_SELINUX */ - if (strchr ("abcdDfFgGhHiklmMnpPstuUyY", *scan2)) -+#endif /* WITH_SELINUX */ - { - segmentp = make_segment (segmentp, format, scan2 - format, - (int) *scan2); -diff -urN findutils-4.2.24.orig/find/pred.c findutils-4.2.24/find/pred.c ---- findutils-4.2.24.orig/find/pred.c 2005-07-29 17:49:05.000000000 -0400 -+++ findutils-4.2.24/find/pred.c 2005-09-28 23:56:47.192112653 -0400 -@@ -38,6 +38,14 @@ - #include "buildcmd.h" - #include "yesno.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) -@@ -215,6 +223,9 @@ - {pred_used, "used "}, - {pred_user, "user "}, - {pred_xtype, "xtype "}, -+#ifdef WITH_SELINUX -+ {pred_scontext, "context"}, -+#endif /*WITH_SELINUX*/ - {0, "none "} - }; - -@@ -903,6 +914,26 @@ - 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 */ - } - } - return true; -@@ -1480,6 +1511,34 @@ - */ - 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 -urN findutils-4.2.24.orig/find/util.c findutils-4.2.24/find/util.c ---- findutils-4.2.24.orig/find/util.c 2005-06-19 16:01:58.000000000 -0400 -+++ findutils-4.2.24/find/util.c 2005-09-28 23:46:10.144846325 -0400 -@@ -78,6 +78,9 @@ - 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/files/findutils-4.3.11-selinux.diff b/sys-apps/findutils/files/findutils-4.3.11-selinux.diff deleted file mode 100644 index aaf9349d..00000000 --- a/sys-apps/findutils/files/findutils-4.3.11-selinux.diff +++ /dev/null @@ -1,463 +0,0 @@ -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/files/findutils-4.3.12-selinux.diff b/sys-apps/findutils/files/findutils-4.3.12-selinux.diff deleted file mode 100644 index 7ccde20c..00000000 --- a/sys-apps/findutils/files/findutils-4.3.12-selinux.diff +++ /dev/null @@ -1,464 +0,0 @@ -diff -purN findutils-4.3.12.orig/find/Makefile.am findutils-4.3.12/find/Makefile.am ---- findutils-4.3.12.orig/find/Makefile.am 2007-07-22 08:29:31.000000000 -0400 -+++ findutils-4.3.12/find/Makefile.am 2008-01-30 08:46:05.750843391 -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.12.orig/find/Makefile.in findutils-4.3.12/find/Makefile.in ---- findutils-4.3.12.orig/find/Makefile.in 2007-12-19 16:27:24.000000000 -0500 -+++ findutils-4.3.12/find/Makefile.in 2008-01-30 08:46:05.750843391 -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.12.orig/find/defs.h findutils-4.3.12/find/defs.h ---- findutils-4.3.12.orig/find/defs.h 2007-11-30 05:19:58.000000000 -0500 -+++ findutils-4.3.12/find/defs.h 2008-01-30 08:46:05.754843619 -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.12.orig/find/find.1 findutils-4.3.12/find/find.1 ---- findutils-4.3.12.orig/find/find.1 2007-12-19 14:53:14.000000000 -0500 -+++ findutils-4.3.12/find/find.1 2008-01-30 08:49:54.983906639 -0500 -@@ -935,6 +935,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 -@@ -1340,6 +1344,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.3.12.orig/find/find.c findutils-4.3.12/find/find.c ---- findutils-4.3.12.orig/find/find.c 2007-12-19 16:12:34.000000000 -0500 -+++ findutils-4.3.12/find/find.c 2008-01-30 08:46:05.754843619 -0500 -@@ -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.3.12.orig/find/parser.c findutils-4.3.12/find/parser.c ---- findutils-4.3.12.orig/find/parser.c 2007-12-19 16:12:34.000000000 -0500 -+++ findutils-4.3.12/find/parser.c 2008-01-30 08:46:05.754843619 -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\ -@@ -2522,6 +2635,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) - { -@@ -2773,7 +2909,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.12.orig/find/pred.c findutils-4.3.12/find/pred.c ---- findutils-4.3.12.orig/find/pred.c 2007-12-19 16:12:34.000000000 -0500 -+++ findutils-4.3.12/find/pred.c 2008-01-30 08:46:05.758843847 -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 -@@ -1045,6 +1056,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; -@@ -1838,6 +1869,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.12.orig/find/tree.c findutils-4.3.12/find/tree.c ---- findutils-4.3.12.orig/find/tree.c 2007-12-19 16:12:34.000000000 -0500 -+++ findutils-4.3.12/find/tree.c 2008-01-30 08:46:05.758843847 -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/files/findutils-4.3.7-selinux.diff b/sys-apps/findutils/files/findutils-4.3.7-selinux.diff deleted file mode 100644 index 09e9a6fd..00000000 --- a/sys-apps/findutils/files/findutils-4.3.7-selinux.diff +++ /dev/null @@ -1,463 +0,0 @@ -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/files/findutils-4.3.8-gnulib-stddef.patch b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch deleted file mode 100644 index 1f17bea5..00000000 --- a/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/197326 - -2007-06-10 Bruno Haible <bruno@clisp.org> - - * lib/mbiter.h: Include <stddef.h>, needed for ptrdiff_t. - * lib/mbuiter.h: Likewise. - -diff --git a/gnulib/lib/mbuiter.h b/gnulib/lib/mbuiter.h -index e6ad488..c4ceddb 100644 ---- a/gnulib/lib/mbuiter.h -+++ b/gnulib/lib/mbuiter.h -@@ -92,6 +92,7 @@ - - #include <assert.h> - #include <stdbool.h> -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - diff --git a/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch b/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch deleted file mode 100644 index d715c6ad..00000000 --- a/sys-apps/findutils/files/findutils-4.3.8-listfile-segv.patch +++ /dev/null @@ -1,58 +0,0 @@ -http://bugs.gentoo.org/188249 - -RCS file: /sources/findutils/findutils/lib/listfile.c,v -Working file: lib/listfile.c -head: 1.27 -branch: -locks: strict -access list: -keyword substitution: kv -total revisions: 35; selected revisions: 1 -description: ----------------------------- -revision 1.27 -date: 2007-08-22 22:33:31 -0400; author: ericb; state: Exp; lines: +2 -5; commitid: 0LN4VaUTK67hWOus; -Update to recent gnulib addition of idcache.h. -* lib/listfile.c (getuser, getgroup): Use header rather than -declaring things ourself. -* po/POTFILES.in (locate/frcode.c): Add missing file. -============================================================================= - -Index: lib/listfile.c -=================================================================== -RCS file: /sources/findutils/findutils/lib/listfile.c,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -p -r1.25 -r1.26 ---- lib/listfile.c 2 Jul 2007 08:25:43 -0000 1.25 -+++ lib/listfile.c 19 Aug 2007 15:31:38 -0000 1.26 -@@ -196,7 +196,7 @@ list_file (const char *name, - int literal_control_chars, - FILE *stream) - { -- char modebuf[11]; -+ char modebuf[12]; - struct tm const *when_local; - char const *user_name; - char const *group_name; -@@ -208,7 +208,6 @@ list_file (const char *name, - #else - strmode (statp->st_mode, modebuf); - #endif -- modebuf[10] = '\0'; - - fprintf (stream, "%6s ", - human_readable ((uintmax_t) statp->st_ino, hbuf, -@@ -221,9 +220,9 @@ list_file (const char *name, - ST_NBLOCKSIZE, output_block_size)); - - -- /* The space between the mode and the number of links is the POSIX -- "optional alternate access method flag". */ -- fprintf (stream, "%s %3lu ", modebuf, (unsigned long) statp->st_nlink); -+ /* modebuf includes the space between the mode and the number of links, -+ as the POSIX "optional alternate access method flag". */ -+ fprintf (stream, "%s%3lu ", modebuf, (unsigned long) statp->st_nlink); - - user_name = getuser (statp->st_uid); - if (user_name) diff --git a/sys-apps/findutils/files/findutils-env-size.patch b/sys-apps/findutils/files/findutils-env-size.patch deleted file mode 100644 index 7a1d69bc..00000000 --- a/sys-apps/findutils/files/findutils-env-size.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN findutils-4.1.20.orig/xargs/xargs.c findutils-4.1.20/xargs/xargs.c ---- findutils-4.1.20.orig/xargs/xargs.c 2003-10-23 11:36:08.000000000 +0200 -+++ findutils-4.1.20/xargs/xargs.c 2003-10-23 11:38:04.000000000 +0200 -@@ -300,8 +300,9 @@ - have it at 1 meg). Things will work fine with a large ARG_MAX but it - will probably hurt the system more than it needs to; an array of this - size is allocated. */ -- if (arg_max > 20 * 1024) -- arg_max = 20 * 1024; -+/* Make this 50 k as ebuild.sh is too big */ -+ if (arg_max > 50 * 1024) -+ arg_max = 50 * 1024; - - /* Take the size of the environment into account. */ - arg_max -= env_size (environ); diff --git a/sys-apps/findutils/findutils-4.3.13.ebuild b/sys-apps/findutils/findutils-4.3.13.ebuild deleted file mode 100644 index b9c206f3..00000000 --- a/sys-apps/findutils/findutils-4.3.13.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.13.ebuild,v 1.4 2008/05/12 16:06:29 corsair Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -SELINUX_PATCH="findutils-4.3.12-selinux.diff" - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="http://www.gnu.org/software/findutils/" -# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz" -SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86" -IUSE="nls selinux static" - -RDEPEND="selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Don't build or install locate because it conflicts with slocate, - # which is a secure version of locate. See bug 18729 - sed -i '/^SUBDIRS/s/locate//' Makefile.in - - use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}" -} - -src_compile() { - use static && append-ldflags -static - - local myconf - use userland_GNU || myconf=" --program-prefix=g" - - if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then - myconf="${myconf} --without-included-regex" - fi - - if [[ ${CHOST} == *-linux* ]] ; then - export gl_cv_func_wcwidth_works=yes - fi - - econf \ - $(use_enable nls) \ - --libexecdir=/usr/$(get_libdir)/find \ - ${myconf} \ - || die "configure failed" - emake AR="$(tc-getAR)" || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc NEWS README TODO ChangeLog -} |