Hello community, here is the log from the commit of package build-compare for openSUSE:Leap:15.2 checked in at 2020-01-19 15:46:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/build-compare (Old) and /work/SRC/openSUSE:Leap:15.2/.build-compare.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build-compare" Sun Jan 19 15:46:59 2020 rev:22 rq:762792 version:20200109T124459.beb05d0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/build-compare/build-compare.changes 2020-01-15 14:49:06.241367073 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.build-compare.new.26092/build-compare.changes 2020-01-19 15:47:08.833690562 +0100 @@ -1,0 +2,71 @@ +Tue Jan 7 13:59:43 UTC 2020 - [email protected] + +- this new decade must be handled in man pages created by docbook.xml +- use bash Process Substitution in diff_two_files +- use bash Process Substitution when processing ELF files +- move normalizing code from check_single_file into separate function +- better input verification in check_single_file +- split verification from diff_two_files into separate function +- move check for ignored files out of check_single_file +- separate helper functions from code in pkg-diff +- touch host watchdog when producing output and in loops (issue#35) +- add functions to touch host watchdog +- always run cleanup in check_compressed_file +- use EXIT handler in pkg-diff to remove tmpfiles + +------------------------------------------------------------------- +Wed Aug 14 13:27:38 UTC 2019 - John Vandenberg <[email protected]> + +- pkg-diff.sh: Ignore R build timestamp & temp paths + https://github.com/openSUSE/build-compare/pull/34 + +------------------------------------------------------------------- +Tue Feb 19 09:30:20 UTC 2019 - [email protected] + +- javadoc: filter dc.created +- Support filenames with spaces +- jar: always list files without date+size +- Fix differing jars reported as identical + +------------------------------------------------------------------- +Tue Aug 28 20:14:53 UTC 2018 - [email protected] + +- Ignore value of Release header when comparing spec files + +------------------------------------------------------------------- +Fri Jul 6 14:01:17 UTC 2018 - [email protected] + +- pkg-diff: fix diff returning 0 + +------------------------------------------------------------------- +Wed Jul 4 05:58:13 UTC 2018 - [email protected] + +- Match also ELF pie executable (bsc#1097339) + +------------------------------------------------------------------- +Wed Jul 4 05:42:05 UTC 2018 - [email protected] + +- Remove trailing space from two match patterns + +------------------------------------------------------------------- +Tue Jun 26 06:45:38 UTC 2018 - [email protected] + +- Recognize "setuid ELF nn-bit xSB shared object" ELF binaries + +------------------------------------------------------------------- +Mon May 28 13:26:44 UTC 2018 - [email protected] + +- Avoid large temporary files from hexdump output and avoid + diff(1) runing OOM by using a fifo (issue#24) + +------------------------------------------------------------------- +Fri Apr 13 07:10:30 UTC 2018 - [email protected] + +- check rpm capabilities for recommends/suggests + +------------------------------------------------------------------- +Fri Dec 8 16:57:00 UTC 2017 - [email protected] + +- Ignore /usr/lib/.build-id differences in package filelist + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.gaUvAy/_old 2020-01-19 15:47:10.033691273 +0100 +++ /var/tmp/diff_new_pack.gaUvAy/_new 2020-01-19 15:47:10.049691283 +0100 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20171204T112209.f06fbac +Version: 20200109T124459.beb05d0 Release: 0 Source1: COPYING Source2: same-build-result.sh @@ -30,8 +30,8 @@ Source5: srpm-check.sh %if 0%{?suse_version} Requires: bash -Requires: coreutils Requires: cpio +Requires: coreutils Requires: diffutils Requires: file Requires: gawk ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.gaUvAy/_old 2020-01-19 15:47:10.225691387 +0100 +++ /var/tmp/diff_new_pack.gaUvAy/_new 2020-01-19 15:47:10.229691389 +0100 @@ -10,6 +10,12 @@ RPM="rpm -qp --nodigest --nosignature" +set_rpm_meta_global_variables() { + + local pkg=$1 + local rpm_tags= + local out=`mktemp` + # Name, Version, Release QF_NAME="%{NAME}" QF_VER_REL="%{VERSION}-%{RELEASE}" @@ -21,8 +27,19 @@ QF_PROVIDES="${QF_PROVIDES}[%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF_PROVIDES="${QF_PROVIDES}[%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF_PROVIDES="${QF_PROVIDES}[%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" -QF_PROVIDES="${QF_PROVIDES}[%{RECOMMENDNAME} %{RECOMMENDFLAGS} %{RECOMMENDVERSION}\\n]\\n" -QF_PROVIDES="${QF_PROVIDES}[%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS} %{SUPPLEMENTVERSION}\\n]\\n" + +rpm_tags="%{RECOMMENDNAME} %{RECOMMENDFLAGS} %{RECOMMENDVERSION}" +check_header "%{NAME} ${rpm_tags}" > "${out}" +if test -s "${out}" +then + QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n" +fi +rpm_tags="%{SUPPLEMENTNAME} %{SUPPLEMENTFLAGS} %{SUPPLEMENTVERSION}" +check_header "%{NAME} ${rpm_tags}" > "${out}" +if test -s "${out}" +then + QF_PROVIDES="${QF_PROVIDES}[${rpm_tags}\\n]\\n" +fi # don't look at RELEASE, it contains our build number QF_TAGS="%{NAME} %{VERSION} %{EPOCH}\\n" @@ -65,6 +82,7 @@ QF_ALL="$QF_ALL\n___QF_SCRIPT___\n${QF_SCRIPT}\n___QF_SCRIPT___\n" QF_ALL="$QF_ALL\n___QF_FILELIST___\n${QF_FILELIST}\n___QF_FILELIST___\n" QF_ALL="$QF_ALL\n___QF_CHECKSUM___\n${QF_CHECKSUM}\n___QF_CHECKSUM___\n" +} check_header() { @@ -83,6 +101,7 @@ /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_old_regex_l\$\|$version_release_old_regex_l)\)/{s,$version_release_old_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_old_regex_s,@VERSION@-@RELEASE_SHORT@,g} s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_old_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g + /\/usr\/lib\/\.build-id/d " } function trim_release_new() @@ -91,6 +110,7 @@ /\(\/boot\|\/lib\/modules\|\/lib\/firmware\|\/usr\/src\|$version_release_new_regex_l\$\|$version_release_new_regex_l)\)/{s,$version_release_new_regex_l,@VERSION@-@RELEASE_LONG@,g;s,$version_release_new_regex_s,@VERSION@-@RELEASE_SHORT@,g} s/\(\/var\/adm\/update-scripts\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g s/\(\/var\/adm\/update-messages\/\)${name_ver_rel_new_regex_l}\([^[:blank:]]\+\)/\1@NAME_VER_REL@\2/g + /\/usr\/lib\/\.build-id/d " } # Get single directory or filename with long or short release string @@ -155,6 +175,7 @@ rm $2 $3 $4 $5 return 1 fi + difffound=1 fi return 0 } @@ -222,6 +243,8 @@ rpm_meta_old=`mktemp` rpm_meta_new=`mktemp` + set_rpm_meta_global_variables $oldrpm + check_header "$QF_ALL" $oldrpm > $rpm_meta_old check_header "$QF_ALL" $newrpm > $rpm_meta_new @@ -243,16 +266,14 @@ set_regex - # Check the whole spec file at first, return 0 immediately if the + # Check the whole spec file at first, return 0 immediately if they # are the same. cat $rpm_meta_old | trim_release_old > $file1 cat $rpm_meta_new | trim_release_new > $file2 echo "comparing the rpm tags of $name_new" if diff -au $file1 $file2; then - if test -z "$check_all"; then - rm $file1 $file2 $rpm_meta_old $rpm_meta_new - return 0 - fi + rm $file1 $file2 $rpm_meta_old $rpm_meta_new + return 0 fi get_value QF_TAGS $rpm_meta_old > $file1 @@ -269,6 +290,7 @@ if test -z "$check_all"; then return 1 fi + difffound=1 ;; # Every other package is allowed to have a different RELEASE *) ;; @@ -301,7 +323,7 @@ fi # Get only files with different MD5sums - files=`diff -U0 $file1 $file2 | fgrep -v +++ | grep ^+ | cut -b2- | awk '{print $1}'` + files=`diff -U0 $file1 $file2 | fgrep -v +++ | grep ^+ | cut -b2- | sed -E -e 's/ [0-9a-f]+ [0-9]+$//'` if test -n "$sh"; then echo "creating rename script" @@ -318,6 +340,7 @@ fi # rm $file1 $file2 + [ "$difffound" = 1 ] && RES=1 return $RES } ++++++ pkg-diff.sh ++++++ ++++ 1338 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/build-compare/pkg-diff.sh ++++ and /work/SRC/openSUSE:Leap:15.2/.build-compare.new.26092/pkg-diff.sh ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.gaUvAy/_old 2020-01-19 15:47:10.301691432 +0100 +++ /var/tmp/diff_new_pack.gaUvAy/_new 2020-01-19 15:47:10.305691434 +0100 @@ -184,6 +184,6 @@ if test $SUCCESS -eq 0; then exit 1 fi -echo 'compare validated built as identical !' +echo 'compare validated build as identical !' exit 0 # vim: tw=666 ts=2 shiftwidth=2 et ++++++ srpm-check.sh ++++++ --- /var/tmp/diff_new_pack.gaUvAy/_old 2020-01-19 15:47:10.333691451 +0100 +++ /var/tmp/diff_new_pack.gaUvAy/_new 2020-01-19 15:47:10.337691453 +0100 @@ -69,8 +69,8 @@ local file=$1 case $file in *.spec) - sed -i -e "s,Release:.*${ver_rel_old}$,Release: @RELEASE@," old/$file - sed -i -e "s,Release:.*${ver_rel_new}$,Release: @RELEASE@," new/$file + sed -i -e 's,^Release:.*$,Release: @RELEASE@,' old/$file + sed -i -e 's,^Release:.*$,Release: @RELEASE@,' new/$file if ! cmp -s old/$file new/$file; then echo "$file differs (spec file)" diff -u old/$file new/$file | head -n 20
