diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/findutils | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/findutils')
-rw-r--r-- | sys-apps/findutils/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch | 26 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-4.4.2-selinux.diff | 464 | ||||
-rw-r--r-- | sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch | 66 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.4.2-r1.ebuild | 54 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.4.2-r2.ebuild | 56 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.5.12.ebuild | 50 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.5.14-r1.ebuild | 56 | ||||
-rw-r--r-- | sys-apps/findutils/findutils-4.5.14.ebuild | 50 | ||||
-rw-r--r-- | sys-apps/findutils/metadata.xml | 8 |
10 files changed, 833 insertions, 0 deletions
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest new file mode 100644 index 000000000000..65f4c71f5fa0 --- /dev/null +++ b/sys-apps/findutils/Manifest @@ -0,0 +1,3 @@ +DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 WHIRLPOOL 2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393 +DIST findutils-4.5.12.tar.gz 3236073 SHA256 df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de SHA512 d909ca2d3629f871e6f79e99cf547f76ea73dad773972923c177267c272a7c82e308cca22e5c8746e6aca33dee8110f1af390fbe2abf93544e5917e6475ab2f8 WHIRLPOOL 046ef3394c0834800139c1c5a6c9caddbbf36190d27bb28bd2afa212c00bbbef6c959441f2afc36c058d3cee279d3b6c971192ff442e796ee7e72edfb76b2730 +DIST findutils-4.5.14.tar.gz 3536727 SHA256 0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2 SHA512 e26f0d58c316202d99d7dcc1c4d4d40591150dcf198dff2dab0f8ef5e4dc039a5ff42ef536bfc08d860f39ee4bd8215591b4cb460ff45f73007040fc5f99e66b WHIRLPOOL 116b725ffb76562a3f1e9bbfa475a791b873746a7ae362eea1a97f3b701c6e32508eafb10fe47a3ad8f56ef0e67fb04a5d98a7baf5371646945718e7aff5ad60 diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch new file mode 100644 index 000000000000..9ff86f6b84a6 --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch @@ -0,0 +1,26 @@ +newer gnulib has rewritten these checks in a way that works for the x32, +and for the targets we care about, these checks won't return false. so +just drop them to make our life simpler. + +https://sites.google.com/site/x32abi/x32-patches + +--- findutils-4.4.2/gnulib/lib/getdate.c.x32 2009-05-10 14:23:57.000000000 -0700 ++++ findutils-4.4.2/gnulib/lib/getdate.c 2011-12-05 11:41:18.130675712 -0800 +@@ -114,7 +114,6 @@ + wraps around, but there's no portable way to check for that at + compile-time. */ + verify (TYPE_IS_INTEGER (time_t)); +-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX); + + /* An integer value, and the number of digits in its textual + representation. */ +--- findutils-4.4.2/gnulib/lib/mktime.c.x32 2009-05-10 14:25:13.000000000 -0700 ++++ findutils-4.4.2/gnulib/lib/mktime.c 2011-12-05 11:49:38.368589386 -0800 +@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda + { + verify (C99_integer_division, -1 / 2 == 0); +- verify (long_int_year_and_yday_are_wide_enough, +- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); + + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid integer overflow here. */ diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff new file mode 100644 index 000000000000..66c9c412a0af --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff @@ -0,0 +1,464 @@ +diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am +--- findutils-4.4.2.orig/find/Makefile.am 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/Makefile.am 2010-04-25 03:58:33.762402367 +0000 +@@ -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.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in +--- findutils-4.4.2.orig/find/Makefile.in 2009-05-16 15:28:13.000000000 +0000 ++++ findutils-4.4.2/find/Makefile.in 2010-04-25 03:58:33.762402367 +0000 +@@ -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@ +@@ -607,7 +607,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.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h +--- findutils-4.4.2.orig/find/defs.h 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/defs.h 2010-04-25 03:58:33.762402367 +0000 +@@ -91,6 +91,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; +@@ -315,6 +318,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, +@@ -459,7 +465,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.4.2.orig/find/find.1 findutils-4.4.2/find/find.1 +--- findutils-4.4.2.orig/find/find.1 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/find.1 2010-04-25 03:58:33.762402367 +0000 +@@ -934,6 +934,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 +@@ -1354,6 +1358,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.4.2.orig/find/find.c findutils-4.4.2/find/find.c +--- findutils-4.4.2.orig/find/find.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/find.c 2010-04-25 03:58:33.764899827 +0000 +@@ -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.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c +--- findutils-4.4.2.orig/find/parser.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/parser.c 2010-04-25 03:58:33.764899827 +0000 +@@ -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) +@@ -155,6 +162,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)); + +@@ -340,6 +350,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} + }; + +@@ -451,10 +463,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 + */ +@@ -463,6 +481,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; +@@ -670,6 +691,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) +@@ -1128,6 +1237,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\ +@@ -2552,6 +2665,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) + { +@@ -2803,7 +2939,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.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c +--- findutils-4.4.2.orig/find/pred.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/pred.c 2010-04-25 03:58:33.764899827 +0000 +@@ -48,6 +48,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) +@@ -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 +@@ -1054,6 +1065,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; +@@ -1844,6 +1875,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.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c +--- findutils-4.4.2.orig/find/tree.c 2009-05-16 15:17:01.000000000 +0000 ++++ findutils-4.4.2/find/tree.c 2010-04-25 03:58:33.764899827 +0000 +@@ -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.5.14-test-bashisms.patch b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch new file mode 100644 index 000000000000..0bfe7017b8b4 --- /dev/null +++ b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch @@ -0,0 +1,66 @@ +From 284afcb4a01996bb1a56f87da1e7c541fd0a903c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 4 Apr 2015 18:34:51 -0400 +Subject: [PATCH] test: fix bashisms + +These test scripts use #!/bin/sh, but then try to use bash-specific +[[...]] tests. Change them to [...] instead. + +Reported-by: Paolo Pedroni <paolo.pedroni@iol.it> +URL: https://bugs.gentoo.org/531020 + +* find/testsuite/binary_locations.sh: Change [[...]] to [...]. +* find/testsuite/sv-34079.sh: Likewise. +--- + find/testsuite/binary_locations.sh | 6 +++--- + find/testsuite/sv-34079.sh | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/find/testsuite/binary_locations.sh b/find/testsuite/binary_locations.sh +index 96943a0..238d57f 100644 +--- a/find/testsuite/binary_locations.sh ++++ b/find/testsuite/binary_locations.sh +@@ -1,15 +1,15 @@ + # Source this file, don't execute it. + +-if [[ -z "${testname}" ]]; then ++if [ -z "${testname}" ]; then + echo 'Please set $testname before sourcing binary_locations.sh.' >&2 + exit 1 + fi + + parent="$(cd .. && pwd)" +-if [[ -f "${parent}/ftsfind" ]]; then ++if [ -f "${parent}/ftsfind" ]; then + ftsfind="${parent}/ftsfind" + oldfind="${parent}/find" +-elif [[ -f "${parent}/oldfind" ]]; then ++elif [ -f "${parent}/oldfind" ]; then + ftsfind="${parent}/find" + oldfind="${parent}/oldfind" + else +diff --git a/find/testsuite/sv-34079.sh b/find/testsuite/sv-34079.sh +index 5773a3f..928a9af 100755 +--- a/find/testsuite/sv-34079.sh ++++ b/find/testsuite/sv-34079.sh +@@ -41,7 +41,7 @@ make_test_data() { + } + + +-if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then ++if [ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]; then + if outdir=$(mktemp -d); then + # Create some test files. + bad="" +@@ -64,7 +64,7 @@ if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then + bad="failed to set up the test in ${outdir}" + fi + rm -rf "${outdir}" || exit 1 +- if [[ -n "${bad}" ]]; then ++ if [ -n "${bad}" ]; then + echo "${bad}" >&2 + exit 1 + fi +-- +2.3.5 + diff --git a/sys-apps/findutils/findutils-4.4.2-r1.ebuild b/sys-apps/findutils/findutils-4.4.2-r1.ebuild new file mode 100644 index 000000000000..276afcfeea6f --- /dev/null +++ b/sys-apps/findutils/findutils-4.4.2-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit eutils flag-o-matic toolchain-funcs multilib + +SELINUX_PATCH="findutils-4.4.2-selinux.diff" + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz + mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 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}" + + epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch + + # 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" + + 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 +} diff --git a/sys-apps/findutils/findutils-4.4.2-r2.ebuild b/sys-apps/findutils/findutils-4.4.2-r2.ebuild new file mode 100644 index 000000000000..9e7d463ebd6f --- /dev/null +++ b/sys-apps/findutils/findutils-4.4.2-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +SELINUX_PATCH="findutils-4.4.2-selinux.diff" + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz + mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="debug nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch + + # 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_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --program-prefix=${program_prefix} \ + $(use_enable debug) \ + $(use_enable nls) \ + --libexecdir='$(libdir)'/find +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + # We don't need this, so punt it. + rm "${ED}"/usr/bin/${program_prefix}oldfind || die +} diff --git a/sys-apps/findutils/findutils-4.5.12.ebuild b/sys-apps/findutils/findutils-4.5.12.ebuild new file mode 100644 index 000000000000..267db222cc40 --- /dev/null +++ b/sys-apps/findutils/findutils-4.5.12.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + # 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 +} + +src_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --with-packager="Gentoo" \ + --with-packager-version="${PVR}" \ + --with-packager-bug-reports="http://bugs.gentoo.org/" \ + --program-prefix=${program_prefix} \ + $(use_enable nls) \ + $(use_with selinux) \ + --libexecdir='$(libdir)'/find +} + +src_install() { + emake DESTDIR="${D}" install + dodoc NEWS README TODO ChangeLog + + # We don't need this, so punt it. + rm "${ED}"/usr/bin/${program_prefix}oldfind \ + "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die +} diff --git a/sys-apps/findutils/findutils-4.5.14-r1.ebuild b/sys-apps/findutils/findutils-4.5.14-r1.ebuild new file mode 100644 index 000000000000..c520ee26744e --- /dev/null +++ b/sys-apps/findutils/findutils-4.5.14-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-test-bashisms.patch #531020 + # 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 + + # Disable gnulib build test that has no impact on the source. + # Re-enable w/next version bump (and gnulib is updated). #554728 + [[ ${PV} != "4.5.14" ]] && die "re-enable test #554728" + echo 'exit 0' > tests/test-update-copyright.sh || die +} + +src_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --with-packager="Gentoo" \ + --with-packager-version="${PVR}" \ + --with-packager-bug-reports="http://bugs.gentoo.org/" \ + --program-prefix=${program_prefix} \ + $(use_enable debug) \ + $(use_enable nls) \ + $(use_with selinux) \ + --libexecdir='$(libdir)'/find +} + +src_install() { + default + + # We don't need this, so punt it. + rm "${ED}"/usr/bin/${program_prefix}oldfind \ + "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die +} diff --git a/sys-apps/findutils/findutils-4.5.14.ebuild b/sys-apps/findutils/findutils-4.5.14.ebuild new file mode 100644 index 000000000000..267db222cc40 --- /dev/null +++ b/sys-apps/findutils/findutils-4.5.14.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="GNU utilities for finding files" +HOMEPAGE="http://www.gnu.org/software/findutils/" +SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls selinux static" + +RDEPEND="selinux? ( sys-libs/libselinux ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + # 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 +} + +src_configure() { + use static && append-ldflags -static + + program_prefix=$(usex userland_GNU '' g) + econf \ + --with-packager="Gentoo" \ + --with-packager-version="${PVR}" \ + --with-packager-bug-reports="http://bugs.gentoo.org/" \ + --program-prefix=${program_prefix} \ + $(use_enable nls) \ + $(use_with selinux) \ + --libexecdir='$(libdir)'/find +} + +src_install() { + emake DESTDIR="${D}" install + dodoc NEWS README TODO ChangeLog + + # We don't need this, so punt it. + rm "${ED}"/usr/bin/${program_prefix}oldfind \ + "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die +} diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml new file mode 100644 index 000000000000..b122af87724d --- /dev/null +++ b/sys-apps/findutils/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>base-system</herd> + <upstream> + <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id> + </upstream> +</pkgmetadata> |