commit: 856c3b52aef8bde7c03a2ec8040ec6f1a0cee980 Author: layman <layman <AT> localhost> AuthorDate: Sun Mar 13 23:31:08 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Mar 14 01:39:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=856c3b52
sys-apps/findutils: in tree version 4.6.0 works sys-apps/findutils/Manifest | 9 - .../files/findutils-4.4.2-gnulib-date-x32.patch | 26 -- .../files/findutils-4.4.2-gnulib-musl.patch | 18 - .../findutils/files/findutils-4.4.2-selinux.diff | 464 --------------------- .../files/findutils-4.5.12-gnulib-musl.patch | 132 ------ sys-apps/findutils/findutils-4.4.2-r99.ebuild | 55 --- sys-apps/findutils/findutils-4.5.12-r99.ebuild | 51 --- sys-apps/findutils/metadata.xml | 11 - 8 files changed, 766 deletions(-) diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest deleted file mode 100644 index fd752e6..0000000 --- a/sys-apps/findutils/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX findutils-4.4.2-gnulib-date-x32.patch 1210 SHA256 004a9d3a28ac727fddf3e54fcf2846aab90b30f29f40f8ff32b19742539e85eb SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60 WHIRLPOOL 7c866ac607fd7c9311160e398ccd98e593f69833ca643606d0462f2b125fce616249a8a0063f2514cd573542e5563539164a1527f3b02c1f20234880d287f258 -AUX findutils-4.4.2-gnulib-musl.patch 646 SHA256 65ae9c84a03b200b742a7e2eed785e7fe7ab3f045ae7151ad2b7e6209ed2fbe5 SHA512 900cf211161ce05d29c17f7e7a264615f616c94f4273d3733ca9ccf0678d911434bf2ff80fed5e13939d748d6cd13c8dab6e2c94be935ea5f1c3e1e6f5b7b11c WHIRLPOOL 5babeecf4d40117ab9086a73d1d311eca7139239e71ed1a7aef59339cf42a76f647dadeabcfc3e9f4a387de2180987040b496806487ab2aac22d45575cf4f7ed -AUX findutils-4.4.2-selinux.diff 15603 SHA256 67de61c659f8d524b70ebabafe25093c02374b1fc83770dd5633480745e2ee9d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9 WHIRLPOOL 612394c54d4095c6cd9d0dc326be2b5b6ce41e43cd3dc8e3cd2a4e99a0844aec769373243c62398df79d6f7561f865754b627917b5f1733d6b065b7e3ce7be35 -AUX findutils-4.5.12-gnulib-musl.patch 4945 SHA256 52ab4e59bad488d9fe2ea64e68e08b90128fd1d8ef2171b160449950f99b0177 SHA512 8137a3d33f4b8612b91db07e4219bfa6e66209783387b50ddbd78dde548f0679d92ff834d6ac2ad1805d7303e25c93d089b86ec66363cec11afc447e095e8dd3 WHIRLPOOL 9d1d8489f7fbe982bca49c9e0155e339d7d91d5763883921139f6504e621a96dd46383e4e0e35273f5033944a430efd82e7b94c3318bb4432cdaf72b08968ef5 -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 -EBUILD findutils-4.4.2-r99.ebuild 1439 SHA256 54565a9da76fa50f6af16fc8aec6ff7bb0696ee689ba8be72143b09fd8802176 SHA512 cfa4339cd8315c208ceb2e72ad488661936e9aace744eae6b037984cf9351eba8d0269bb6832f11f096e795354b57143489246a7279df9a00764b7363f131b43 WHIRLPOOL 150b650ac57083e2f52d1b7c4eabd6c820e2547d383347197485bea3d27bc50deb1144b33cb27b6c21f74445b21c7f1afb1f57127161730f7100e44755bd4cf9 -EBUILD findutils-4.5.12-r99.ebuild 1453 SHA256 969c9c10bedc2e2906917f7867212e629c2c482ca23705c1c7a61bd03671509e SHA512 4b9c1a712dc43dc2a707587dd6a299021e13cf0d9c5cc7f7a7390752b4e6da486fbb1f45fa5ce81ed321514713a47c88de7186c8791a152880b1906f08d99408 WHIRLPOOL 05fcc0cc44e61614b0dae52771956d5c650a8a89ccc49083ec73afe26e9549a59ba4c6c7ae62341a247fc04bce17a6f54cb9fee75207d1de98aa915af5abb4a0 -MISC metadata.xml 332 SHA256 bd5bf452b35ee08d601bd151e4685f73418e5f48ff246e751233dd978b2c444f SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00 WHIRLPOOL 888659b8fd180da51e5185fe47c85e78c014bb4ece4836f7a765aa193c46919e53c6b2383f9c24005cfea97746dcbff5f11d9aee44304e05a4c56b1615637431 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 deleted file mode 100644 index 9ff86f6..0000000 --- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch deleted file mode 100644 index 0a47c90..0000000 --- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur findutils-4.4.2.orig/gnulib/lib/freadahead.c findutils-4.4.2/gnulib/lib/freadahead.c ---- findutils-4.4.2.orig/gnulib/lib/freadahead.c 2009-05-10 21:23:57.000000000 +0000 -+++ findutils-4.4.2/gnulib/lib/freadahead.c 2013-07-06 01:54:25.443043832 +0000 -@@ -22,6 +22,7 @@ - size_t - freadahead (FILE *fp) - { -+#if 0 - #if defined _IO_ferror_unlocked /* GNU libc, BeOS */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; -@@ -63,4 +64,6 @@ - #else - #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib." - #endif -+#endif -+ return 0; - } diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff deleted file mode 100644 index 66c9c41..0000000 --- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff +++ /dev/null @@ -1,464 +0,0 @@ -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.12-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch deleted file mode 100644 index b553801..0000000 --- a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Naur findutils-4.5.12.orig/gl/lib/fseeko.c findutils-4.5.12/gl/lib/fseeko.c ---- findutils-4.5.12.orig/gl/lib/fseeko.c 2013-09-22 15:27:42.000000000 +0000 -+++ findutils-4.5.12/gl/lib/fseeko.c 2014-03-01 13:35:14.718973449 +0000 -@@ -26,128 +26,6 @@ - - int - fseeko (FILE *fp, off_t offset, int whence) --#undef fseeko --#if !HAVE_FSEEKO --# undef fseek --# define fseeko fseek --#endif --#if _GL_WINDOWS_64_BIT_OFF_T --# undef fseeko --# if HAVE__FSEEKI64 /* msvc, mingw64 */ --# define fseeko _fseeki64 --# else /* mingw */ --# define fseeko fseeko64 --# endif --#endif - { --#if LSEEK_PIPE_BROKEN -- /* mingw gives bogus answers rather than failure on non-seekable files. */ -- if (lseek (fileno (fp), 0, SEEK_CUR) == -1) -- return EOF; --#endif -- -- /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -- if (fp->_IO_read_end == fp->_IO_read_ptr -- && fp->_IO_write_ptr == fp->_IO_write_base -- && fp->_IO_save_base == NULL) --#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ --# if defined __SL64 && defined __SCLE /* Cygwin */ -- if ((fp->_flags & __SL64) == 0) -- { -- /* Cygwin 1.5.0 through 1.5.24 failed to open stdin in 64-bit -- mode; but has an fseeko that requires 64-bit mode. */ -- FILE *tmp = fopen ("/dev/null", "r"); -- if (!tmp) -- return -1; -- fp->_flags |= __SL64; -- fp->_seek64 = tmp->_seek64; -- fclose (tmp); -- } --# endif -- if (fp_->_p == fp_->_bf._base -- && fp_->_r == 0 -- && fp_->_w == ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ -- ? fp_->_bf._size -- : 0) -- && fp_ub._base == NULL) --#elif defined __EMX__ /* emx+gcc */ -- if (fp->_ptr == fp->_buffer -- && fp->_rcount == 0 -- && fp->_wcount == 0 -- && fp->_ungetc_count == 0) --#elif defined __minix /* Minix */ -- if (fp_->_ptr == fp_->_buf -- && (fp_->_ptr == NULL || fp_->_count == 0)) --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- if (fp_->_ptr == fp_->_base -- && (fp_->_ptr == NULL || fp_->_cnt == 0)) --#elif defined __UCLIBC__ /* uClibc */ -- if (((fp->__modeflags & __FLAG_WRITING) == 0 -- || fp->__bufpos == fp->__bufstart) -- && ((fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) == 0 -- || fp->__bufpos == fp->__bufread)) --#elif defined __QNX__ /* QNX */ -- if ((fp->_Mode & 0x2000 /* _MWRITE */ ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend) -- && fp->_Rback == fp->_Back + sizeof (fp->_Back) -- && fp->_Rsave == NULL) --#elif defined __MINT__ /* Atari FreeMiNT */ -- if (fp->__bufp == fp->__buffer -- && fp->__get_limit == fp->__bufp -- && fp->__put_limit == fp->__bufp -- && !fp->__pushed_back) --#elif defined EPLAN9 /* Plan9 */ -- if (fp->rp == fp->buf -- && fp->wp == fp->buf) --#else -- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." --#endif -- { -- /* We get here when an fflush() call immediately preceded this one (or -- if ftell() has created buffers but no I/O has occurred on a -- newly-opened stream). We know there are no buffers. */ -- off_t pos = lseek (fileno (fp), offset, whence); -- if (pos == -1) -- { --#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -- fp_->_flags &= ~__SOFF; --#endif -- return -1; -- } -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -- fp->_flags &= ~_IO_EOF_SEEN; -- fp->_offset = pos; --#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ --# if defined __CYGWIN__ -- /* fp_->_offset is typed as an integer. */ -- fp_->_offset = pos; --# else -- /* fp_->_offset is an fpos_t. */ -- { -- /* Use a union, since on NetBSD, the compilation flags -- determine whether fpos_t is typedef'd to off_t or a struct -- containing a single off_t member. */ -- union -- { -- fpos_t f; -- off_t o; -- } u; -- u.o = pos; -- fp_->_offset = u.f; -- } --# endif -- fp_->_flags |= __SOFF; -- fp_->_flags &= ~__SEOF; --#elif defined __EMX__ /* emx+gcc */ -- fp->_flags &= ~_IOEOF; --#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ -- fp->_flag &= ~_IOEOF; --#elif defined __MINT__ /* Atari FreeMiNT */ -- fp->__offset = pos; -- fp->__eof = 0; --#endif -- return 0; -- } - return fseeko (fp, offset, whence); - } diff --git a/sys-apps/findutils/findutils-4.4.2-r99.ebuild b/sys-apps/findutils/findutils-4.4.2-r99.ebuild deleted file mode 100644 index 12c72e9..0000000 --- a/sys-apps/findutils/findutils-4.4.2-r99.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.4.2-r1.ebuild,v 1.10 2012/03/27 17:50:37 vapier Exp $ - -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-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc 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 - epatch "${FILESDIR}"/${P}-gnulib-musl.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.5.12-r99.ebuild b/sys-apps/findutils/findutils-4.5.12-r99.ebuild deleted file mode 100644 index c3a869a..0000000 --- a/sys-apps/findutils/findutils-4.5.12-r99.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.12.ebuild,v 1.4 2014/01/18 03:28:44 vapier Exp $ - -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="~amd64 ~arm ~mips ~ppc ~x86" -IUSE="nls selinux static" - -RDEPEND="selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gnulib-musl.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 -} - -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 deleted file mode 100644 index b385831..0000000 --- a/sys-apps/findutils/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>base-sys...@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id> -</upstream> -</pkgmetadata>
