From 6855de7c23f0ebda6fe0c54fff7e43549ec21bc10119ae2061d3e5dd09689aae Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 6 Sep 2021 08:44:23 +0000 Subject: [PATCH 1/3] rebase OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=284 --- build-compare.changes | 5 +++++ build-compare.spec | 13 ++++++------- same-build-result.sh | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 9e67ad2..64a7a2d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 6 07:15:06 UTC 2021 - bwiedemann@suse.de + +- Drop another duration from rpmlint.log + ------------------------------------------------------------------- Wed Aug 11 20:30:40 UTC 2021 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 1e4d42f..18b5d74 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,16 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: build-compare Summary: Build Result Compare Script -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Building -Url: https://github.com/openSUSE/build-compare -Version: 20210811T224256.f313711 +URL: https://github.com/openSUSE/build-compare +Version: 20210906T092724.c14c0a7 Release: 0 Source1: COPYING Source2: same-build-result.sh @@ -30,8 +30,8 @@ Source4: functions.sh Source5: srpm-check.sh %if 0%{?suse_version} Requires: bash -Requires: cpio Requires: coreutils +Requires: cpio Requires: diffutils Requires: file Requires: gawk @@ -47,7 +47,6 @@ BuildArch: noarch This package contains scripts to find out if the build result differs to a former build. - %prep %setup -q -c -T diff --git a/same-build-result.sh b/same-build-result.sh index 6937c2b..cde7679 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -151,6 +151,7 @@ if test -n "$OTHERDIR"; then /: W: python-bytecode-inconsistent-mtime /d /: W: filename-too-long-for-joliet /d /: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s| + /specfiles checked;/s| [0-9]\+\.[0-9] s$| x.x s| " $file1 $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:" From e57ee3eb6100280e25d56f57e4cd6400b4f32607509869139b6bcc2eaa08d8c4 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 20 Sep 2021 11:03:29 +0000 Subject: [PATCH 2/3] - Properly drop another duration from rpmlint.log OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=285 --- _service | 2 +- build-compare.changes | 5 +++++ build-compare.spec | 13 +++++++------ pkg-diff.sh | 4 +++- same-build-result.sh | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/_service b/_service index 16800ff..abd0f4f 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ %ci.%h - git://github.com/openSUSE/build-compare.git + https://github.com/openSUSE/build-compare.git git diff --git a/build-compare.changes b/build-compare.changes index 64a7a2d..0e838f8 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 20 08:25:27 UTC 2021 - Andreas Schwab + +- Properly drop another duration from rpmlint.log + ------------------------------------------------------------------- Mon Sep 6 07:15:06 UTC 2021 - bwiedemann@suse.de diff --git a/build-compare.spec b/build-compare.spec index 18b5d74..1e7358c 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,16 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: build-compare Summary: Build Result Compare Script -License: GPL-2.0-or-later +License: GPL-2.0+ Group: Development/Tools/Building -URL: https://github.com/openSUSE/build-compare -Version: 20210906T092724.c14c0a7 +Url: https://github.com/openSUSE/build-compare +Version: 20210920T124345.b684003 Release: 0 Source1: COPYING Source2: same-build-result.sh @@ -30,8 +30,8 @@ Source4: functions.sh Source5: srpm-check.sh %if 0%{?suse_version} Requires: bash -Requires: coreutils Requires: cpio +Requires: coreutils Requires: diffutils Requires: file Requires: gawk @@ -47,6 +47,7 @@ BuildArch: noarch This package contains scripts to find out if the build result differs to a former build. + %prep %setup -q -c -T diff --git a/pkg-diff.sh b/pkg-diff.sh index 3ec0606..d853ce4 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -893,7 +893,9 @@ check_single_file() monodis "new/$file" 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} if ! cmp -s "${file1}" "${file2}"; then wprint "$file differs ($ftype)" - diff --speed-large-files -u "${file1}" "${file2}" + diff --speed-large-files -u \ + --label "old $file (monodis)" "${file1}" \ + --label "new $file (monodis)" "${file2}" return 1 fi else diff --git a/same-build-result.sh b/same-build-result.sh index cde7679..3c2868f 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -151,7 +151,7 @@ if test -n "$OTHERDIR"; then /: W: python-bytecode-inconsistent-mtime /d /: W: filename-too-long-for-joliet /d /: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s| - /specfiles checked;/s| [0-9]\+\.[0-9] s$| x.x s| + s/; has taken [0-9]\+\.[0-9] s/; has taken x.x s/ " $file1 $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:" From 1bc9801b2d8483b6842dd7d2b659fb5f4440d669970623a10d09c18ec1ddf6b0 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 21 Sep 2021 19:44:56 +0000 Subject: [PATCH 3/3] - Fix build-compare for shadow package OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=286 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- pkg-diff.sh | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 0e838f8..062b3de 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 21 19:19:19 UTC 2021 - Stephan Kulow + +- Fix build-compare for shadow package + ------------------------------------------------------------------- Mon Sep 20 08:25:27 UTC 2021 - Andreas Schwab diff --git a/build-compare.spec b/build-compare.spec index 1e7358c..5044494 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20210920T124345.b684003 +Version: 20210921T214418.86d06d9 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index d853ce4..4eee363 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -906,9 +906,9 @@ check_single_file() ELF*executable*|\ ELF*[LM]SB\ relocatable*|\ ELF*[LM]SB\ shared\ object*|\ - setuid\ ELF*[LM]SB\ shared\ object*|\ + set?id\ ELF*[LM]SB\ shared\ object*|\ ELF*[LM]SB\ pie\ executable*|\ - setuid\ ELF*[LM]SB\ pie\ executable*) + set?id\ ELF*[LM]SB\ pie\ executable*) diff --speed-large-files --unified \ --label "old $file (disasm)" \ --label "new $file (disasm)" \