rpms/rpmlint/F-10 .cvsignore, 1.22, 1.23 rpmlint.config, 1.28, 1.29 rpmlint.spec, 1.55, 1.56 sources, 1.22, 1.23

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18819/F-10

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Log Message:
* Sun Jun 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.88-1
- Update to 0.88; fixes #461610, #496735, #496737 (partially), #491188, #506957.
- Sync Fedora license list with Wiki revision 1.44.
- Parse list of standard users and groups from the setup package's uidgid file.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	19 Mar 2009 23:20:55 -0000	1.22
+++ .cvsignore	21 Jun 2009 21:17:39 -0000	1.23
@@ -1 +1 @@
-rpmlint-0.87.tar.bz2
+rpmlint-0.88.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-10/rpmlint.config,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- rpmlint.config	19 Mar 2009 23:20:55 -0000	1.28
+++ rpmlint.config	21 Jun 2009 21:17:39 -0000	1.29
@@ -3,14 +3,19 @@
 # System wide rpmlint default configuration.  Do not modify, override/add
 # options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.
 
+import os.path
+import re
+
 from Config import *
+import Pkg
+
 
 setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)')
-setOption("UseVersionInChangeLog", 1)
-setOption("UseBzip2", 0)
-setOption("UseDefaultRunlevels", 0)
-setOption("UseEpoch", 0)
-setOption("UseUTF8", 1)
+setOption("UseVersionInChangeLog", True)
+setOption("UseBzip2", False)
+setOption("UseDefaultRunlevels", False)
+setOption("UseEpoch", False)
+setOption("UseUTF8", True)
 setOption("ValidSrcPerms", (0664, 0644, ))
 setOption("ValidShells", (
     "/bin/sh",
@@ -28,7 +33,7 @@ setOption("DanglingSymlinkExceptions", (
 setOption("ValidLicenses", (
     # These are the short names for all of the Fedora approved licenses.
     # The master list is kept here: http://fedoraproject.org/wiki/Licensing
-    # Last synced with revision "1.38, 27 Feb 2009" of that page.
+    # Last synced with revision "1.44, 5 June 2009" of that page.
     'AAL',
     'Adobe',
     'ADSL',
@@ -47,6 +52,7 @@ setOption("ValidLicenses", (
     'APSL 2.0+',
     'Artistic 2.0',
     'Artistic clarified',
+    'Beerware',
     'BitTorrent',
     'Boost',
     'BSD',
@@ -104,6 +110,8 @@ setOption("ValidLicenses", (
     'ISC',
     'Jabber',
     'JasPer',
+    'JPython',
+    'Knuth',
     'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
@@ -116,6 +124,7 @@ setOption("ValidLicenses", (
     'LGPLv3+ with exceptions',
     'libtiff',
     'LLGPL',
+    'Logica',
     'LPL',
     'LPPL',
     'mecab-ipadic',
@@ -152,6 +161,7 @@ setOption("ValidLicenses", (
     'Phorum',
     'PHP',
     'PlainTeX',
+    'Plexus',
     'psutils',
     'Public Domain',
     'Python',
@@ -160,6 +170,7 @@ setOption("ValidLicenses", (
     'RiceBSD',
     'RPSL',
     'Ruby',
+    'Saxpath',
     'SCEA',
     'SCRIP',
     'Sendmail',
@@ -229,15 +240,35 @@ setOption("ValidLicenses", (
     'Freely redistributable without restriction',
 ))
 
-# Standard users & groups from the setup package:
-setOption("StandardUsers",
-          ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
-           "mail", "news", "uucp", "operator", "games", "gopher", "ftp",
-           "nobody"))
-setOption("StandardGroups",
-          ("root", "bin", "daemon", "sys", "adm", "tty", "disk", "lp", "mem",
-           "kmem", "wheel", "mail", "news", "uucp", "man", "games", "gopher",
-           "dip", "ftp", "lock", "nobody", "users"))
+# Get standard users and groups from the setup package's uidgid file
+setOption('StandardUsers', [])
+setOption('StandardGroups', [])
+setup_pkg = None
+try:
+    setup_pkg = Pkg.InstalledPkg('setup')
+except:
+    pass
+if setup_pkg:
+    uidgid_regex = re.compile('^\s*(\S+)\s+(-|\d+)\s+(-|\d+)\s')
+    for uidgid_file in [x for x in setup_pkg.files() if x.endswith('/uidgid')]:
+        if os.path.exists(uidgid_file):
+            fobj = open(uidgid_file)
+            try:
+                for line in fobj.read().strip().splitlines():
+                    res = uidgid_regex.search(line)
+                    if res:
+                        name = res.group(1)
+                        if res.group(2) != '-':
+                            getOption('StandardUsers').append(name)
+                        if res.group(3) != '-':
+                            getOption('StandardGroups').append(name)
+                    del res
+                del line
+            finally:
+                fobj.close()
+            del fobj
+    del uidgid_regex, uidgid_file
+del setup_pkg
 
 # Output filters
 addFilter("source-or-patch-not-[bg]zipped")
@@ -268,3 +299,8 @@ addFilter("not-standard-release-extensio
 addFilter("explicit-lib-dependency (liberation-fonts|libertas-.*-firmware)")
 addFilter("filename-too-long-for-joliet")
 addFilter("symlink-should-be-")
+addFilter("dangling-\S*symlink /usr/share/doc/HTML/\S+/common .+/common$")
+addFilter("hidden-file-or-dir .*/man5/\.k5login\.5[^/]+$")
+# TODO: more whitelisted executables, https://bugzilla.redhat.com/496737
+addFilter("krb5-workstation.+ (setuid-binary|non-standard-executable-perm) /usr/kerberos/bin/ksu (root )?04755")
+addFilter("blender.+ (wrong-script-interpreter|non-executable-script) .+/blender/.+\.py.*BPY.*")


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-10/rpmlint.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- rpmlint.spec	19 Mar 2009 23:20:55 -0000	1.55
+++ rpmlint.spec	21 Jun 2009 21:17:39 -0000	1.56
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.87
+Version:        0.88
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.88-1
+- Update to 0.88; fixes #461610, #496735, #496737 (partially), #491188, #506957.
+- Sync Fedora license list with Wiki revision 1.44.
+- Parse list of standard users and groups from the setup package's uidgid file.
+
 * Thu Mar 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.87-1
 - 0.87; fixes #480664, #483196, #483199, #486748, #488146, #488930, #489118.
 - Sync Fedora license list with Wiki revision 1.38.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	19 Mar 2009 23:20:55 -0000	1.22
+++ sources	21 Jun 2009 21:17:39 -0000	1.23
@@ -1 +1 @@
-2880a1e7b245161982453f9a26c0e9d0  rpmlint-0.87.tar.bz2
+97a71974677e82bd071bd0a4c002463a  rpmlint-0.88.tar.bz2