Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2016-10-04 15:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilt" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2016-09-21 18:24:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2016-10-04 15:46:13.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Sep 16 09:24:13 UTC 2016 - [email protected] + +- reject-binary-files-in-patches.patch: Since diffutils version + 3.4, diff no longer returns an error code for binary files. Parse + the first line of the output to detect this case and raise our + own error. +- Remove fix-faildiff-test-for-diffutils-3.4.patch, use the + upstream fix instead. + +------------------------------------------------------------------- Old: ---- fix-faildiff-test-for-diffutils-3.4.patch New: ---- reject-binary-files-in-patches.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.zPrvlO/_old 2016-10-04 15:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.zPrvlO/_new 2016-10-04 15:46:15.000000000 +0200 @@ -50,7 +50,7 @@ Patch9: edit-01-test-file-creation.patch Patch10: edit-02-call-remove-not-revert.patch Patch11: edit-03-fix-corner-case.patch -Patch12: fix-faildiff-test-for-diffutils-3.4.patch +Patch12: reject-binary-files-in-patches.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} ++++++ reject-binary-files-in-patches.patch ++++++ From: Jean Delvare <[email protected]> Date: Thu, 15 Sep 2016 14:05:29 +0200 Subject: Reject binary files in patches Git-commit: 20f06212baced666027131555ad4c834d8e4b232 Patch-mainline: yes Since diffutils version 3.4, diff no longer returns an error code for binary files. Parse the first line of the output to detect this case and raise our own error. diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 521e92d18b53..a496f3b07390 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -741,6 +741,12 @@ diff_file() "$old_file" "$new_file" \ | if read line then + if [[ "$line" =~ ^Binary\ files\ .*\ differ$ ]] + then + echo "$line" + return 1 + fi + if [ -z "$QUILT_NO_DIFF_INDEX" ] then echo "Index: $index" @@ -751,7 +757,7 @@ diff_file() fi # Test the return value of diff, and propagate the error retcode if any - if [ ${PIPESTATUS[0]} == 2 ] + if [ ${PIPESTATUS[0]} == 2 -o ${PIPESTATUS[1]} == 1 ] then return 1 fi
