commit pesign-obs-integration for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pesign-obs-integration for openSUSE:Factory checked in at 2022-07-29 16:47:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pesign-obs-integration (Old) and /work/SRC/openSUSE:Factory/.pesign-obs-integration.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pesign-obs-integration" Fri Jul 29 16:47:13 2022 rev:49 rq:991177 version:10.2+git20220504.8690743 Changes: -------- --- /work/SRC/openSUSE:Factory/pesign-obs-integration/pesign-obs-integration.changes 2022-07-07 12:56:35.399254109 +0200 +++ /work/SRC/openSUSE:Factory/.pesign-obs-integration.new.1533/pesign-obs-integration.changes 2022-07-29 16:47:26.818577328 +0200 @@ -1,0 +2,6 @@ +Sat Jul 9 16:19:57 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> + +- Update attr.patch to fix ghost symlinks still being affected +- Add rpmlintrc.patch to stop copying it to the build output + +------------------------------------------------------------------- New: ---- rpmlintrc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pesign-obs-integration.spec ++++++ --- /var/tmp/diff_new_pack.Uny04v/_old 2022-07-29 16:47:27.434579041 +0200 +++ /var/tmp/diff_new_pack.Uny04v/_new 2022-07-29 16:47:27.438579052 +0200 @@ -28,6 +28,7 @@ Patch: order.patch Patch1: attr.patch Patch2: lang.patch +Patch3: rpmlintrc.patch BuildRequires: openssl Requires: fipscheck Requires: mozilla-nss-tools ++++++ attr.patch ++++++ --- /var/tmp/diff_new_pack.Uny04v/_old 2022-07-29 16:47:27.494579207 +0200 +++ /var/tmp/diff_new_pack.Uny04v/_new 2022-07-29 16:47:27.498579219 +0200 @@ -1,6 +1,6 @@ -From 118395dd551022faea75debac0dca30515f03949 Mon Sep 17 00:00:00 2001 +From f2d245886ad2e734922b17a8f1a3d24b5075c023 Mon Sep 17 00:00:00 2001 From: Callum Farmer <gmbr3@opensuse.org> -Date: Wed, 22 Jun 2022 14:41:34 +0100 +Date: Sat, 9 Jul 2022 16:15:26 +0100 Subject: [PATCH] Fix %attr issues 1) Avoid assigning %attr's to symlinks which causes rpmbuild spam @@ -10,20 +10,27 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pesign-gen-repackage-spec b/pesign-gen-repackage-spec -index 688c375..e5c961a 100755 +index 688c375..ae7eba8 100755 --- a/pesign-gen-repackage-spec +++ b/pesign-gen-repackage-spec -@@ -416,8 +416,10 @@ sub print_files { +@@ -416,8 +416,6 @@ sub print_files { $attrs .= "\%dir "; utime($f->{mtime}, $f->{mtime}, $path); } - $attrs .= sprintf('%%attr(%04o, %s, %s) ', ($f->{mode} & 0777), - $f->{owner}, $f->{group}); -+ unless (-l "$path") { -+ $attrs .= sprintf('%%attr(%04o, %s, %s) ', ($f->{mode} & 07777), -+ $f->{owner}, $f->{group}); -+ } if ($f->{flags} & $filetypes{config}) { $attrs .= "%config "; my @cfg_attrs; +@@ -448,6 +446,10 @@ sub print_files { + symlink($f->{target}, $path); + } + } ++ unless (S_ISLNK($f->{mode})) { ++ $attrs .= sprintf('%%attr(%04o, %s, %s) ', ($f->{mode} & 07777), ++ $f->{owner}, $f->{group}); ++ } + # mtime of symlinks is also not preserved by cpio + if (S_ISLNK($f->{mode})) { + # perl core does not provide lutimes()/utimensat() ++++++ rpmlintrc.patch ++++++ From 1441e0e2b3ece30febd88a0476189865b6738695 Mon Sep 17 00:00:00 2001 From: Callum Farmer <gmbr3@opensuse.org> Date: Tue, 12 Jul 2022 11:44:57 +0100 Subject: [PATCH] Don't copy rpmlintrc to OTHER --- pesign-repackage.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in index 7b3d2e5..0c77133 100644 --- a/pesign-repackage.spec.in +++ b/pesign-repackage.spec.in @@ -87,6 +87,7 @@ popd # Copy files other than the meta files and RPMs to %_topdir/OTHER OTHER_FILES=`find %_sourcedir/ -maxdepth 1 -type f \ -not -regex '.*\.\(rpm\|spec\|rsasign\|sig\|crt\)' \ + -not -regex '.*\rpmlintrc' \ -not -name "_buildenv" \ -not -name "_statistics" \ -not -name "logfile" \
participants (1)
-
Source-Sync