Accepting request 620480 from devel:openSUSE:Factory:rpmlint

OBS-URL: https://build.opensuse.org/request/show/620480
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=297

0001-Fix-compatibility-with-file-5.33.patch

@@ -0,0 +1,42 @@
+From 6497ac4806c2178a19d23203016cbdb6f7f45825 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dirk@dmllr.de>
+Date: Tue, 3 Jul 2018 14:24:01 +0200
+Subject: [PATCH] Fix compatibility with file 5.33+
+
+In file 5.33 the pkgfile magic output for pie executables changed
+from
+
+    ELF 64-bit LSB shared object
+
+to
+
+    ELF 64-bit LSB pie executable x86-64
+
+So we need to treat "pie executable" as an equivalent file magic
+type for the purpose of PIE executable detection.
+---
+ BinariesCheck.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+Index: rpmlint-rpmlint-1.10/BinariesCheck.py
+===================================================================
+--- rpmlint-rpmlint-1.10.orig/BinariesCheck.py
++++ rpmlint-rpmlint-1.10/BinariesCheck.py
+@@ -525,6 +525,7 @@ class BinariesCheck(AbstractCheck.Abstra
+ 
+             is_exec = 'executable' in pkgfile.magic
+             is_shobj = 'shared object' in pkgfile.magic
++            is_pie_exec = 'pie executable' in pkgfile.magic
+ 
+             if not is_exec and not is_shobj:
+                 continue
+@@ -542,7 +543,8 @@ class BinariesCheck(AbstractCheck.Abstra
+                 if ocaml_mixed_regex.search(bin_info.tail):
+                     printWarning(pkg, 'ocaml-mixed-executable', fname)
+ 
+-                if not is_shobj and pie_exec_re and pie_exec_re.search(fname):
++                if ((not is_shobj and not is_pie_exec) and
++                        pie_exec_re and pie_exec_re.search(fname)):
+                     printError(pkg, 'non-position-independent-executable',
+                                fname)
+                 if not is_shobj:

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://github.com/openSUSE/rpmlint-tests.git</param>
-          <param name="changesrevision">f4dfbdc2cc367245537df410353a64d67cbcc519</param></service><service name="tar_scm">
+          <param name="changesrevision">88daa4ecc60c092a31c0d3839ef936ddc16503ff</param></service><service name="tar_scm">
             <param name="url">https://github.com/openSUSE/rpmlint-checks.git</param>
-          <param name="changesrevision">b8bbedf5f1bdfae4e9a50253abf09f81be4a55e4</param></service></servicedata>
+          <param name="changesrevision">4015553df03d74e0908c9f9acdb586c5dbfeb37c</param></service></servicedata>

config

@@ -468,6 +468,7 @@ setOption('StandardGroups', (
     'siproxd',
     '_sks',
     'snort',
+    'sogo',
     'squid',
     'sshd',
     'suse-ncc',
@@ -650,6 +651,7 @@ setOption('StandardUsers', (
     'siproxd',
     '_sks',
     'snort',
+    'sogo',
     'squid',
     'sshd',
     'statd',

rpmlint-checks-master.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75d6dcf83002964adefe908ed67f151ae2ce7b6f3cbd09edab9f0ef519e35cea
+oid sha256:e7aaa481bf5ce515c4be6ccb99c5b5eef8ec535a14a7b8377f4ba4aaa92e31a8
-size 23252
+size 23260

rpmlint-tests-84.87+git20180220.6f1f0aa.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a98c2c0baa5d14aa89e654803482e44c871e703bc4aab777db5e5e82267a116
-size 11700

rpmlint-tests-84.87+git20180703.88daa4e.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:905d0559dccf426f5ca52451732f80bf3eb2d75cae87f84d503f6cd8553ba108
+size 11548

rpmlint-tests.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jul 03 12:53:18 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Update to version 84.87+git20180703.88daa4e:
+  * Adjust order of output as well
+
+-------------------------------------------------------------------
+Tue Jul 03 12:45:14 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Update to version 84.87+git20180703.03176da:
+  * adjust reference testoutput for removal of badness
+
 -------------------------------------------------------------------
 Wed May  9 11:48:47 UTC 2018 - lnussel@suse.de
 

rpmlint-tests.spec

@@ -24,7 +24,7 @@ BuildRequires:  rpmlint-Factory-strict
 BuildRequires:  rpmlint-mini
 
 Name:           rpmlint-tests
-Version:        84.87+git20180220.6f1f0aa
+Version:        84.87+git20180703.88daa4e
 Release:        0
 Summary:        rpmlint regression tests
 License:        SUSE-Public-Domain

rpmlint.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jul  3 14:09:19 UTC 2018 - mcepl@suse.com
+
+- Add update-magic-values-python-37.patch
+    Neccessary for update of Python to 3.7
+    https://github.com/rpm-software-management/rpmlint/commit/52b715763217
+
+-------------------------------------------------------------------
+Tue Jul 03 12:30:20 UTC 2018 - opensuse-packaging@opensuse.org
+
+- Update rpmlint-checks to version master:
+  * New file 5.33 does identify pie executables now (bsc#1097339)
+- add 0001-Fix-compatibility-with-file-5.33.patch
+
+-------------------------------------------------------------------
+Mon Jul  2 10:01:36 UTC 2018 - c.schweingruber@catatec.ch
+
+- Add 'sogo' user and group (used in server:SOGo) 
+
 -------------------------------------------------------------------
 Mon Jun 11 16:44:30 UTC 2018 - matthias.gerstner@suse.com
 

rpmlint.spec

@@ -90,6 +90,8 @@ Patch71:        0001-Avoid-calling-close-on-undefined-fd-variable.patch
 Patch72:        rpmlint-slpp-NUM-NUM.patch
 Patch73:        0001-Binariescheck-Check-for-chroot-chdir-on-ARM-PPC.patch
 Patch74:        0001-Always-import-XDG-desktop-files-as-utf8.patch
+Patch75:        0001-Fix-compatibility-with-file-5.33.patch
+Patch76:        update-magic-values-python-37.patch
 BuildRequires:  obs-service-format_spec_file
 BuildRequires:  python3-flake8
 BuildRequires:  python3-pytest

update-magic-values-python-37.patch

@@ -0,0 +1,22 @@
+From 52b715763217bbc1cfcad9bba8e6a446e820690e Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dirk@dmllr.de>
+Date: Tue, 13 Feb 2018 13:42:27 +0100
+Subject: [PATCH] Update Magic values for Python 3.7 (Fixes #123)
+
+---
+ FilesCheck.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/FilesCheck.py b/FilesCheck.py
+index 2ece474..232a918 100644
+--- a/FilesCheck.py
++++ b/FilesCheck.py
+@@ -331,7 +331,7 @@ def peek(filename, pkg, length=1024):
+     '3.4': [3310],
+     '3.5': [3350, 3351],  # 3350 for < 3.5.2
+     '3.6': [3379],
+-    '3.7': [3390],
++    '3.7': [3390, 3391, 3392, 3393],
+ }
+ 
+