forked from pool/findutils
Accepting request 349721 from home:berny:branches:Base:System
- Upgrade to 4.5.15
- Delete now-upstream patch:
findutils-oldfind-fix-dotdot-skipping.patch
- Refresh patches:
findutils-4.4.2-xautofs.patch
gnulib-perl522.patch
OBS-URL: https://build.opensuse.org/request/show/349721
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=62
This commit is contained in:
Git OBS Bridge
parent
c0c312a63c
commit
2929704796
@ -11,7 +11,7 @@ Index: doc/find.texi
|
||||
===================================================================
|
||||
--- doc/find.texi.orig
|
||||
+++ doc/find.texi
|
||||
@@ -1438,6 +1438,10 @@ them.
|
||||
@@ -1448,6 +1448,10 @@ them.
|
||||
There are two ways to avoid searching certain filesystems. One way is
|
||||
to tell @code{find} to only search one filesystem:
|
||||
|
||||
@ -40,7 +40,7 @@ Index: find/find.1
|
||||
===================================================================
|
||||
--- find/find.1.orig
|
||||
+++ 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.
|
||||
|
||||
@ -96,7 +96,7 @@ Index: find/parser.c
|
||||
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,16 @@ parse_xdev (const struct parser_table* e
|
||||
@@ -2673,6 +2675,16 @@ parse_xdev (const struct parser_table* e
|
||||
}
|
||||
|
||||
static bool
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2
|
||||
size 3536727
|
||||
3
findutils-4.5.15.tar.gz
Normal file
3
findutils-4.5.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bc843179f32cba7bec8192edc91b4ad0d0bf434e61b82c04d9d2c8115617d9fb
|
||||
size 3815470
|
||||
@ -1,100 +0,0 @@
|
||||
Upstream patch to fix a problem in oldfind(1) skipping files starting with "..".
|
||||
http://lists.gnu.org/archive/html/findutils-patches/2014-12/msg00004.html
|
||||
|
||||
2 patches squashed together:
|
||||
- the fix by Phil Miller in find/find.c,
|
||||
- the test for it by Bernhard Voelker.
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
From 286a2ff1d1bb71837c72d44c88da8ba3827906d4 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Miller <mille121@illinois.edu>
|
||||
Date: Mon, 29 Dec 2014 16:27:49 -0600
|
||||
Subject: [PATCH] oldfind: Don't skip names matching ..*
|
||||
|
||||
Prevent errors like the following:
|
||||
|
||||
$ mkdir test
|
||||
$ touch test/..test
|
||||
$ oldfind test
|
||||
test
|
||||
|
||||
Note that the file "test/..test" was not listed.
|
||||
|
||||
* find/find.c (process_dir): When skipping a directory's self and
|
||||
parent entries, don't also skip other entries that happen to begin
|
||||
with "..".
|
||||
|
||||
Copyright-paperwork-exempt: yes
|
||||
--------------------------------------------------------------------------------
|
||||
From bebee334524bc7c23ebc2db27f97094989a7de5d Mon Sep 17 00:00:00 2001
|
||||
From: Bernhard Voelker <mail@bernhard-voelker.de>
|
||||
Date: Tue, 30 Dec 2014 14:38:56 +0100
|
||||
Subject: [PATCH] tests: add test for the previously fixed regression
|
||||
|
||||
* find/testsuite/find.posix/dotdotfiles.exp: Add test to verify
|
||||
oldfind(1) does not skip directory entries starting with "..".
|
||||
* find/testsuite/find.posix/dotdotfiles.xo: Add expected output
|
||||
for the above test.
|
||||
* find/testsuite/Makefile.am (EXTRA_DIST_XO, EXTRA_DIST_EXP):
|
||||
Mention the above new test files.
|
||||
---
|
||||
find/find.c | 4 +++-
|
||||
find/testsuite/Makefile.am | 2 ++
|
||||
find/testsuite/find.posix/dotdotfiles.exp | 7 +++++++
|
||||
find/testsuite/find.posix/dotdotfiles.xo | 2 ++
|
||||
5 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: find/find.c
|
||||
===================================================================
|
||||
--- find/find.c.orig
|
||||
+++ find/find.c
|
||||
@@ -1441,7 +1441,9 @@ process_dir (char *pathname, char *name,
|
||||
namep = dp->d_name;
|
||||
/* Skip "", ".", and "..". "" is returned by at least one buggy
|
||||
implementation: Solaris 2.4 readdir on NFS file systems. */
|
||||
- if (!namep[0] || (namep[0] == '.' && (namep[1] == '.' || namep[1] == 0)))
|
||||
+ if (!namep[0] ||
|
||||
+ (namep[0] == '.' && (namep[1] == 0 ||
|
||||
+ (namep[1] == '.' && namep[2] == 0))))
|
||||
continue;
|
||||
}
|
||||
|
||||
Index: find/testsuite/Makefile.am
|
||||
===================================================================
|
||||
--- find/testsuite/Makefile.am.orig
|
||||
+++ find/testsuite/Makefile.am
|
||||
@@ -73,6 +73,7 @@ find.gnu/quit.xo \
|
||||
find.gnu/xtype.xo \
|
||||
find.posix/and.xo \
|
||||
find.posix/depth1.xo \
|
||||
+find.posix/dotdotfiles.xo \
|
||||
find.posix/exec-nogaps.xo \
|
||||
find.posix/exec-one.xo \
|
||||
find.posix/files-not-expressions1.xo \
|
||||
@@ -189,6 +190,7 @@ find.gnu/xtype.exp \
|
||||
find.posix/and.exp \
|
||||
find.posix/bracket-depth.exp \
|
||||
find.posix/depth1.exp \
|
||||
+find.posix/dotdotfiles.exp \
|
||||
find.posix/empty-parens.exp \
|
||||
find.posix/exec-nogaps.exp \
|
||||
find.posix/exec-one.exp \
|
||||
Index: find/testsuite/find.posix/dotdotfiles.exp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ find/testsuite/find.posix/dotdotfiles.exp
|
||||
@@ -0,0 +1,7 @@
|
||||
+# Test entries starting with "..", e.g. "..tmp".
|
||||
+# Commit v4.5.10-95-ga29e61b introduced a regression
|
||||
+# which made oldfind(1) skip such entries.
|
||||
+exec rm -rf tmp
|
||||
+exec mkdir tmp tmp/..tmp
|
||||
+find_start p {tmp}
|
||||
+exec rm -rf tmp
|
||||
Index: find/testsuite/find.posix/dotdotfiles.xo
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ find/testsuite/find.posix/dotdotfiles.xo
|
||||
@@ -0,0 +1,2 @@
|
||||
+tmp
|
||||
+tmp/..tmp
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 20 12:29:05 UTC 2015 - mail@bernhard-voelker.de
|
||||
|
||||
- Upgrade to 4.5.15
|
||||
- Delete now-upstream patch:
|
||||
findutils-oldfind-fix-dotdot-skipping.patch
|
||||
- Refresh patches:
|
||||
findutils-4.4.2-xautofs.patch
|
||||
gnulib-perl522.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 6 10:19:01 UTC 2015 - coolo@suse.com
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: findutils
|
||||
Url: http://www.gnu.org/software/findutils/
|
||||
Version: 4.5.14
|
||||
Version: 4.5.15
|
||||
Release: 0
|
||||
Summary: The GNU versions of find utilities (find and xargs)
|
||||
License: GPL-3.0+
|
||||
@ -28,9 +28,7 @@ Source: http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
|
||||
Patch0: findutils-4.4.2-xautofs.patch
|
||||
# Fix imported gnulib long double math tests for little-endian PowerPC
|
||||
Patch1: findutils-gnulib-ppc64le.patch
|
||||
# Upstream patch to fix a problem in oldfind(1) skipping files starting with "..".
|
||||
Patch2: findutils-oldfind-fix-dotdot-skipping.patch
|
||||
Patch3: gnulib-perl522.patch
|
||||
Patch2: gnulib-perl522.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# BuildRequire dejagnu for 'runtest' to execute all tests.
|
||||
@ -63,7 +61,6 @@ useful for finding things on your system.
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?qemu_user_space_build}
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272
|
||||
|
||||
Index: grep-2.21/build-aux/update-copyright
|
||||
---
|
||||
build-aux/update-copyright | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: build-aux/update-copyright
|
||||
===================================================================
|
||||
--- grep-2.21.orig/build-aux/update-copyright
|
||||
+++ grep-2.21/build-aux/update-copyright
|
||||
--- build-aux/update-copyright.orig
|
||||
+++ build-aux/update-copyright
|
||||
@@ -124,7 +124,7 @@ use strict;
|
||||
use warnings;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user