rpms/findutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to findutils-4.4.2

Browse Source
This commit is contained in:
vcrhonek 2009-07-01 12:03:32 +00:00
parent baf2630655
commit 75e498be0a
4 changed files with 222 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
findutils-4.4.0-no-locate.patch
View File

@ -1,8 +1,20 @@
diff -up findutils-4.4.0/Makefile.in_old findutils-4.4.0/Makefile.in diff -up findutils-4.4.2/Makefile.am_old findutils-4.4.2/Makefile.am
--- findutils-4.4.0/Makefile.in_old 2008-04-21 13:32:59.000000000 +0200 --- findutils-4.4.2/Makefile.am_old 2009-06-30 14:54:41.000000000 +0200
+++ findutils-4.4.0/Makefile.in 2008-04-21 13:33:20.000000000 +0200 +++ findutils-4.4.2/Makefile.am 2009-06-30 14:54:59.000000000 +0200
@@ -572,7 +572,7 @@ EXTRA_DIST = COPYING ChangeLog TODO conf @@ -8,7 +8,7 @@ DISTCLEANFILES = tool-versions.txt
THANKS import-gnulib.sh import-gnulib.config
# "tests" is the gnulib unit test dir.
-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4
+SUBDIRS = gnulib tests build-aux lib find xargs doc po m4
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
diff -up findutils-4.4.2/Makefile.in_old findutils-4.4.2/Makefile.in
--- findutils-4.4.2/Makefile.in_old 2009-06-30 14:54:00.000000000 +0200
+++ findutils-4.4.2/Makefile.in 2009-06-30 14:54:35.000000000 +0200
@@ -607,7 +607,7 @@ EXTRA_DIST = COPYING ChangeLog TODO conf
DISTCLEANFILES = tool-versions.txt
# "tests" is the gnulib unit test dir. # "tests" is the gnulib unit test dir.
-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 -SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4
@ -10,15 +22,3 @@ diff -up findutils-4.4.0/Makefile.in_old findutils-4.4.0/Makefile.in
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4 ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
TESTFILE_SUFFIXES = .exp .xo .xe .xi TESTFILE_SUFFIXES = .exp .xo .xe .xi
all: config.h all: config.h
diff -up findutils-4.4.0/Makefile.am_old findutils-4.4.0/Makefile.am
--- findutils-4.4.0/Makefile.am_old 2007-11-29 11:50:16.000000000 +0100
+++ findutils-4.4.0/Makefile.am 2008-04-21 13:32:51.000000000 +0200
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS=gnits
EXTRA_DIST = COPYING ChangeLog TODO config.h.in stamp-h.in \
THANKS import-gnulib.sh import-gnulib.config
# "tests" is the gnulib unit test dir.
-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4
+SUBDIRS = gnulib tests build-aux lib find xargs doc po m4
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4

397
findutils-4.4.0-selinux.patch
View File

@ -1,6 +1,6 @@
diff -up findutils-4.4.0/configure.ac.selinux findutils-4.4.0/configure.ac diff -up findutils-4.4.2/configure.ac_old findutils-4.4.2/configure.ac
--- findutils-4.4.0/configure.ac.selinux 2008-03-15 12:45:00.000000000 +0100 --- findutils-4.4.2/configure.ac_old 2009-07-01 10:24:04.000000000 +0200
+++ findutils-4.4.0/configure.ac 2008-04-25 16:52:54.000000000 +0200 +++ findutils-4.4.2/configure.ac 2009-07-01 10:24:46.000000000 +0200
@@ -114,6 +114,16 @@ AC_CHECK_LIB([m],[fabs],[FINDLIBS="-lm $ @@ -114,6 +114,16 @@ AC_CHECK_LIB([m],[fabs],[FINDLIBS="-lm $
AC_DEFINE_UNQUOTED(HAVE_FABS_IN_LIBM,1,[fabs is defined in -lm])) AC_DEFINE_UNQUOTED(HAVE_FABS_IN_LIBM,1,[fabs is defined in -lm]))
AC_SUBST([FINDLIBS]) AC_SUBST([FINDLIBS])
@ -18,9 +18,9 @@ diff -up findutils-4.4.0/configure.ac.selinux findutils-4.4.0/configure.ac
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
dnl Assume unistd.h is present - coreutils does too. dnl Assume unistd.h is present - coreutils does too.
diff -up findutils-4.4.0/doc/find.texi.selinux findutils-4.4.0/doc/find.texi diff -up findutils-4.4.2/doc/find.texi_old findutils-4.4.2/doc/find.texi
--- findutils-4.4.0/doc/find.texi.selinux 2008-03-10 21:31:16.000000000 +0100 --- findutils-4.4.2/doc/find.texi_old 2009-07-01 10:25:09.000000000 +0200
+++ findutils-4.4.0/doc/find.texi 2008-04-29 14:57:42.000000000 +0200 +++ findutils-4.4.2/doc/find.texi 2009-07-01 10:26:37.000000000 +0200
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
@c %**end of header @c %**end of header
@ -54,9 +54,74 @@ diff -up findutils-4.4.0/doc/find.texi.selinux findutils-4.4.0/doc/find.texi
@end table @end table
@node Location Directives @node Location Directives
diff -up findutils-4.4.0/find/find.c.selinux findutils-4.4.0/find/find.c diff -up findutils-4.4.2/find/defs.h_old findutils-4.4.2/find/defs.h
--- findutils-4.4.0/find/find.c.selinux 2008-03-10 21:26:34.000000000 +0100 --- findutils-4.4.2/find/defs.h_old 2009-07-01 12:38:32.000000000 +0200
+++ findutils-4.4.0/find/find.c 2008-04-28 17:19:26.000000000 +0200 +++ findutils-4.4.2/find/defs.h 2009-07-01 12:52:47.000000000 +0200
@@ -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
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
} args;
/* The next predicate in the user input sequence,
@@ -459,6 +465,9 @@ PREDICATEFUNCTION pred_used;
PREDICATEFUNCTION pred_user;
PREDICATEFUNCTION pred_writable;
PREDICATEFUNCTION pred_xtype;
+#ifdef WITH_SELINUX
+PREDICATEFUNCTION pred_context;
+#endif
@@ -601,6 +610,10 @@ struct options
*/
int regex_options;
+#ifdef WITH_SELINUX
+ int (*x_getfilecon) ();
+#endif
+
/* Optimisation level. One is the default.
*/
unsigned short optimisation_level;
diff -up findutils-4.4.2/find/find.1_old findutils-4.4.2/find/find.1
--- findutils-4.4.2/find/find.1_old 2009-07-01 10:30:04.000000000 +0200
+++ findutils-4.4.2/find/find.1 2009-07-01 10:30:59.000000000 +0200
@@ -933,6 +933,8 @@ if \fIc\fR is `l'. In other words, for
checks the type of the file that
.B \-type
does not check.
+.IP "\-context \fIpattern\fR"
+(SELinux only) Security context of the file matches glob \fIpattern\fR.
.SS ACTIONS
.IP "\-delete\fR"
@@ -1354,6 +1356,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 -up findutils-4.4.2/find/find.c_old findutils-4.4.2/find/find.c
--- findutils-4.4.2/find/find.c_old 2009-07-01 10:26:53.000000000 +0200
+++ findutils-4.4.2/find/find.c 2009-07-01 10:29:52.000000000 +0200
@@ -120,6 +120,36 @@ int get_current_dirfd(void) @@ -120,6 +120,36 @@ int get_current_dirfd(void)
return AT_FDCWD; return AT_FDCWD;
} }
@ -103,139 +168,9 @@ diff -up findutils-4.4.0/find/find.c.selinux findutils-4.4.0/find/find.c
boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */ 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? */ unsigned int idx; /* Which entry are we on? */
struct stat stat_buf; struct stat stat_buf;
diff -up findutils-4.4.0/find/find.1.selinux findutils-4.4.0/find/find.1 diff -up findutils-4.4.2/find/Makefile.am_old findutils-4.4.2/find/Makefile.am
--- findutils-4.4.0/find/find.1.selinux 2007-12-19 20:53:14.000000000 +0100 --- findutils-4.4.2/find/Makefile.am_old 2009-07-01 10:35:04.000000000 +0200
+++ findutils-4.4.0/find/find.1 2008-04-25 16:52:54.000000000 +0200 +++ findutils-4.4.2/find/Makefile.am 2009-07-01 10:35:37.000000000 +0200
@@ -934,6 +934,8 @@ if \fIc\fR is `l'. In other words, for
checks the type of the file that
.B \-type
does not check.
+.IP "\-context \fIpattern\fR"
+(SELinux only) Security context of the file matches glob \fIpattern\fR.
.SS ACTIONS
.IP "\-delete\fR"
@@ -1340,6 +1342,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 -up findutils-4.4.0/find/pred.c.selinux findutils-4.4.0/find/pred.c
--- findutils-4.4.0/find/pred.c.selinux 2008-03-10 10:37:22.000000000 +0100
+++ findutils-4.4.0/find/pred.c 2008-04-28 17:09:17.000000000 +0200
@@ -47,6 +47,10 @@
#include "error.h"
#include "verify.h"
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
+
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
@@ -229,6 +233,9 @@ struct pred_assoc pred_table[] =
{pred_user, "user "},
{pred_writable, "writable "},
{pred_xtype, "xtype "},
+#ifdef WITH_SELINUX
+ {pred_context, "context"},
+#endif /*WITH_SELINUX*/
{0, "none "}
};
#endif
@@ -1053,6 +1060,27 @@ do_fprintf(struct format_val *dest,
mode_to_filetype(stat_buf->st_mode & S_IFMT));
}
break;
+ case 'Z': /* SELinux security context */
+#ifdef WITH_SELINUX
+ {
+ security_context_t scontext;
+ int rv;
+ rv = (*options.x_getfilecon) (state.rel_pathname, &scontext);
+
+ if (rv < 0)
+ {
+ fprintf (stderr, "getfilecon(%s): %s", pathname,
+ strerror(errno));
+ fflush (stderr);
+ }
+ else
+ {
+ checked_fprintf (dest, segment->text, scontext);
+ freecon (scontext);
+ }
+ }
+#endif /* WITH_SELINUX */
+ break;
}
/* end of KIND_FORMAT case */
break;
@@ -1841,6 +1869,33 @@ pred_xtype (const char *pathname, struct
*/
return (pred_type (pathname, &sbuf, pred_ptr));
}
+
+
+#ifdef WITH_SELINUX
+
+boolean
+pred_context (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)
+ {
+ fprintf (stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
+ 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 -up findutils-4.4.0/find/tree.c.selinux findutils-4.4.0/find/tree.c
--- findutils-4.4.0/find/tree.c.selinux 2007-12-20 22:40:35.000000000 +0100
+++ findutils-4.4.0/find/tree.c 2008-04-30 11:12:46.000000000 +0200
@@ -953,7 +953,8 @@ static struct pred_cost_lookup costlooku
{ pred_used , NeedsStatInfo },
{ pred_user , NeedsStatInfo },
{ pred_writable , NeedsAccessInfo },
- { pred_xtype , NeedsType } /* roughly correct unless most files are symlinks */
+ { pred_xtype , NeedsType }, /* roughly correct unless most files are symlinks */
+ { pred_context , NeedsNothing } /* remove warning only:) */
};
static int pred_table_sorted = 0;
@@ -1434,6 +1435,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 -up findutils-4.4.0/find/Makefile.am.selinux findutils-4.4.0/find/Makefile.am
--- findutils-4.4.0/find/Makefile.am.selinux 2007-07-22 14:29:31.000000000 +0200
+++ findutils-4.4.0/find/Makefile.am 2008-04-25 16:52:54.000000000 +0200
@@ -26,7 +26,7 @@ endif @@ -26,7 +26,7 @@ endif
EXTRA_DIST = defs.h $(man_MANS) EXTRA_DIST = defs.h $(man_MANS)
@ -245,11 +180,11 @@ diff -up findutils-4.4.0/find/Makefile.am.selinux findutils-4.4.0/find/Makefile.
man_MANS = find.1 man_MANS = find.1
SUBDIRS = . testsuite SUBDIRS = . testsuite
diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c diff -up findutils-4.4.2/find/parser.c_old findutils-4.4.2/find/parser.c
--- findutils-4.4.0/find/parser.c.selinux 2008-03-10 10:37:21.000000000 +0100 --- findutils-4.4.2/find/parser.c_old 2009-07-01 10:35:43.000000000 +0200
+++ findutils-4.4.0/find/parser.c 2008-04-28 15:34:45.000000000 +0200 +++ findutils-4.4.2/find/parser.c 2009-07-01 12:38:19.000000000 +0200
@@ -53,6 +53,10 @@ @@ -53,6 +53,10 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
@ -259,7 +194,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
#if ENABLE_NLS #if ENABLE_NLS
# include <libintl.h> # include <libintl.h>
# define _(Text) gettext (Text) # define _(Text) gettext (Text)
@@ -156,6 +160,9 @@ static boolean parse_noignore_race PARAM @@ -155,6 +159,9 @@ static boolean parse_noignore_race PARAM
static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); 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_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)); static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
@ -269,7 +204,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
@@ -252,6 +259,9 @@ static struct parser_table const parse_t @@ -251,6 +258,9 @@ static struct parser_table const parse_t
PARSE_TEST ("cmin", cmin), /* GNU */ PARSE_TEST ("cmin", cmin), /* GNU */
PARSE_TEST ("cnewer", cnewer), /* GNU */ PARSE_TEST ("cnewer", cnewer), /* GNU */
{ARG_TEST, "ctime", parse_time, pred_ctime}, /* POSIX */ {ARG_TEST, "ctime", parse_time, pred_ctime}, /* POSIX */
@ -279,7 +214,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
PARSE_POSOPT ("daystart", daystart), /* GNU */ PARSE_POSOPT ("daystart", daystart), /* GNU */
PARSE_ACTION ("delete", delete), /* GNU, Mac OS, FreeBSD */ PARSE_ACTION ("delete", delete), /* GNU, Mac OS, FreeBSD */
PARSE_OPTION ("d", d), /* Mac OS X, FreeBSD, NetBSD, OpenBSD, but deprecated in favour of -depth */ PARSE_OPTION ("d", d), /* Mac OS X, FreeBSD, NetBSD, OpenBSD, but deprecated in favour of -depth */
@@ -348,6 +358,89 @@ static struct parser_table const parse_t @@ -347,6 +357,89 @@ static struct parser_table const parse_t
static const char *first_nonoption_arg = NULL; static const char *first_nonoption_arg = NULL;
static const struct parser_table *noop = NULL; static const struct parser_table *noop = NULL;
@ -367,9 +302,9 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
+} +}
+#endif /* WITH_SELINUX */ +#endif /* WITH_SELINUX */
void void
check_option_combinations(const struct predicate *p) check_option_combinations(const struct predicate *p)
@@ -451,11 +544,17 @@ set_follow_state(enum SymlinkOption opt) @@ -450,11 +543,17 @@ set_follow_state(enum SymlinkOption opt)
{ {
case SYMLINK_ALWAYS_DEREF: /* -L */ case SYMLINK_ALWAYS_DEREF: /* -L */
options.xstat = optionl_stat; options.xstat = optionl_stat;
@ -378,17 +313,17 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
+#endif +#endif
options.no_leaf_check = true; options.no_leaf_check = true;
break; break;
case SYMLINK_NEVER_DEREF: /* -P (default) */ case SYMLINK_NEVER_DEREF: /* -P (default) */
options.xstat = optionp_stat; options.xstat = optionp_stat;
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ options.x_getfilecon = optionp_getfilecon; + options.x_getfilecon = optionp_getfilecon;
+#endif +#endif
/* Can't turn no_leaf_check off because the user might have specified /* Can't turn no_leaf_check off because the user might have specified
* -noleaf anyway * -noleaf anyway
*/ */
@@ -463,6 +562,9 @@ set_follow_state(enum SymlinkOption opt) @@ -462,6 +561,9 @@ set_follow_state(enum SymlinkOption opt)
case SYMLINK_DEREF_ARGSONLY: /* -H */ case SYMLINK_DEREF_ARGSONLY: /* -H */
options.xstat = optionh_stat; options.xstat = optionh_stat;
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
@ -397,7 +332,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
options.no_leaf_check = true; options.no_leaf_check = true;
} }
} }
@@ -1128,8 +1230,12 @@ tests (N can be +N or -N or N): -amin N @@ -1127,8 +1229,12 @@ tests (N can be +N or -N or N): -amin N
-nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
-readable -writable -executable\n\ -readable -writable -executable\n\
-wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
@ -411,7 +346,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-exec COMMAND ; -exec COMMAND {} + -ok COMMAND ;\n\ -exec COMMAND ; -exec COMMAND {} + -ok COMMAND ;\n\
@@ -2492,6 +2598,10 @@ parse_version (const struct parser_table @@ -2518,6 +2624,10 @@ parse_version (const struct parser_table
printf("LEAF_OPTIMISATION "); printf("LEAF_OPTIMISATION ");
++features; ++features;
#endif #endif
@ -422,7 +357,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
flags = 0; flags = 0;
if (is_fts_enabled(&flags)) if (is_fts_enabled(&flags))
@@ -2526,6 +2636,32 @@ parse_version (const struct parser_table @@ -2552,6 +2662,32 @@ parse_version (const struct parser_table
exit (0); exit (0);
} }
@ -455,7 +390,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
static boolean static boolean
parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
{ {
@@ -2777,7 +2913,7 @@ insert_fprintf (struct format_val *vec, @@ -2803,7 +2939,7 @@ insert_fprintf (struct format_val *vec,
if (*scan2 == '.') if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++) for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ; /* Do nothing. */ ;
@ -464,7 +399,7 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
{ {
segmentp = make_segment (segmentp, format, scan2 - format, segmentp = make_segment (segmentp, format, scan2 - format,
KIND_FORMAT, *scan2, 0, KIND_FORMAT, *scan2, 0,
@@ -2904,6 +3040,7 @@ make_segment (struct segment **segment, @@ -2930,6 +3066,7 @@ make_segment (struct segment **segment,
case 'h': /* leading directories part of path */ case 'h': /* leading directories part of path */
case 'p': /* pathname */ case 'p': /* pathname */
case 'P': /* pathname with ARGV element stripped */ case 'P': /* pathname with ARGV element stripped */
@ -472,47 +407,111 @@ diff -up findutils-4.4.0/find/parser.c.selinux findutils-4.4.0/find/parser.c
*fmt++ = 's'; *fmt++ = 's';
break; break;
diff -up findutils-4.4.0/find/defs.h.selinux findutils-4.4.0/find/defs.h diff -up findutils-4.4.2/find/pred.c_old findutils-4.4.2/find/pred.c
--- findutils-4.4.0/find/defs.h.selinux 2008-03-10 10:37:21.000000000 +0100 --- findutils-4.4.2/find/pred.c_old 2009-07-01 10:31:11.000000000 +0200
+++ findutils-4.4.0/find/defs.h 2008-04-25 16:52:54.000000000 +0200 +++ findutils-4.4.2/find/pred.c 2009-07-01 10:33:45.000000000 +0200
@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat @@ -48,6 +48,10 @@
#define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) #include "error.h"
#define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) #include "verify.h"
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+#include <selinux/selinux.h> +#include <selinux/selinux.h>
+#endif +#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
} args;
/* The next predicate in the user input sequence,
@@ -459,6 +465,9 @@ PREDICATEFUNCTION pred_used;
PREDICATEFUNCTION pred_user;
PREDICATEFUNCTION pred_writable;
PREDICATEFUNCTION pred_xtype;
+#ifdef WITH_SELINUX
+PREDICATEFUNCTION pred_context;
+#endif
@@ -601,6 +610,10 @@ struct options
*/
int regex_options;
+#ifdef WITH_SELINUX
+ int (*x_getfilecon) ();
+#endif
+ +
/* Optimisation level. One is the default. #if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
@@ -230,6 +234,9 @@ struct pred_assoc pred_table[] =
{pred_user, "user "},
{pred_writable, "writable "},
{pred_xtype, "xtype "},
+#ifdef WITH_SELINUX
+ {pred_context, "context"},
+#endif /*WITH_SELINUX*/
{0, "none "}
};
#endif
@@ -1054,6 +1061,27 @@ do_fprintf(struct format_val *dest,
mode_to_filetype(stat_buf->st_mode & S_IFMT));
}
break;
+ case 'Z': /* SELinux security context */
+#ifdef WITH_SELINUX
+ {
+ security_context_t scontext;
+ int rv;
+ rv = (*options.x_getfilecon) (state.rel_pathname, &scontext);
+
+ if (rv < 0)
+ {
+ fprintf (stderr, "getfilecon(%s): %s", pathname,
+ strerror(errno));
+ fflush (stderr);
+ }
+ else
+ {
+ checked_fprintf (dest, segment->text, scontext);
+ freecon (scontext);
+ }
+ }
+#endif /* WITH_SELINUX */
+ break;
}
/* end of KIND_FORMAT case */
break;
@@ -1844,6 +1872,32 @@ pred_xtype (const char *pathname, struct
*/ */
unsigned short optimisation_level; return (pred_type (pathname, &sbuf, pred_ptr));
}
+
+#ifdef WITH_SELINUX
+
+boolean
+pred_context (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)
+ {
+ fprintf (stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
+ 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 -up findutils-4.4.2/find/tree.c_old findutils-4.4.2/find/tree.c
--- findutils-4.4.2/find/tree.c_old 2009-07-01 10:33:57.000000000 +0200
+++ findutils-4.4.2/find/tree.c 2009-07-01 10:34:54.000000000 +0200
@@ -953,7 +953,8 @@ static struct pred_cost_lookup costlooku
{ pred_used , NeedsStatInfo },
{ pred_user , NeedsStatInfo },
{ pred_writable , NeedsAccessInfo },
- { pred_xtype , NeedsType } /* roughly correct unless most files are symlinks */
+ { pred_xtype , NeedsType }, /* roughly correct unless most files are symlinks */
+ { pred_context , NeedsNothing } /* remove warning only:) */
};
static int pred_table_sorted = 0;
@@ -1434,6 +1435,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;

7
findutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU versions of find utilities (find and xargs) Summary: The GNU versions of find utilities (find and xargs)
Name: findutils Name: findutils
Version: 4.4.0 Version: 4.4.2
Release: 2%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
License: GPLv3+ License: GPLv3+
Group: Applications/File Group: Applications/File
@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/find-maint.info.gz %{_infodir}/find-maint.info.gz
%changelog %changelog
* Wed Jul 1 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1:4.4.2-1
- Update to findutils-4.4.2
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-2 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
49e769ac4382fae6f104f99d54d0a112 findutils-4.4.0.tar.gz 351cc4adb07d54877fa15f75fb77d39f findutils-4.4.2.tar.gz
04a7d2fcf851b770e586d8a01c1f14f1 findutils-4.4.0.tar.gz.sig 36d8b8c7d6c6ff88e9d46eb2322873cc findutils-4.4.2.tar.gz.sig