rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

Accepting request 449305 from devel:openSUSE:Factory:rpmlint

Browse Source 
- Adding org.freedesktop.resolve1.conf (bsc#917781) (forwarded request 449302 from krahmer)

OBS-URL: https://build.opensuse.org/request/show/449305
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=262
This commit is contained in:
Dominique Leuenberger 2017-01-19 09:34:04 +00:00 committed by Git OBS Bridge
commit 1a1a826085
6 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config
View File

@ -716,7 +716,10 @@ setOption("DBUSServices.WhiteList", (
"org.gnome.Sysprof2.conf",
# flatpak (bsc#984817)
"org.freedesktop.Flatpak.SystemHelper.service",
"org.freedesktop.Flatpak.SystemHelper.conf"
"org.freedesktop.Flatpak.SystemHelper.conf",
# systemd resolver, but dont add automatically to nsswitch.conf! (bsc#917781)
"org.freedesktop.resolve1.conf",
"org.freedesktop.resolve1.service"
))
setOption("PAMModules.WhiteList", (

2
rpmlint-tests.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package rpmlint-tests
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

16
rpmlint.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Jan 9 09:49:53 UTC 2017 - krahmer@suse.com
- Adding org.freedesktop.resolve1.conf (bsc#917781)
-------------------------------------------------------------------
Tue Jan 3 10:05:42 UTC 2017 - stefan.bruens@rwth-aachen.de
- add suse-readd_terminator_in_regex.patch
Fixes bad detection of dependencies for devel packages
-------------------------------------------------------------------
Mon Jan 2 14:27:52 UTC 2017 - dmueller@suse.com
- update suse-obsolete-version check (bsc#743981)
-------------------------------------------------------------------
Mon Dec 5 10:33:21 UTC 2016 - krahmer@suse.com

4
rpmlint.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package rpmlint
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -117,6 +117,8 @@ Patch64: omit_BUILDROOT_from_pyo_files.patch
# PATCH-FIX-UPSTREAM 0001-Fix-resolving-Python-source-from-3.5-.opt-12.pyc.patch alarrosa@suse.com -- Fixes resolving python source from files generated following PEP0488
Patch65: 0001-Fix-resolving-Python-source-from-3.5-.opt-12.pyc.patch
Patch66: issue_68_BinariesCheck_lower_memory.patch
# Fix a regression introduced by suse-shlib-devel-dependency.diff
Patch67: suse-readd_terminator_in_regex.patch
# PATCHLIST END
# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
BuildArch: noarch

24
suse-readd_terminator_in_regex.patch Normal file
View File

@ -0,0 +1,24 @@
From 0d93fa7656cb68c63c11d451d7894cac17af33e2 Mon Sep 17 00:00:00 2001
From: StefanBruens <stefan.bruens@rwth-aachen.de>
Date: Mon, 12 Dec 2016 20:12:46 +0100
Subject: [PATCH] Readd dropped '$' in regex, fix broken check on devel
dependency
The current regex also maches "Requires: libzork-data", although it should only match e.g. "libzork1" or "zork-libs". As the latter sorts after "libzork-data", an existing correct dependency may be missed.
---
TagsCheck.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/TagsCheck.py b/TagsCheck.py
index fa6154c..e71d90b 100644
--- a/TagsCheck.py
+++ b/TagsCheck.py
@@ -640,7 +640,7 @@ def check(self, pkg):
base_or_libs = base + '*/' + base + '-libs/lib' + base + '*'
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
base_or_libs_re = re.compile(
- '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?' % re.escape(base))
+ '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?$' % re.escape(base))
for d in deps:
if base_or_libs_re.match(d[0]):
dep = d

4
suse-version.diff
View File

@ -24,9 +24,9 @@ index b69bead..2e3ba56 100644
printWarning(pkg, 'hardcoded-prefix-tag', res.group(1))
+ res = suse_version_regex.search(line)
+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1210:
+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1315:
+ printWarning(pkg, "obsolete-suse-version-check", res.group(1))
+ elif res and int(res.group(1)) > 1310:
+ elif res and int(res.group(1)) > 1330:
+ printError(pkg, "invalid-suse-version-check", res.group(1))
+
res = prereq_regex.search(line)