diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-11-30 19:30:58 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-11-30 19:30:58 +0000 |
commit | 2db550e320b1629385ca0565428d49445565c08d (patch) | |
tree | ed9301497aec03bc801199c3e5319004929e52d5 /sys-apps/findutils | |
parent | Automated update of use.local.desc (diff) | |
download | historical-2db550e320b1629385ca0565428d49445565c08d.tar.gz historical-2db550e320b1629385ca0565428d49445565c08d.tar.bz2 historical-2db550e320b1629385ca0565428d49445565c08d.zip |
old
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.4 x86_64
Diffstat (limited to 'sys-apps/findutils')
-rw-r--r-- | sys-apps/findutils/Manifest | 13 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-4.1.20-selinux.diff | 336 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-4.3.11-selinux.diff | 463 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-env-size.patch | 15 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.1.20-r2.ebuild | 63 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.2.31.ebuild | 65 |
6 files changed, 3 insertions, 952 deletions
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest index 49c02c317467..4acfd0009da4 100644 --- a/sys-apps/findutils/Manifest +++ b/sys-apps/findutils/Manifest @@ -1,20 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -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-env-size.patch 672 RMD160 8a88bf1346d7c54bf9936a037975558e4490e5c2 SHA1 0eb4276b7ef05529938a84696f6565f35d36811c SHA256 5d83294b209acbe6dc12b941becc0556e86a80d5f4de4ab3af4dd1c182b7af95 -DIST findutils-4.1.20.tar.gz 777980 RMD160 8911491449f23408e0bebe1e9c8e0f4303aaf66a SHA1 9a2d5f8981f6f5bbdcfa956737658cb5e9051a17 SHA256 8c5dd50a5ca54367fa186f6294b81ec7a365e36d670d9feac62227cb513e63ab -DIST findutils-4.2.31.tar.gz 1326294 RMD160 0b6775ebf5455e99bf594dd02432d8eeee508ace SHA1 e031ddb4f50c8a053d3f216d10f92621c1fa21ba SHA256 e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204 DIST findutils-4.2.33.tar.gz 1455067 RMD160 51c750025487434dd785a332050fff925633c8f9 SHA1 930a77cd0cbf4ee05888947cc10809f0761c84b8 SHA256 813cd9405aceec5cfecbe96400d01e90ddad7b512d3034487176ce5258ab0f78 DIST findutils-4.3.13.tar.gz 2054988 RMD160 e75ca08435e80d02f188739d5862f431b4d8f8d6 SHA1 e4ba80c195b517236fe28afcded9639ccda9639e SHA256 077205f7b85f6e354b56010fbb1d69cc0a48d50828ff14f487a091559d144397 DIST findutils-4.4.0.tar.gz 2029809 RMD160 0ea2b03f4d49902b64c2028abfba3a870c892420 SHA1 25e3d4dec40cec0165ffeff50acc4d4523ec3e07 SHA256 fb108c2959f17baf3559da9b3854495b9bb69fb13309fdd05576c66feb661ea9 DIST findutils-4.5.1.tar.gz 2082907 RMD160 e2832c1ca6ad9131c6f994fef7bbf13fa550b1bc SHA1 4a1f73149af5165c8674809c44c22d5aad92b9b9 SHA256 40cd996358535fb95f58d772d5923e9da7358111039c658f8a784a5aa066a084 DIST findutils-4.5.2.tar.gz 2109947 RMD160 411fae22e0e0cd000809916525f5994decf976e9 SHA1 ca1bcb988d1cb36f1e2ba039282c0579cbc1b4ad SHA256 18785897642d962eebbeb9dba602df2020b6687da459c67ee21c2323ab758440 -EBUILD findutils-4.1.20-r2.ebuild 1828 RMD160 c0ea0c012e32125376c566af866650fb64b4db13 SHA1 1b4f6342acd6467e9b09b29d259cdbff00222823 SHA256 c043f86d05f39b1a6870af94a7089e6dcae5dc41172b1cde8d14d7139d5434ee -EBUILD findutils-4.2.31.ebuild 1912 RMD160 628f655456dfdaeaa601e4417a0dac79d7092d03 SHA1 50b9ef23970a5cc92e68ca19d23d2fac1087abed SHA256 74de821fdb9e0b744d9c538df995feeed146dadea4bb8b135c38bb95d7aed749 EBUILD findutils-4.2.33.ebuild 1834 RMD160 7561de2104b71a77320c466eee864b6d2707b858 SHA1 0c0efb4db784b670372a1e0eef841ee38c2cb4bc SHA256 704867dc4bb1d4bdc6be25bfba8e1162b9dad494b2e6aa5bc92bc71a986e033f EBUILD findutils-4.3.13.ebuild 1539 RMD160 16316d1d010e2cf14ef7ad9d290919953d79adb9 SHA1 6dc2565fd8f44c0ea01f3f5282f9a83576432de8 SHA256 bad3a8185a2bf9d5c06b3c1a7a6b0008481766ef462ae1c58b249df8dd848a76 EBUILD findutils-4.4.0.ebuild 1501 RMD160 14f26d92d950710fd28ac8ef83ff3b33cbf44a4b SHA1 8a6a0cc94f24b1ba4cd4f18540ea269ea5d3c257 SHA256 ded2614d45e8924e0ec8987110055bdbb5f6752ca54f5660ab546374c0fa481f @@ -25,7 +18,7 @@ MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkyuNcACgkQkKaRLQcq0GL25QCggajhTogrpO7tCtgQApwGdMyp -0dwAnjfkJzm2AiNTT2UnCaEKpwCrdSrH -=y2fc +iEYEARECAAYFAkky6fcACgkQ67wieSYcaxcX9ACgrOZ5HcL5qWkfzPrfHxY+nuvJ +kA0AoI5bQ/HIa5DqHaHFLq8GJlx09Puw +=lHFl -----END PGP SIGNATURE----- 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 e66d126949c8..000000000000 --- 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.3.11-selinux.diff b/sys-apps/findutils/files/findutils-4.3.11-selinux.diff deleted file mode 100644 index aaf9349db4d2..000000000000 --- 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-env-size.patch b/sys-apps/findutils/files/findutils-env-size.patch deleted file mode 100644 index 7a1d69bc53f8..000000000000 --- 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.1.20-r2.ebuild b/sys-apps/findutils/findutils-4.1.20-r2.ebuild deleted file mode 100644 index 5bc6f427200c..000000000000 --- a/sys-apps/findutils/findutils-4.1.20-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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.1.20-r2.ebuild,v 1.12 2007/01/05 09:10:55 flameeyes Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -SELINUX_PATCH="findutils-4.1.20-selinux.diff" - -# Note this doesn't point to gnu.org because alpha.gnu.org has quit -# supplying the development versions. If it comes back in the future -# then we might want to redirect the link. See bug 18729 -DESCRIPTION="GNU utilities to find files" -HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" -SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz - mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="nls build selinux static" - -DEPEND="virtual/libc - >=sys-apps/sed-4 - nls? ( sys-devel/gettext ) - selinux? ( sys-libs/libselinux )" -RDEPEND="virtual/libc" - -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 - - #get a bigger environment as ebuild.sh is growing large - epatch ${FILESDIR}/findutils-env-size.patch - - use selinux && epatch ${FILESDIR}/${SELINUX_PATCH} -} - -src_compile() { - export CPPFLAGS="${CXXFLAGS}" - use static && append-ldflags -static - - econf $(use_enable nls) || die - emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die -} - -src_install() { - einstall libexecdir=${D}/usr/lib/find || die - - rm -rf ${D}/usr/var - use build \ - && rm -rf ${D}/usr/share \ - || dodoc NEWS README TODO ChangeLog -} - -pkg_postinst() { - ewarn "Please note that the locate and updatedb binaries" - ewarn "are not longer provided by findutils." - ewarn "Please emerge slocate" -} diff --git a/sys-apps/findutils/findutils-4.2.31.ebuild b/sys-apps/findutils/findutils-4.2.31.ebuild deleted file mode 100644 index 12cca9e0408f..000000000000 --- a/sys-apps/findutils/findutils-4.2.31.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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.2.31.ebuild,v 1.8 2007/06/11 16:49:38 gustavoz Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -SELINUX_PATCH="findutils-4.2.24-selinux.diff" - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html" -# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="nls build selinux static" - -RDEPEND="selinux? ( sys-libs/libselinux )" -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 - - # Patches for selinux - use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}" - - if [[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]]; then - # Use the system-provided regex.h, bug #114747 - echo "#include_next <regex.h>" > gnulib/lib/regex.h - fi -} - -src_compile() { - use static && append-ldflags -static - - local myconf - use userland_GNU || myconf=" --program-prefix=g" - - [[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]] && \ - myconf="${myconf} --without-included-regex" - - econf $(use_enable nls) ${myconf} || die "configure failed" - emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die "make failed" -} - -src_install() { - make DESTDIR="${D}" libexecdir="${D}/usr/lib/find" install || die - - rm -rf "${D}"/usr/var - use build \ - && rm -rf "${D}"/usr/share \ - || dodoc NEWS README TODO ChangeLog -} - -pkg_postinst() { - ewarn "Please note that the locate and updatedb binaries" - ewarn "are now provided by slocate, not findutils." -} |