diff --git a/.cvsignore b/.cvsignore index b0ad4c8..39aa244 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ findutils-4.2.15.tar.gz findutils-4.2.18.tar.gz findutils-4.2.20.tar.gz findutils-4.2.23.tar.gz +findutils-4.2.25.tar.gz diff --git a/findutils-selinux.patch b/findutils-selinux.patch index 388fa0c..2a8ea27 100644 --- a/findutils-selinux.patch +++ b/findutils-selinux.patch @@ -1,6 +1,6 @@ ---- findutils-4.2.23/find/util.c.selinux 2005-06-07 23:18:41.000000000 +0100 -+++ findutils-4.2.23/find/util.c 2005-06-20 09:43:21.000000000 +0100 -@@ -70,6 +70,9 @@ +--- findutils-4.2.25/find/util.c.selinux 2005-06-19 20:01:58.000000000 +0000 ++++ findutils-4.2.25/find/util.c 2005-09-05 10:15:31.000000000 +0000 +@@ -78,6 +78,9 @@ last_pred->need_stat = true; last_pred->need_type = true; last_pred->args.str = NULL; @@ -10,9 +10,9 @@ last_pred->pred_next = NULL; last_pred->pred_left = NULL; last_pred->pred_right = NULL; ---- findutils-4.2.23/find/find.c.selinux 2005-06-19 09:48:00.000000000 +0100 -+++ findutils-4.2.23/find/find.c 2005-06-20 09:43:21.000000000 +0100 -@@ -239,6 +239,93 @@ +--- findutils-4.2.25/find/find.c.selinux 2005-08-30 07:40:03.000000000 +0000 ++++ findutils-4.2.25/find/find.c 2005-09-05 10:16:37.000000000 +0000 +@@ -244,6 +244,93 @@ { return lstat(name, p); } @@ -106,7 +106,7 @@ #ifdef DEBUG_STAT static uintmax_t stat_count = 0u; -@@ -267,11 +354,17 @@ +@@ -272,11 +359,17 @@ { case SYMLINK_ALWAYS_DEREF: /* -L */ options.xstat = optionl_stat; @@ -124,7 +124,7 @@ /* Can't turn no_leaf_check off because the user might have specified * -noleaf anyway */ -@@ -279,6 +372,9 @@ +@@ -284,6 +377,9 @@ case SYMLINK_DEREF_ARGSONLY: /* -H */ options.xstat = optionh_stat; @@ -134,7 +134,7 @@ options.no_leaf_check = true; } -@@ -384,6 +480,9 @@ +@@ -389,6 +485,9 @@ int main (int argc, char **argv) { @@ -142,9 +142,9 @@ + int is_selinux_enabled_flag = is_selinux_enabled()>0; +#endif /* WITH_SELINUX */ int i; - PARSE_FUNC parse_function; /* Pointer to the function which parses. */ + const struct parser_table *parse_entry; /* Pointer to the parsing table entry for this expression. */ struct predicate *cur_pred; -@@ -512,6 +611,14 @@ +@@ -537,6 +636,14 @@ if (strchr ("-!(),", argv[i][0]) == NULL) usage (_("paths must precede expression")); predicate_name = argv[i]; @@ -156,12 +156,12 @@ + } + } +#endif - parse_function = find_parser (predicate_name); - if (parse_function == NULL) - /* Command line option not recognized */ ---- findutils-4.2.23/find/find.1.selinux 2005-06-19 09:48:00.000000000 +0100 -+++ findutils-4.2.23/find/find.1 2005-06-20 09:43:21.000000000 +0100 -@@ -443,6 +443,9 @@ + parse_entry = find_parser (predicate_name); + if (parse_entry == NULL) + { +--- findutils-4.2.25/find/find.1.selinux 2005-09-02 20:46:48.000000000 +0000 ++++ findutils-4.2.25/find/find.1 2005-09-05 10:15:31.000000000 +0000 +@@ -455,6 +455,9 @@ link to a file of type \fIc\fR; if the \-L option has been given, true if \fIc\fR is `l'. In other words, for symbolic links, \-xtype checks the type of the file that \-type does not check. @@ -171,7 +171,7 @@ .SS ACTIONS .IP "\-delete\fR" -@@ -735,6 +738,8 @@ +@@ -753,6 +756,8 @@ File's type (like in ls \-l), U=unknown type (shouldn't happen) .IP %Y File's type (like %y), plus follow symlinks: L=loop, N=nonexistent @@ -180,19 +180,19 @@ .PP A `%' character followed by any other character is discarded (but the other character is printed). ---- findutils-4.2.23/find/Makefile.in.selinux 2005-06-19 12:28:32.000000000 +0100 -+++ findutils-4.2.23/find/Makefile.in 2005-06-20 09:43:21.000000000 +0100 +--- findutils-4.2.25/find/Makefile.in.selinux 2005-09-03 11:17:59.000000000 +0000 ++++ findutils-4.2.25/find/Makefile.in 2005-09-05 10:15:31.000000000 +0000 @@ -175,7 +175,7 @@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ + CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ + CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ +DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ -@@ -268,7 +268,7 @@ - localedir = $(datadir)/locale +@@ -270,7 +270,7 @@ + # regexprops_SOURCES = regexprops.c find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c EXTRA_DIST = defs.h $(man_MANS) -LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @@ -200,9 +200,9 @@ man_MANS = find.1 SUBDIRS = testsuite all: all-recursive ---- findutils-4.2.23/find/defs.h.selinux 2005-06-19 09:48:00.000000000 +0100 -+++ findutils-4.2.23/find/defs.h 2005-06-20 09:44:07.000000000 +0100 -@@ -130,6 +130,10 @@ +--- findutils-4.2.25/find/defs.h.selinux 2005-08-30 07:36:24.000000000 +0000 ++++ findutils-4.2.25/find/defs.h 2005-09-05 10:17:20.000000000 +0000 +@@ -131,6 +131,10 @@ #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) @@ -213,7 +213,7 @@ #if 1 #include typedef bool boolean; -@@ -318,6 +322,9 @@ +@@ -320,6 +324,9 @@ struct dir_id fileid; /* samefile */ mode_t type; /* type */ FILE *stream; /* ls fls fprint0 */ @@ -223,7 +223,7 @@ struct format_val printf_vec; /* printf fprintf fprint */ } args; -@@ -451,6 +458,9 @@ +@@ -479,6 +486,9 @@ boolean pred_used PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); @@ -231,22 +231,23 @@ +boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); +#endif /* WITH_SELINUX */ - int launch PARAMS((const struct buildcmd_control *ctl, - struct buildcmd_state *buildstate)); -@@ -531,6 +541,9 @@ - * flag to open(2). + + +@@ -568,6 +578,10 @@ + * can be changed with the positional option, -regextype. */ - boolean open_nofollow_available; + int regex_options; ++ +#ifdef WITH_SELINUX + int (*x_getfilecon) (); +#endif /* WITH_SELINUX */ }; extern struct options options; ---- findutils-4.2.23/find/Makefile.am.selinux 2005-06-07 23:18:41.000000000 +0100 -+++ findutils-4.2.23/find/Makefile.am 2005-06-20 09:43:21.000000000 +0100 -@@ -3,8 +3,9 @@ - bin_PROGRAMS = find +--- findutils-4.2.25/find/Makefile.am.selinux 2005-07-03 16:07:16.000000000 +0000 ++++ findutils-4.2.25/find/Makefile.am 2005-09-05 10:15:31.000000000 +0000 +@@ -5,8 +5,9 @@ + # regexprops_SOURCES = regexprops.c find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c EXTRA_DIST = defs.h $(man_MANS) +DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX @@ -256,11 +257,11 @@ man_MANS = find.1 SUBDIRS = testsuite ---- findutils-4.2.23/find/parser.c.selinux 2005-06-19 09:48:00.000000000 +0100 -+++ findutils-4.2.23/find/parser.c 2005-06-20 09:43:21.000000000 +0100 -@@ -45,6 +45,10 @@ - #endif - +--- findutils-4.2.25/find/parser.c.selinux 2005-07-31 21:01:54.000000000 +0000 ++++ findutils-4.2.25/find/parser.c 2005-09-05 10:20:44.000000000 +0000 +@@ -47,6 +47,10 @@ + /* We need for isatty(). */ + #include +#ifdef WITH_SELINUX +#include @@ -269,26 +270,26 @@ #if ENABLE_NLS # include # define _(Text) gettext (Text) -@@ -148,6 +152,9 @@ - static boolean parse_warn PARAMS((char *argv[], int *arg_ptr)); - static boolean parse_xtype PARAMS((char *argv[], int *arg_ptr)); - static boolean parse_quit PARAMS((char *argv[], int *arg_ptr)); +@@ -147,6 +151,9 @@ + static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); +#ifdef WITH_SELINUX +static boolean parse_scontext PARAMS((char *argv[], int *arg_ptr)); +#endif /*WITH_SELINUX*/ - static boolean insert_regex PARAMS((char *argv[], int *arg_ptr, boolean ignore_case)); - static boolean insert_type PARAMS((char *argv[], int *arg_ptr, PRED_FUNC which_pred)); -@@ -276,6 +283,8 @@ - {ARG_TEST, "wholename", parse_wholename}, /* GNU, replaces -path */ - {ARG_OPTION, "xdev", parse_xdev}, - {ARG_TEST, "xtype", parse_xtype}, /* GNU */ -+ {ARG_TEST, "context", parse_scontext}, /* SELinux */ -+ {ARG_TEST, "-context", parse_scontext}, /* SELinux */ - {0, 0, 0} + + +@@ -298,6 +305,8 @@ + {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, NULL}, /* SELinux */ ++ {ARG_TEST, "-context", parse_scontext, NULL}, /* SELinux */ + {0, 0, 0, 0} }; -@@ -755,6 +764,10 @@ +@@ -803,6 +812,10 @@ -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ -used N -user NAME -xtype [bcdpfls]\n")); @@ -299,8 +300,8 @@ puts (_("\ actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ -@@ -1670,6 +1683,32 @@ - return true; +@@ -1712,6 +1725,32 @@ + exit (0); } +#ifdef WITH_SELINUX @@ -330,9 +331,9 @@ +#endif /*WITH_SELINUX*/ + static boolean - parse_xtype (char **argv, int *arg_ptr) + parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) { -@@ -1867,7 +1906,11 @@ +@@ -1949,7 +1988,11 @@ if (*scan2 == '.') for (scan2++; ISDIGIT (*scan2); scan2++) /* Do nothing. */ ; @@ -344,8 +345,8 @@ { segmentp = make_segment (segmentp, format, scan2 - format, (int) *scan2); ---- findutils-4.2.23/find/pred.c.selinux 2005-06-07 23:18:41.000000000 +0100 -+++ findutils-4.2.23/find/pred.c 2005-06-20 09:43:21.000000000 +0100 +--- findutils-4.2.25/find/pred.c.selinux 2005-09-01 20:57:49.000000000 +0000 ++++ findutils-4.2.25/find/pred.c 2005-09-05 10:15:31.000000000 +0000 @@ -38,6 +38,14 @@ #include "buildcmd.h" #include "yesno.h" @@ -379,8 +380,8 @@ {0, "none "} }; -@@ -893,6 +903,26 @@ - +@@ -903,6 +913,26 @@ + mode_to_filetype(stat_buf->st_mode & S_IFMT)); } break; +#ifdef WITH_SELINUX @@ -405,8 +406,8 @@ +#endif /* WITH_SELINUX */ } } - return (true); -@@ -1470,6 +1500,34 @@ + return true; +@@ -1480,6 +1510,34 @@ */ return (pred_type (pathname, &sbuf, pred_ptr)); } diff --git a/findutils.spec b/findutils.spec index fbed52e..c656fe8 100644 --- a/findutils.spec +++ b/findutils.spec @@ -3,7 +3,7 @@ %endif Summary: The GNU versions of find utilities (find and xargs). Name: findutils -Version: 4.2.23 +Version: 4.2.25 Release: 1 Epoch: 1 License: GPL @@ -91,6 +91,9 @@ rm -rf %{buildroot} %{_infodir}/find.info* %changelog +* Mon Sep 5 2005 Tim Waugh 1:4.2.25-1 +- 4.2.25. + * Mon Jun 20 2005 Tim Waugh 1:4.2.23-1 - 4.2.23. diff --git a/sources b/sources index f63a53d..239ed62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecaff8b060e8d69c10eb2391a8032e26 findutils-4.2.23.tar.gz +e92fef6714ffa9972f28a1a423066921 findutils-4.2.25.tar.gz