Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Wed Jun 1 09:49:36 CEST 2011.
-------- --- rpmlint/rpmlint.changes 2011-05-24 16:21:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2011-05-31 13:31:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 31 11:29:52 UTC 2011 - [email protected] + +- add check for /var/lock/subsys usage + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rpmlint-subsys.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.Be91bV/_old 2011-06-01 09:49:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Be91bV/_new 2011-06-01 09:49:02.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: rpm-python xz Summary: Rpm correctness checker Version: 1.2 -Release: 5 +Release: 7 Source0: http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz Source1: config Source1001: config.in @@ -130,6 +130,7 @@ Patch89: rpmlint-pie.diff # accepted upstream Patch90: rpmlint-typo.diff +Patch91: rpmlint-subsys.diff %py_requires %description @@ -145,6 +146,7 @@ %prep %setup -q -n rpmlint-%{version} +%patch91 -p1 %patch0 %patch1 %patch2 ++++++ config ++++++ --- /var/tmp/diff_new_pack.Be91bV/_old 2011-06-01 09:49:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Be91bV/_new 2011-06-01 09:49:03.000000000 +0200 @@ -64,6 +64,7 @@ #setOption("ValidGroups", ("Group1", "Group2")) #setOption("KernelModuleRPMsOK", 0) setOption("CompressExtension", None) +setOption('UseVarLockSubsys', False) setOption('StandardGroups', ( 'aegis', ++++++ rpmlint-subsys.diff ++++++ >From 665a612a589e161509de4aeab1486f430cc99e03 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <[email protected]> Date: Tue, 31 May 2011 13:21:27 +0200 Subject: [PATCH] add option to disable /var/lock/subsys check openSUSE for example doesn't use /var/lock/subsys --- InitScriptCheck.py | 11 +++++++++-- config | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/InitScriptCheck.py b/InitScriptCheck.py index ba7952e..167385b 100644 --- a/InitScriptCheck.py +++ b/InitScriptCheck.py @@ -29,6 +29,7 @@ dot_in_name_regex = re.compile('.*\..*') use_deflevels = Config.getOption('UseDefaultRunlevels', True) lsb_tags_regex = re.compile('^# ([\w-]+):\s*(.*?)\s*$') lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$') +use_subsys = Config.getOption('UseVarLockSubsys', True) LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start', 'Should-Stop', 'Default-Start', 'Default-Stop', @@ -152,7 +153,7 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): if res: subsys_regex_found = True name = res.group(1) - if name != basename: + if use_subsys and name != basename: error = True if name[0] == '$': value = Pkg.substitute_shell_vars(name, content_str) @@ -181,8 +182,10 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): printWarning(pkg, 'no-reload-entry', fname) if not chkconfig_content_found: printError(pkg, 'no-chkconfig-line', fname) - if not subsys_regex_found: + if not subsys_regex_found and use_subsys: printError(pkg, 'subsys-not-used', fname) + elif subsys_regex_found and not use_subsys: + printError(pkg, 'subsys-unsupported', fname) goodnames = (pkg.name.lower(), pkg.name.lower() + 'd') if len(initscript_list) == 1 and initscript_list[0] not in goodnames: @@ -238,6 +241,10 @@ reasons, most services should not be. Use "-" as the default runlevel in the init script's "chkconfig:" line and/or remove the "Default-Start:" LSB keyword to fix this if appropriate for this service.''', +'subsys-unsupported', +'''The init script uses /var/lock/subsys which is not supported by +this distribution.''', + 'subsys-not-used', '''While your daemon is running, you have to put a lock file in /var/lock/subsys/. To see an example, look at this directory on your diff --git a/config b/config index 8ed05d4..5631260 100644 --- a/config +++ b/config @@ -162,6 +162,10 @@ from Config import * # Type: boolean, default: True #setOption("UseVersionInChangelog", True) +# Whether init scripts must use /var/lock/subsys +# Type: boolean, default: True +#setOption("UseVarLockSubsys", True) + # Architecture dependent paths in which packages are allowed to install files # even if they are all non-binary. # Type: regexp, default: see BinariesCheck -- 1.7.3.4 ++++++ suse-rclink-check.diff ++++++ --- /var/tmp/diff_new_pack.Be91bV/_old 2011-06-01 09:49:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Be91bV/_new 2011-06-01 09:49:03.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -50,7 +50,7 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -52,7 +52,7 @@ class InitScriptCheck(AbstractCheck.Abst return initscript_list = [] @@ -11,7 +11,7 @@ # check chkconfig call in %post and %preun postin = pkg[rpm.RPMTAG_POSTIN] or pkg[rpm.RPMTAG_POSTINPROG] -@@ -59,6 +59,10 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -61,6 +61,10 @@ class InitScriptCheck(AbstractCheck.Abst for fname, pkgfile in pkg.files().items(): @@ -22,9 +22,9 @@ if not fname.startswith('/etc/init.d/') and \ not fname.startswith('/etc/rc.d/init.d/'): continue -@@ -194,6 +198,12 @@ class InitScriptCheck(AbstractCheck.Abst - if not subsys_regex_found: - printError(pkg, 'subsys-not-used', fname) +@@ -198,6 +202,12 @@ class InitScriptCheck(AbstractCheck.Abst + elif subsys_regex_found and not use_subsys: + printError(pkg, 'subsys-unsupported', fname) + for script in initscript_list: + if script.startswith("rc") or script.startswith("boot."): @@ -35,7 +35,7 @@ goodnames = (pkg.name.lower(), pkg.name.lower() + 'd') if len(initscript_list) == 1 and initscript_list[0] not in goodnames: printWarning(pkg, 'incoherent-init-script-name', initscript_list[0], -@@ -216,6 +226,10 @@ a call to chkconfig.''', +@@ -220,6 +230,10 @@ a call to chkconfig.''', '''The package contains an init script but doesn't contain a %preun with a call to chkconfig.''', ++++++ sysv5-init-checks.diff ++++++ --- /var/tmp/diff_new_pack.Be91bV/_old 2011-06-01 09:49:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Be91bV/_new 2011-06-01 09:49:03.000000000 +0200 @@ -2,17 +2,18 @@ =================================================================== --- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -29,6 +29,9 @@ dot_in_name_regex = re.compile('.*\..*') - use_deflevels = Config.getOption('UseDefaultRunlevels', True) - lsb_tags_regex = re.compile('^# ([\w-]+):\s*(.*?)\s*$') +@@ -31,6 +31,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+) lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$') + use_subsys = Config.getOption('UseVarLockSubsys', True) + +stop_on_removal_regex=re.compile('/etc/init.d/\$service stop > /dev/null') +restart_on_update_regex=re.compile('/etc/init.d/\$service try-restart > /dev/null') +insserv_cleanup_regex=re.compile('^\s*/sbin/insserv /etc/init.d$', re.MULTILINE) - ++ LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start', 'Should-Stop', 'Default-Start', 'Default-Stop', -@@ -47,6 +50,13 @@ class InitScriptCheck(AbstractCheck.Abst + 'Short-Description', 'Description') +@@ -48,6 +52,13 @@ class InitScriptCheck(AbstractCheck.Abst return initscript_list = [] @@ -26,7 +27,7 @@ for fname, pkgfile in pkg.files().items(): if not fname.startswith('/etc/init.d/') and \ -@@ -60,18 +70,15 @@ class InitScriptCheck(AbstractCheck.Abst +@@ -61,18 +72,15 @@ class InitScriptCheck(AbstractCheck.Abst if dot_in_name_regex.match(basename): printError(pkg, 'init-script-name-with-dot', fname) @@ -54,7 +55,7 @@ status_found = False reload_found = False -@@ -264,6 +271,17 @@ of chkconfig don't work as expected with +@@ -271,6 +279,17 @@ of chkconfig don't work as expected with 'init-script-non-executable', '''The init script should have at least the execution bit set for root in order for it to run at boot time.''', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
