[packages/findutils] - updated to 4.7.0 - updated info,pl.po-update patches - removed obsolete 4.6.0 patches - added test
qboosh
qboosh at pld-linux.org
Mon Sep 2 16:57:18 CEST 2019
commit 1a4e795f82e5c096c94316cb78c9e84156cef7ab
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Sep 2 16:59:51 2019 +0200
- updated to 4.7.0
- updated info,pl.po-update patches
- removed obsolete 4.6.0 patches
- added tests
findutils-4.6.0-exec-args.patch | 226 ---------------------
findutils-4.6.0-mbrtowc-tests.patch | 35 ----
findutils-info.patch | 160 +++++----------
findutils-pl.po-update.patch | 395 ++++++++++++++++++++++++++++++++++--
findutils.spec | 51 +++--
5 files changed, 457 insertions(+), 410 deletions(-)
---
diff --git a/findutils.spec b/findutils.spec
index 8578df2..160d9da 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
-%bcond_without selinux # build without SELinux support
+%bcond_without selinux # SELinux support
+%bcond_without tests # unit tests
#
Summary: GNU Find Utilities (find, xargs)
Summary(de.UTF-8): GNU-Suchprogramme (find, xargs)
@@ -10,29 +11,29 @@ Summary(pl.UTF-8): Narzędzia GNU do odnajdywania plików (find, xargs)
Summary(pt_BR.UTF-8): Utilitários de procura da GNU
Summary(tr.UTF-8): GNU dosya arama araçları
Name: findutils
-Version: 4.6.0
-Release: 2
+Version: 4.7.0
+Release: 1
Epoch: 1
License: GPL v3+
Group: Applications/File
# development versions at ftp://alpha.gnu.org/gnu/findutils/
-Source0: http://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
-# Source0-md5: 9936aa8009438ce185bea2694a997fc1
+Source0: http://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.xz
+# Source0-md5: 731356dec4b1109b812fecfddfead6b2
#Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: e76388b0c3218eec3557d05ccd6d6515
-Patch0: findutils-4.6.0-exec-args.patch
-Patch1: %{name}-man-selinux.patch
-Patch2: %{name}-info.patch
-# http://translationproject.org/latest/findutils/pl.po
-Patch3: %{name}-pl.po-update.patch
-Patch4: findutils-4.6.0-mbrtowc-tests.patch
+Patch0: %{name}-man-selinux.patch
+Patch1: %{name}-info.patch
+# (will be again after tp update) http://translationproject.org/latest/findutils/pl.po
+Patch2: %{name}-pl.po-update.patch
URL: http://www.gnu.org/software/findutils/
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake
-BuildRequires: gettext-tools >= 0.14.5
+BuildRequires: autoconf >= 2.69
+BuildRequires: automake >= 1:1.11
+BuildRequires: gettext-tools >= 0.19.3
%{?with_selinux:BuildRequires: libselinux-devel}
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
+BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -86,11 +87,9 @@ arayabilirsiniz.
%prep
%setup -q
-%patch0 -p1
-# patch1 is applied in install stage
+# patch0 is applied in install stage
+%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%{__rm} po/stamp-po
@@ -100,10 +99,17 @@ arayabilirsiniz.
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
%{__with_without selinux}
%{__make}
+%if %{with tests}
+# tests use bashish $'\n' substitution
+%{__make} check \
+ SHELL=/bin/bash
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -111,21 +117,22 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-%{?with_selinux:patch -p0 -d $RPM_BUILD_ROOT%{_mandir} < %{PATCH1}}
+%{?with_selinux:patch -p0 -d $RPM_BUILD_ROOT%{_mandir} < %{PATCH0}}
# xargs is wanted in /bin
install -d $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT%{_bindir}/xargs $RPM_BUILD_ROOT/bin
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/xargs $RPM_BUILD_ROOT/bin
# useless in binary package
%{__rm} $RPM_BUILD_ROOT%{_infodir}/find-maint.info*
# unpackaged locate
%{__rm} $RPM_BUILD_ROOT%{_bindir}/{locate,updatedb} \
- $RPM_BUILD_ROOT%{_libdir}/{bigram,code,frcode} \
+ $RPM_BUILD_ROOT%{_libexecdir}/frcode \
$RPM_BUILD_ROOT%{_mandir}/{,*/}man?/{locate.1,updatedb.1,locatedb.5}*
-rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_mandir}/README.findutils-non-english-man-pages}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.findutils-non-english-man-pages
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang %{name}
diff --git a/findutils-4.6.0-exec-args.patch b/findutils-4.6.0-exec-args.patch
deleted file mode 100644
index e86b883..0000000
--- a/findutils-4.6.0-exec-args.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 443166adaf1c8b91e16a716f3b13f47493b895cc Mon Sep 17 00:00:00 2001
-From: Bernhard Voelker <mail at bernhard-voelker.de>
-Date: Tue, 31 May 2016 10:38:52 +0200
-Subject: [PATCH] Fix bug #48030: find: -exec + does not pass all arguments in
- certain cases
-
-When the -exec arguments buffer (usually 128k) is full and the given
-command has been executed with all that arguments, find(1) missed to
-execute the command yet another time if only 1 another file would have
-to be processed.
-Both find(1), i.e., nowadays FTS-version, and oldfind are affected.
-This bug was present since the implementation of '-exec +' in 2005,
-see commit FINDUTILS_4_2_11-1-25-gf0a6ac6.
-
-* lib/buildcmd.c (bc_push_arg): Move the assignment to set 'state->todo'
-to 1 down after the immediate execution which resets that flag.
-* find/testsuite/sv-48030-exec-plus-bug.sh: Add a test.
-* find/testsuite/Makefile.am (test_shell_progs): Reference the test.
-* NEWS (Bug Fixes): Mention the fix.
-
-Reported by Joe Philip Ninan <indiajoe at gmail.com> in
-https://savannah.gnu.org/bugs/?48030
-
-Upstream-commit: 8cdc9767e305c9566f537af9d1acf71d1bc6ee8e
-Signed-off-by: Kamil Dudka <kdudka at redhat.com>
----
- find/testsuite/Makefile.am | 3 +-
- find/testsuite/sv-48030-exec-plus-bug.sh | 143 +++++++++++++++++++++++++++++++
- lib/buildcmd.c | 10 +--
- 3 files changed, 150 insertions(+), 6 deletions(-)
- create mode 100644 find/testsuite/sv-48030-exec-plus-bug.sh
-
-diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am
-index c1369c3..ab5dbe8 100644
---- a/find/testsuite/Makefile.am
-+++ b/find/testsuite/Makefile.am
-@@ -258,7 +258,8 @@ test_escapechars.sh \
- test_escape_c.sh \
- test_inode.sh \
- sv-34079.sh \
--sv-34976-execdir-fd-leak.sh
-+sv-34976-execdir-fd-leak.sh \
-+sv-48030-exec-plus-bug.sh
-
- EXTRA_DIST = $(EXTRA_DIST_EXP) $(EXTRA_DIST_XO) $(EXTRA_DIST_GOLDEN) \
- $(test_shell_progs) binary_locations.sh checklists.py
-diff --git a/find/testsuite/sv-48030-exec-plus-bug.sh b/find/testsuite/sv-48030-exec-plus-bug.sh
-new file mode 100644
-index 0000000..4dbf149
---- /dev/null
-+++ b/find/testsuite/sv-48030-exec-plus-bug.sh
-@@ -0,0 +1,143 @@
-+#! /bin/sh
-+# Copyright (C) 2016 Free Software Foundation, Inc.
-+#
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+# This test verifies that find invokes the given command for the
-+# multiple-argument sytax '-exec CMD {} +'. Between FINDUTILS-4.2.12
-+# and v4.6.0, find(1) would have failed to execute CMD another time
-+# if there was only one last single file argument.
-+
-+testname="$(basename $0)"
-+
-+. "${srcdir}"/binary_locations.sh
-+
-+die() {
-+ echo "$@" >&2
-+ exit 1
-+}
-+
-+# This is used to simplify checking of the return value
-+# which is useful when ensuring a command fails as desired.
-+# I.e., just doing `command ... &&fail=1` will not catch
-+# a segfault in command for example. With this helper you
-+# instead check an explicit exit code like
-+# returns_ 1 command ... || fail
-+returns_ () {
-+ # Disable tracing so it doesn't interfere with stderr of the wrapped command
-+ { set +x; } 2>/dev/null
-+
-+ local exp_exit="$1"
-+ shift
-+ "$@"
-+ test $? -eq $exp_exit && ret_=0 || ret_=1
-+
-+ set -x
-+ { return $ret_; } 2>/dev/null
-+}
-+
-+# Define the nicest compare available (borrowed from gnulib).
-+if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
-+ && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then
-+ # diff accepts the -u option and does not (like AIX 7 'diff') produce an
-+ # extra space on column 1 of every content line.
-+ if test -z "$diff_out_"; then
-+ compare () { diff -u "$@"; }
-+ else
-+ compare ()
-+ {
-+ if diff -u "$@" > diff.out; then
-+ # No differences were found, but Solaris 'diff' produces output
-+ # "No differences encountered". Hide this output.
-+ rm -f diff.out
-+ true
-+ else
-+ cat diff.out
-+ rm -f diff.out
-+ false
-+ fi
-+ }
-+ fi
-+elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
-+ if test -z "$diff_out_"; then
-+ compare () { diff -c "$@"; }
-+ else
-+ compare ()
-+ {
-+ if diff -c "$@" > diff.out; then
-+ # No differences were found, but AIX and HP-UX 'diff' produce output
-+ # "No differences encountered" or "There are no differences between the
-+ # files.". Hide this output.
-+ rm -f diff.out
-+ true
-+ else
-+ cat diff.out
-+ rm -f diff.out
-+ false
-+ fi
-+ }
-+ fi
-+elif cmp -s /dev/null /dev/null 2>/dev/null; then
-+ compare () { cmp -s "$@"; }
-+else
-+ compare () { cmp "$@"; }
-+fi
-+
-+DIR='RashuBug'
-+# Name of the CMD to execute: the file name must be 6 characters long
-+# (to trigger the bug in combination with the test files).
-+CMD='tstcmd'
-+
-+# Create test files.
-+make_test_data() {
-+ # Create the CMD script and check that it works.
-+ mkdir "$DIR" 'bin' \
-+ && echo 'printf "%s\n" "$@"' > "bin/$CMD" \
-+ && chmod +x "bin/$CMD" \
-+ && PATH="$PWD/bin:$PATH" \
-+ && [ $( "${ftsfind}" bin -maxdepth 0 -exec "$CMD" '{}' + ) = 'bin' ] \
-+ || return 1
-+
-+ # Create expected output file - also used for creating the test data.
-+ { seq -f "${DIR}/abcdefghijklmnopqrstuv%04g" 901 &&
-+ seq -f "${DIR}/abcdefghijklmnopqrstu%04g" 902 3719
-+ } > exp2 \
-+ && LC_ALL=C sort exp2 > exp \
-+ && rm exp2 \
-+ || return 1
-+
-+ # Create test files, and check if test data has been created correctly.
-+ xargs touch < exp \
-+ && [ -f "${DIR}/abcdefghijklmnopqrstu3719" ] \
-+ && [ 3719 = $( "${ftsfind}" "$DIR" -type f | wc -l ) ] \
-+ || return 1
-+}
-+
-+set -x
-+tmpdir="$(mktemp -d)" \
-+ && cd "$tmpdir" \
-+ && make_test_data "${tmpdir}" \
-+ || die "FAIL: failed to set up the test in ${tmpdir}"
-+
-+fail=0
-+for exe in "${ftsfind}" "${oldfind}"; do
-+ "$exe" "$DIR" -type f -exec "$CMD" '{}' + > out || fail=1
-+ LC_ALL=C sort out > out2 || fail=1
-+ compare exp out2 || fail=1
-+done
-+
-+cd ..
-+rm -rf "${tmpdir}" || exit 1
-+exit $fail
-diff --git a/lib/buildcmd.c b/lib/buildcmd.c
-index a58f67e..27e9ce5 100644
---- a/lib/buildcmd.c
-+++ b/lib/buildcmd.c
-@@ -356,11 +356,6 @@ bc_push_arg (struct buildcmd_control *ctl,
-
- assert (arg != NULL);
-
-- if (!initial_args)
-- {
-- state->todo = 1;
-- }
--
- if (!terminate)
- {
- if (state->cmd_argv_chars + len + pfxlen > ctl->arg_max)
-@@ -380,6 +375,11 @@ bc_push_arg (struct buildcmd_control *ctl,
- bc_do_exec (ctl, state);
- }
-
-+ if (!initial_args)
-+ {
-+ state->todo = 1;
-+ }
-+
- if (state->cmd_argc >= state->cmd_argv_alloc)
- {
- /* XXX: we could use extendbuf() here. */
---
-2.5.5
-
diff --git a/findutils-4.6.0-mbrtowc-tests.patch b/findutils-4.6.0-mbrtowc-tests.patch
deleted file mode 100644
index a140654..0000000
--- a/findutils-4.6.0-mbrtowc-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 06a46ba755195810f2aeda01b12d1ccfe7c2dcfd Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno at gnu.org>
-Date: Mon, 28 Dec 2015 06:27:42 +0900
-Subject: [PATCH] maint: fix operator precedence in mbrtowc test
-
-This is a fix for test breakage introduced by commit 45228d96; the
-equality expression must be parenthesized when negated with '!',
-otherwise we always get:
-
- test-mbrtowc.c:49: assertion 'ret == (size_t)(-2)' failed
-
-* m4/mbrtowc.m4 (gl_MBRTOWC_EMPTY_INPUT): Negate the entire expression.
-
-Upstream-commit: 1f63650823cebf52044df840c81062ccb52163a2
-Signed-off-by: Kamil Dudka <kdudka at redhat.com>
----
- gl/m4/mbrtowc.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4
-index deb9f06..be2e9d6 100644
---- a/gl/m4/mbrtowc.m4
-+++ b/gl/m4/mbrtowc.m4
-@@ -569,7 +569,7 @@ changequote([,])dnl
- int
- main (void)
- {
-- return ! mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
-+ return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
- }]])],
- [gl_cv_func_mbrtowc_empty_input=yes],
- [gl_cv_func_mbrtowc_empty_input=no],
---
-2.5.0
-
diff --git a/findutils-info.patch b/findutils-info.patch
index b2a2b0e..4b18e2b 100644
--- a/findutils-info.patch
+++ b/findutils-info.patch
@@ -1,5 +1,5 @@
---- findutils-4.6.0/doc/find.texi.orig 2015-12-28 22:10:23.000000000 +0100
-+++ findutils-4.6.0/doc/find.texi 2016-01-24 17:56:21.578207819 +0100
+--- findutils-4.7.0/doc/find.texi.orig 2019-06-23 11:00:40.000000000 +0200
++++ findutils-4.7.0/doc/find.texi 2019-09-01 20:37:54.009605511 +0200
@@ -13,17 +13,11 @@
@finalout
@end iftex
@@ -22,7 +22,7 @@
@end direntry
@copying
-@@ -73,7 +67,6 @@
+@@ -72,7 +66,6 @@
* Introduction:: Summary of the tasks this manual describes.
* Finding Files:: Finding files that match certain criteria.
* Actions:: Doing things to files you have found.
@@ -30,7 +30,7 @@
* File Permissions:: How to control access to files.
* Date input formats:: Specifying literal times.
* Configuration:: Options you can select at compile time.
-@@ -92,16 +85,14 @@
+@@ -91,16 +84,14 @@
This manual shows how to find files that meet criteria you specify,
and how to perform various actions on the files that you find. The
principal programs that you use to perform these tasks are
@@ -49,7 +49,7 @@
from Dan Bernstein. The current maintainer of GNU findutils (and this
manual) is James Youngman. Many other people have contributed bug
fixes, small improvements, and helpful suggestions. Thanks!
-@@ -127,7 +118,7 @@
+@@ -126,7 +117,7 @@
@itemize @bullet
@item The version of the software you are running. You can find this
@@ -58,7 +58,7 @@
@item What you were trying to do
@item The @emph{exact} command line you used
@item The @emph{exact} output you got (if this is very long, try to
-@@ -226,9 +217,7 @@
+@@ -225,9 +216,7 @@
@section Overview
The principal programs used for making lists of files that match given
@@ -69,7 +69,7 @@
@code{find} searches for files in a directory hierarchy and prints
information about the files it found. It is run like this:
-@@ -248,23 +237,6 @@
+@@ -247,23 +236,6 @@
Notice that the wildcard must be enclosed in quotes in order to
protect it from expansion by the shell.
@@ -93,7 +93,7 @@
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
-@@ -372,7 +344,6 @@
+@@ -376,7 +348,6 @@
@menu
* Base Name Patterns::
* Full Name Patterns::
@@ -101,7 +101,7 @@
* Shell Pattern Matching:: Wildcards used by these programs.
@end menu
-@@ -524,82 +495,10 @@
+@@ -528,82 +499,10 @@
@end deffn
@@ -185,7 +185,7 @@
names, to shell patterns. A @dfn{shell pattern} is a string that may
contain the following special characters, which are known as
@dfn{wildcards} or @dfn{metacharacters}.
-@@ -2849,261 +2748,6 @@
+@@ -2886,245 +2785,6 @@
@end example
@@ -248,18 +248,17 @@
-database format changed starting with GNU @code{locate} version 4.0 to
-allow machines with different byte orderings to share the databases.
-
--GNU @code{locate} can read both the old and new database formats.
--However, old versions of @code{locate} (on other Unix systems, or GNU
-- at code{locate} before version 4.0) produce incorrect results if run
--against a database in something other than the old format.
--
--Support for the old database format will eventually be discontinued,
--first in @code{updatedb} and later in @code{locate}.
+-GNU @code{locate} can read both the old pre-findutils-4.0 database
+-format and the @samp{LOCATE02} database format. Support for the old
+-database format will shortly be removed from @code{locate}. It has
+-already been removed from @code{updatedb}.
-
-If you run @samp{locate --statistics}, the resulting summary indicates
-the type of each @code{locate} database. You select which database
-format @code{updatedb} will use with the @samp{--dbformat} option.
-
+-The @samp{slocate} database format is very similar to @samp{LOCATE02}
+-and is also supported (in both @code{updatedb} and @code{locate}).
-
- at menu
-* LOCATE02 Database Format::
@@ -360,21 +359,20 @@
- at subsection Old Database Format
-
-The old database format is used by Unix @code{locate} and @code{find}
--programs and earlier releases of the GNU ones. @code{updatedb}
--produces this format if given the @samp{--old-format} option.
--
-- at code{updatedb} runs programs called @code{bigram} and @code{code} to
--produce old-format databases. The old format differs from the new one
--in the following ways. Instead of each entry starting with an
--offset-differential count byte and ending with a null, byte values
--from 0 through 28 indicate offset-differential counts from -14 through
--14. The byte value indicating that a long offset-differential count
--follows is 0x1e (30), not 0x80. The long counts are stored in host
--byte order, which is not necessarily network byte order, and host
--integer word size, which is usually 4 bytes. They also represent a
--count 14 less than their value. The database lines have no
--termination byte; the start of the next line is indicated by its first
--byte having a value <= 30.
+-programs and pre-4.0 releases of GNU findutils. @code{locate}
+-understands this format, though @code{updatedb} will no longer produce
+-it.
+-
+-The old format differs from @samp{LOCATE02} in the following ways.
+-Instead of each entry starting with an offset-differential count byte
+-and ending with a null, byte values from 0 through 28 indicate
+-offset-differential counts from -14 through 14. The byte value
+-indicating that a long offset-differential count follows is 0x1e (30),
+-not 0x80. The long counts are stored in host byte order, which is not
+-necessarily network byte order, and host integer word size, which is
+-usually 4 bytes. They also represent a count 14 less than their
+-value. The database lines have no termination byte; the start of the
+-next line is indicated by its first byte having a value <= 30.
-
-In addition, instead of starting with a dummy entry, the old database
-format starts with a 256 byte table containing the 128 most common
@@ -385,17 +383,13 @@
-than the new format, but makes them not 8-bit clean. Any byte in a
-file name that is in the ranges used for the special codes is replaced
-in the database by a question mark, which not coincidentally is the
--shell wildcard to match a single character.
--
--The old format therefore cannot faithfully store entries with
--non-ASCII characters. It therefore should not be used in
--internationalised environments. That is, most installations should
--not use it.
+-shell wildcard to match a single character. The old format therefore
+-cannot faithfully store entries with non-ASCII characters.
-
--Because the long counts are stored by the @code{code} program as
+-Because the long counts are stored as
-native-order machine words, the database format is not easily used in
-environments which differ in terms of byte order. If locate databases
--are to be shared between machines, the LOCATE02 database format should
+-are to be shared between machines, the @samp{LOCATE02} database format should
-be used. This has other benefits as discussed above. However, the
-length of the filename currently being processed can normally be used
-to place reasonable limits on the long counts and so this information
@@ -433,21 +427,11 @@
-the newline character, meaning that parts of file names containing
-newlines will be incorrectly sorted. This can result in both
-incorrect matches and incorrect failures to match.
--
--On the other hand, if you are using the old database format, file
--names with embedded newlines are not correctly handled. There is no
--technical limitation which enforces this, it's just that the
-- at code{bigram} program has not been updated to support lists of file
--names separated by nulls.
--
--So, if you are using the new database format (this is the default) and
--your system uses GNU @code{sort}, newlines will be correctly handled
--at all times. Otherwise, newlines may not be correctly handled.
-
@node File Permissions
@chapter File Permissions
-@@ -3182,15 +2826,13 @@
+@@ -3203,15 +2863,13 @@
discussed in this manual.
@menu
@@ -466,7 +450,7 @@
@section Invoking @code{find}
@example
-@@ -3404,255 +3046,7 @@
+@@ -3426,243 +3084,7 @@
actions, and options that the expression can contain. If the
expression is missing, @samp{-print} is assumed.
@@ -693,24 +677,12 @@
- at code{user} is @code{daemon}. You can also use the environment variable
- at code{NETUSER} to set this user.
-
-- at item --old-format
--Generate a @code{locate} database in the old format, for compatibility
--with versions of @code{locate} other than GNU @code{locate}. Using
--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). @xref{Database
--Formats}, for a detailed description of the supported database
--formats.
--
- at item --dbformat=@var{FORMAT}
-Generate the locate database in format @code{FORMAT}. Supported
--database formats include @code{LOCATE02} (which is the default),
-- at 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
-- at code{slocate}. @xref{Database Formats}, for a detailed description
--of each format.
+-database formats include @code{LOCATE02} (which is the default) and
+- at code{slocate}. The @code{slocate} format exists for compatibility
+-with @code{slocate}. @xref{Database Formats}, for a detailed
+-description of each format.
-
- at item --help
-Print a summary of the command line usage and exit.
@@ -723,7 +695,7 @@
@section Invoking @code{xargs}
@example
-@@ -4953,7 +4347,6 @@
+@@ -4985,7 +4407,6 @@
* Levels of Risk:: What is your level of exposure to security problems?
* Security Considerations for find:: Security problems with find
* Security Considerations for xargs:: Security problems with xargs
@@ -731,7 +703,7 @@
* Security Summary:: That was all very complex, what does it boil down to?
* Further Reading on Security::
@end menu
-@@ -5360,59 +4753,6 @@
+@@ -5392,19 +4813,6 @@
trailing whitespace is turned off by the @samp{-0} argument to
@code{xargs}, which is another reason to use that option.
@@ -748,50 +720,10 @@
-the race condition problems associated with @samp{find @dots{} -print0}.
-There is no way to avoid these problems in the case of @code{locate}.
-
-- at subsection Long File Name Bugs with Old-Format Databases
--Old versions of @code{locate} have a bug in the way that old-format
--databases are read. This bug affects the following versions of
-- at code{locate}:
--
-- at enumerate
-- at item All releases prior to 4.2.31
-- at item All 4.3.x releases prior to 4.3.7
-- at end enumerate
--
--The affected versions of @code{locate} read file names into a
--fixed-length 1026 byte buffer, allocated on the heap. This buffer is
--not extended if file names are too long to fit into the buffer. No
--range checking on the length of the filename is performed. This could
--in theory lead to a privilege escalation attack. Findutils versions
--4.3.0 to 4.3.6 are also affected.
--
--On systems using the old database format and affected versions of
-- at code{locate}, carefully-chosen long file names could in theory allow
--malicious users to run code of their choice as any user invoking
--locate.
--
--If remote users can choose the names of files stored on your system,
--and these files are indexed by @code{updatedb}, this may be a remote
--security vulnerability. Findutils version 4.2.31 and findutils
--version 4.3.7 include fixes for this problem. The @code{updatedb},
-- at code{bigram} and @code{code} programs do no appear to be affected.
--
--If you are also using GNU coreutils, you can use the following command
--to determine the length of the longest file name on a given system:
--
-- at example
--find / -print0 | tr -c '\0' 'x' | tr '\0' '\n' | wc -L
-- at end example
--
--Although this problem is significant, the old database format is not
--the default, and use of the old database format is not common. Most
--installations and most users will not be affected by this problem.
--
--
-
@node Security Summary
@section Summary
-@@ -5485,8 +4825,6 @@
+
+@@ -5476,8 +4884,6 @@
@menu
* Error Messages From find::
* Error Messages From xargs::
@@ -800,8 +732,8 @@
@end menu
@node Error Messages From find
-@@ -5631,38 +4969,6 @@
- why @code{xargs} is confused by your operating system).
+@@ -5627,38 +5033,6 @@
+ See the manual of the system call @code{dup2(2)}.
@end table
- at node Error Messages From locate
diff --git a/findutils-pl.po-update.patch b/findutils-pl.po-update.patch
index 937c1d0..8a05bfc 100644
--- a/findutils-pl.po-update.patch
+++ b/findutils-pl.po-update.patch
@@ -1,42 +1,411 @@
---- findutils-4.6.0/po/pl.po.orig 2016-01-24 21:21:37.307690975 +0100
-+++ findutils-4.6.0/po/pl.po 2016-01-24 21:21:41.544357465 +0100
-@@ -31,9 +31,9 @@
+--- findutils-4.7.0/po/pl.po.orig 2019-08-29 21:53:10.000000000 +0200
++++ findutils-4.7.0/po/pl.po 2019-09-01 21:35:37.664174620 +0200
+@@ -32,9 +32,9 @@
msgstr "Nie można zamknąć standardowego wejścia"
- #: find/exec.c:285
+ #: find/exec.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Failed to change directory%s%s"
-msgstr "Nie udało się zmienić katalogu: %s"
+msgstr "Nie udało się zmienić katalogu%s%s"
- #: find/exec.c:314 xargs/xargs.c:1265
+ #: find/exec.c:303 xargs/xargs.c:1275
+ msgid "cannot fork"
+@@ -193,16 +193,16 @@
+ "-depth."
+
+ #: find/parser.c:609
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "warning: you have specified the global option %s after the argument %s, but "
+ "global options are not positional, i.e., %s affects tests specified before "
+ "it as well as those specified after it. Please specify global options "
+ "before other arguments."
+ msgstr ""
+-"uwaga: podano opcję %s po argumencie %s nie będącym opcją, ale opcje nie są "
+-"pozycyjne (%s wpływa na testy podane przed nią jak i po niej). Proszę "
+-"podawać opcje przed innymi argumentami.\n"
++"uwaga: podano opcję globalną %s po argumencie %s, ale opcje globalne nie są "
++"pozycyjne (np. %s wpływa na testy podane przed nią jak i po niej). Proszę "
++"podawać opcje globalne przed innymi argumentami."
+
+ #: find/parser.c:912
#, c-format
-@@ -402,7 +402,7 @@
- #: find/parser.c:2128
+@@ -243,6 +243,8 @@
+ "directory separator (%s), thus the expression will evaluate to false all the "
+ "time. Did you mean %s?"
+ msgstr ""
++"uwaga: %s pasuje tylko do nazw podstawowych, ale podany wzorzec zawiera separator "
++"katalogów (%s), więc wyrażenie będzie cały czas fałszywe. Czy nie miało być %s?"
+
+ #: find/parser.c:1387
+ #, c-format
+@@ -296,7 +298,7 @@
+ #: find/parser.c:2057
#, c-format
msgid "failed to compile regular expression '%s': %s"
-msgstr ""
+msgstr "nie udało się skompilować wyrażenia regularnego '%s': %s"
- #: find/parser.c:2157
+ #: find/parser.c:2086
+ msgid "invalid null argument to -size"
+@@ -344,60 +346,60 @@
+ msgstr "błędne wyrażenie -context: SELinux nie jest włączony."
+
+ #: find/parser.c:2648
+-#, fuzzy, c-format
++#, c-format
+ msgid "Arguments to %s should contain at least one letter"
+-msgstr "Argumenty dla -type powinny zawierać tylko jedną literę"
++msgstr "Argumenty dla %s powinny zawierać przynajmniej jedną literę"
+
+ #: find/parser.c:2713
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "%s %c is not supported because symbolic links are not supported on the "
+ "platform find was compiled on."
+ msgstr ""
+-"-type %c nie jest obsługiwane, ponieważ dowiązania symboliczne nie są "
++"%s %c nie jest obsługiwane, ponieważ dowiązania symboliczne nie są "
+ "obsługiwane na platformie, dla której find został skompilowany."
+
+ #: find/parser.c:2725
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "%s %c is not supported because FIFOs are not supported on the platform find "
+ "was compiled on."
+ msgstr ""
+-"-type %c nie jest obsługiwane, ponieważ FIFO nie są obsługiwane na "
++"%s %c nie jest obsługiwane, ponieważ FIFO nie są obsługiwane na "
+ "platformie, dla której find został skompilowany."
+
+ #: find/parser.c:2737
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "%s %c is not supported because named sockets are not supported on the "
+ "platform find was compiled on."
+ msgstr ""
+-"-type %c nie jest obsługiwane, ponieważ gniazda nazwane nie są obsługiwane "
++"%s %c nie jest obsługiwane, ponieważ gniazda nazwane nie są obsługiwane "
+ "na platformie, dla której find został skompilowany."
+
+ #: find/parser.c:2753
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "%s %c is not supported because Solaris doors are not supported on the "
+ "platform find was compiled on."
+ msgstr ""
+-"-type %c nie jest obsługiwane, ponieważ solarisowe \"drzwi\" nie są "
++"%s %c nie jest obsługiwane, ponieważ solarisowe \"drzwi\" nie są "
+ "obsługiwane na platformie, dla której find został skompilowany."
+
+ #: find/parser.c:2761
+-#, fuzzy, c-format
++#, c-format
+ msgid "Unknown argument to %s: %c"
+-msgstr "Nieznany argument opcji -type: %c"
++msgstr "Nieznany argument opcji %s: %c"
+
+ #: find/parser.c:2769
#, c-format
-@@ -747,14 +747,14 @@
- msgstr "] [ścieżka...] [wyrażenie]\n"
+ msgid "Duplicate file type '%c' in the argument list to %s."
+-msgstr ""
++msgstr "Powtórzony typ pliku '%c' w liście argumentów opcji %s."
- #: find/util.c:458
+ #: find/parser.c:2785
+ #, c-format
+ msgid "Must separate multiple arguments to %s using: ','"
+-msgstr ""
++msgstr "Wielokrotne argumenty opcji %s muszą być rozdzielone znakiem ','"
+
+ #: find/parser.c:2794
+ #, c-format
+@@ -405,6 +407,7 @@
+ "Last file type in list argument to %s is missing, i.e., list is ending on: "
+ "','"
+ msgstr ""
++"Brak ostatniego typu pliku na liście argumentów %s, tzn. lista kończy się znakiem ','"
+
+ #: find/parser.c:2853
+ #, c-format
+@@ -554,13 +557,13 @@
+ msgstr "błędne wyrażenie; za dużo ')'"
+
+ #: find/tree.c:175
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "invalid expression; expected to find a ')' but didn't see one. Perhaps you "
+ "need an extra predicate after '%s'"
+ msgstr ""
+-"błędne wyrażenie; oczekiwano gdzieś ')', ale nie znaleziono. Być może "
+-"potrzebne jest dodatkowe wyrażenie po '%s'"
++"błędne wyrażenie; oczekiwano ')', ale nie znaleziono. Być może "
++"potrzebne jest dodatkowe słowo po '%s'"
+
+ #: find/tree.c:184
+ msgid "invalid expression; empty parentheses are not allowed."
+@@ -591,14 +594,14 @@
+ "zgłosić to jako błąd"
+
+ #: find/tree.c:1272
+-#, fuzzy, c-format
++#, c-format
+ msgid "paths must precede expression: `%s'"
+-msgstr "ścieżki muszą poprzedzać wyrażenie: %s"
++msgstr "ścieżki muszą poprzedzać wyrażenie: `%s'"
+
+ #: find/tree.c:1274
+ #, c-format
+ msgid "possible unquoted pattern after predicate `%s'?"
+-msgstr ""
++msgstr "czyżby niecytowany wzorzec po słowie `%s'?"
+
+ #: find/tree.c:1284
+ #, c-format
+@@ -638,20 +641,20 @@
+ msgstr "ojej -- błędne domyślne wstawienie and!"
+
+ #: find/util.c:139
+-#, fuzzy
+ msgid "Valid arguments for -D:\n"
+-msgstr "Prawidłowe argumenty to:"
++msgstr "Prawidłowe argumenty dla -D:\n"
+
+ #: find/util.c:163 locate/frcode.c:142 locate/locate.c:1363 xargs/xargs.c:1655
+ #, c-format
+ msgid "Try '%s --help' for more information.\n"
+-msgstr ""
++msgstr "Polecenie '%s --help' pozwoli uzyskać więcej informacji.\n"
+
+ #: find/util.c:169
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "Usage: %s [-H] [-L] [-P] [-Olevel] [-D debugopts] [path...] [expression]\n"
+-msgstr "Składnia: %s [-H] [-L] [-P] [-Opoziom] [-D "
++msgstr ""
++"Składnia: %s [-H] [-L] [-P] [-Opoziom] [-D opcje_diagn] [ścieżka...] [wyrażenie]\n"
+
+ #: find/util.c:173
+ msgid ""
+@@ -704,7 +707,6 @@
+ " -links N -lname WZORZEC -mmin N -mtime N -name WZORZEC -newer PLIK"
+
+ #: find/util.c:190
+-#, fuzzy
+ msgid ""
+ "\n"
+ " -nouser -nogroup -path PATTERN -perm [-/]MODE -regex PATTERN\n"
+@@ -712,6 +714,7 @@
+ " -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n"
+ " -used N -user NAME -xtype [bcdpfls]"
+ msgstr ""
++"\n"
+ " -nouser -nogroup -path WZORZEC -perm [-/]TRYB -regex WZORZEC\n"
+ " -readable -writable -executable\n"
+ " -wholename WZORZEC -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n"
+@@ -722,7 +725,6 @@
+ msgstr " -context KONTEKST\n"
+
+ #: find/util.c:197
+-#, fuzzy
+ msgid ""
+ "\n"
+ "actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n"
+@@ -743,16 +745,19 @@
+ "Use '-D help' for a description of the options, or see find(1)\n"
+ "\n"
+ msgstr ""
++"\n"
++"Opis opcji można uzyskać przy użyciu '-D help' lub w podręczniku find(1)\n"
++"\n"
+
+ #: find/util.c:491
-#, fuzzy, c-format
+#, c-format
msgid "Failed to save initial working directory%s%s"
-msgstr "nie udało się zachować początkowego katalogu roboczego: %s"
+msgstr "Nie udało się zachować początkowego katalogu roboczego%s%s"
- #: find/util.c:477
+ #: find/util.c:510
-#, fuzzy, c-format
+#, c-format
msgid "Failed to restore initial working directory%s%s"
-msgstr "nie udało się przywrócić początkowego katalogu roboczego: %s"
+msgstr "Nie udało się przywrócić początkowego katalogu roboczego%s%s"
- #: find/util.c:827
+ #: find/util.c:848
+ #, c-format
+@@ -787,9 +792,9 @@
+ "można użyć GNU locate."
+
+ #: find/util.c:957
+-#, fuzzy, c-format
++#, c-format
+ msgid "Missing argument after the -D option."
+-msgstr "Pusty argument dla opcji -D."
++msgstr "Brak argumentu dla opcji -D."
+
+ #: find/util.c:1060
+ msgid ""
+@@ -800,7 +805,7 @@
+ "na rozmiar bloku, to zmienna środowiskowa POSIXLY_CORRECT"
+
+ #: lib/bugreports.c:28
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "Please see also the documentation at %s.\n"
+ "You can report (and track progress on fixing) bugs in the \"%s\"\n"
+@@ -808,10 +813,11 @@
+ "%s or, if\n"
+ "you have no web access, by sending email to <%s>.\n"
+ msgstr ""
+-"Proszę zgłaszać błędy (i śledzić proces ich naprawiania) poprzez stronę\n"
+-"zgłaszania błędów w findutils pod adresem http://savannah.gnu.org/ lub,\n"
++"Więcej dokumentacji można znaleźć pod %s.\n"
++"Błędy w programie \"%s\" można zgłaszać (i śledzić proces ich naprawiania)\n"
++"poprzez stronę zgłaszania błędów w %s pod adresem %s lub,\n"
+ "w przypadku braku dostępu do WWW, wysyłając pocztę elektroniczną pod\n"
+-"adres <bug-findutils at gnu.org>."
++"adres <%s>.\n"
+
+ #: lib/buildcmd.c:144
+ msgid "command too long"
+@@ -908,9 +914,9 @@
+ msgstr "Poziom bezpieczeństwa slocate %ld nie jest obsługiwany."
+
+ #: locate/frcode.c:265
+-#, fuzzy, c-format
++#, c-format
+ msgid "no argument expected."
+-msgstr "Nieznany argument opcji -type: %c"
++msgstr "nie oczekiwano argumentu."
+
+ #: locate/frcode.c:282
+ msgid "Failed to write to standard output"
+@@ -919,7 +925,7 @@
+ #: locate/frcode.c:291
+ #, c-format
+ msgid "The input file should end with the delimiter"
+-msgstr ""
++msgstr "Plik wejściowy powinien kończyć się ogranicznikiem"
+
+ #: locate/locate.c:110
+ msgid "days"
+@@ -1102,7 +1108,7 @@
+ #: locate/locate.c:1720
+ #, c-format
+ msgid "pattern argument expected"
+-msgstr ""
++msgstr "oczekiwano argumentu będącego wzorcem"
+
+ #: locate/locate.c:1761
+ #, c-format
+@@ -1117,9 +1123,9 @@
+ msgstr "wywołanie systemowe nie powiodło się"
+
+ #: locate/locate.c:1845
+-#, fuzzy, c-format
++#, c-format
+ msgid "warning: database %s is more than %u %s old (actual age is %.1f %s)"
+-msgstr "uwaga: baza danych %s ma już ponad %d %s (jej wiek to %.1f %s)"
++msgstr "uwaga: baza danych %s ma już ponad %u %s (jej wiek to %.1f %s)"
+
+ #: locate/word_io.c:77
#, c-format
+@@ -1326,7 +1332,7 @@
+
+ #: xargs/xargs.c:1212
+ msgid "failed to redirect standard input of the child process"
+-msgstr ""
++msgstr "nie udało się przekierować standardowego wejścia procesu potomnego"
+
+ #: xargs/xargs.c:1264
+ msgid "could not create pipe before fork"
+@@ -1342,12 +1348,12 @@
+ "proszę to zgłosić)"
+
+ #: xargs/xargs.c:1388
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "read returned unexpected value %<PRIuMAX>; this is probably a bug, please "
+ "report it"
+ msgstr ""
+-"read zwróciło nieoczekiwaną wartość %zu; prawdopodobnie błąd, proszę to "
++"read zwróciło nieoczekiwaną wartość %<PRIuMAX>; prawdopodobnie błąd, proszę to "
+ "zgłosić"
+
+ #: xargs/xargs.c:1481
+@@ -1375,19 +1381,19 @@
+ msgstr "%s: zakończony sygnałem %d"
+
+ #: xargs/xargs.c:1624
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s: invalid number \"%s\" for -%c option\n"
+-msgstr "%s: błędna liczba dla opcji -%c\n"
++msgstr "%s: błędna liczba \"%s\" dla opcji -%c\n"
+
+ #: xargs/xargs.c:1631
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s: value %s for -%c option should be >= %ld\n"
+-msgstr "%s: wartość dla opcji -%c powinna być >= %ld\n"
++msgstr "%s: wartość %s dla opcji -%c powinna być >= %ld\n"
+
+ #: xargs/xargs.c:1640
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s: value %s for -%c option should be <= %ld\n"
+-msgstr "%s: wartość dla opcji -%c powinna być <= %ld\n"
++msgstr "%s: wartość %s dla opcji -%c powinna być <= %ld\n"
+
+ #: xargs/xargs.c:1660
+ #, c-format
+@@ -1510,7 +1516,6 @@
+ " polecenia\n"
+
+ #: xargs/xargs.c:1690
+-#, fuzzy
+ msgid ""
+ " -o, --open-tty Reopen stdin as /dev/tty in the child "
+ "process\n"
+@@ -1518,11 +1523,10 @@
+ "an\n"
+ " interactive application.\n"
+ msgstr ""
+-" -0, --null elementy oddzielone znakiem NULL zamiast "
+-"spacji;\n"
+-" wyłącza przetwarzanie cytowania, "
+-"odwrotnych\n"
+-" ukośników i logicznych EOF\n"
++" -o, --open-tty Ponowne otwarcie standardowego wejścia jako\n"
++" /dev/tty w procesie potomnym przed\n"
++" uruchomieniem polecenia; przydatne przy\n"
++" uruchamianiu aplikacji interaktywnych.\n"
+
+ #: xargs/xargs.c:1693
+ msgid ""
+@@ -1584,12 +1588,12 @@
+ msgstr " --help wyświetlenie tego opisu i zakończenie\n"
+
+ #: xargs/xargs.c:1705
+-#, fuzzy
+ msgid ""
+ " --version output version information and exit\n"
+ "\n"
+ msgstr ""
+ " --version wypisanie informacji o wersji i zakończenie\n"
++"\n"
+
+ #~ msgid ""
+ #~ "warning: Unix filenames usually don't contain slashes (though pathnames "
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/findutils.git/commitdiff/1a4e795f82e5c096c94316cb78c9e84156cef7ab
More information about the pld-cvs-commit
mailing list