diff --git a/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch b/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch deleted file mode 100644 index b5ec2fa..0000000 --- a/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4565372c418433d3d8ff47e59924791f62a20b3a Mon Sep 17 00:00:00 2001 -From: Jimmy Berry -Date: Tue, 25 Oct 2016 13:27:06 -0500 -Subject: [PATCH 1/2] Update varrun test for Leap 42.2 severity reduction. - ---- - tests/varrun.ref | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/varrun.ref b/tests/varrun.ref -index 9982344..6b0d28a 100644 ---- a/tests/varrun.ref -+++ b/tests/varrun.ref -@@ -1,6 +1,6 @@ --varrun: E: non-ghost-in-run (Badness: 10000) /run/bar --varrun: E: non-ghost-in-run (Badness: 10000) /run/lock/foo --varrun: E: dir-or-file-in-var-run (Badness: 10000) /var/run --varrun: E: dir-or-file-in-var-run (Badness: 10000) /var/run/bar --varrun: E: dir-or-file-in-var-lock (Badness: 10000) /var/lock/foo --1 packages and 0 specfiles checked; 5 errors, 0 warnings. -+varrun: W: non-ghost-in-run /run/bar -+varrun: W: non-ghost-in-run /run/lock/foo -+varrun: W: dir-or-file-in-var-run /var/run -+varrun: W: dir-or-file-in-var-run /var/run/bar -+varrun: W: dir-or-file-in-var-lock /var/lock/foo -+1 packages and 0 specfiles checked; 0 errors, 5 warnings. --- -2.10.1 - diff --git a/_servicedata b/_servicedata index a30c0ce..c1c4721 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpmlint-tests.git - 27b6cb37e629d20ad4d7c0a590a73fbce5ae6009 + 921e05148f1f32a2ef1f31a5e646ed9b2b22c4e1 https://github.com/openSUSE/rpmlint-checks.git - b82179a9c8d48a3573e8c4f4770500d1fe932921 + b82179a9c8d48a3573e8c4f4770500d1fe932921 \ No newline at end of file diff --git a/rpmlint-pie-factory.patch b/rpmlint-pie-factory.patch deleted file mode 100644 index 8f363aa..0000000 --- a/rpmlint-pie-factory.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: rpmlint-tests-84.87+git20170418.092177d/tests/pie.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/pie.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/pie.ref -@@ -1,4 +1,5 @@ -+pie: W: position-independent-executable-suggested /usr/bin/telnet - pie: W: permissions-incorrect /bin/mount has mode 0755 but should be 04755 - pie: E: non-position-independent-executable (Badness: 10000) /usr/bin/telnet - pie: W: missing-call-to-setgroups-before-setuid /bin/mount --1 packages and 0 specfiles checked; 1 errors, 2 warnings. -+1 packages and 0 specfiles checked; 1 errors, 3 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/permissions1.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/permissions1.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/permissions1.ref -@@ -1,3 +1,4 @@ -+permissions1: W: position-independent-executable-suggested /bin/ls - permissions1: E: permissions-unauthorized-file (Badness: 10000) /etc/permissions.d/test - permissions1: W: permissions-missing-verifyscript missing %verify_permissions -e /bin/ls - permissions1: W: permissions-missing-verifyscript missing %verify_permissions -e /bin/su -@@ -8,4 +9,4 @@ permissions1: W: permissions-incorrect-o - permissions1: W: permissions-incorrect /bin/su has mode 0755 but should be 04755 - permissions1: E: permissions-file-setuid-bit (Badness: 10000) /bin/ls is packaged with setuid/setgid bits (04755) - permissions1: W: non-position-independent-executable /bin/ls --1 packages and 0 specfiles checked; 2 errors, 8 warnings. -+1 packages and 0 specfiles checked; 2 errors, 9 warnings. diff --git a/rpmlint-pie-leap42.patch b/rpmlint-pie-leap42.patch deleted file mode 100644 index 8d52a9f..0000000 --- a/rpmlint-pie-leap42.patch +++ /dev/null @@ -1,88 +0,0 @@ -Index: rpmlint-tests-84.87+git20170418.092177d/tests/srv.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/srv.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/srv.ref -@@ -1,4 +1,5 @@ - srv: E: suse-filelist-forbidden-srv (Badness: 10000) /usr/local/ftp is not allowed in SUSE - srv: W: suse-filelist-forbidden-fhs23 /usr/local is not allowed in FHS 2.3 -+srv: W: position-independent-executable-suggested /usr/local/ftp/foo - srv: W: call-to-mktemp /usr/local/ftp/foo --1 packages and 0 specfiles checked; 1 errors, 2 warnings. -+1 packages and 0 specfiles checked; 1 errors, 3 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/debug.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/debug.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/debug.ref -@@ -1,5 +1,6 @@ - debug: W: static-library-without-symtab /usr/lib/foo/t2.a - debug: W: static-library-without-debuginfo /usr/lib/foo/t.a -+debug: W: position-independent-executable-suggested /usr/bin/t - debug: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t.a - debug: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t2.a --1 packages and 0 specfiles checked; 2 errors, 2 warnings. -+1 packages and 0 specfiles checked; 2 errors, 3 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/game.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/game.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/game.ref -@@ -1,5 +1,7 @@ - game: E: suse-filelist-forbidden-games (Badness: 10000) /usr/games/lib/blub is not allowed in SUSE - game: E: suse-filelist-forbidden-games (Badness: 10000) /usr/games/lib is not allowed in SUSE -+game: W: position-independent-executable-suggested /usr/games/foo -+game: W: position-independent-executable-suggested /usr/games/lib/blub - game: W: call-to-mktemp /usr/games/foo - game: W: call-to-mktemp /usr/games/lib/blub --1 packages and 0 specfiles checked; 2 errors, 2 warnings. -+1 packages and 0 specfiles checked; 2 errors, 4 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/debug2.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/debug2.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/debug2.ref -@@ -1,4 +1,5 @@ - debug2: W: static-library-without-symtab /usr/lib/foo/t2.a -+debug2: W: position-independent-executable-suggested /usr/bin/t - debug2: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t.a - debug2: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t2.a --1 packages and 0 specfiles checked; 2 errors, 1 warnings. -+1 packages and 0 specfiles checked; 2 errors, 2 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/chroot.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/chroot.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/chroot.ref -@@ -1,2 +1,4 @@ -+chroot: W: position-independent-executable-suggested /usr/bin/call_chroot_with_chdir -+chroot: W: position-independent-executable-suggested /usr/bin/call_chroot - chroot: W: missing-call-to-chdir-with-chroot /usr/bin/call_chroot --1 packages and 0 specfiles checked; 0 errors, 1 warnings. -+1 packages and 0 specfiles checked; 0 errors, 3 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/debug1.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/debug1.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/debug1.ref -@@ -1,5 +1,6 @@ - debug1: W: static-library-without-symtab /usr/lib/foo/t2.a - debug1: W: static-library-without-debuginfo /usr/lib/foo/t.a -+debug1: W: position-independent-executable-suggested /usr/bin/t - debug1: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t.a - debug1: E: devel-file-in-non-devel-package (Badness: 50) /usr/lib/foo/t2.a --1 packages and 0 specfiles checked; 2 errors, 2 warnings. -+1 packages and 0 specfiles checked; 2 errors, 3 warnings. -Index: rpmlint-tests-84.87+git20170418.092177d/tests/gethostbyname.ref -=================================================================== ---- rpmlint-tests-84.87+git20170418.092177d.orig/tests/gethostbyname.ref -+++ rpmlint-tests-84.87+git20170418.092177d/tests/gethostbyname.ref -@@ -1,7 +1,13 @@ -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyaddr -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyname2 -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyname -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyname2_r -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyaddr_r -+gethostbyname: W: position-independent-executable-suggested /usr/bin/call_gethostbyname_r - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyaddr - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyname2 - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyname - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyname2_r - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyaddr_r - gethostbyname: I: binary-or-shlib-calls-gethostbyname /usr/bin/call_gethostbyname_r --1 packages and 0 specfiles checked; 0 errors, 0 warnings. -+1 packages and 0 specfiles checked; 0 errors, 6 warnings. diff --git a/rpmlint-tests-84.87+git20170928.27b6cb3.tar.xz b/rpmlint-tests-84.87+git20170928.27b6cb3.tar.xz deleted file mode 100644 index e506e69..0000000 --- a/rpmlint-tests-84.87+git20170928.27b6cb3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ee29044ba89b88fb014a1c09760cbda60f210f63225c0a4a778f59d5eba7622 -size 11192 diff --git a/rpmlint-tests-84.87+git20170930.921e051.tar.xz b/rpmlint-tests-84.87+git20170930.921e051.tar.xz new file mode 100644 index 0000000..b37e3d7 --- /dev/null +++ b/rpmlint-tests-84.87+git20170930.921e051.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:736b97e6b2b1568a63b432f68a0db15ba37c3f856c13fdcbbc031d2ce2690406 +size 11212 diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index a8d1dd0..508bc7a 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,8 +1,17 @@ +------------------------------------------------------------------- +Sat Sep 30 16:19:07 UTC 2017 - opensuse-packaging@opensuse.org + +- Update to version 84.87+git20170930.921e051: + * Update reference files against rpmlint 1.10 + ------------------------------------------------------------------- Thu Sep 28 21:16:42 UTC 2017 - opensuse-packaging@opensuse.org - Update to version 84.87+git20170928.27b6cb3: * Adjustments for newer rpmlint + drop 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch + rpmlint-pie-factory.patch, rpmlint-pie-leap42.patch: + this belongs into git ------------------------------------------------------------------- Thu Sep 28 12:47:02 UTC 2017 - opensuse-packaging@opensuse.org diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index 645f111..88f3d30 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -23,7 +23,7 @@ BuildRequires: rpmlint-Factory-strict BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 84.87+git20170928.27b6cb3 +Version: 84.87+git20170930.921e051 Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain @@ -31,9 +31,6 @@ Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.opensuse.org/ Source: rpmlint-tests-%version.tar.xz -Patch1: 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch -Patch2: rpmlint-pie-leap42.patch -Patch3: rpmlint-pie-factory.patch %description This package doesn't actually contain any files and is not meant to @@ -42,13 +39,6 @@ regression tests against rpmlint(-mini). %prep %setup -q -%if 0%{?sle_version} >= 120200 -%patch1 -p1 -%endif -%if 0%{?suse_version} < 1330 -%patch2 -p1 -%endif -%patch3 -p1 %build mkdir rpms