summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-09-27 16:02:05 +0000
committerRoy Marples <uberlord@gentoo.org>2006-09-27 16:02:05 +0000
commit82ed48424928656e7d94f89045407d0baf7da7c7 (patch)
treeca03b8c8beed608a9377b81dbee0d629e15ba3bd /sys-apps/findutils/files
parentnew upstream release. (diff)
downloadgentoo-2-82ed48424928656e7d94f89045407d0baf7da7c7.tar.gz
gentoo-2-82ed48424928656e7d94f89045407d0baf7da7c7.tar.bz2
gentoo-2-82ed48424928656e7d94f89045407d0baf7da7c7.zip
Fix segfaults when -regex foo is the last argument, #149309.
(Portage version: 2.1.2_pre1-r3)
Diffstat (limited to 'sys-apps/findutils/files')
-rw-r--r--sys-apps/findutils/files/digest-findutils-4.3.1-r13
-rw-r--r--sys-apps/findutils/files/findutils-4.3.1-sv-bug-17490.patch44
2 files changed, 47 insertions, 0 deletions
diff --git a/sys-apps/findutils/files/digest-findutils-4.3.1-r1 b/sys-apps/findutils/files/digest-findutils-4.3.1-r1
new file mode 100644
index 000000000000..6ce1baffc903
--- /dev/null
+++ b/sys-apps/findutils/files/digest-findutils-4.3.1-r1
@@ -0,0 +1,3 @@
+MD5 1be385bde801d7bc8e02101f96b8a4ee findutils-4.3.1.tar.gz 1191565
+RMD160 aea3de4834ba7ac501a9af38e2ec3e4bc8663656 findutils-4.3.1.tar.gz 1191565
+SHA256 c298b3afa7c5e6a15aa5015454b106461c8079d6a0bba62bc8a8c2057d0c6612 findutils-4.3.1.tar.gz 1191565
diff --git a/sys-apps/findutils/files/findutils-4.3.1-sv-bug-17490.patch b/sys-apps/findutils/files/findutils-4.3.1-sv-bug-17490.patch
new file mode 100644
index 000000000000..5af56836a6f0
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.1-sv-bug-17490.patch
@@ -0,0 +1,44 @@
+Index: find/parser.c
+===================================================================
+RCS file: /cvsroot/findutils/findutils/find/parser.c,v
+retrieving revision 1.92
+diff -u -r1.92 parser.c
+--- find/parser.c 20 Aug 2006 20:45:09 -0000 1.92
++++ find/parser.c 21 Aug 2006 22:33:21 -0000
+@@ -1642,8 +1642,8 @@
+ re);
+ if (error_message)
+ error (1, 0, "%s", error_message);
+- (*arg_ptr)++;
+ our_pred->est_success_rate = estimate_pattern_match_rate(argv[*arg_ptr], 1);
++ (*arg_ptr)++;
+ return true;
+ }
+
+Index: find/testsuite/Makefile.am
+===================================================================
+RCS file: /cvsroot/findutils/findutils/find/testsuite/Makefile.am,v
+retrieving revision 1.32
+diff -u -r1.32 Makefile.am
+--- find/testsuite/Makefile.am 20 Aug 2006 20:39:48 -0000 1.32
++++ find/testsuite/Makefile.am 21 Aug 2006 22:33:21 -0000
+@@ -137,6 +137,7 @@
+ find.gnu/wholename.exp \
+ find.gnu/xtype-symlink.exp \
+ find.gnu/sv-bug-12230.exp \
++find.gnu/sv-bug-17490.exp \
+ find.gnu/quit.exp \
+ find.gnu/xtype.exp \
+ find.posix/and.exp \
+Index: find/testsuite/find.gnu/sv-bug-17490.exp
+===================================================================
+RCS file: find/testsuite/find.gnu/sv-bug-17490.exp
+diff -N find/testsuite/find.gnu/sv-bug-17490.exp
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ find/testsuite/find.gnu/sv-bug-17490.exp 21 Aug 2006 22:33:21 -0000
+@@ -0,0 +1,5 @@
++# test for Savannah bug #17490
++#
++# That bug was a coredump if the argument to -regex was the final argument.
++find_start p {. -maxdepth 0 -regex x }
++