diff --git a/_servicedata b/_servicedata
index fe75923..d6b28e5 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
http://github.com/openSUSE/rpmlint-tests.git
- 092177d4fccb48dfb4164faddf11442b63249bff
+ d2c55ee87053a52d81b33cca0d760fa99588d155
http://github.com/openSUSE/rpmlint-checks.git
8d8fc8774ada96397e437d451b2461b64338db08
\ No newline at end of file
diff --git a/add-weak-dependencies.diff b/add-weak-dependencies.diff
index ee557df..1ef9934 100644
--- a/add-weak-dependencies.diff
+++ b/add-weak-dependencies.diff
@@ -1,15 +1,3 @@
-From: Some One
-Date: Thu, 9 Apr 2015 14:55:39 +0200
-Subject: [PATCH] add-weak-dependencies.diff
-
-===================================================================
----
- Pkg.py | 29 +++++++++++++++++++++++++++--
- TagsCheck.py | 19 +++++++++++++++++++
- 2 files changed, 46 insertions(+), 2 deletions(-)
-
-Index: rpmlint-rpmlint-1.10/Pkg.py
-===================================================================
--- rpmlint-rpmlint-1.10.orig/Pkg.py
+++ rpmlint-rpmlint-1.10/Pkg.py
@@ -494,6 +494,10 @@ class Pkg(AbstractPkg):
diff --git a/better-wrong-script.diff b/better-wrong-script.diff
index fc8c37a..0159dd2 100644
--- a/better-wrong-script.diff
+++ b/better-wrong-script.diff
@@ -1,14 +1,3 @@
-From: Some One
-Date: Thu, 9 Apr 2015 14:55:38 +0200
-Subject: [PATCH] better-wrong-script.diff
-
-===================================================================
----
- FilesCheck.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: rpmlint-rpmlint-1.9/FilesCheck.py
-===================================================================
--- rpmlint-rpmlint-1.9.orig/FilesCheck.py
+++ rpmlint-rpmlint-1.9/FilesCheck.py
@@ -1249,7 +1249,10 @@ executed.''',
diff --git a/buildroot-doc.diff b/buildroot-doc.diff
index e6cd13a..0e76117 100644
--- a/buildroot-doc.diff
+++ b/buildroot-doc.diff
@@ -1,14 +1,3 @@
-From: Some One
-Date: Thu, 9 Apr 2015 14:55:38 +0200
-Subject: [PATCH] buildroot-doc.diff
-
-===================================================================
----
- SpecCheck.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rpmlint-rpmlint-1.10/SpecCheck.py
-===================================================================
--- rpmlint-rpmlint-1.10.orig/SpecCheck.py
+++ rpmlint-rpmlint-1.10/SpecCheck.py
@@ -670,7 +670,7 @@ versions you can ignore this warning.'''
diff --git a/buildroot-in-scripts.diff b/buildroot-in-scripts.diff
index 017ad32..37b7cd7 100644
--- a/buildroot-in-scripts.diff
+++ b/buildroot-in-scripts.diff
@@ -1,14 +1,3 @@
-From: Some One
-Date: Thu, 9 Apr 2015 14:55:39 +0200
-Subject: [PATCH] buildroot-in-scripts.diff
-
-===================================================================
----
- SpecCheck.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: rpmlint-rpmlint-1.10/SpecCheck.py
-===================================================================
--- rpmlint-rpmlint-1.10.orig/SpecCheck.py
+++ rpmlint-rpmlint-1.10/SpecCheck.py
@@ -235,7 +235,9 @@ class SpecCheck(AbstractCheck.AbstractCh
diff --git a/rpmlint-tests-84.87+git20170418.092177d.tar.xz b/rpmlint-tests-84.87+git20170418.092177d.tar.xz
deleted file mode 100644
index c833378..0000000
--- a/rpmlint-tests-84.87+git20170418.092177d.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31d10b7286df08b73336c314ade702381f09913ad141a6a2b5c16cefe3ddf784
-size 11452
diff --git a/rpmlint-tests-84.87+git20170928.d2c55ee.tar.xz b/rpmlint-tests-84.87+git20170928.d2c55ee.tar.xz
new file mode 100644
index 0000000..3defcde
--- /dev/null
+++ b/rpmlint-tests-84.87+git20170928.d2c55ee.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:300fe9dd0a582aac7536644fdcac5859b8be789015975443e0d415f25f2a0927
+size 11260
diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes
index 7be06f2..43aa240 100644
--- a/rpmlint-tests.changes
+++ b/rpmlint-tests.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:47:02 UTC 2017 - opensuse-packaging@opensuse.org
+
+- Update to version 84.87+git20170928.d2c55ee:
+ * Remove some outdated sysv init check, we have switched to systemd
+
-------------------------------------------------------------------
Sun Jul 2 16:30:01 UTC 2017 - meissner@suse.com
diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec
index 199ba4c..cbabf35 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+git20170418.092177d
+Version: 84.87+git20170928.d2c55ee
Release: 0
Summary: rpmlint regression tests
License: SUSE-Public-Domain
diff --git a/rpmlint.changes b/rpmlint.changes
index c19266f..6ad1e18 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -158,6 +158,7 @@ Thu Sep 28 09:37:04 UTC 2017 - dmueller@suse.com
suse-filesystem.diff: obsolete
- drop update_git.sh related stuff: this is obsolete, patches are
either supposed to be upstreamed or handled via quilt
+- add suse-skip-macro-expansion.diff: rename from remove-expand-macros.diff
-------------------------------------------------------------------
Thu Sep 28 09:31:24 UTC 2017 - opensuse-packaging@opensuse.org
diff --git a/rpmlint.spec b/rpmlint.spec
index 8d793e7..481cc78 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -68,6 +68,7 @@ Patch07: suse-binarieschecks.diff
Patch08: no-doc-for-lib.diff
Patch09: suse-filter-exception.diff
Patch10: suse-spdx-license-exceptions.patch
+Patch11: suse-skip-macro-expansion.diff
Patch20: usr-arch.diff
Patch23: suse-filter-more-verbose.diff
Patch24: docdata-examples.diff
diff --git a/suse-binarieschecks.diff b/suse-binarieschecks.diff
index 9bf46b0..9b1f3e7 100644
--- a/suse-binarieschecks.diff
+++ b/suse-binarieschecks.diff
@@ -42,19 +42,17 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
self.tail = ''
self.setgid = False
-@@ -167,6 +174,11 @@ class BinaryInfo(object):
- if ret:
- self.forbidden_calls.append(r_name)
+@@ -161,6 +168,9 @@ class BinaryInfo(object):
+ if BinaryInfo.chroot_call_regex.search(l):
+ self.chroot = True
-+ r = BinaryInfo.gethostbyname_call_regex.search(l)
-+ if r:
++ if BinaryInfo.gethostbyname_call_regex.search(l):
+ self.calls_gethostbyname = True
-+ continue
+
- if is_shlib:
- r = BinaryInfo.exit_call_regex.search(l)
- if r:
-@@ -177,6 +189,14 @@ class BinaryInfo(object):
+ if BinaryInfo.forbidden_functions:
+ for r_name, func in BinaryInfo.forbidden_functions.items():
+ ret = func['f_regex'].search(l)
+@@ -177,6 +187,14 @@ class BinaryInfo(object):
fork_called = True
continue
@@ -69,7 +67,7 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
# check if we don't have a string that will automatically
# waive the presence of a forbidden call
if self.forbidden_calls:
-@@ -392,13 +412,26 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -392,13 +410,26 @@ class BinariesCheck(AbstractCheck.Abstra
continue
# stripped ?
@@ -97,7 +95,7 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
if is_shlib:
has_lib = True
-@@ -453,6 +486,10 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -453,6 +484,10 @@ class BinariesCheck(AbstractCheck.Abstra
printWarning(pkg, ec, fname,
BinaryInfo.forbidden_functions[ec]['f_name'])
@@ -108,7 +106,7 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
# rpath ?
if bin_info.rpath:
for p in bin_info.rpath:
-@@ -666,6 +703,14 @@ with the intended shared libraries only.
+@@ -666,6 +701,14 @@ with the intended shared libraries only.
'ldd-failed',
'''Executing ldd on this file failed, all checks could not be run.''',
@@ -123,7 +121,7 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
'executable-stack',
'''The binary declares the stack as executable. Executable stack is usually an
error as it is only needed if the code contains GCC trampolines or similar
-@@ -678,6 +723,10 @@ don\'t define a proper .note.GNU-stack s
+@@ -678,6 +721,10 @@ don\'t define a proper .note.GNU-stack s
make the stack executable. Usual suspects include use of a non-GNU linker or
an old GNU linker version.''',
@@ -134,7 +132,7 @@ Index: rpmlint-rpmlint-1.10/BinariesCheck.py
'shared-lib-calls-exit',
'''This library package calls exit() or _exit(), probably in a non-fork()
context. Doing so from a library is strongly discouraged - when a library
-@@ -696,6 +745,12 @@ that use prelink, make sure that prelink
+@@ -696,6 +743,12 @@ that use prelink, make sure that prelink
placing a blacklist file in /etc/prelink.conf.d. For more information, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900#49''',