new upstream release: findutils-4.5.12
This commit is contained in:
parent
f76086b2b7
commit
1c07ba6f13
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
findutils-4.5.9.tar.gz
|
||||
/findutils-4.5.10.tar.gz
|
||||
/findutils-4.5.11.tar.gz
|
||||
/findutils-4.5.12.tar.gz
|
||||
|
@ -26,7 +26,7 @@ diff --git a/configure.ac b/configure.ac
|
||||
index f31dd37..431f0ce 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -244,8 +244,6 @@ find/testsuite/Makefile
|
||||
@@ -245,8 +245,6 @@ find/testsuite/Makefile
|
||||
gl/Makefile
|
||||
gl/lib/Makefile
|
||||
lib/Makefile
|
||||
@ -57,7 +57,7 @@ index 1f278de..c584298 100644
|
||||
|
||||
@table @code
|
||||
@item --database=@var{path}
|
||||
@@ -2840,13 +2838,9 @@ thrashing the network.
|
||||
@@ -2872,13 +2870,9 @@ thrashing the network.
|
||||
directories are indexed by each database file.
|
||||
|
||||
The default location for the locate database depends on how findutils
|
||||
@ -74,7 +74,7 @@ index 1f278de..c584298 100644
|
||||
|
||||
@node Database Formats
|
||||
@section Database Formats
|
||||
@@ -3389,8 +3383,7 @@ present.
|
||||
@@ -3421,8 +3415,7 @@ present.
|
||||
|
||||
@item --database=@var{path}
|
||||
@itemx -d @var{path}
|
||||
@ -84,7 +84,7 @@ index 1f278de..c584298 100644
|
||||
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
|
||||
@@ -3575,8 +3568,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
|
||||
@@ -3597,8 +3590,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
|
||||
is @file{nfs NFS proc}.
|
||||
|
||||
@item --output=@var{dbfile}
|
||||
@ -94,7 +94,7 @@ index 1f278de..c584298 100644
|
||||
|
||||
@item --localuser=@var{user}
|
||||
The user to search the non-network directories as, using @code{su}.
|
||||
@@ -5583,7 +5575,7 @@ why @code{xargs} is confused by your operating system).
|
||||
@@ -5617,7 +5609,7 @@ why @code{xargs} is confused by your operating system).
|
||||
@section Error Messages From @code{locate}
|
||||
|
||||
@table @samp
|
||||
@ -103,7 +103,7 @@ index 1f278de..c584298 100644
|
||||
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
|
||||
@@ -5591,7 +5583,7 @@ often happen on systems that are generally not left on, so the
|
||||
@@ -5625,7 +5617,7 @@ 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.
|
||||
|
||||
|
@ -16,7 +16,7 @@ diff --git a/doc/find.texi b/doc/find.texi
|
||||
index c584298..9731b71 100644
|
||||
--- a/doc/find.texi
|
||||
+++ b/doc/find.texi
|
||||
@@ -1439,6 +1439,10 @@ them.
|
||||
@@ -1436,6 +1436,10 @@ them.
|
||||
There are two ways to avoid searching certain filesystems. One way is
|
||||
to tell @code{find} to only search one filesystem:
|
||||
|
||||
@ -45,7 +45,7 @@ diff --git a/find/find.1 b/find/find.1
|
||||
index e851f82..a4799ff 100644
|
||||
--- a/find/find.1
|
||||
+++ b/find/find.1
|
||||
@@ -460,6 +460,9 @@ if standard input is a tty, and to
|
||||
@@ -461,6 +461,9 @@ if standard input is a tty, and to
|
||||
.B \-nowarn
|
||||
otherwise.
|
||||
|
||||
@ -101,7 +101,7 @@ index 52a1ef6..995aec3 100644
|
||||
puts (_("\
|
||||
tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
|
||||
-cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
|
||||
@@ -2799,6 +2801,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
@@ -2736,6 +2738,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
}
|
||||
|
||||
static bool
|
||||
|
@ -1,366 +0,0 @@
|
||||
From 8171b840e74641733d33af53664b811699eb7eab Mon Sep 17 00:00:00 2001
|
||||
From: James Youngman <jay@gnu.org>
|
||||
Date: Mon, 22 Apr 2013 21:49:40 +0100
|
||||
Subject: [PATCH 1/3] Fix documentation typo.
|
||||
|
||||
* doc/find.texi (Mode Bits): Fix typo "it set" -> "is set".
|
||||
|
||||
[upstream commit 2957a7ae5581cf2e5b36f2c23781317a7bf2e901]
|
||||
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
doc/find.texi | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/doc/find.texi b/doc/find.texi
|
||||
index a44e5d5..94d0081 100644
|
||||
--- a/doc/find.texi
|
||||
+++ b/doc/find.texi
|
||||
@@ -1183,7 +1183,7 @@ if @var{mode} exactly matches the file mode bits.
|
||||
|
||||
A @var{pmode} that starts with @samp{+} but which is not valid (for
|
||||
example @samp{+a+x}) is an error if the POSIXLY_CORRECT environment
|
||||
-variable it set. Otherwise this is treated as if the initial
|
||||
+variable is set. Otherwise this is treated as if the initial
|
||||
@samp{+} were a @samp{/}, for backward compatibility.
|
||||
|
||||
A @var{pmode} that starts with @samp{-} matches if
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
||||
From cf50a86bea92033c42c1f3e539b666444cacb8eb Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 21 Apr 2013 00:14:18 -0700
|
||||
Subject: [PATCH 2/3] Remove support for obsolete -perm +MODE syntax.
|
||||
|
||||
Also, do not reject -perm /MODE merely because of POSIXLY_CORRECT.
|
||||
Problem reported in <https://savannah.gnu.org/bugs/?38474>.
|
||||
* NEWS:
|
||||
* doc/find.texi (Mode Bits): Document this.
|
||||
(Environment Variables): POSIXLY_CORRECT does not affect -perm.
|
||||
* find/parser.c (parse_help): Mention /MODE, not +MODE.
|
||||
(non_posix_mode): Remove.
|
||||
(parse_perm): Remove support for -perm +MODE.
|
||||
Do not reject -perm /MODE merely because POSIXLY_CORRECT is set;
|
||||
POSIXLY_CORRECT is not supposed to be for pedantic checking.
|
||||
|
||||
[upstream commit 90f0c5d24153ad3327edd6f2249fc95a5cfb72e0]
|
||||
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
NEWS | 9 ++++++++
|
||||
doc/find.texi | 11 +--------
|
||||
find/find.1 | 38 ++++++++++++---------------------
|
||||
find/parser.c | 63 ++++++++++----------------------------------------------
|
||||
4 files changed, 37 insertions(+), 84 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 184722a..7de91e8 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -2,6 +2,15 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
|
||||
|
||||
* Major changes in release 4.5.11, 2013-02-02
|
||||
|
||||
+** Functional Changes to find
|
||||
+
|
||||
+The GNU extension "find ... -perm /MODE" is no longer disabled when
|
||||
+the POSIXLY_CORRECT environment variable is set.
|
||||
+
|
||||
+The obsolete GNU extension "find ... -perm +MODE", which was withdrawn
|
||||
+in release 4.2.21 in 2005 due to compatibility problems, has been
|
||||
+completely removed. Use "find ... -perm /MODE" instead.
|
||||
+
|
||||
** Documentation Changes
|
||||
|
||||
The Texinfo manual and the find manual pafe now explain why two find
|
||||
diff --git a/doc/find.texi b/doc/find.texi
|
||||
index 94d0081..1ad3af5 100644
|
||||
--- a/doc/find.texi
|
||||
+++ b/doc/find.texi
|
||||
@@ -1180,11 +1180,8 @@ optionally prefixed by @samp{-} or @samp{/}.
|
||||
|
||||
A @var{pmode} that starts with neither @samp{-} nor @samp{/} matches
|
||||
if @var{mode} exactly matches the file mode bits.
|
||||
-
|
||||
-A @var{pmode} that starts with @samp{+} but which is not valid (for
|
||||
-example @samp{+a+x}) is an error if the POSIXLY_CORRECT environment
|
||||
-variable is set. Otherwise this is treated as if the initial
|
||||
-@samp{+} were a @samp{/}, for backward compatibility.
|
||||
+(To avoid confusion with an obsolete GNU extension, @var{mode}
|
||||
+must not start with a @samp{+} immediately followed by an octal digit.)
|
||||
|
||||
A @var{pmode} that starts with @samp{-} matches if
|
||||
@emph{all} the file mode bits set in @var{mode} are set for the file;
|
||||
@@ -3944,10 +3941,6 @@ Setting this variable also turns off warning messages (that is, implies
|
||||
the output for @samp{-ok}, all messages printed on stderr are
|
||||
diagnostics and must result in a non-zero exit status.
|
||||
|
||||
-Arguments to @samp{-perm} beginning with @samp{+} are treated
|
||||
-differently when POSIXLY_CORRECT is set. See
|
||||
-@ref{Mode Bits,-perm,File Mode Bits}.
|
||||
-
|
||||
When POSIXLY_CORRECT is set, the response to the prompt made by the
|
||||
@code{-ok} action is interpreted according to the system's message
|
||||
catalogue, as opposed to according to @code{find}'s own message
|
||||
diff --git a/find/find.1 b/find/find.1
|
||||
index 34a4cba..071b7fe 100644
|
||||
--- a/find/find.1
|
||||
+++ b/find/find.1
|
||||
@@ -804,25 +804,9 @@ with the behaviour of
|
||||
.BR \-000 ).
|
||||
|
||||
.IP "\-perm +\fImode\fR"
|
||||
-Deprecated, old way of searching for files with any of the permission
|
||||
-bits in \fImode\fR set. You should use
|
||||
-.B \-perm \fI/mode\fR
|
||||
-instead. Trying to use the `+' syntax with symbolic modes will yield
|
||||
-surprising results. For example, `+u+x' is a valid symbolic mode
|
||||
-(equivalent to +u,+x, i.e. 0111) and will therefore not be evaluated
|
||||
-as
|
||||
-.B \-perm +\fImode\fR
|
||||
-but instead as the exact mode specifier
|
||||
-.B \-perm \fImode\fR
|
||||
-and so it matches files with exact permissions 0111 instead of files with any
|
||||
-execute bit set. If you found this paragraph confusing, you're not
|
||||
-alone - just use
|
||||
-.B \-perm /\fImode\fR.
|
||||
-This form of the
|
||||
-.B \-perm
|
||||
-test is deprecated because the POSIX specification requires the
|
||||
-interpretation of a leading `+' as being part of a symbolic mode, and
|
||||
-so we switched to using `/' instead.
|
||||
+This is no longer supported (and has been deprecated since 2005). Use
|
||||
+.B "\-perm /\fImode\fR"
|
||||
+instead.
|
||||
|
||||
.IP \-readable
|
||||
Matches files which are readable. This takes into account access
|
||||
@@ -2046,11 +2030,6 @@ As of findutils-4.2.2, shell metacharacters (`*', `?' or `[]' for
|
||||
example) used in filename patterns will match a leading `.', because
|
||||
IEEE POSIX interpretation 126 requires this.
|
||||
.P
|
||||
-The syntax
|
||||
-\.B \-perm +MODE
|
||||
-was deprecated in findutils-4.2.21, in favour of
|
||||
-\.B \-perm
|
||||
-.BR /MODE .
|
||||
As of findutils-4.3.3,
|
||||
.B \-perm /000
|
||||
now matches all files instead of none.
|
||||
@@ -2098,6 +2077,17 @@ Feature Added in Also occurs in
|
||||
\-ipath 3.8
|
||||
\-iregex 3.8
|
||||
.TE
|
||||
+.P
|
||||
+The syntax
|
||||
+\.B \-perm +MODE
|
||||
+was removed in findutils-4.5.12, in favour of
|
||||
+\.B \-perm
|
||||
+.BR /MODE .
|
||||
+The
|
||||
+.B +MODE
|
||||
+syntax had been deprecated since findutils-4.2.21
|
||||
+which was released in 2005.
|
||||
+.P
|
||||
.SH "NON-BUGS"
|
||||
.nf
|
||||
.B $ find . \-name *.c \-print
|
||||
diff --git a/find/parser.c b/find/parser.c
|
||||
index d15c0e0..19747cd 100644
|
||||
--- a/find/parser.c
|
||||
+++ b/find/parser.c
|
||||
@@ -1239,7 +1239,7 @@ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
|
||||
-ilname PATTERN -iname PATTERN -inum N -iwholename PATTERN -iregex PATTERN\n\
|
||||
-links N -lname PATTERN -mmin N -mtime N -name PATTERN -newer FILE"));
|
||||
puts (_("\
|
||||
- -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\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]"));
|
||||
@@ -1944,17 +1944,6 @@ parse_iwholename (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
return insert_path_check (entry, argv, arg_ptr, "iwholename", pred_ipath);
|
||||
}
|
||||
|
||||
-static void
|
||||
-non_posix_mode (const char *mode)
|
||||
-{
|
||||
- if (options.posixly_correct)
|
||||
- {
|
||||
- error (EXIT_FAILURE, 0,
|
||||
- _("Mode %s is not valid when POSIXLY_CORRECT is on."),
|
||||
- quotearg_n_style (0, options.err_quoting_style, mode));
|
||||
- }
|
||||
-}
|
||||
-
|
||||
|
||||
static bool
|
||||
parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
@@ -1964,7 +1953,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
int mode_start = 0;
|
||||
bool havekind = false;
|
||||
enum permissions_type kind = PERM_EXACT;
|
||||
- struct mode_change *change = NULL;
|
||||
+ struct mode_change *change;
|
||||
struct predicate *our_pred;
|
||||
const char *perm_expr;
|
||||
|
||||
@@ -1980,38 +1969,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
rate = 0.2;
|
||||
break;
|
||||
|
||||
- case '+':
|
||||
- change = mode_compile (perm_expr);
|
||||
- if (NULL == change)
|
||||
- {
|
||||
- /* Most likely the caller is an old script that is still
|
||||
- * using the obsolete GNU syntax '-perm +MODE'. This old
|
||||
- * syntax was withdrawn in favor of '-perm /MODE' because
|
||||
- * it is incompatible with POSIX in some cases, but we
|
||||
- * still support uses of it that are not incompatible with
|
||||
- * POSIX.
|
||||
- *
|
||||
- * Example: POSIXLY_CORRECT=y find -perm +a+x
|
||||
- */
|
||||
- non_posix_mode (perm_expr);
|
||||
-
|
||||
- /* support the previous behaviour. */
|
||||
- mode_start = 1;
|
||||
- kind = PERM_ANY;
|
||||
- rate = 0.3;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- /* This is a POSIX-compatible usage */
|
||||
- mode_start = 0;
|
||||
- kind = PERM_EXACT;
|
||||
- rate = 0.1;
|
||||
- }
|
||||
- havekind = true;
|
||||
- break;
|
||||
-
|
||||
case '/': /* GNU extension */
|
||||
- non_posix_mode (perm_expr);
|
||||
mode_start = 1;
|
||||
kind = PERM_ANY;
|
||||
havekind = true;
|
||||
@@ -2029,13 +1987,16 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
break;
|
||||
}
|
||||
|
||||
- if (NULL == change)
|
||||
- {
|
||||
- change = mode_compile (perm_expr + mode_start);
|
||||
- if (NULL == change)
|
||||
- error (EXIT_FAILURE, 0, _("invalid mode %s"),
|
||||
- quotearg_n_style (0, options.err_quoting_style, perm_expr));
|
||||
- }
|
||||
+ change = mode_compile (perm_expr + mode_start);
|
||||
+
|
||||
+ /* Reject invalid modes, or modes of the form +NUMERICMODE.
|
||||
+ The latter were formerly accepted as a GNU extension, but that
|
||||
+ extension was incompatible with how GNU 'chmod' treats these modes now,
|
||||
+ and it would be confusing if 'find' continued to support it. */
|
||||
+ if (NULL == change
|
||||
+ || (perm_expr[0] == '+' && '0' <= perm_expr[1] && perm_expr[1] < '8'))
|
||||
+ error (EXIT_FAILURE, 0, _("invalid mode %s"),
|
||||
+ quotearg_n_style (0, options.err_quoting_style, perm_expr));
|
||||
perm_val[0] = mode_adjust (0, false, 0, change, NULL);
|
||||
perm_val[1] = mode_adjust (0, true, 0, change, NULL);
|
||||
free (change);
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
||||
From e9ebac18d364958f9872aa981a79ed97492a1b15 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 22 Apr 2013 15:15:53 -0700
|
||||
Subject: [PATCH 3/3] More removal of support for -perm +MODE.
|
||||
|
||||
* find/parser.c (parse_perm): Remove no-longer-needed local var
|
||||
and associated code. Reported by Eric Blake in
|
||||
<http://savannah.gnu.org/bugs/?38474#comment9>.
|
||||
|
||||
[upstream commit 3d13be5654b42ef126cb19c84a9469634c005b7f]
|
||||
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
find/parser.c | 26 +-------------------------
|
||||
1 files changed, 1 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/find/parser.c b/find/parser.c
|
||||
index 19747cd..3c2c771 100644
|
||||
--- a/find/parser.c
|
||||
+++ b/find/parser.c
|
||||
@@ -1951,7 +1951,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
mode_t perm_val[2];
|
||||
float rate;
|
||||
int mode_start = 0;
|
||||
- bool havekind = false;
|
||||
enum permissions_type kind = PERM_EXACT;
|
||||
struct mode_change *change;
|
||||
struct predicate *our_pred;
|
||||
@@ -1965,14 +1964,12 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
case '-':
|
||||
mode_start = 1;
|
||||
kind = PERM_AT_LEAST;
|
||||
- havekind = true;
|
||||
rate = 0.2;
|
||||
break;
|
||||
|
||||
case '/': /* GNU extension */
|
||||
mode_start = 1;
|
||||
kind = PERM_ANY;
|
||||
- havekind = true;
|
||||
rate = 0.3;
|
||||
break;
|
||||
|
||||
@@ -1982,7 +1979,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
*/
|
||||
mode_start = 0;
|
||||
kind = PERM_EXACT;
|
||||
- havekind = true;
|
||||
rate = 0.01;
|
||||
break;
|
||||
}
|
||||
@@ -2020,7 +2016,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
perm_expr);
|
||||
|
||||
kind = PERM_AT_LEAST;
|
||||
- havekind = true;
|
||||
|
||||
/* The "magic" number below is just the fraction of files on my
|
||||
* own system that "-type l -xtype l" fails for (i.e. unbroken symlinks).
|
||||
@@ -2031,26 +2026,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
|
||||
our_pred = insert_primary (entry, perm_expr);
|
||||
our_pred->est_success_rate = rate;
|
||||
- if (havekind)
|
||||
- {
|
||||
- our_pred->args.perm.kind = kind;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
-
|
||||
- switch (perm_expr[0])
|
||||
- {
|
||||
- case '-':
|
||||
- our_pred->args.perm.kind = PERM_AT_LEAST;
|
||||
- break;
|
||||
- case '+':
|
||||
- our_pred->args.perm.kind = PERM_ANY;
|
||||
- break;
|
||||
- default:
|
||||
- our_pred->args.perm.kind = PERM_EXACT;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
+ our_pred->args.perm.kind = kind;
|
||||
memcpy (our_pred->args.perm.val, perm_val, sizeof perm_val);
|
||||
return true;
|
||||
}
|
||||
--
|
||||
1.7.1
|
||||
|
Binary file not shown.
BIN
findutils-4.5.12.tar.gz.sig
Normal file
BIN
findutils-4.5.12.tar.gz.sig
Normal file
Binary file not shown.
@ -4,47 +4,15 @@ Date: Wed, 11 May 2011 16:46:57 +0200
|
||||
Subject: [PATCH 4/4] findutils-4.5.7-warnings.patch
|
||||
|
||||
---
|
||||
find/Makefile.am | 2 +-
|
||||
find/defs.h | 2 +-
|
||||
find/exec.c | 2 +-
|
||||
find/find.c | 14 +-------------
|
||||
find/pred.c | 2 +-
|
||||
lib/Makefile.am | 2 +-
|
||||
xargs/Makefile.am | 2 +-
|
||||
xargs/xargs.c | 5 +++--
|
||||
8 files changed, 10 insertions(+), 21 deletions(-)
|
||||
find/exec.c | 2 +-
|
||||
xargs/xargs.c | 5 +++--
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/find/Makefile.am b/find/Makefile.am
|
||||
index 0795b87..f1068bf 100644
|
||||
--- a/find/Makefile.am
|
||||
+++ b/find/Makefile.am
|
||||
@@ -36,7 +36,7 @@ endif
|
||||
# We don't just include man_MANS in EXTRA_DIST because while the value of
|
||||
# man_MANS is not always the same, we want to distribute all of those files.
|
||||
EXTRA_DIST = defs.h sharefile.h print.h find.1 ftsfind.1 oldfind.1
|
||||
-INCLUDES = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
|
||||
+AM_CPPFLAGS = -I../gl/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gl/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
|
||||
LDADD = ./libfindtools.a ../lib/libfind.a ../gl/lib/libgnulib.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) $(FINDLIBS) $(GETHOSTNAME_LIB) $(LIB_EACCESS)
|
||||
# gnulib advises we link against <first> because we use <second>:
|
||||
# $(GETHOSTNAME_LIB) uname
|
||||
diff --git a/find/defs.h b/find/defs.h
|
||||
index 366edab..f25b700 100644
|
||||
--- a/find/defs.h
|
||||
+++ b/find/defs.h
|
||||
@@ -258,7 +258,7 @@ struct predicate
|
||||
|
||||
/* Only used for debugging, but defined unconditionally so individual
|
||||
modules can be compiled with -DDEBUG. */
|
||||
- char *p_name;
|
||||
+ const char *p_name;
|
||||
|
||||
/* The type of this node. There are two kinds. The first is real
|
||||
predicates ("primaries") such as -perm, -print, or -exec. The
|
||||
diff --git a/find/exec.c b/find/exec.c
|
||||
index aa69fe3..f731d82 100644
|
||||
--- a/find/exec.c
|
||||
+++ b/find/exec.c
|
||||
@@ -324,7 +324,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
|
||||
@@ -326,7 +326,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,96 +21,11 @@ index aa69fe3..f731d82 100644
|
||||
errno = E2BIG;
|
||||
else
|
||||
execvp (argv[0], argv);
|
||||
diff --git a/find/find.c b/find/find.c
|
||||
index 5d287b5..00a2a6c 100644
|
||||
--- a/find/find.c
|
||||
+++ b/find/find.c
|
||||
@@ -528,6 +528,7 @@ wd_sanity_check (const char *thing_to_stat,
|
||||
#ifdef STAT_MOUNTPOINTS
|
||||
isfatal = dirchange_is_fatal (specific_what,isfatal,silent,newinfo);
|
||||
#else
|
||||
+ (void) silent;
|
||||
isfatal = RETRY_IF_SANITY_CHECK_FAILS;
|
||||
#endif
|
||||
}
|
||||
@@ -1302,7 +1303,6 @@ process_dir (char *pathname, char *name, int pathlen, const struct stat *statp,
|
||||
{
|
||||
int subdirs_left; /* Number of unexamined subdirs in PATHNAME. */
|
||||
bool subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
|
||||
- unsigned int idx; /* Which entry are we on? */
|
||||
struct stat stat_buf;
|
||||
size_t dircount = 0u;
|
||||
DIR *dirp;
|
||||
@@ -1519,7 +1519,6 @@ process_dir (char *pathname, char *name, int pathlen, const struct stat *statp,
|
||||
if (strcmp (name, "."))
|
||||
{
|
||||
enum SafeChdirStatus status;
|
||||
- struct dir_id did;
|
||||
|
||||
/* We could go back and do the next command-line arg
|
||||
instead, maybe using longjmp. */
|
||||
@@ -1555,17 +1554,6 @@ process_dir (char *pathname, char *name, int pathlen, const struct stat *statp,
|
||||
"%s", safely_quote_err_filename (0, pathname));
|
||||
return;
|
||||
}
|
||||
-
|
||||
- if (dir_curr > 0)
|
||||
- {
|
||||
- did.dev = dir_ids[dir_curr-1].dev;
|
||||
- did.ino = dir_ids[dir_curr-1].ino;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- did.dev = starting_stat_buf.st_dev;
|
||||
- did.ino = starting_stat_buf.st_ino;
|
||||
- }
|
||||
}
|
||||
|
||||
free (cur_path);
|
||||
diff --git a/find/pred.c b/find/pred.c
|
||||
index 88dacd9..e9c9a49 100644
|
||||
--- a/find/pred.c
|
||||
+++ b/find/pred.c
|
||||
@@ -1216,7 +1216,7 @@ pred_context (const char *pathname, struct stat *stat_buf,
|
||||
Return BUF. */
|
||||
|
||||
static char *
|
||||
-blank_rtrim (char *str, char *buf)
|
||||
+blank_rtrim (const char *str, char *buf)
|
||||
{
|
||||
int i;
|
||||
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index bbb4dc2..eba43d2 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -28,7 +28,7 @@ DISTCLEANFILES =
|
||||
MAINTAINERCLEANFILES =
|
||||
|
||||
|
||||
-INCLUDES = -I../gl/lib -I$(top_srcdir)/gl/lib
|
||||
+AM_CPPFLAGS = -I../gl/lib -I$(top_srcdir)/gl/lib
|
||||
LDADD = ../gl/lib/libgnulib.a $(LIBINTL)
|
||||
|
||||
libfind_a_SOURCES += printquoted.h listfile.h \
|
||||
diff --git a/xargs/Makefile.am b/xargs/Makefile.am
|
||||
index d34f87a..1cfe3e4 100644
|
||||
--- a/xargs/Makefile.am
|
||||
+++ b/xargs/Makefile.am
|
||||
@@ -3,7 +3,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
|
||||
localedir = $(datadir)/locale
|
||||
bin_PROGRAMS = xargs
|
||||
man_MANS = xargs.1
|
||||
-INCLUDES = -I.. -I../gl/lib -I$(top_srcdir)/gl/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
|
||||
+AM_CPPFLAGS = -I.. -I../gl/lib -I$(top_srcdir)/gl/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
|
||||
LDADD = ../lib/libfind.a ../gl/lib/libgnulib.a $(LIB_CLOSE) $(LIBINTL)
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
SUBDIRS = . testsuite
|
||||
diff --git a/xargs/xargs.c b/xargs/xargs.c
|
||||
index 3cc1832..35f6822 100644
|
||||
--- a/xargs/xargs.c
|
||||
+++ b/xargs/xargs.c
|
||||
@@ -1208,7 +1208,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
|
||||
@@ -1224,7 +1224,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
|
||||
|
||||
prep_child_for_exec ();
|
||||
|
||||
@ -151,7 +34,7 @@ index 3cc1832..35f6822 100644
|
||||
errno = E2BIG;
|
||||
else
|
||||
execvp (argv[0], argv);
|
||||
@@ -1226,7 +1226,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
|
||||
@@ -1242,7 +1242,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
|
||||
* utility if we run it, for POSIX compliance on the
|
||||
* handling of exit values.
|
||||
*/
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: The GNU versions of find utilities (find and xargs)
|
||||
Name: findutils
|
||||
Version: 4.5.11
|
||||
Release: 4%{?dist}
|
||||
Version: 4.5.12
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv3+
|
||||
Group: Applications/File
|
||||
@ -18,9 +18,6 @@ Patch3: findutils-4.4.2-xautofs.patch
|
||||
# eliminate compile-time warnings
|
||||
Patch4: findutils-4.5.7-warnings.patch
|
||||
|
||||
# remove support for obsolete -perm +MODE syntax (#982503)
|
||||
Patch5: findutils-4.5.11-perm-mode.patch
|
||||
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
Conflicts: filesystem < 3
|
||||
@ -51,7 +48,6 @@ rm -rf locate
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
# needed because of findutils-4.4.0-no-locate.patch
|
||||
autoreconf -iv
|
||||
@ -98,6 +94,9 @@ fi
|
||||
%{_infodir}/find-maint.info.gz
|
||||
|
||||
%changelog
|
||||
* Mon Sep 23 2013 Kamil Dudka <kdudka@redhat.com> - 1:4.5.12-1
|
||||
- new upstream release
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user