forked from pool/quilt
- grep-support-spaces.patch: grep: Accept file names with spaces.
- mail-fix-a-temporary-directory-leak.patch: mail: Fix a temporary directory leak. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=35
This commit is contained in:
parent
7c7b12f15a
commit
dae9b7c076
28
grep-support-spaces.patch
Normal file
28
grep-support-spaces.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
Subject: grep: Accept file names with spaces
|
||||||
|
|
||||||
|
This is a continuation of Yasushi SHOJI's initial work of fixing
|
||||||
|
support for file names with spaces. This time I fixed support in the
|
||||||
|
grep command. This is particularly important because the grep command
|
||||||
|
operates on all files in the work tree, even if they aren't touched
|
||||||
|
by any patch, so the chances that one of them has a space in its name
|
||||||
|
is greater. As before, no guarantee is made that all options are
|
||||||
|
covered, but this should be a good starting point.
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
---
|
||||||
|
quilt/grep.in | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--- quilt-0.48.orig/quilt/grep.in
|
||||||
|
+++ quilt-0.48/quilt/grep.in
|
||||||
|
@@ -117,8 +117,8 @@ fi
|
||||||
|
find "${myargs[@]}" \( \
|
||||||
|
-path "./$QUILT_PATCHES/*" -o \
|
||||||
|
-path "./$QUILT_PC/*" \) -prune -o \
|
||||||
|
- -type f -print \
|
||||||
|
-| xargs grep $opt_H "${args[@]}" \
|
||||||
|
+ -type f -print0 \
|
||||||
|
+| xargs -0 grep $opt_H "${args[@]}" \
|
||||||
|
| if [ ${#myargs[@]} -eq 0 ]; then
|
||||||
|
sed -e 's,^./,,'
|
||||||
|
else
|
20
mail-fix-a-temporary-directory-leak.patch
Normal file
20
mail-fix-a-temporary-directory-leak.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
From de13f097662d785863f52c1cdaca125cebfe40d2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Sun, 06 Feb 2011 17:22:20 +0000
|
||||||
|
Subject: quilt mail: Fix a temporary directory leak.
|
||||||
|
|
||||||
|
---
|
||||||
|
diff --git a/quilt/mail.in b/quilt/mail.in
|
||||||
|
index a2cf2d5..d16b3c1 100644
|
||||||
|
--- a/quilt/mail.in
|
||||||
|
+++ b/quilt/mail.in
|
||||||
|
@@ -350,6 +350,7 @@ then
|
||||||
|
|
||||||
|
if [ -z "$subject" ]
|
||||||
|
then
|
||||||
|
+ rm -rf $tmpdir
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v0.8.3.4
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 10 21:00:07 CET 2011 - jdelvare@suse.de
|
||||||
|
|
||||||
|
- grep-support-spaces.patch: grep: Accept file names with spaces.
|
||||||
|
- mail-fix-a-temporary-directory-leak.patch: mail: Fix a temporary
|
||||||
|
directory leak.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 10 12:25:27 CET 2011 - pth@suse.de
|
Thu Nov 10 12:25:27 CET 2011 - pth@suse.de
|
||||||
|
|
||||||
|
@ -47,6 +47,8 @@ Patch12: setup-add-fuzz-parameter.patch
|
|||||||
Patch13: setup-support-reverse-patch.patch
|
Patch13: setup-support-reverse-patch.patch
|
||||||
Patch14: completion-revert.patch
|
Patch14: completion-revert.patch
|
||||||
Patch15: inspect-shell-syntax-errors.patch
|
Patch15: inspect-shell-syntax-errors.patch
|
||||||
|
Patch16: grep-support-spaces.patch
|
||||||
|
Patch17: mail-fix-a-temporary-directory-leak.patch
|
||||||
Url: http://savannah.nongnu.org/projects/quilt
|
Url: http://savannah.nongnu.org/projects/quilt
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
@ -66,7 +68,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15
|
%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoconf
|
autoconf
|
||||||
|
Loading…
Reference in New Issue
Block a user