new upstream release: findutils-4.5.15
This commit is contained in:
Kamil Dudka
parent
129629fda7
commit
968ba6867d
|
|
@ -1,16 +1,84 @@
|
|||
From dc92679e2c363f8c0d659fa428c138684455a6bd Mon Sep 17 00:00:00 2001
|
||||
From 3e5e311d23ac0a5bd5930ddb4094f7555b886329 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Sat, 19 Dec 2015 22:56:40 +0100
|
||||
Subject: [PATCH 1/2] Revert "Don't include dblocation.texi from original spot,
|
||||
symlink it."
|
||||
|
||||
This reverts commit f59d88e456553dfe0b5185caf75e4041285fd595.
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
doc/Makefile.am | 8 +-------
|
||||
doc/find.texi | 2 +-
|
||||
3 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7962719..ce0e768 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -70,7 +70,7 @@ AC_PROG_CPP
|
||||
|
||||
dnl for gnulib
|
||||
gl_EARLY
|
||||
-AC_PROG_LN_S
|
||||
+
|
||||
AC_PROG_INSTALL
|
||||
AC_CHECK_TOOLS([AR], [ar])
|
||||
AC_CHECK_TOOLS([RANLIB], [ranlib], [:])
|
||||
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index f6f7443..6fbf57b 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -16,11 +16,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
|
||||
|
||||
info_TEXINFOS = find.texi find-maint.texi
|
||||
find_TEXINFOS = perm.texi parse-datetime.texi regexprops.texi fdl.texi
|
||||
-BUILT_SOURCES = dblocation.texi
|
||||
-nodist_find_TEXINFOS = dblocation.texi
|
||||
find_maint_TEXINFOS = fdl.texi
|
||||
MOSTLYCLEANFILES = find.cps
|
||||
-CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz dblocation.texi
|
||||
+CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz
|
||||
|
||||
MAKEINFOTXT = $(MAKEINFO) --plaintext
|
||||
|
||||
@@ -69,7 +67,3 @@ find_mono.html: find.texi
|
||||
# for "make all" or "make install" (or even "make check").
|
||||
findutils.texi_html_node.tar.gz: find.html
|
||||
tar zcf $@ $<
|
||||
-
|
||||
-
|
||||
-dblocation.texi: ../locate/dblocation.texi
|
||||
- $(LN_S) ../locate/dblocation.texi $@
|
||||
diff --git a/doc/find.texi b/doc/find.texi
|
||||
index a83a645..c2714dd 100644
|
||||
--- a/doc/find.texi
|
||||
+++ b/doc/find.texi
|
||||
@@ -7,7 +7,7 @@
|
||||
@c %**end of header
|
||||
|
||||
@include version.texi
|
||||
-@include dblocation.texi
|
||||
+@include ../locate/dblocation.texi
|
||||
|
||||
@iftex
|
||||
@finalout
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
||||
From d5473caa86f689ebcadacc593f5a71781c99e829 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Wed, 11 May 2011 16:46:13 +0200
|
||||
Subject: [PATCH 1/4] findutils-4.4.0-no-locate.patch
|
||||
Subject: [PATCH 2/2] findutils-4.4.0-no-locate.patch
|
||||
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
configure.ac | 2 --
|
||||
doc/find.texi | 24 ++++++++----------------
|
||||
Makefile.am | 2 +-
|
||||
configure.ac | 2 --
|
||||
doc/find.texi | 24 ++++++++----------------
|
||||
3 files changed, 9 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c7f8f39..0dacb93 100644
|
||||
index af82d54..6ad453b 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -9,7 +9,7 @@ DISTCLEANFILES = tool-versions.txt
|
||||
|
|
@ -23,10 +91,10 @@ index c7f8f39..0dacb93 100644
|
|||
ACLOCAL_AMFLAGS = -I gl/m4 -I m4
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f31dd37..431f0ce 100644
|
||||
index ce0e768..521e665 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -253,8 +253,6 @@ find/testsuite/Makefile
|
||||
@@ -248,8 +248,6 @@ find/testsuite/Makefile
|
||||
gl/Makefile
|
||||
gl/lib/Makefile
|
||||
lib/Makefile
|
||||
|
|
@ -36,7 +104,7 @@ index f31dd37..431f0ce 100644
|
|||
po/Makefile.in
|
||||
po/Makefile
|
||||
diff --git a/doc/find.texi b/doc/find.texi
|
||||
index 1f278de..c584298 100644
|
||||
index c2714dd..01367a4 100644
|
||||
--- a/doc/find.texi
|
||||
+++ b/doc/find.texi
|
||||
@@ -7,7 +7,6 @@
|
||||
|
|
@ -57,7 +125,7 @@ index 1f278de..c584298 100644
|
|||
|
||||
@table @code
|
||||
@item --database=@var{path}
|
||||
@@ -2874,13 +2872,9 @@ thrashing the network.
|
||||
@@ -2892,13 +2890,9 @@ thrashing the network.
|
||||
directories are indexed by each database file.
|
||||
|
||||
The default location for the locate database depends on how findutils
|
||||
|
|
@ -74,7 +142,7 @@ index 1f278de..c584298 100644
|
|||
|
||||
@node Database Formats
|
||||
@section Database Formats
|
||||
@@ -3423,8 +3417,7 @@ present.
|
||||
@@ -3438,8 +3432,7 @@ present.
|
||||
|
||||
@item --database=@var{path}
|
||||
@itemx -d @var{path}
|
||||
|
|
@ -84,7 +152,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
|
||||
@@ -3599,8 +3592,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
|
||||
@@ -3614,8 +3607,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
|
||||
is @file{nfs NFS proc}.
|
||||
|
||||
@item --output=@var{dbfile}
|
||||
|
|
@ -94,7 +162,7 @@ index 1f278de..c584298 100644
|
|||
|
||||
@item --localuser=@var{user}
|
||||
The user to search the non-network directories as, using @code{su}.
|
||||
@@ -5619,7 +5611,7 @@ why @code{xargs} is confused by your operating system).
|
||||
@@ -5635,7 +5627,7 @@ why @code{xargs} is confused by your operating system).
|
||||
@section Error Messages From @code{locate}
|
||||
|
||||
@table @samp
|
||||
|
|
@ -103,7 +171,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
|
||||
@@ -5627,7 +5619,7 @@ often happen on systems that are generally not left on, so the
|
||||
@@ -5643,7 +5635,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.
|
||||
|
||||
|
|
@ -113,5 +181,5 @@ index 1f278de..c584298 100644
|
|||
@code{locate} still produces this error, run @code{locate --version}
|
||||
and @code{updatedb --version}. These should produce the same output.
|
||||
--
|
||||
1.7.4.4
|
||||
2.5.0
|
||||
|
||||
|
|
@ -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
|
||||
@@ -1436,6 +1436,10 @@ them.
|
||||
@@ -1446,6 +1446,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
|
||||
@@ -461,6 +461,9 @@ if standard input is a tty, and to
|
||||
@@ -466,6 +466,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\
|
||||
@@ -2736,6 +2738,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
@@ -2673,6 +2675,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
|
||||
}
|
||||
|
||||
static bool
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/xargs/xargs.c b/xargs/xargs.c
|
|||
index 5e373f2..c0a8676 100644
|
||||
--- a/xargs/xargs.c
|
||||
+++ b/xargs/xargs.c
|
||||
@@ -1253,7 +1253,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
|
||||
@@ -1265,7 +1265,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.
|
||||
*/
|
||||
|
|
@ -39,7 +39,7 @@ diff --git a/find/parser.c b/find/parser.c
|
|||
index 89d8bcf..8c399d7 100644
|
||||
--- a/find/parser.c
|
||||
+++ b/find/parser.c
|
||||
@@ -2776,7 +2776,7 @@ insert_type (char **argv, int *arg_ptr,
|
||||
@@ -2713,7 +2713,7 @@ insert_type (char **argv, int *arg_ptr,
|
||||
const struct parser_table *entry,
|
||||
PRED_FUNC which_pred)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From 16bc7d519ed81bc9427a4e28dd74b45e1595f960 Mon Sep 17 00:00:00 2001
|
||||
From: James Youngman <jay@gnu.org>
|
||||
Date: Tue, 19 Aug 2014 08:29:49 +0100
|
||||
Subject: [PATCH] Fix bug #42903: the print statement doesn't exist in Python
|
||||
3.
|
||||
|
||||
* find/testsuite/checklists.py (main): Avoid using the print
|
||||
statement as it is not compatible with Python 3. We use
|
||||
sys.stdout.write, since our needs here are simple.
|
||||
|
||||
Upstream-commit: d56af2e2d5902c5f8a1ef99073d925c7d3b253d2
|
||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||||
---
|
||||
find/testsuite/checklists.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/find/testsuite/checklists.py b/find/testsuite/checklists.py
|
||||
index 2a2fd10..63c9c16 100644
|
||||
--- a/find/testsuite/checklists.py
|
||||
+++ b/find/testsuite/checklists.py
|
||||
@@ -77,7 +77,8 @@ def main(args):
|
||||
dupes, configured = configured_file_names(args[1])
|
||||
with TemporaryWorkingDirectory(args[2]):
|
||||
actual = set(find_test_files(args[3:]))
|
||||
- print '%d test files configured for find, %s files on-disk' % (len(configured), len(actual))
|
||||
+ sys.stdout.write('%d test files configured for find, %s files on-disk'
|
||||
+ % (len(configured), len(actual)))
|
||||
problem_count = 0
|
||||
problem_count += report_problems(dupes, report_dupe)
|
||||
problem_count += report_problems(configured - actual, report_missing)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: The GNU versions of find utilities (find and xargs)
|
||||
Name: findutils
|
||||
Version: 4.5.14
|
||||
Release: 7%{?dist}
|
||||
Version: 4.5.15
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv3+
|
||||
Group: Applications/File
|
||||
|
|
@ -9,7 +9,7 @@ URL: http://www.gnu.org/software/findutils/
|
|||
Source0: ftp://alpha.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
|
||||
|
||||
# do not build locate
|
||||
Patch1: findutils-4.4.0-no-locate.patch
|
||||
Patch1: findutils-4.4.15-no-locate.patch
|
||||
|
||||
# fix a crash triggered by recursive bind mount (#1188498)
|
||||
Patch2: findutils-4.5.14-fts-cycle.patch
|
||||
|
|
@ -24,9 +24,6 @@ Patch4: findutils-4.5.13-warnings.patch
|
|||
# eliminate failure of gnulib tests on little-endian PowerPC (#1083145)
|
||||
Patch5: findutils-4.5.12-ppc-gnulib-tests.patch
|
||||
|
||||
# make the test-suite ready for Python 3
|
||||
Patch6: findutils-4.5.14-python3.patch
|
||||
|
||||
# make the test-suite ready for Perl 5.22 (#1239501)
|
||||
Patch7: findutils-4.5.14-perl-5.22.patch
|
||||
|
||||
|
|
@ -61,11 +58,10 @@ rm -rf locate
|
|||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
# needed because of findutils-4.4.0-no-locate.patch
|
||||
autoreconf -iv
|
||||
autoreconf -fiv
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -111,6 +107,9 @@ fi
|
|||
%{_infodir}/find-maint.info.gz
|
||||
|
||||
%changelog
|
||||
* Sat Dec 19 2015 Kamil Dudka <kdudka@redhat.com> - 1:4.5.15-1
|
||||
- new upstream release
|
||||
|
||||
* Tue Jul 07 2015 Kamil Dudka <kdudka@redhat.com> - 1:4.5.14-7
|
||||
- make the test-suite ready for Perl 5.22 (#1239501)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue