Hello community,
here is the log from the commit of package findutils for openSUSE:Factory
checked in at Fri Mar 12 16:45:16 CET 2010.
--------
--- findutils/findutils.changes 2009-07-10 21:27:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/findutils/findutils.changes 2010-03-08 19:04:20.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Mar 8 18:53:10 CET 2010 - prusnak@suse.cz
+
+- updated to 4.4.2
+ * see NEWS for more info
+- updated SElinux patches (selinux.patch, selinux-gnulib.patch)
+- added more patches from Fedora (autofs.patch, ftsremount.patch, xautofs.patch)
+- findutils.patch renamed to updatedb.patch
+- split-off lang package
+
+-------------------------------------------------------------------
@@ -571 +580,0 @@
-
@@ -573 +581,0 @@
-
@@ -575 +582,0 @@
-
@@ -577 +583,0 @@
-
calling whatdependson for head-i586
Old:
----
findutils-4.4.0.diff
findutils-4.4.0.tar.bz2
findutils-null.diff
findutils-selinux.diff
New:
----
findutils-4.4.2-autofs.patch
findutils-4.4.2-fts-remount.patch
findutils-4.4.2-selinux-gnulib.patch
findutils-4.4.2-selinux.patch
findutils-4.4.2-updatedb.patch
findutils-4.4.2-xautofs.patch
findutils-4.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ findutils.spec ++++++
--- /var/tmp/diff_new_pack.MvTpLI/_old 2010-03-12 16:45:09.000000000 +0100
+++ /var/tmp/diff_new_pack.MvTpLI/_new 2010-03-12 16:45:09.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package findutils (Version 4.4.0)
+# spec file for package findutils (Version 4.4.2)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,51 +18,58 @@
Name: findutils
-%if %suse_version > 1100
-BuildRequires: libselinux-devel
-%endif
Url: http://www.gnu.org/software/findutils/
-License: GFDL v1.2 ; GPL v3 or later
+License: GPLv3+
Group: Productivity/File utilities
-Provides: find
-Obsoletes: find
-AutoReqProv: on
-PreReq: %{install_info_prereq}
-Version: 4.4.0
-Release: 45
-Summary: GNU find--Finding Files
+Version: 4.4.2
+Release: 1
+Summary: The GNU versions of find utilities (find and xargs)
+# retreived from http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz
Source: findutils-%{version}.tar.bz2
Source1: sysconfig.locate
Source2: cron.daily.updatedb
-Patch: findutils-%{version}.diff
-Patch1: findutils-selinux.diff
-Patch2: findutils-null.diff
+# learn find to recognize autofs file system by reading /proc/mounts
+# as autofs mount points are not listed in /etc/mtab
+Patch0: findutils-4.4.2-autofs.patch
+# adds a new option -xautofs to find to not descend into directories on autofs file systems
+Patch1: findutils-4.4.2-xautofs.patch
+# patch accepted by gnulib upstream - rhbz#538536
+Patch2: findutils-4.4.2-fts-remount.patch
+# gnulib based SELinux patch adding a new search predicate -context and
+# a new -printf conversion %Z
+Patch3: findutils-4.4.2-selinux.patch
+# once the selinux-at module appears on the list within import-gnulib.config
+# the following patch will be no longer needed
+Patch4: findutils-4.4.2-selinux-gnulib.patch
+Patch5: findutils-4.4.2-updatedb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1100
+BuildRequires: libselinux-devel
+%endif
+Provides: find = %{version}
+Obsoletes: find < %{version}
+Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
%description
-This package contains GNU find and xargs. The programs comply with
-POSIX 1003.2. They also support additional options, some borrowed from
-Unix and some unique to GNU.
-
+The findutils package contains programs which will help you locate
+files on your system. The find utility searches through a hierarchy
+of directories looking for files which match a certain set of criteria
+(such as a file name pattern). The xargs utility builds and executes
+command lines from standard input arguments (usually lists of file
+names generated by the find command).
+You should install findutils because it includes tools that are very
+useful for finding things on your system.
-Authors:
---------
- David J. MacKenzie
- Jan Brittenson
- Brian L. Matthews
- Mike Rendell
- James A. Woods
- Jay Plett
- Tim Wood
+%lang_package
%package locate
-License: GPL v3 or later
-Summary: Tool for Locating Files (GNU Findutils Subpackage)
+License: GPLv3+
+Summary: Tool for Locating Files (findutils subpackage)
Group: Productivity/File utilities
Provides: findutils:/usr/bin/locate
-AutoReqProv: on
-PreReq: %fillup_prereq
+PreReq: %{fillup_prereq}
Requires: cron
%description locate
@@ -74,48 +81,45 @@
job will update the files database every night or shortly after
switching on the computer.
-
-
-Authors:
---------
- David J. MacKenzie
- Jan Brittenson
- Brian L. Matthews
- Mike Rendell
- James A. Woods
- Jay Plett
- Tim Wood
-
%prep
%setup -q
-%patch
+%patch0 -p1
%patch1 -p1
-%patch2 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5
%build
+autoreconf
%ifarch %arm armv5tel armv7l armv7el armv5el
# this is a workaround for a qemu-user bug, we hit. A qemu patch is being discussed, but for now ...
-DEFAULT_ARG_SIZE="(31u * 1024u)" \
+export DEFAULT_ARG_SIZE="(31u * 1024u)"
%endif
-./configure CFLAGS="$RPM_OPT_FLAGS" \
- --prefix=%{_prefix} --libexecdir=%{_libdir}/find \
+%configure \
+ --libexecdir=%{_libdir}/find \
--localstatedir=/var/lib \
- --infodir=%{_infodir} --mandir=%{_mandir} \
--without-included-regex \
--without-fts \
--enable-d_type-optimisation
-make
+make %{?_smp_mflags}
+
+%check
+make check
%install
make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-updatedb
-%find_lang %name
+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.locate
+install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse-updatedb
rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind
rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind
rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
+%find_lang %{name}
+# move find to /bin/find
+mkdir -p $RPM_BUILD_ROOT/bin
+mv $RPM_BUILD_ROOT{%{_bindir},/bin}/find
+# create /usr/bin/find -> /bin/find symlink
+ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -126,20 +130,24 @@
%post
%install_info --info-dir=%{_infodir} %{_infodir}/find.info.gz
-%postun
+%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/find.info.gz
-%files -f %name.lang
-%defattr(-,root,root,755)
-%doc README NEWS AUTHORS TODO
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README THANKS TODO
+/bin/find
%{_bindir}/find
%{_bindir}/xargs
%doc %{_infodir}/find.info*.gz
%doc %{_mandir}/man1/find.1.gz
%doc %{_mandir}/man1/xargs.1.gz
+%files lang -f %{name}.lang
+%defattr(-,root,root,-)
+
%files locate
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
/etc/cron.daily/*
%{_bindir}/locate
%{_bindir}/updatedb
++++++ findutils-4.4.2-autofs.patch ++++++
Index: findutils-4.4.2/find/fstype.c
===================================================================
--- findutils-4.4.2.orig/find/fstype.c
+++ findutils-4.4.2/find/fstype.c
@@ -205,7 +205,72 @@ must_read_fs_list(bool need_fs_type)
return entries;
}
+/* Return the device number from MOUNT_OPTIONS, if possible.
+ Otherwise return (dev_t) -1. Taken from 'mountlist' module
+ from gnulib. */
+static dev_t
+dev_from_mount_options (char const *mount_options)
+{
+ /* GNU/Linux allows file system implementations to define their own
+ meaning for "dev=" mount options, so don't trust the meaning
+ here. */
+# ifndef __linux__
+
+ static char const dev_pattern[] = ",dev=";
+ char const *devopt = strstr (mount_options, dev_pattern);
+
+ if (devopt)
+ {
+ char const *optval = devopt + sizeof dev_pattern - 1;
+ char *optvalend;
+ unsigned long int dev;
+ errno = 0;
+ dev = strtoul (optval, &optvalend, 16);
+ if (optval != optvalend
+ && (*optvalend == '\0' || *optvalend == ',')
+ && ! (dev == ULONG_MAX && errno == ERANGE)
+ && dev == (dev_t) dev)
+ return dev;
+ }
+
+# endif
+ (void) mount_options;
+ return -1;
+}
+
+/* Return true if the file described by STATP is on autofs file system
+ and call set_fstype_devno () if the autofs file system is matched. */
+static bool
+filesystem_check_autofs (const struct stat *statp)
+{
+ FILE *fp;
+ struct mntent *mnt;
+ struct mount_entry entry;
+ bool match = false;
+
+ /* open /proc/mounts because autofs is not listed in /etc/mtab */
+ fp = setmntent ("/proc/mounts", "r");
+ if (fp == NULL)
+ return false;
+ while ((mnt = getmntent (fp)))
+ {
+ if (0 != strcmp ("autofs", mnt->mnt_type))
+ continue;
+
+ entry.me_mountdir = mnt->mnt_dir;
+ entry.me_dev = dev_from_mount_options (mnt->mnt_opts);
+ set_fstype_devno (&entry);
+ if (entry.me_dev == statp->st_dev)
+ {
+ match = true;
+ break;
+ }
+ }
+
+ endmntent (fp);
+ return match;
+}
/* Return a newly allocated string naming the type of file system that the
file PATH, described by STATP, is on.
@@ -244,6 +309,10 @@ file_system_type_uncached (const struct
}
free_file_system_list(entries);
+ /* check for autofs */
+ if (type == NULL && filesystem_check_autofs (statp))
+ type = xstrdup ("autofs");
+
/* Don't cache unknown values. */
fstype_known = (type != NULL);
++++++ findutils-4.4.2-fts-remount.patch ++++++
This patch is already applied on gnulib upstream git.
Index: findutils-4.4.2/gnulib/lib/fts.c
===================================================================
--- findutils-4.4.2.orig/gnulib/lib/fts.c
+++ findutils-4.4.2/gnulib/lib/fts.c
@@ -974,6 +974,20 @@ fts_build (register FTS *sp, int type)
opening it. */
if (cur->fts_info == FTS_NSOK)
cur->fts_info = fts_stat(sp, cur, false);
+ else if (sp->fts_options & FTS_TIGHT_CYCLE_CHECK) {
+ /* Now read the stat info again after opening a directory to
+ * reveal eventual changes caused by a submount triggered by
+ * the traverse. But do it only for utilities which use
+ * FTS_TIGHT_CYCLE_CHECK. Therefore only find and du can
+ * benefit from this feature for now.
+ */
+ LEAVE_DIR (sp, cur, "4");
+ fts_stat (sp, cur, false);
+ if (! enter_dir (sp, cur)) {
+ __set_errno (ENOMEM);
+ return NULL;
+ }
+ }
/*
* Nlinks is the number of possible entries of type directory in the
++++++ findutils-4.4.2-selinux-gnulib.patch ++++++
++++ 1138 lines (skipped)
++++++ findutils-4.4.2-selinux.patch ++++++
Index: findutils-4.4.2/NEWS
===================================================================
--- findutils-4.4.2.orig/NEWS
+++ findutils-4.4.2/NEWS
@@ -1,5 +1,11 @@
GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
+* Major changes in release 4.4.2, 2009-11-26
+
+** Functional Enhancements to find
+
+patch #4848: Patch - Support for SELinux
+
* Major changes in release 4.4.2, 2009-05-16
** Bug Fixes
Index: findutils-4.4.2/doc/find.texi
===================================================================
--- findutils-4.4.2.orig/doc/find.texi
+++ findutils-4.4.2/doc/find.texi
@@ -1242,6 +1242,14 @@ situation.
@end deffn
+@deffn Test -context pattern
+True if file's SELinux context matches the pattern @var{pattern}.
+The pattern uses shell glob matching.
+
+This predicate is supported only on @code{find} versions compiled with
+SELinux support and only when SELinux is enabled.
+@end deffn
+
@node Contents
@section Contents
@@ -1737,6 +1745,7 @@ from the novel you are reading.
* Size Directives::
* Location Directives::
* Time Directives::
+* Other Directives::
* Formatting Flags::
@end menu
@@ -1894,6 +1903,14 @@ File's last modification time in the for
(@pxref{Time Formats}).
@end table
+@node Other Directives
+@subsubsection Other Directives
+
+@table @code
+@item %Z
+File's SELinux context, or empty string if the file has no SELinux context.
+@end table
+
@node Time Formats
@subsection Time Formats
Index: findutils-4.4.2/find/Makefile.am
===================================================================
--- findutils-4.4.2.orig/find/Makefile.am
+++ findutils-4.4.2/find/Makefile.am
@@ -26,7 +26,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@ @LIB_SELINUX@
man_MANS = find.1
SUBDIRS = . testsuite
Index: findutils-4.4.2/find/defs.h
===================================================================
--- findutils-4.4.2.orig/find/defs.h
+++ findutils-4.4.2/find/defs.h
@@ -48,6 +48,7 @@ Please stop compiling the program now
#include /* for bool/boolean */
#include /* for uintmax_t */
#include /* S_ISUID etc. */
+#include
@@ -315,6 +316,7 @@ 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 */
+ security_context_t scontext; /* security context */
} args;
/* The next predicate in the user input sequence,
@@ -459,6 +461,7 @@ PREDICATEFUNCTION pred_used;
PREDICATEFUNCTION pred_user;
PREDICATEFUNCTION pred_writable;
PREDICATEFUNCTION pred_xtype;
+PREDICATEFUNCTION pred_context;
@@ -604,6 +607,9 @@ struct options
*/
int regex_options;
+ /* function used to get file context */
+ int (*x_getfilecon) (int, const char *, security_context_t *);
+
/* Optimisation level. One is the default.
*/
unsigned short optimisation_level;
Index: findutils-4.4.2/find/find.1
===================================================================
--- findutils-4.4.2.orig/find/find.1
+++ findutils-4.4.2/find/find.1
@@ -936,6 +936,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"
@@ -1357,6 +1359,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
Index: findutils-4.4.2/find/parser.c
===================================================================
--- findutils-4.4.2.orig/find/parser.c
+++ findutils-4.4.2/find/parser.c
@@ -53,6 +53,8 @@
#include
#include
+#include "selinux-at.h"
+
#if ENABLE_NLS
# include
# define _(Text) gettext (Text)
@@ -156,6 +158,7 @@ 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));
+static boolean parse_context 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 +255,7 @@ static struct parser_table const parse_t
PARSE_TEST ("cmin", cmin), /* GNU */
PARSE_TEST ("cnewer", cnewer), /* GNU */
{ARG_TEST, "ctime", parse_time, pred_ctime}, /* POSIX */
+ PARSE_TEST ("context", context), /* GNU */
PARSE_POSOPT ("daystart", daystart), /* GNU */
PARSE_ACTION ("delete", delete), /* GNU, Mac OS, FreeBSD */
PARSE_OPTION ("d", d), /* Mac OS X, FreeBSD, NetBSD, OpenBSD, but deprecated in favour of -depth */
@@ -349,6 +353,86 @@ static struct parser_table const parse_t
static const char *first_nonoption_arg = NULL;
static const struct parser_table *noop = NULL;
+static int
+fallback_getfilecon (int fd, 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 lgetfileconat (fd, 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 (int fd, const char *name, security_context_t *p)
+{
+ int rv;
+ if (0 == state.curdepth)
+ {
+ /* This file is from the command line; dereference the link (if it is
+ a link). */
+ rv = getfileconat (fd, name, p);
+ if (0 == rv)
+ return 0; /* success */
+ else
+ return fallback_getfilecon (fd, name, p, rv);
+ }
+ else
+ {
+ /* Not a file on the command line; do not dereference the link. */
+ return lgetfileconat (fd, 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 (int fd, const char *name, security_context_t *p)
+{
+ int rv = getfileconat (fd, name, p);
+ if (0 == rv)
+ return 0; /* normal case. */
+ else
+ return fallback_getfilecon (fd, 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 (int fd, const char *name, security_context_t *p)
+{
+ return lgetfileconat (fd, name, p);
+}
void
check_option_combinations(const struct predicate *p)
@@ -452,11 +536,13 @@ set_follow_state(enum SymlinkOption opt)
{
case SYMLINK_ALWAYS_DEREF: /* -L */
options.xstat = optionl_stat;
+ options.x_getfilecon = optionl_getfilecon;
options.no_leaf_check = true;
break;
case SYMLINK_NEVER_DEREF: /* -P (default) */
options.xstat = optionp_stat;
+ options.x_getfilecon = optionp_getfilecon;
/* Can't turn no_leaf_check off because the user might have specified
* -noleaf anyway
*/
@@ -464,6 +550,7 @@ set_follow_state(enum SymlinkOption opt)
case SYMLINK_DEREF_ARGSONLY: /* -H */
options.xstat = optionh_stat;
+ options.x_getfilecon = optionh_getfilecon;
options.no_leaf_check = true;
}
}
@@ -1129,8 +1216,10 @@ tests (N can be +N or -N or N): -amin N
-nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
-readable -writable -executable\n\
-wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
- -used N -user NAME -xtype [bcdpfls]\n"));
+ -used N -user NAME -xtype [bcdpfls]"));
puts (_("\
+ -context CONTEXT\n"));
+ puts (_("\n\
actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-exec COMMAND ; -exec COMMAND {} + -ok COMMAND ;\n\
@@ -2520,6 +2609,11 @@ parse_version (const struct parser_table
printf("LEAF_OPTIMISATION ");
++features;
#endif
+ if (0 < is_selinux_enabled ())
+ {
+ printf ("SELINUX ");
+ ++features;
+ }
flags = 0;
if (is_fts_enabled(&flags))
@@ -2555,6 +2649,31 @@ parse_version (const struct parser_table
}
static boolean
+parse_context (const struct parser_table* entry, char **argv, int *arg_ptr)
+{
+ struct predicate *our_pred;
+
+ if ((argv == NULL) || (argv[*arg_ptr] == NULL))
+ return false;
+
+ if (is_selinux_enabled () <= 0)
+ {
+ error (1, 0, _("invalid predicate -context: SELinux is not enabled."));
+ return false;
+ }
+ our_pred = insert_primary (entry);
+ our_pred->est_success_rate = 0.01f;
+ our_pred->need_stat = false;
+#ifdef DEBUG
+ our_pred->p_name = find_pred_name (pred_context);
+#endif /*DEBUG*/
+ our_pred->args.scontext = argv[*arg_ptr];
+
+ (*arg_ptr)++;
+ return true;
+}
+
+static boolean
parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
{
options.stay_on_filesystem = true;
@@ -2815,7 +2934,7 @@ insert_fprintf (struct format_val *vec,
if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ;
- if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
+ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
{
segmentp = make_segment (segmentp, format, scan2 - format,
KIND_FORMAT, *scan2, 0,
@@ -2945,6 +3064,11 @@ make_segment (struct segment **segment,
*fmt++ = 's';
break;
+ case 'Z': /* SELinux security context */
+ mycost = NeedsAccessInfo;
+ *fmt++ = 's';
+ break;
+
case 'H': /* ARGV element file was found under */
*fmt++ = 's';
break;
Index: findutils-4.4.2/find/pred.c
===================================================================
--- findutils-4.4.2.orig/find/pred.c
+++ findutils-4.4.2/find/pred.c
@@ -48,6 +48,8 @@
#include "error.h"
#include "verify.h"
+#include
+
#if ENABLE_NLS
# include
# define _(Text) gettext (Text)
@@ -230,6 +232,7 @@ struct pred_assoc pred_table[] =
{pred_user, "user "},
{pred_writable, "writable "},
{pred_xtype, "xtype "},
+ {pred_context, "context"},
{0, "none "}
};
#endif
@@ -1054,6 +1057,30 @@ do_fprintf(struct format_val *dest,
mode_to_filetype(stat_buf->st_mode & S_IFMT));
}
break;
+
+ case 'Z': /* SELinux security context */
+ {
+ security_context_t scontext;
+ int rv = (*options.x_getfilecon) (state.cwd_dir_fd, state.rel_pathname,
+ &scontext);
+ if (rv < 0)
+ {
+ /* If getfilecon fails, there will in the general case
+ still be some text to print. We just make %Z expand
+ to an empty string. */
+ checked_fprintf (dest, segment->text, "");
+
+ error (0, errno, "getfilecon: %s",
+ safely_quote_err_filename (0, pathname));
+ state.exit_status = 1;
+ }
+ else
+ {
+ checked_fprintf (dest, segment->text, scontext);
+ freecon (scontext);
+ }
+ }
+ break;
}
/* end of KIND_FORMAT case */
break;
@@ -1844,6 +1871,26 @@ pred_xtype (const char *pathname, struct
*/
return (pred_type (pathname, &sbuf, pred_ptr));
}
+
+
+boolean
+pred_context (const char *pathname, struct stat *stat_buf,
+ struct predicate *pred_ptr)
+{
+ security_context_t scontext;
+ int rv = (*options.x_getfilecon) (state.cwd_dir_fd, state.rel_pathname,
+ &scontext);
+ if (rv < 0)
+ {
+ error (0, errno, "getfilecon: %s", safely_quote_err_filename (0, pathname));
+ return false;
+ }
+
+ rv = (fnmatch (pred_ptr->args.scontext, scontext, 0) == 0);
+ freecon (scontext);
+ return rv;
+}
+
/* 1) fork to get a child; parent remembers the child pid
2) child execs the command requested
Index: findutils-4.4.2/find/tree.c
===================================================================
--- findutils-4.4.2.orig/find/tree.c
+++ findutils-4.4.2/find/tree.c
@@ -904,6 +904,7 @@ static struct pred_cost_lookup costlooku
{ pred_cmin , NeedsStatInfo, },
{ pred_cnewer , NeedsStatInfo, },
{ pred_comma , NeedsNothing, },
+ { pred_context , NeedsAccessInfo },
{ pred_ctime , NeedsStatInfo, },
{ pred_delete , NeedsSyncDiskHit },
{ pred_empty , NeedsStatInfo },
@@ -1434,6 +1435,7 @@ get_new_pred (const struct parser_table
last_pred->need_stat = true;
last_pred->need_type = true;
last_pred->args.str = NULL;
+ last_pred->args.scontext = NULL;
last_pred->pred_next = NULL;
last_pred->pred_left = NULL;
last_pred->pred_right = NULL;
++++++ findutils-4.4.2-updatedb.patch ++++++
Index: doc/find.texi
===================================================================
--- doc/find.texi.orig
+++ doc/find.texi
@@ -3364,7 +3364,7 @@ Default is none.
@item --prunepaths='@var{path}@dots{}'
Directories to omit from the database, which would otherwise be
included. The environment variable @code{PRUNEPATHS} also sets this
-value. Default is @file{/tmp /usr/tmp /var/tmp /afs}. The paths are
+value. Default is @file{/tmp /usr/tmp /var/tmp /afs /var/spool}. The paths are
used as regular expressions (with @code{find ... -regex}, so you need
to specify these paths in the same way that @code{find} will encounter
them. This means for example that the paths must not include trailing
Index: locate/updatedb.1
===================================================================
--- locate/updatedb.1.orig
+++ locate/updatedb.1
@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
.TP
.B \-\-output=\fIdbfile\fP
The database file to build.
-Default is system-dependent. In Debian GNU/Linux, the default
-is /var/cache/locate/locatedb.
+Default is /var/lib/locatedb.
.TP
.B \-\-localuser=\fIuser\fP
The user to search non-network directories as, using \fBsu\fP(1).
@@ -85,7 +84,7 @@ You can also use the environment variabl
.TP
.B \-\-netuser=\fIuser\fP
The user to search network directories as, using \fBsu\fP(1).
-Default is \fBdaemon\fP.
+Default is \fBnobody\fP.
You can also use the environment variable \fBNETUSER\fP to set this user.
.TP
.B \-\-old\-format
Index: locate/updatedb.sh
===================================================================
--- locate/updatedb.sh.orig
+++ locate/updatedb.sh
@@ -158,7 +158,7 @@ select_shell() {
: ${NETPATHS=}
# Directories to not put in the database, which would otherwise be.
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc"}
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc /var/spool"}
# Trailing slashes result in regex items that are never matched, which
# is not what the user will expect. Therefore we now reject such
@@ -188,7 +188,7 @@ fi
export TMPDIR
# The user to search network directories as.
-: ${NETUSER=daemon}
+: ${NETUSER=nobody}
# The directory containing the subprograms.
if test -n "$LIBEXECDIR" ; then
@@ -228,11 +228,10 @@ done
PATH=/bin:/usr/bin:${BINDIR}; export PATH
-: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs"}
+: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P"}
if test -n "$PRUNEFS"; then
-prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \
- -e 's/-o //' -e 's/$/ -o/'`
+prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-fstype \1 -o/g'`
else
prunefs_exp=''
fi
@@ -252,13 +251,12 @@ if test -n "$SEARCHPATHS"; then
# : A1
su $LOCALUSER `select_shell $LOCALUSER` -c \
"$find $SEARCHPATHS $FINDOPTIONS \
- \\( $prunefs_exp \
- -type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
+ -type d \\( $prunefs_exp -regex '$PRUNEREGEX' \\) -prune \
+ -o $print_option"
else
# : A2
$find $SEARCHPATHS $FINDOPTIONS \
- \( $prunefs_exp \
- -type d -regex "$PRUNEREGEX" \) -prune -o $print_option
+ -type d \( $prunefs_exp -regex "$PRUNEREGEX" \) -prune -o $print_option
fi
fi
@@ -321,13 +319,13 @@ if test -n "$SEARCHPATHS"; then
# : A5
su $LOCALUSER `select_shell $LOCALUSER` -c \
"$find $SEARCHPATHS $FINDOPTIONS \
- \( $prunefs_exp \
- -type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
+ -type d \( $prunefs_exp -regex '$PRUNEREGEX' \) -prune \
+ -o $print_option" || exit $?
else
# : A6
$find $SEARCHPATHS $FINDOPTIONS \
- \( $prunefs_exp \
- -type d -regex "$PRUNEREGEX" \) -prune -o $print_option || exit $?
+ -type d \( $prunefs_exp -regex "$PRUNEREGEX" \) -prune \
+ -o $print_option || exit $?
fi
fi
++++++ findutils-4.4.2-xautofs.patch ++++++
Index: findutils-4.4.2/doc/find.texi
===================================================================
--- findutils-4.4.2.orig/doc/find.texi
+++ findutils-4.4.2/doc/find.texi
@@ -1413,6 +1413,10 @@ them.
There are two ways to avoid searching certain filesystems. One way is
to tell @code{find} to only search one filesystem:
+@deffn Option -xautofs
+Don't descend directories on autofs filesystems.
+@end deffn
+
@deffn Option -xdev
@deffnx Option -mount
Don't descend directories on other filesystems. These options are
Index: findutils-4.4.2/find/defs.h
===================================================================
--- findutils-4.4.2.orig/find/defs.h
+++ findutils-4.4.2/find/defs.h
@@ -550,6 +550,9 @@ struct options
/* If true, don't cross filesystem boundaries. */
boolean stay_on_filesystem;
+ /* If true, don't descend directories on autofs filesystems. */
+ boolean bypass_autofs;
+
/* If true, we ignore the problem where we find that a directory entry
* no longer exists by the time we get around to processing it.
*/
Index: findutils-4.4.2/find/find.1
===================================================================
--- findutils-4.4.2.orig/find/find.1
+++ findutils-4.4.2/find/find.1
@@ -451,6 +451,9 @@ if standard input is a tty, and to
.B \-nowarn
otherwise.
+.IP \-xautofs
+Don't descend directories on autofs filesystems.
+
.IP \-xdev
Don't descend directories on other filesystems.
Index: findutils-4.4.2/find/ftsfind.c
===================================================================
--- findutils-4.4.2.orig/find/ftsfind.c
+++ findutils-4.4.2/find/ftsfind.c
@@ -525,6 +525,12 @@ consider_visiting(FTS *p, FTSENT *ent)
}
}
+ if (options.bypass_autofs &&
+ 0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name)))
+ {
+ fts_set(p, ent, FTS_SKIP); /* descend no further */
+ }
+
if ( (ent->fts_info == FTS_D) && !options.do_dir_first )
{
/* this is the preorder visit, but user said -depth */
Index: findutils-4.4.2/find/parser.c
===================================================================
--- findutils-4.4.2.orig/find/parser.c
+++ findutils-4.4.2/find/parser.c
@@ -150,6 +150,7 @@ static boolean parse_user PARAM
static boolean parse_version PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
static boolean parse_wholename PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
static boolean parse_xdev PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
+static boolean parse_xautofs PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
static boolean parse_ignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
static boolean parse_noignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
@@ -320,6 +321,7 @@ static struct parser_table const parse_t
PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
{ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
PARSE_OPTION ("xdev", xdev), /* POSIX */
+ PARSE_OPTION ("xautofs", xautofs),
PARSE_TEST ("xtype", xtype), /* GNU */
#ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats.
@@ -2560,6 +2562,16 @@ parse_xdev (const struct parser_table* e
}
static boolean
+parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
+{
+ (void) argv;
+ (void) arg_ptr;
+ (void) entry;
+ options.bypass_autofs = true;
+ return true;
+}
+
+static boolean
parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
{
options.ignore_readdir_race = true;
Index: findutils-4.4.2/find/util.c
===================================================================
--- findutils-4.4.2.orig/find/util.c
+++ findutils-4.4.2/find/util.c
@@ -933,6 +933,7 @@ set_option_defaults(struct options *p)
p->full_days = false;
p->stay_on_filesystem = false;
+ p->bypass_autofs = false;
p->ignore_readdir_race = false;
if (p->posixly_correct)
++++++ findutils-4.4.0.tar.bz2 -> findutils-4.4.2.tar.bz2 ++++++
++++ 31823 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org