From 9eee3d4c25bc44802f9b0388c8ee12180950a51f20e2968f4a64047e145fbd7b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 30 Jul 2013 13:46:54 +0000 Subject: [PATCH 1/2] - fix setgroups error name, patch from upstream git: rpmlint-1.5-Fix-setgroups-error-name.diff OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=197 --- rpmlint-1.5-Fix-setgroups-error-name.diff | 25 +++++++++++++++++++++++ rpmlint.changes | 6 ++++++ rpmlint.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 rpmlint-1.5-Fix-setgroups-error-name.diff diff --git a/rpmlint-1.5-Fix-setgroups-error-name.diff b/rpmlint-1.5-Fix-setgroups-error-name.diff new file mode 100644 index 0000000..fb2c3a2 --- /dev/null +++ b/rpmlint-1.5-Fix-setgroups-error-name.diff @@ -0,0 +1,25 @@ +From e6c176c7d03f377e55d405ebe5d0368f688426c7 Mon Sep 17 00:00:00 2001 +From: Orion Poplawski +Date: Thu, 11 Jul 2013 12:29:34 -0600 +Subject: [PATCH] Fix setgroups error name + +--- + BinariesCheck.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BinariesCheck.py b/BinariesCheck.py +index b770085..cea85b9 100644 +--- a/BinariesCheck.py ++++ b/BinariesCheck.py +@@ -459,7 +459,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck): + printError(pkg, 'missing-PT_GNU_STACK-section', fname) + + if bin_info.setgid and bin_info.setuid and not bin_info.setgroups: +- printError(pkg, 'missing-call-to-setgroups', fname) ++ printError(pkg, 'missing-call-to-setgroups-before-setuid', fname) + + if bin_info.chroot: + if not bin_info.chdir or not bin_info.chroot_near_chdir: +-- +1.8.1.4 + diff --git a/rpmlint.changes b/rpmlint.changes index 1b9d9bb..96b3cb5 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 30 13:44:07 UTC 2013 - lnussel@suse.de + +- fix setgroups error name, patch from upstream git: + rpmlint-1.5-Fix-setgroups-error-name.diff + ------------------------------------------------------------------- Mon Jul 29 12:28:19 UTC 2013 - meissner@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 3599991..45c5cd5 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -120,6 +120,8 @@ Patch88: suse-speccheck-utf8.diff Patch89: suse-python-abi-check.diff # PATCH-FIX-OPENSUSE: saschpe@suse.de - Don't complain about missing man-pages for rc-scripts Patch91: suse-manpages-for-rc-scripts.patch +# PATCH-FIX-UPSTREAM: lnussel@suse.de - Fix setgroups error name +Patch92: rpmlint-1.5-Fix-setgroups-error-name.diff %py_requires @@ -195,6 +197,7 @@ source packages can be checked. %patch88 %patch89 %patch91 -p1 +%patch92 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py From 3061df53279f6ac011848c6525b953bfcbe2b9f4100a6aa811f69d6be6070fb3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 31 Jul 2013 14:00:39 +0000 Subject: [PATCH 2/2] Accepting request 185091 from home:msmeissn:branches:devel:openSUSE:Factory:rpmlint - allow pam_snapper after audit (bnc#815383) - follow /usr move for the /bin/ binaries in pie.config. OBS-URL: https://build.opensuse.org/request/show/185091 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=199 --- config | 2 ++ pie.config | 3 +++ rpmlint.changes | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/config b/config index 4bb0435..1f7514e 100644 --- a/config +++ b/config @@ -678,6 +678,8 @@ setOption("PAMModules.WhiteList", ( "pam_smbpass.so", # pam_chroot "pam_chroot.so", + # pam_snapper (bnc#815383) + "pam_snapper.so", )) # Output filters diff --git a/pie.config b/pie.config index 312c433..52c4495 100644 --- a/pie.config +++ b/pie.config @@ -5,8 +5,11 @@ from Config import * pie_execs = ( "/bin/ping", +"/usr/bin/ping", "/bin/ping6", +"/usr/bin/ping6", "/bin/su", +"/usr/bin/su", "/usr/bin/pidgin", "/sbin/arping", "/sbin/clockdiff", diff --git a/rpmlint.changes b/rpmlint.changes index 96b3cb5..270d23f 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 31 11:42:54 UTC 2013 - meissner@suse.com + +- allow pam_snapper after audit (bnc#815383) + +------------------------------------------------------------------- +Tue Jul 30 15:18:46 UTC 2013 - meissner@suse.com + +- follow /usr move for the /bin/ binaries in pie.config. + ------------------------------------------------------------------- Tue Jul 30 13:44:07 UTC 2013 - lnussel@suse.de