Hello community, here is the log from the commit of package bzip2 for openSUSE:Factory checked in at 2014-11-07 14:07:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bzip2 (Old) and /work/SRC/openSUSE:Factory/.bzip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bzip2" Changes: -------- --- /work/SRC/openSUSE:Factory/bzip2/bzip2.changes 2014-09-03 19:36:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bzip2.new/bzip2.changes 2014-11-07 14:07:17.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 03 16:19:00 UTC 2014 - Led <led...@gmail.com> + +- fix basisms in bzgrep and bznew +- add patches: + * bzip2-1.0.6-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- bzip2-1.0.6-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzip2.spec ++++++ --- /var/tmp/diff_new_pack.MBi1eF/_old 2014-11-07 14:07:18.000000000 +0100 +++ /var/tmp/diff_new_pack.MBi1eF/_new 2014-11-07 14:07:18.000000000 +0100 @@ -30,6 +30,7 @@ Source100: bzip2-rpmlintrc # PATCH-FEATURE-OPENSUSE bzip2-1.0.6-autoconfiscated.patch sbra...@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 @@ %prep %setup -q %patch +%patch1 -p1 %patch3 %patch5 %patch6 -p1 ++++++ bzip2-1.0.6-fix-bashisms.patch ++++++ 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=$? ++++++ bznew.gz ++++++ --- /var/tmp/diff_new_pack.MBi1eF/_old 2014-11-07 14:07:18.000000000 +0100 +++ /var/tmp/diff_new_pack.MBi1eF/_new 2014-11-07 14:07:18.000000000 +0100 @@ -51,7 +51,7 @@ fi # check about bzip extension -bzip2 $tmp/1 &> /dev/null +bzip2 $tmp/1 >/dev/null 2>&1 ext=`echo $tmp/1* | sed "s|$tmp/1||"` rm -rf $tmp/ trap - 0 1 2 3 6 13 15 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
