Accepting request 259874 from Archiving
1 OBS-URL: https://build.opensuse.org/request/show/259874 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bzip2?expand=0&rev=51
This commit is contained in:
commit
ef04e1f58a
14
bzip2-1.0.6-fix-bashisms.patch
Normal file
14
bzip2-1.0.6-fix-bashisms.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -Ndurp bzip2-1.0.6/bzgrep bzip2-1.0.6-fix-bashisms/bzgrep
|
||||
--- bzip2-1.0.6/bzgrep 2007-01-03 04:00:55.000000000 +0200
|
||||
+++ bzip2-1.0.6-fix-bashisms/bzgrep 2014-10-19 02:07:30.036033876 +0300
|
||||
@@ -63,9 +63,7 @@ for i do
|
||||
bzip2 -cdfq "$i" | $grep $opt "$pat"
|
||||
r=$?
|
||||
else
|
||||
- j=${i//\\/\\\\}
|
||||
- j=${j//|/\\|}
|
||||
- j=${j//&/\\&}
|
||||
+ j=$(echo "$i" | sed 's/\\/&&/g;s/|/\\&/g;s/&/\\&/g')
|
||||
j=`printf "%s" "$j" | tr '\n' ' '`
|
||||
bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
|
||||
r=$?
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 03 16:19:00 UTC 2014 - Led <ledest@gmail.com>
|
||||
|
||||
- fix basisms in bzgrep and bznew
|
||||
- add patches:
|
||||
* bzip2-1.0.6-fix-bashisms.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 2 15:16:50 UTC 2014 - vcizek@suse.com
|
||||
|
||||
|
@ -30,6 +30,7 @@ Source3: baselibs.conf
|
||||
Source100: bzip2-rpmlintrc
|
||||
# PATCH-FEATURE-OPENSUSE bzip2-1.0.6-autoconfiscated.patch sbrabec@suse.cz -- Convert to a standard autoconf based package.
|
||||
Patch: http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch
|
||||
Patch1: bzip2-1.0.6-fix-bashisms.patch
|
||||
Patch3: bzip2-faster.patch
|
||||
Patch5: bzip2-unsafe_strcpy.patch
|
||||
Patch6: bzip2-point-to-doc-pkg.patch
|
||||
@ -79,6 +80,7 @@ The bzip2 runtime library development files.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1 -p1
|
||||
%patch3
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user