---- findutils-4.2.32/doc/find.texi.orig 2007-12-08 17:00:30.000000000 +0100
-+++ findutils-4.2.32/doc/find.texi 2008-01-26 00:37:49.666750899 +0100
-@@ -12,17 +12,11 @@
+--- findutils-4.4.0/doc/find.texi.orig 2008-03-10 21:31:16.000000000 +0100
++++ findutils-4.4.0/doc/find.texi 2008-03-16 00:00:13.875930612 +0100
+@@ -7,23 +7,16 @@
+ @c %**end of header
+
+ @include version.texi
+-@include ../locate/dblocation.texi
+
+ @iftex
@finalout
@end iftex
@end direntry
@copying
-@@ -2406,10 +2400,6 @@
- fileserver where that filesystem is on a local disk, to prevent
- thrashing the network.
+@@ -225,9 +218,7 @@
+ @section Overview
+
+ The principal programs used for making lists of files that match given
+-criteria and running commands on them are @code{find}, @code{locate},
+-and @code{xargs}. An additional command, @code{updatedb}, is used by
+-system administrators to create databases for @code{locate} to use.
++criteria and running commands on them are @code{find} and @code{xargs}.
+
+ @code{find} searches for files in a directory hierarchy and prints
+ information about the files it found. It is run like this:
+@@ -247,23 +238,6 @@
+ Notice that the wildcard must be enclosed in quotes in order to
+ protect it from expansion by the shell.
--@xref{Invoking updatedb},
--for the description of the options to @code{updatedb}, which specify
--which directories would each database contain entries for.
+-@code{locate} searches special file name databases for file names that
+-match patterns. The system administrator runs the @code{updatedb}
+-program to create the databases. @code{locate} is run like this:
+-
+-@example
+-locate @r{[}@var{option}@dots{}@r{]} @var{pattern}@dots{}
+-@end example
-
+-@noindent
+-This example prints the names of all files in the default file name
+-database whose name ends with @samp{Makefile} or @samp{makefile}.
+-Which file names are stored in the database depends on how the system
+-administrator ran @code{updatedb}.
+-@example
+-locate '*[Mm]akefile'
+-@end example
+-
+ The name @code{xargs}, pronounced EX-args, means ``combine
+ arguments.'' @code{xargs} builds and executes command lines by
+ gathering together arguments it reads on the standard input. Most
+@@ -371,7 +345,6 @@
+ @menu
+ * Base Name Patterns::
+ * Full Name Patterns::
+-* Fast Full Name Search::
+ * Shell Pattern Matching:: Wildcards used by these programs.
+ @end menu
+
+@@ -504,78 +477,6 @@
+
+ @end deffn
+-@node Fast Full Name Search
+-@subsection Fast Full Name Search
+-
+-To search for files by name without having to actually scan the
+-directories on the disk (which can be slow), you can use the
+-@code{locate} program. For each shell pattern you give it,
+-@code{locate} searches one or more databases of file names and
+-displays the file names that contain the pattern. @xref{Shell Pattern
+-Matching}, for details about shell patterns.
+-
+-If a pattern is a plain string---it contains no
+-metacharacters---@code{locate} displays all file names in the database
+-that contain that string. If a pattern contains
+-metacharacters, @code{locate} only displays file names that match the
+-pattern exactly. As a result, patterns that contain metacharacters
+-should usually begin with a @samp{*}, and will most often end with one
+-as well. The exceptions are patterns that are intended to explicitly
+-match the beginning or end of a file name.
+-
+-If you only want @code{locate} to match against the last component of
+-the file names (the ``base name'' of the files) you can use the
+-@samp{--basename} option. The opposite behaviour is the default, but
+-can be selected explicitly by using the option @samp{--wholename}.
+-
+-The command
+-@example
+-locate @var{pattern}
+-@end example
+-
+-is almost equivalent to
+-@example
+-find @var{directories} -name @var{pattern}
+-@end example
+-
+-where @var{directories} are the directories for which the file name
+-databases contain information. The differences are that the
+-@code{locate} information might be out of date, and that @code{locate}
+-handles wildcards in the pattern slightly differently than @code{find}
+-(@pxref{Shell Pattern Matching}).
+-
+-The file name databases contain lists of files that were on the system
+-when the databases were last updated. The system administrator can
+-choose the file name of the default database, the frequency with which
+-the databases are updated, and the directories for which they contain
+-entries.
+-
+-Here is how to select which file name databases @code{locate}
+-searches. The default is system-dependent. At the time this document
+-was generated, the default was @file{@value{LOCATE_DB}}.
+-
+-@table @code
+-@item --database=@var{path}
+-@itemx -d @var{path}
+-Instead of searching the default file name database, search the file
+-name databases in @var{path}, which is a colon-separated list of
+-database file names. You can also use the environment variable
+-@code{LOCATE_PATH} to set the list of database files to search. The
+-option overrides the environment variable if both are used.
+-@end table
+-
+-GNU @code{locate} can read file name databases generated by the
+-@code{slocate} package. However, these generally contain a list of
+-all the files on the system, and so when using this database,
+-@code{locate} will produce output only for files which are accessible
+-to you. @xref{Invoking locate}, for a description of the
+-@samp{--existing} option which is used to do this.
+-
+-The @code{updatedb} program can also generate database in a format
+-compatible with @code{slocate}. @xref{Invoking updatedb}, for a
+-description of its @samp{--dbformat} and @samp{--output} options.
+-
+-
+ @node Shell Pattern Matching
+ @subsection Shell Pattern Matching
+
+@@ -2650,42 +2551,11 @@
+ @samp{locate --statistics}.
+
+ @menu
+-* Database Locations::
+ * Database Formats::
+ * Newline Handling::
+ @end menu
+
+
+-@node Database Locations
+-@section Database Locations
+-
+-There can be multiple file name databases. Users can select which
+-databases @code{locate} searches using the @code{LOCATE_PATH}
+-environment variable or a command line option. The system
+-administrator can choose the file name of the default database, the
+-frequency with which the databases are updated, and the directories
+-for which they contain entries. File name databases are updated by
+-running the @code{updatedb} program, typically nightly.
+-
+-In networked environments, it often makes sense to build a database at
+-the root of each filesystem, containing the entries for that
+-filesystem. @code{updatedb} is then run for each filesystem on the
+-fileserver where that filesystem is on a local disk, to prevent
+-thrashing the network.
+-
+-@xref{Invoking updatedb}, for the description of the options to
+-@code{updatedb}. These options can be used to specify which
+-directories are indexed by each database file.
+-
+-The default location for the locate database depends on how findutils
+-is built, but the findutils installation accompanying this manual uses
+-the default location @file{@value{LOCATE_DB}}.
+-
+-If no database exists at @file{@value{LOCATE_DB}} but the user did not
+-specify where to look (by using @samp{-d} or setting
+-@code{LOCATE_PATH}), then @code{locate} will also check for a
+-``secure'' database in @file{/var/lib/slocate/slocate.db}.
+-
@node Database Formats
@section Database Formats
-@@ -2590,15 +2580,13 @@
+
+@@ -2904,15 +2774,13 @@
discussed in this manual.
@menu
* Environment Variables::
@end menu
--@node Invoking find, Invoking locate, , Reference
-+@node find, xargs, , Reference
+-@node Invoking find
++@node find
@section Invoking @code{find}
@example
-@@ -2669,7 +2657,7 @@
- @end menu
-
+@@ -3120,268 +2988,7 @@
+ actions, and options that the expression can contain. If the
+ expression is missing, @samp{-print} is assumed.
--@node Warning Messages,,, Invoking find
-+@node Warning Messages,,, find
- @subsection Warning Messages
-
- If there is an error on the @code{find} command line, an error message
-@@ -2725,251 +2713,7 @@
- Use of an unrecognised formatting directive with @samp{-fprintf}
- @end itemize
-
--@node Invoking locate, Invoking updatedb, Invoking find, Reference
+-@node Invoking locate
-@section Invoking @code{locate}
-
-@example
-
-@item --database=@var{path}
-@itemx -d @var{path}
--Instead of searching the default @code{locate} database, @code{locate} search the file
+-Instead of searching the default @code{locate} database
+-@file{@value{LOCATE_DB}}, @code{locate} searches the file
-name databases in @var{path}, which is a colon-separated list of
-database file names. You can also use the environment variable
-@code{LOCATE_PATH} to set the list of database files to search. The
-The way in which broken symbolic links are treated is affected by the
-@samp{-L}, @samp{-P} and @samp{-H} options. Please note that it is
-possible for the file to be deleted after @code{locate} has checked
--that it exists, but before you use it.
+-that it exists, but before you use it. This option is automatically
+-turned on when reading an @code{slocate} database in secure mode
+-(@pxref{slocate Database Format}).
-
-@item --non-existing
-@itemx -E
-Limit the number of results printed to N. When used with the
-@samp{--count} option, the value printed will never be larger than
-this limit.
--
+-@item --max-database-age=D
+-Normally, @code{locate} will issue a warning message when it searches
+-a database which is more than 8 days old. This option changes that
+-value to something other than 8. The effect of specifying a negative
+-value is undefined.
-@item --mmap
-@itemx -m
-Accepted but does nothing. The option is supported only to provide
-@item --null
-@itemx -0
-Results are separated with the ASCII NUL character rather than the
--newline character. To get the full benefit of the use of this option,
+-newline character. To get the full benefit of this option,
-use the new @code{locate} database format (that is the default
-anyway).
-
-@item --print
-@itemx -p
--Print search results when they normally would not, because of the
--presence of @samp{--statistics} (@samp{-S}) or @samp{--count}
+-Print search results when they normally would not be due to
+-use of @samp{--statistics} (@samp{-S}) or @samp{--count}
-(@samp{-c}).
-
-@item --wholename
-@item --statistics
-@itemx -S
-Print some summary information for each @code{locate} database. No
--search is performed unless non-option arguments are given. Although
--the BSD version of locate also has this option, the format of the
+-search is performed unless non-option arguments are given.
+-Although the BSD version of locate also has this option, the format of the
-output is different.
-
-@item --help
-Print the version number of @code{locate} and exit.
-@end table
-
--@node Invoking updatedb, Invoking xargs, Invoking locate, Reference
+-@node Invoking updatedb
-@section Invoking @code{updatedb}
-
-@example
-is @file{nfs NFS proc}.
-
-@item --output=@var{dbfile}
--The database file to build. Default is system-dependent, but
--typically @file{/usr/local/var/locatedb}.
+-The database file to build. The default is system-dependent, but
+-when this document was formatted it was @file{@value{LOCATE_DB}}.
-
-@item --localuser=@var{user}
-The user to search the non-network directories as, using @code{su}.
-this option means that @code{locate} will not be able to properly
-handle non-ASCII characters in file names (that is, file names
-containing characters which have the eighth bit set, such as many of
--the characters from the ISO-8859-1 character set). Versions of
--@code{locate} prior to 4.2.31 fail to correctly handle long filenames
--in old-format databases. Versions 4.3.0 to 4.3.6 were also affected.
+-the characters from the ISO-8859-1 character set). @xref{Database
+-Formats}, for a detailed description of the supported database
+-formats.
+-
+-@item --dbformat=@var{FORMAT}
+-Generate the locate database in format @code{FORMAT}. Supported
+-database formats include @code{LOCATE02} (which is the default),
+-@code{old} and @code{slocate}. The @code{old} format exists for
+-compatibility with implementations of @code{locate} on other Unix
+-systems. The @code{slocate} format exists for compatibility with
+-@code{slocate}. @xref{Database Formats}, for a detailed description
+-of each format.
+-
-@item --help
-Print a summary of the command line usage and exit.
-@item --version
-Print the version number of @code{updatedb} and exit.
-@end table
-
--@node Invoking xargs, Regular Expressions, Invoking updatedb, Reference
-+@node xargs, Regular Expressions, find, Reference
+-@node Invoking xargs
++@node xargs
@section Invoking @code{xargs}
@example
-@@ -3118,7 +2862,7 @@
- @end table
-
+@@ -5091,8 +4698,6 @@
+ @menu
+ * Error Messages From find::
+ * Error Messages From xargs::
+-* Error Messages From locate::
+-* Error Messages From updatedb::
+ @end menu
--@node Regular Expressions, Environment Variables, Invoking xargs, Reference
-+@node Regular Expressions, Environment Variables, xargs, Reference
- @section Regular Expressions
+ @node Error Messages From find
+@@ -5223,38 +4828,6 @@
+ See the description of the similar message for @code{find}.
+ @end table
- The @samp{-regex} and @samp{-iregex} tests of @code{find} allow
+-@node Error Messages From locate
+-@section Error Messages From @code{locate}
+-
+-@table @samp
+-@item warning: database @file{@value{LOCATE_DB}} is more than 8 days old
+-The @code{locate} program relies on a database which is periodically
+-built by the @code{updatedb} program. That hasn't happened in a long
+-time. To fix this problem, run @code{updatedb} manually. This can
+-often happen on systems that are generally not left on, so the
+-periodic ``cron'' task which normally does this doesn't get a chance
+-to run.
+-
+-@item locate database @file{@value{LOCATE_DB}} is corrupt or invalid
+-This should not happen. Re-run @code{updatedb}. If that works, but
+-@code{locate} still produces this error, run @code{locate --version}
+-and @code{updatedb --version}. These should produce the same output.
+-If not, you are using a mixed toolset; check your @samp{$PATH}
+-environment variable and your shell aliases (if you have any). If
+-both programs claim to be GNU versions, this is a bug; all versions of
+-these programs should interoperate without problem. Ask for help on
+-@email{bug-findutils@@gnu.org}.
+-@end table
+-
+-
+-@node Error Messages From updatedb
+-@section Error Messages From updatedb
+-
+-The @code{updatedb} program (and the programs it invokes) do issue
+-error messages, but none seem to be candidates for guidance. If
+-you are having a problem understanding one of these, ask for help on
+-@email{bug-findutils@@gnu.org}.
+-
+ @node GNU Free Documentation License
+ @appendix GNU Free Documentation License
+ @include fdl.texi
--- /dev/null
+--- findutils-4.4.0/po/pl.po.orig 2008-03-15 12:43:32.000000000 +0100
++++ findutils-4.4.0/po/pl.po 2008-03-17 20:33:46.545320968 +0100
+@@ -5,10 +5,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: findutils 4.3.13\n"
++"Project-Id-Version: findutils 4.4.0\n"
+ "Report-Msgid-Bugs-To: bug-findutils@gnu.org\n"
+ "POT-Creation-Date: 2008-03-15 11:43+0000\n"
+-"PO-Revision-Date: 2008-02-15 00:07+0100\n"
++"PO-Revision-Date: 2008-03-16 00:10+0100\n"
+ "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+@@ -263,13 +263,13 @@
+ "numer urz±dzenia %ld, typ systemu plików to %s) [ref %ld]"
+
+ #: find/find.c:528
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "%s%s changed during execution of %s (old inode number %<PRIuMAX>, new inode "
+ "number %<PRIuMAX>, file system type is %s) [ref %ld]"
+ msgstr ""
+-"%s%s zmieni³ siê podczas wykonywania %s (stary numer i-wêz³a %ld, nowy numer "
+-"i-wêz³a %ld, typ systemu plików %s) [ref %ld]"
++"%s%s zmieni³ siê podczas wykonywania %s (stary numer i-wêz³a %<PRIuMAX>, "
++"nowy numer i-wêz³a %<PRIuMAX>, typ systemu plików %s) [ref %ld]"
+
+ #: find/find.c:1012
+ #, c-format
+@@ -961,7 +961,7 @@
+ msgstr "Wszystkie nazwy plików: %s\n"
+
+ #: locate/locate.c:912
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "File names have a cumulative length of %s bytes.\n"
+ "Of those file names,\n"
+@@ -970,12 +970,12 @@
+ "\t%s contain newline characters, \n"
+ "\tand %s contain characters with the high bit set.\n"
+ msgstr ""
+-"Nazwy plików maj± ³±czn± d³ugo¶æ %1$s bajtów.\n"
++"Nazwy plików maj± ³±czn± d³ugo¶æ %s bajtów.\n"
+ "W¶ród tych nazw:\n"
+ "\n"
+-"\t%2$s zawiera spacje,\n"
+-"\t%3$s zawiera znaki nowej linii,\n"
+-"\ta %4$s zawiera znaki z ustawionym najstarszym bitem.\n"
++"\t%s zawiera spacje,\n"
++"\t%s zawiera znaki nowej linii,\n"
++"\ta %s zawiera znaki z ustawionym najstarszym bitem.\n"
+
+ #: locate/locate.c:926
+ #, c-format
---- findutils-4.1.20/find/Makefile.am.orig Mon May 26 20:02:34 2003
-+++ findutils-4.1.20/find/Makefile.am Wed Jan 28 15:15:13 2004
-@@ -3,8 +3,9 @@
- bin_PROGRAMS = find
- find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c
+--- findutils-4.4.0/find/Makefile.am.orig 2007-07-22 14:29:31.000000000 +0200
++++ findutils-4.4.0/find/Makefile.am 2008-03-16 01:19:36.539333465 +0100
+@@ -25,8 +25,9 @@
+ endif
+
EXTRA_DIST = defs.h $(man_MANS)
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
++DEFS = @DEFS@ -DWITH_SELINUX
INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
-+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux
+-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
+ SUBDIRS = . testsuite
---- findutils-4.2.11/find/defs.h.orig 2005-01-03 01:06:10.000000000 +0100
-+++ findutils-4.2.11/find/defs.h 2005-01-09 18:10:03.183117288 +0100
-@@ -126,6 +126,10 @@
- #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
+--- findutils-4.4.0/find/defs.h.orig 2008-03-10 10:37:21.000000000 +0100
++++ findutils-4.4.0/find/defs.h 2008-03-16 01:22:53.718566717 +0100
+@@ -49,6 +49,9 @@
+ #include <stdint.h> /* for uintmax_t */
+ #include <sys/stat.h> /* S_ISUID etc. */
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
-+
- #if 1
- #include <stdbool.h>
- typedef bool boolean;
-@@ -322,6 +322,9 @@
- struct dir_id fileid; /* samefile */
+
+
+ #ifndef CHAR_BIT
+@@ -314,6 +317,9 @@
+ struct perm_val perm; /* perm */
+ struct samefile_file_id samefileid; /* samefile */
mode_t type; /* type */
- FILE *stream; /* ls fls fprint0 */
+#ifdef WITH_SELINUX
+ security_context_t scontext; /* scontext */
+#endif /*WITH_SELINUX*/
- struct format_val printf_vec; /* printf fprintf fprint */
+ struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
} args;
-@@ -477,6 +484,10 @@
-
+@@ -589,6 +595,10 @@
/* Pointer to the function used to stat files. */
int (*xstat) (const char *name, struct stat *statbuf);
-+
+
+#ifdef WITH_SELINUX
+ int (*x_getfilecon) ();
+#endif /* WITH_SELINUX */
++
+ /* Indicate if we can implement safely_chdir() using the O_NOFOLLOW
+ * flag to open(2).
+@@ -657,4 +667,9 @@
+ extern char *program_name;
- /* Indicate if we can implement safely_chdir() using the O_NOFOLLOW
-@@ -511,4 +522,9 @@
- # define fchdir(fd) (-1)
- #endif
+#ifdef WITH_SELINUX
-+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
++PREDICATEFUNCTION pred_scontext;
+extern int (*x_getfilecon) ();
+#endif /*WITH_SELINUX*/
+
#endif
---- findutils-4.2.6/find/find.1.orig 2004-11-21 10:52:17.000000000 +0100
-+++ findutils-4.2.6/find/find.1 2004-11-21 22:52:25.469719184 +0100
-@@ -396,6 +396,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.
+--- findutils-4.4.0/find/find.1.orig 2007-12-19 20:53:14.000000000 +0100
++++ findutils-4.4.0/find/find.1 2008-03-16 01:24:14.939206112 +0100
+@@ -935,6 +935,10 @@
+ .B \-type
+ does not check.
+
+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
++.IP "\-\-context \fIscontext\fR"
+(SELinux only) File has the security context \fIscontext\fR.
-
++
.SS ACTIONS
.IP "\-delete\fR"
-@@ -633,6 +636,8 @@
- File's type (like in ls -l), U=unknown type (shouldn't happen)
+ Delete files; true if removal succeeded. If the removal failed, an
+@@ -1340,6 +1344,8 @@
+ 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).
---- findutils-4.2.26/find/find.c.orig 2005-11-11 08:41:37.000000000 +0100
-+++ findutils-4.2.26/find/find.c 2005-11-27 03:32:00.836912296 +0100
-@@ -272,11 +272,17 @@
- {
- case SYMLINK_ALWAYS_DEREF: /* -L */
- options.xstat = optionl_stat;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = getfilecon;
-+#endif /* WITH_SELINUX */
- options.no_leaf_check = true;
- break;
-
- case SYMLINK_NEVER_DEREF: /* -P (default) */
- options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = lgetfilecon;
-+#endif /* WITH_SELINUX */
- /* Can't turn no_leaf_check off because the user might have specified
- * -noleaf anyway
- */
-@@ -284,6 +290,9 @@
-
- case SYMLINK_DEREF_ARGSONLY: /* -H */
- options.xstat = optionh_stat;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = getfilecon;
-+#endif /* WITH_SELINUX */
- options.no_leaf_check = true;
- }
-
-@@ -395,6 +404,9 @@
- struct predicate *cur_pred;
- char *predicate_name; /* Name of predicate being parsed. */
- int end_of_leading_options = 0; /* First arg after any -H/-L etc. */
-+#ifdef WITH_SELINUX
-+ int is_selinux_enabled_flag;
-+#endif /* WITH_SELINUX */
-
-
- program_name = argv[0];
-@@ -442,6 +454,9 @@
- options.ignore_readdir_race = false;
-
- state.exit_status = 0;
-+#ifdef WITH_SELINUX
-+ is_selinux_enabled_flag = (is_selinux_enabled() > 0);
-+#endif /* WITH_SELINUX */
-
- #if defined(DEBUG_STAT)
- options.xstat = debug_stat;
-@@ -538,6 +553,14 @@
- if (strchr ("-!(),", argv[i][0]) == NULL)
- usage (_("paths must precede expression"));
- 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)
- {
---- findutils-4.2.25/find/parser.c.orig 2005-07-31 23:01:54.000000000 +0200
-+++ findutils-4.2.25/find/parser.c 2005-10-25 23:58:27.823557240 +0200
-@@ -47,6 +47,10 @@
- /* We need <unistd.h> for isatty(). */
+ A `%' character followed by any other character is discarded, but the
+ other character is printed (don't rely on this, as further format
+--- findutils-4.4.0/find/parser.c.orig 2008-03-10 10:37:21.000000000 +0100
++++ findutils-4.4.0/find/parser.c 2008-03-17 20:23:52.047453360 +0100
+@@ -53,6 +53,10 @@
#include <unistd.h>
+ #include <sys/stat.h>
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
-@@ -147,6 +151,9 @@
+@@ -156,6 +160,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));
+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));
-
-@@ -280,6 +287,10 @@
- PARSE_TEST_NP ("wholename", wholename), /* GNU, replaces -path */
- PARSE_OPTION ("xdev", xdev),
+@@ -322,6 +329,10 @@
+ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
+ PARSE_OPTION ("xdev", xdev), /* POSIX */
PARSE_TEST ("xtype", xtype), /* GNU */
+#ifdef WITH_SELINUX
+ PARSE_TEST ("context", scontext), /* SELINUX */
#ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats.
Plus what it could do with cpio archives is very limited.
-@@ -803,6 +814,10 @@
- -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
+@@ -451,11 +462,17 @@
+ {
+ case SYMLINK_ALWAYS_DEREF: /* -L */
+ options.xstat = optionl_stat;
++#ifdef WITH_SELINUX
++ options.x_getfilecon = getfilecon;
++#endif /* WITH_SELINUX */
+ options.no_leaf_check = true;
+ break;
+
+ case SYMLINK_NEVER_DEREF: /* -P (default) */
+ options.xstat = optionp_stat;
++#ifdef WITH_SELINUX
++ options.x_getfilecon = lgetfilecon;
++#endif /* WITH_SELINUX */
+ /* Can't turn no_leaf_check off because the user might have specified
+ * -noleaf anyway
+ */
+@@ -463,6 +480,9 @@
+
+ case SYMLINK_DEREF_ARGSONLY: /* -H */
+ options.xstat = optionh_stat;
++#ifdef WITH_SELINUX
++ options.x_getfilecon = getfilecon;
++#endif /* WITH_SELINUX */
+ options.no_leaf_check = true;
+ }
+ }
+@@ -1129,6 +1149,10 @@
+ -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 (_("\
actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -1614,6 +1629,30 @@
- return insert_num (argv, arg_ptr, entry);
+@@ -2392,6 +2416,30 @@
+ }
}
+#ifdef WITH_SELINUX
static boolean
parse_used (const struct parser_table* entry, char **argv, int *arg_ptr)
{
-@@ -1949,7 +1988,11 @@
+@@ -2777,7 +2825,11 @@
if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ;
+#ifdef WITH_SELINUX
-+ if (strchr ("abcdDfFgGhHiklmMnpPstuUyYZ", *scan2))
++ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
+#else /* WITH_SELINUX */
- if (strchr ("abcdDfFgGhHiklmMnpPstuUyY", *scan2))
+ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
+#endif /* WITH_SELINUX */
{
segmentp = make_segment (segmentp, format, scan2 - format,
- (int) *scan2);
+ KIND_FORMAT, *scan2, 0,
--- findutils-4.2.11/find/pred.c.orig 2005-01-03 01:15:48.000000000 +0100
+++ findutils-4.2.11/find/pred.c 2005-01-09 18:22:25.204312920 +0100
@@ -30,6 +30,14 @@
+ }
+ else {
+ segment->text[segment->text_len] = 's';
-+ (void) fprintf (fp, segment->text, scontext);
++ checked_fprintf (dest, segment->text, scontext);
+ freecon(scontext);
+ }
+ }
+#ifdef WITH_SELINUX
+
+boolean
-+pred_scontext (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
++pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
+{
+ int rv;
+ security_context_t scontext;
\f
/* 1) fork to get a child; parent remembers the child pid
2) child execs the command requested
---- findutils-4.1.7/find/util.c.selinux 2001-05-20 16:39:37.000000000 -0400
-+++ findutils-4.1.7/find/util.c 2003-10-10 13:19:10.869534272 -0400
-@@ -65,6 +65,9 @@
- last_pred->no_default_print = false;
- last_pred->need_stat = true;
- last_pred->args.str = NULL;
+--- findutils-4.4.0/find/tree.c.orig 2007-12-20 22:40:35.000000000 +0100
++++ findutils-4.4.0/find/tree.c 2008-03-17 20:21:28.427267235 +0100
+@@ -1194,6 +1194,9 @@
+ struct predicate *cur_pred;
+ const struct parser_table *entry_close, *entry_print, *entry_open;
+ int i, oldi;
++#ifdef WITH_SELINUX
++ int is_selinux_enabled_flag;
++#endif /* WITH_SELINUX */
+
+ predicates = NULL;
+
+@@ -1230,6 +1233,14 @@
+ }
+
+ 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)
+ {
+--- findutils-4.4.0/find/util.c.orig 2008-03-10 10:37:22.000000000 +0100
++++ findutils-4.4.0/find/util.c 2008-03-16 01:28:33.177920622 +0100
+@@ -97,6 +97,9 @@
+ new_pred->pred_func = pred_func;
+ new_pred->p_name = entry->parser_name;
+ new_pred->args.str = NULL;
+#ifdef WITH_SELINUX
-+ last_pred->args.scontext = NULL;
++ new_pred->args.scontext = NULL;
+#endif
- last_pred->pred_next = NULL;
- last_pred->pred_left = NULL;
- last_pred->pred_right = NULL;
---- findutils-4.2.32/po/pl.po.orig 2008-01-26 00:38:26.276837190 +0100
-+++ findutils-4.2.32/po/pl.po 2008-01-26 00:47:58.617453022 +0100
-@@ -162,6 +162,11 @@
- msgid "paths must precede expression"
- msgstr "¶cie¿ki musz± poprzedzaæ wyra¿enie"
+ new_pred->p_type = PRIMARY_TYPE;
+ new_pred->p_prec = NO_PREC;
+ return new_pred;
+--- findutils-4.4.0/po/pl.po.orig 2008-03-15 12:43:32.000000000 +0100
++++ findutils-4.4.0/po/pl.po 2008-03-17 20:28:05.717905863 +0100
+@@ -453,6 +453,10 @@
+ " -wholename WZORZEC -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n"
+ " -used N -user NAZWA -xtype [bcdpfls]\n"
+
++#: find/parser.c:1154
++msgid " -context CONTEXT\n"
++msgstr " -context KONTEKST\n"
++
+ #: find/parser.c:1132
+ msgid ""
+ "actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n"
+@@ -755,6 +759,11 @@
+ msgid "unknown predicate `%s'"
+ msgstr "nieznane wyra¿enie `%s'"
-+#: find/find.c:558
++#: find/tree.c:1241
+#, c-format
+msgid "Error: invalid predicate %s: the kernel is not SELinux-enabled.\n"
+msgstr "B³±d: b³êdne wyra¿enie %s: j±dro nie ma w³±czonej obs³ugi SELinuksa.\n"
+
- #: find/find.c:543
+ #: find/tree.c:1257
#, c-format
msgid "invalid predicate `%s'"
-@@ -368,6 +373,10 @@
- "w przypadku braku dostêpu do WWW, wysy³aj±c pocztê elektroniczn± pod\n"
- "adres <bug-findutils@gnu.org>."
-
-+#: find/parser.c:815
-+msgid " -context CONTEXT\n"
-+msgstr " -context KONTEKST\n"
-+
- #: find/parser.c:840
- msgid "sanity check of the fnmatch() library function failed."
- msgstr ""
projects / packages / findutils.git / commitdiff