- added patches:

* 0001-Python-3-compatibility-tweaks.patch - Change openstack- related users to non-prefixed variants, as they get renamed with the switch to Icehouse OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=244
2014-02-21 14:54:14 +00:00 · 2014-02-21 14:54:14 +00:00 · b0b29cefb3
commit b0b29cefb3
parent e12e58e634
26 changed files with 1002 additions and 80 deletions
--- a/0001-Python-3-compatibility-tweaks.patch
+++ b/0001-Python-3-compatibility-tweaks.patch
@ -0,0 +1,909 @@
+From 54235cd38e08c8a93de74e7884eea746ae002b2e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Thu, 12 Sep 2013 21:27:55 +0300
+Subject: [PATCH 1/3] Python 3 compatibility tweaks.
+
+(cherry picked from commit cc6369dbafb27568802b8f0a60518a69d6738e3b)
+---
+ AbstractCheck.py |  4 +++-
+ Filter.py        |  2 +-
+ Pkg.py           | 37 ++++++++++++++++++++-----------------
+ PostCheck.py     |  3 +--
+ rpmdiff          |  8 ++++----
+ rpmlint          | 40 +++++++++++++++++++++++-----------------
+ 6 files changed, 52 insertions(+), 42 deletions(-)
+
+Index: rpmlint-1.5/AbstractCheck.py
+===================================================================
+--- rpmlint-1.5.orig/AbstractCheck.py
+++ rpmlint-1.5/AbstractCheck.py
+@@ -9,7 +9,11 @@
+ 
+ import re
+ import socket
+-import urllib2
+import sys
+try:
+    import urllib2
+except:
+    import urllib.request as urllib2
+ 
+ from Filter import addDetails, printInfo, printWarning
+ import Config
+@@ -61,7 +65,8 @@ class AbstractCheck:
+             opener.addheaders = [('User-Agent',
+                                   'rpmlint/%s' % Config.__version__)]
+             res = opener.open(_HeadRequest(url))
+-        except Exception, e:
+        except Exception:
+            e = sys.exc_info()[1]
+             errstr = str(e) or repr(e) or type(e)
+             printWarning(pkg, 'invalid-url', '%s:' % tag, url, errstr)
+         info = None
+Index: rpmlint-1.5/Filter.py
+===================================================================
+--- rpmlint-1.5.orig/Filter.py
+++ rpmlint-1.5/Filter.py
+@@ -123,7 +123,7 @@ def printAllReasons():
+ _details = {}
+ 
+ def addDetails(*details):
+-    for idx in range(len(details)/2):
+    for idx in range(int(len(details)/2)):
+         if not details[idx*2] in _details:
+             _details[details[idx*2]] = details[idx*2+1]
+ 
+Index: rpmlint-1.5/Pkg.py
+===================================================================
+--- rpmlint-1.5.orig/Pkg.py
+++ rpmlint-1.5/Pkg.py
+@@ -8,14 +8,15 @@
+ #                 the rpm file or by accessing the files contained inside.
+ #############################################################################
+ 
+-import commands
+ import os
+ import re
+ import subprocess
+ import sys
+ import tempfile
+-import types
+-import urlparse
+try:
+    from urlparse import urljoin
+except:
+    from urllib.parse import urljoin
+ 
+ try:
+     import magic
+@@ -73,18 +74,18 @@ def substitute_shell_vars(val, script):
+     else:
+         return val
+ 
+-def getstatusoutput(cmd, stdoutonly = False):
+def getstatusoutput(cmd, stdoutonly = False, shell = False):
+     '''A version of commands.getstatusoutput() which can take cmd as a
+        sequence, thus making it potentially more secure.'''
+     if stdoutonly:
+-        proc = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+        proc = subprocess.Popen(cmd, shell=shell, stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE, close_fds=True)
+     else:
+-        proc = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+        proc = subprocess.Popen(cmd, shell=shell, stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT, close_fds=True)
+     proc.stdin.close()
+-    text = proc.stdout.read()
+    text = proc.stdout.read().decode()
+     sts = proc.wait()
+     if sts is None:
+         sts = 0
+@@ -192,7 +193,9 @@ def get_default_valid_rpmgroups(filename
+     return groups
+ 
+ # from yum 3.2.27, rpmUtils.miscutils, with rpmlint modifications
+-def compareEVR((e1, v1, r1), (e2, v2, r2)):
+def compareEVR(evr1, evr2):
+    (e1, v1, r1) = evr1
+    (e2, v2, r2) = evr2
+     # return 1: a is newer than b
+     # 0: a and b are the same version
+     # -1: b is newer than a
+@@ -441,13 +444,13 @@ class Pkg:
+                 os.close(fd)
+             self.is_source = not self.header[rpm.RPMTAG_SOURCERPM]
+ 
+-        self.name = self.header[rpm.RPMTAG_NAME]
+        self.name = self.header[rpm.RPMTAG_NAME].decode()
+         if self.isNoSource():
+             self.arch = 'nosrc'
+         elif self.isSource():
+             self.arch = 'src'
+         else:
+-            self.arch = self.header[rpm.RPMTAG_ARCH]
+            self.arch = self.header.format("%{ARCH}")
+ 
+     # Return true if the package is a source package
+     def isSource(self):
+@@ -488,7 +491,7 @@ class Pkg:
+             command_str = \
+                 'rpm2cpio "%s" | (cd "%s"; cpio -id); chmod -R +rX "%s"' % \
+                 (self.filename, self.dirname, self.dirname)
+-            cmd = commands.getstatusoutput(command_str)
+            cmd = getstatusoutput(command_str, shell=True)
+             self.extracted = True
+             return cmd
+ 
+@@ -507,14 +510,16 @@ class Pkg:
+         in_file = None
+         try:
+             try:
+-                in_file = open(self.dirName() + '/' + filename)
+                in_file = open(os.path.join(
+                    self.dirName() or '/', filename.lstrip('/')))
+                 for line in in_file:
+                     lineno += 1
+                     if regex.search(line):
+                         ret.append(str(lineno))
+                         break
+-            except Exception, e:
+-                Filter.printWarning(self, 'read-error', filename, e)
+            except Exception:
+                Filter.printWarning(self, 'read-error', filename,
+                                    sys.exc_info()[1])
+         finally:
+             if in_file:
+                 in_file.close()
+@@ -525,7 +530,7 @@ class Pkg:
+         # LANGUAGE trumps other env vars per GNU gettext docs, see also #166
+         orig = os.environ.get('LANGUAGE')
+         os.environ['LANGUAGE'] = lang
+-        ret = self[tag]
+        ret = self[tag].decode()
+         if orig is not None:
+             os.environ['LANGUAGE'] = orig
+         return ret
+@@ -590,17 +595,17 @@ class Pkg:
+         modes = self.header[rpm.RPMTAG_FILEMODES]
+         users = self.header[rpm.RPMTAG_FILEUSERNAME]
+         groups = self.header[rpm.RPMTAG_FILEGROUPNAME]
+-        links = self.header[rpm.RPMTAG_FILELINKTOS]
+        links = [x.decode() for x in self.header[rpm.RPMTAG_FILELINKTOS]]
+         sizes = self.header[rpm.RPMTAG_FILESIZES]
+         md5s = self.header[rpm.RPMTAG_FILEMD5S]
+         mtimes = self.header[rpm.RPMTAG_FILEMTIMES]
+         rdevs = self.header[rpm.RPMTAG_FILERDEVS]
+         langs = self.header[rpm.RPMTAG_FILELANGS]
+         inodes = self.header[rpm.RPMTAG_FILEINODES]
+-        requires = self.header[rpm.RPMTAG_FILEREQUIRE]
+-        provides = self.header[rpm.RPMTAG_FILEPROVIDE]
+-        files = self.header[rpm.RPMTAG_FILENAMES]
+-        magics = self.header[rpm.RPMTAG_FILECLASS]
+        requires = [x.decode() for x in self.header[rpm.RPMTAG_FILEREQUIRE]]
+        provides = [x.decode() for x in self.header[rpm.RPMTAG_FILEPROVIDE]]
+        files = [x.decode() for x in self.header[rpm.RPMTAG_FILENAMES]]
+        magics = [x.decode() for x in self.header[rpm.RPMTAG_FILECLASS]]
+         try: # rpm >= 4.7.0
+             filecaps = self.header[rpm.RPMTAG_FILECAPS]
+         except:
+@@ -608,16 +613,14 @@ class Pkg:
+ 
+         # rpm-python < 4.6 does not return a list for this (or FILEDEVICES,
+         # FWIW) for packages containing exactly one file
+-        if not isinstance(inodes, types.ListType):
+        if not isinstance(inodes, list):
+             inodes = [inodes]
+ 
+         if files:
+             for idx in range(0, len(files)):
+                 pkgfile = PkgFile(files[idx])
+-                # Do not use os.path.join here, pkgfile.name can start with a
+-                # / which would result in self.dirName being ignored
+-                pkgfile.path = os.path.normpath(
+-                    self.dirName() + '/' + pkgfile.name)
+                pkgfile.path = os.path.normpath(os.path.join(
+                    self.dirName() or '/', pkgfile.name.lstrip('/')))
+                 pkgfile.flags = flags[idx]
+                 pkgfile.mode = modes[idx]
+                 pkgfile.user = users[idx]
+@@ -652,7 +655,7 @@ class Pkg:
+            PkgFile if it is found in this package, None if not."""
+         result = pkgfile
+         while result and result.linkto:
+-            linkpath = urlparse.urljoin(result.name, result.linkto)
+            linkpath = urljoin(result.name, result.linkto)
+             linkpath = safe_normpath(linkpath)
+             result = self.files().get(linkpath)
+         return result
+@@ -713,12 +716,12 @@ class Pkg:
+ 
+         if versions:
+             for loop in range(len(versions)):
+-                evr = stringToVersion(versions[loop])
+                name = names[loop].decode()
+                evr = stringToVersion(versions[loop].decode())
+                 if prereq is not None and flags[loop] & PREREQ_FLAG:
+-                    prereq.append((names[loop], flags[loop] & (~PREREQ_FLAG),
+-                                   evr))
+                    prereq.append((name, flags[loop] & (~PREREQ_FLAG), evr))
+                 else:
+-                    list.append((names[loop], flags[loop], evr))
+                    list.append((name, flags[loop], evr))
+ 
+     def _gatherDepInfo(self):
+         if self._requires is None:
+Index: rpmlint-1.5/PostCheck.py
+===================================================================
+--- rpmlint-1.5.orig/PostCheck.py
+++ rpmlint-1.5/PostCheck.py
+@@ -10,7 +10,6 @@
+ 
+ import os
+ import re
+-import types
+ 
+ import rpm
+ 
+@@ -107,7 +106,7 @@ class PostCheck(AbstractCheck.AbstractCh
+         for tag in script_tags:
+             script = pkg[tag[0]]
+ 
+-            if not isinstance(script, types.ListType):
+            if not isinstance(script, list):
+                 prog = pkg.scriptprog(tag[1])
+                 if prog:
+                     prog = prog.split()[0]
+Index: rpmlint-1.5/rpmdiff
+===================================================================
+--- rpmlint-1.5.orig/rpmdiff
+++ rpmlint-1.5/rpmdiff
+@@ -82,8 +82,8 @@ class Rpmdiff:
+         try:
+             old = self.__load_pkg(old).header
+             new = self.__load_pkg(new).header
+-        except KeyError, e:
+-            Pkg.warn(str(e))
+        except KeyError:
+            Pkg.warn(str(sys.exc_info()[1]))
+             sys.exit(2)
+ 
+         # Compare single tags
+@@ -107,8 +107,8 @@ class Rpmdiff:
+ 
+         old_files_dict = self.__fileIteratorToDict(old.fiFromHeader())
+         new_files_dict = self.__fileIteratorToDict(new.fiFromHeader())
+-        files = list(set(itertools.chain(old_files_dict.iterkeys(),
+-                                         new_files_dict.iterkeys())))
+        files = list(set(itertools.chain(iter(old_files_dict),
+                                         iter(new_files_dict))))
+         files.sort()
+ 
+         for f in files:
+@@ -205,16 +205,20 @@ class Rpmdiff:
+         if not isinstance(newflags, list): newflags = [ newflags ]
+ 
+         o = zip(old[name], oldflags, old[name[:-1]+'VERSION'])
+        if not isinstance(o, list):
+            o = list(o)
+         n = zip(new[name], newflags, new[name[:-1]+'VERSION'])
+        if not isinstance(n, list):
+            n = list(n)
+ 
+         # filter self provides, TODO: self %name(%_isa) as well
+         if name == 'PROVIDES':
+             oldE = old['epoch'] is not None and str(old['epoch'])+":" or ""
+-            oldNV = (old['name'], rpm.RPMSENSE_EQUAL,
+-                     "%s%s-%s" % (oldE, old['version'], old['release']))
+            oldV = "%s%s" % (oldE, old.format("%{VERSION}-%{RELEASE}"))
+            oldNV = (old['name'], rpm.RPMSENSE_EQUAL, oldV.encode())
+             newE = new['epoch'] is not None and str(new['epoch'])+":" or ""
+-            newNV = (new['name'], rpm.RPMSENSE_EQUAL,
+-                     "%s%s-%s" % (newE, new['version'], new['release']))
+            newV = "%s%s" % (newE, new.format("%{VERSION}-%{RELEASE}"))
+            newNV = (new['name'], rpm.RPMSENSE_EQUAL, newV.encode())
+             o = [entry for entry in o if entry != oldNV]
+             n = [entry for entry in n if entry != newNV]
+ 
+@@ -224,16 +228,16 @@ class Rpmdiff:
+                 if namestr == 'REQUIRES':
+                     namestr = self.req2str(oldentry[1])
+                 self.__add(self.DEPFORMAT,
+-                           (self.REMOVED, namestr, oldentry[0],
+-                            self.sense2str(oldentry[1]), oldentry[2]))
+                           (self.REMOVED, namestr, oldentry[0].decode(),
+                            self.sense2str(oldentry[1]), oldentry[2].decode()))
+         for newentry in n:
+             if not newentry in o:
+                 namestr = name
+                 if namestr == 'REQUIRES':
+                     namestr = self.req2str(newentry[1])
+                 self.__add(self.DEPFORMAT,
+-                           (self.ADDED, namestr, newentry[0],
+-                            self.sense2str(newentry[1]), newentry[2]))
+                           (self.ADDED, namestr, newentry[0].decode(),
+                            self.sense2str(newentry[1]), newentry[2].decode()))
+ 
+     def __fileIteratorToDict(self, fi):
+         result = {}
+@@ -258,8 +262,8 @@ def main():
+     try:
+         opts, args = getopt.getopt(sys.argv[1:],
+                                    "hti:", ["help", "ignore-times", "ignore="])
+-    except getopt.GetoptError, e:
+-        Pkg.warn("Error: %s" % e)
+    except getopt.GetoptError:
+        Pkg.warn("Error: %s" % sys.exc_info()[1])
+         _usage()
+ 
+     for option, argument in opts:
+Index: rpmlint-1.5/rpmlint
+===================================================================
+--- rpmlint-1.5.orig/rpmlint
+++ rpmlint-1.5/rpmlint
+@@ -157,10 +157,11 @@ def main():
+                 Pkg.warn(
+                     '(none): E: interrupted, exiting while reading %s' % arg)
+                 sys.exit(2)
+-            except Exception, e:
+            except Exception:
+                 if isfile:
+                     arg = os.path.abspath(arg)
+-                Pkg.warn('(none): E: error while reading %s: %s' % (arg, e))
+                Pkg.warn('(none): E: error while reading %s: %s' %
+                         (arg, sys.exc_info()[1]))
+                 pkgs = []
+                 continue
+ 
+@@ -192,13 +193,15 @@ def main():
+                             Pkg.warn('(none): E: interrupted, exiting while ' +
+                                      'reading %s' % fname)
+                             sys.exit(2)
+-                        except Exception, e:
+                        except Exception:
+                             Pkg.warn(
+-                                '(none): E: while reading %s: %s' % (fname, e))
+                                '(none): E: while reading %s: %s' %
+                                (fname, sys.exc_info()[1]))
+                             continue
+-            except Exception, e:
+            except Exception:
+                 Pkg.warn(
+-                    '(none): E: error while reading dir %s: %s' % (dname, e))
+                    '(none): E: error while reading dir %s: %s' %
+                    (dname, sys.exc_info()[1]))
+                 continue
+ 
+         if printAllReasons():
+@@ -207,9 +210,9 @@ def main():
+             sys.exit(66)
+ 
+     finally:
+-        print "%d packages and %d specfiles checked; %d errors, %d warnings." \
+        print("%d packages and %d specfiles checked; %d errors, %d warnings." \
+               % (packages_checked, specfiles_checked,
+-                 printed_messages["E"], printed_messages["W"])
+                 printed_messages["E"], printed_messages["W"]))
+ 
+     if printed_messages["E"] > 0:
+         sys.exit(64)
+@@ -255,8 +258,8 @@ try:
+                                'option=',
+                                'rawout=',
+                                ])
+-except getopt.GetoptError, e:
+-    Pkg.warn("%s: %s" % (sys.argv[0], e))
+except getopt.GetoptError:
+    Pkg.warn("%s: %s" % (sys.argv[0], sys.exc_info()[1]))
+     usage(sys.argv[0])
+     sys.exit(1)
+ 
+@@ -290,11 +293,12 @@ else:
+ 
+ for f in configs:
+     try:
+-        execfile(f)
+        exec(compile(open(f).read(), f, 'exec'))
+     except IOError:
+         pass
+-    except Exception, E:
+-        Pkg.warn('(none): W: error loading %s, skipping: %s' % (f, E))
+    except Exception:
+        Pkg.warn('(none): W: error loading %s, skipping: %s' %
+                 (f, sys.exc_info()[1]))
+ # pychecker fix
+ del f
+ 
+@@ -340,11 +344,13 @@ for o in opt:
+ 
+ # load user config file
+ try:
+-    execfile(os.path.expanduser(conf_file))
+    expconf = os.path.expanduser(conf_file)
+    exec(compile(open(expconf).read(), expconf, 'exec'))
+ except IOError:
+     pass
+-except Exception,E:
+-    Pkg.warn('(none): W: error loading %s, skipping: %s' % (conf_file, E))
+except Exception:
+    Pkg.warn('(none): W: error loading %s, skipping: %s' %
+             (conf_file, sys.exc_info()[1]))
+ 
+ # apply config overrides
+ for key, value in config_overrides.items():
+@@ -361,7 +367,7 @@ if info_error:
+     for c in Config.allChecks():
+         loadCheck(c)
+     for e in sorted(info_error):
+-        print "%s:" % e
+        print("%s:" % e)
+         printDescriptions(e)
+     sys.exit(0)
+ 
+Index: rpmlint-1.5/BinariesCheck.py
+===================================================================
+--- rpmlint-1.5.orig/BinariesCheck.py
+++ rpmlint-1.5/BinariesCheck.py
+@@ -10,6 +10,7 @@
+ import re
+ import stat
+ import os
+import sys
+ 
+ import rpm
+ 
+@@ -195,10 +196,11 @@ class BinaryInfo:
+ 
+         fobj = None
+         try:
+-            fobj = open(path)
+            fobj = open(path, 'rb')
+             fobj.seek(-12, 2) # 2 == os.SEEK_END, for python 2.4 compat (#172)
+-            self.tail = fobj.read()
+-        except Exception, e:
+            self.tail = fobj.read().decode()
+        except Exception:
+            e = sys.exc_info()[1]
+             printWarning(pkg, 'binaryinfo-tail-failed %s: %s' % (file, e))
+         if fobj:
+             fobj.close()
+@@ -291,9 +293,11 @@ class BinariesCheck(AbstractCheck.Abstra
+         has_usr_lib_file = False
+ 
+         multi_pkg = False
+-        res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
+-        if res:
+-            multi_pkg = (pkg.name != res.group(1))
+        srpm = pkg[rpm.RPMTAG_SOURCERPM]
+        if srpm:
+            res = srcname_regex.search(srpm.decode())
+            if res:
+                multi_pkg = (pkg.name != res.group(1))
+ 
+         for fname, pkgfile in files.items():
+ 
+Index: rpmlint-1.5/DocFilesCheck.py
+===================================================================
+--- rpmlint-1.5.orig/DocFilesCheck.py
+++ rpmlint-1.5/DocFilesCheck.py
+@@ -43,7 +43,9 @@ class DocFilesCheck(AbstractCheck.Abstra
+             core_reqs[dep.N()] = []
+ 
+         # register things which are provided by the package
+-        for i in pkg.header[rpm.RPMTAG_PROVIDES] + files.keys():
+        for i in pkg.header[rpm.RPMTAG_PROVIDES]:
+            core_reqs[i.decode()] = []
+        for i in files:
+             core_reqs[i] = []
+ 
+         for i in files:
+Index: rpmlint-1.5/FilesCheck.py
+===================================================================
+--- rpmlint-1.5.orig/FilesCheck.py
+++ rpmlint-1.5/FilesCheck.py
+@@ -9,16 +9,16 @@
+ #############################################################################
+ 
+ from datetime import datetime
+-import commands
+ import os
+ import re
+ import stat
+ import string
+import sys
+ 
+ import rpm
+ 
+ from Filter import addDetails, printError, printWarning
+-from Pkg import catcmd, is_utf8, is_utf8_str
+from Pkg import catcmd, getstatusoutput, is_utf8, is_utf8_str
+ import AbstractCheck
+ import Config
+ 
+@@ -674,7 +674,7 @@ scalable_icon_regex = re.compile(r'^/usr
+ 
+ # loosely inspired from Python Cookbook
+ # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/173220
+-text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
+text_characters = "".join(map(chr, range(32, 127))) + "\n\r\t\b"
+ _null_trans = string.maketrans("", "")
+ 
+ def peek(filename, pkg, length=1024):
+@@ -686,7 +686,8 @@ def peek(filename, pkg, length=1024):
+         fobj = open(filename, 'rb')
+         chunk = fobj.read(length)
+         fobj.close()
+-    except IOError, e: # eg. https://bugzilla.redhat.com/209876
+    except IOError: # eg. https://bugzilla.redhat.com/209876
+        e = sys.exc_info()[1]
+         printWarning(pkg, 'read-error', e)
+         if fobj:
+             fobj.close()
+@@ -910,7 +911,8 @@ class FilesCheck(AbstractCheck.AbstractC
+                         printError(pkg, 'compressed-symlink-with-wrong-ext',
+                                    f, link)
+ 
+-            perm = mode & 07777
+            perm = mode & int("7777", 8)
+            mode_is_exec = mode & int("111", 8)
+ 
+             if log_regex.search(f):
+                 log_file = f
+@@ -935,17 +937,17 @@ class FilesCheck(AbstractCheck.AbstractC
+                                     pkg[rpm.RPMTAG_GROUP]))):
+                             printError(pkg, 'setgid-binary', f, group,
+                                        oct(perm))
+-                    if mode & 0777 != 0755:
+                    if mode & int("777", 8) != int("755", 8):
+                         printError(pkg, 'non-standard-executable-perm', f,
+                                    oct(perm))
+ 
+                 # Prefetch scriptlets, strip quotes from them (#169)
+-                postin = pkg[rpm.RPMTAG_POSTIN] or \
+-                    pkg.scriptprog(rpm.RPMTAG_POSTINPROG)
+                postin = (pkg[rpm.RPMTAG_POSTIN] or \
+                    pkg.scriptprog(rpm.RPMTAG_POSTINPROG)).decode()
+                 if postin:
+                     postin = quotes_regex.sub('', postin)
+-                postun = pkg[rpm.RPMTAG_POSTUN] or \
+-                    pkg.scriptprog(rpm.RPMTAG_POSTUNPROG)
+                postun = (pkg[rpm.RPMTAG_POSTUN] or \
+                    pkg.scriptprog(rpm.RPMTAG_POSTUNPROG)).decode()
+                 if postun:
+                     postun = quotes_regex.sub('', postun)
+ 
+@@ -1049,7 +1051,7 @@ class FilesCheck(AbstractCheck.AbstractC
+ 
+                 res = bin_regex.search(f)
+                 if res:
+-                    if mode & 0111 == 0:
+                    if not mode_is_exec:
+                         printWarning(pkg, 'non-executable-in-bin', f, oct(perm))
+                     else:
+                         exe = res.group(1)
+@@ -1060,7 +1062,8 @@ class FilesCheck(AbstractCheck.AbstractC
+                        (includefile_regex.search(f) or \
+                         develfile_regex.search(f) or is_buildconfig):
+                     printWarning(pkg, 'devel-file-in-non-devel-package', f)
+-                if mode & 0444 != 0444 and perm & 07000 == 0:
+                if mode & int("444", 8) != int("444", 8) and \
+                   perm & int("7000", 8) == 0:
+                     ok_nonreadable = False
+                     for regex in non_readable_regexs:
+                         if regex.search(f):
+@@ -1072,7 +1075,7 @@ class FilesCheck(AbstractCheck.AbstractC
+                         f not in ghost_files:
+                     printError(pkg, 'zero-length', f)
+ 
+-                if mode & 0002 != 0:
+                if mode & stat.S_IWOTH:
+                     printError(pkg, 'world-writable', f, oct(perm))
+ 
+                 if not perl_dep_error:
+@@ -1144,10 +1147,10 @@ class FilesCheck(AbstractCheck.AbstractC
+                         printWarning(pkg, 'python-bytecode-without-source', f)
+ 
+                 # normal executable check
+-                if mode & stat.S_IXUSR and perm != 0755:
+                if mode & stat.S_IXUSR and perm != int("755", 8):
+                     printError(pkg, 'non-standard-executable-perm',
+                                f, oct(perm))
+-                if mode & 0111 != 0:
+                if mode_is_exec:
+                     if f in config_files:
+                         printError(pkg, 'executable-marked-as-config-file', f)
+                     if not nonexec_file:
+@@ -1179,11 +1182,12 @@ class FilesCheck(AbstractCheck.AbstractC
+                     man_basenames.add(res.group(1))
+                     if use_utf8 and chunk:
+                         # TODO: better shell escaping or seq based invocation
+-                        cmd = commands.getstatusoutput(
+                        cmd = getstatusoutput(
+                             'env LC_ALL=C %s "%s" | gtbl | '
+                             'env LC_ALL=en_US.UTF-8 groff -mtty-char -Tutf8 '
+                             '-P-c -mandoc -w%s >/dev/null' %
+-                            (catcmd(f), pkgfile.path, man_warn_category))
+                            (catcmd(f), pkgfile.path, man_warn_category),
+                            shell=True)
+                         for line in cmd[1].split("\n"):
+                             res = man_warn_regex.search(line)
+                             if not res or man_nowarn_regex.search(line):
+@@ -1213,12 +1217,11 @@ class FilesCheck(AbstractCheck.AbstractC
+                             printError(pkg,
+                                        'sourced-script-with-shebang', f,
+                                        interpreter)
+-                        if mode & 0111 != 0:
+                        if mode_is_exec:
+                             printError(pkg, 'executable-sourced-script',
+                                        f, oct(perm))
+                     # ...but executed ones should
+-                    elif interpreter or mode & 0111 != 0 or \
+-                            script_regex.search(f):
+                    elif interpreter or mode_is_exec or script_regex.search(f):
+                         if interpreter:
+                             if mode & 0111 != 0 and not interpreter_regex.search(interpreter):
+                                 printError(pkg, 'wrong-script-interpreter',
+@@ -1228,7 +1231,7 @@ class FilesCheck(AbstractCheck.AbstractC
+                                  f.endswith('.la')):
+                             printError(pkg, 'script-without-shebang', f)
+ 
+-                        if mode & 0111 == 0 and not is_doc:
+                        if not mode_is_exec and not is_doc:
+                             printError(pkg, 'non-executable-script', f,
+                                        oct(perm), interpreter)
+                         if '\r' in chunk:
+@@ -1256,9 +1259,9 @@ class FilesCheck(AbstractCheck.AbstractC
+ 
+             # normal dir check
+             elif stat.S_ISDIR(mode):
+-                if mode & 01002 == 2: # world writable without sticky bit
+                if mode & int("1002", 8) == 2: # world writable w/o sticky bit
+                     printError(pkg, 'world-writable', f, oct(perm))
+-                if perm != 0755:
+                if perm != int("755", 8):
+                     printError(pkg, 'non-standard-dir-perm', f, oct(perm))
+                 if pkg.name not in filesys_packages and f in STANDARD_DIRS:
+                     printError(pkg, 'standard-dir-owned-by-package', f)
+@@ -1368,7 +1371,7 @@ class FilesCheck(AbstractCheck.AbstractC
+                 if stat.S_ISLNK(mode):
+                     printError(pkg, 'symlink-crontab-file', f)
+ 
+-                if mode & 0111:
+                if mode_is_exec:
+                     printError(pkg, 'executable-crontab-file', f)
+ 
+                 if stat.S_IWGRP & mode or stat.S_IWOTH & mode:
+Index: rpmlint-1.5/I18NCheck.py
+===================================================================
+--- rpmlint-1.5.orig/I18NCheck.py
+++ rpmlint-1.5/I18NCheck.py
+@@ -79,7 +79,7 @@ class I18NCheck(AbstractCheck.AbstractCh
+         if pkg.isSource():
+             return
+ 
+-        files = pkg.files().keys()
+        files = list(pkg.files().keys())
+         files.sort()
+         locales = []                      # list of locales for this packages
+         webapp = False
+Index: rpmlint-1.5/InitScriptCheck.py
+===================================================================
+--- rpmlint-1.5.orig/InitScriptCheck.py
+++ rpmlint-1.5/InitScriptCheck.py
+@@ -10,6 +10,7 @@
+ 
+ import os
+ import re
+import sys
+ 
+ import rpm
+ 
+@@ -54,7 +55,7 @@ class InitScriptCheck(AbstractCheck.Abst
+ 
+             basename = os.path.basename(fname)
+             initscript_list.append(basename)
+-            if pkgfile.mode & 0500 != 0500:
+            if pkgfile.mode & int("500", 8) != int("500", 8):
+                 printError(pkg, 'init-script-non-executable', fname)
+ 
+             if "." in basename:
+@@ -87,7 +88,8 @@ class InitScriptCheck(AbstractCheck.Abst
+             content = None
+             try:
+                 content = Pkg.readlines(pkgfile.path)
+-            except Exception, e:
+            except Exception:
+                e = sys.exc_info()[1]
+                 printWarning(pkg, 'read-error', e)
+                 continue
+             content_str = "".join(content)
+Index: rpmlint-1.5/LSBCheck.py
+===================================================================
+--- rpmlint-1.5.orig/LSBCheck.py
+++ rpmlint-1.5/LSBCheck.py
+@@ -31,12 +31,16 @@ class LSBCheck(AbstractCheck.AbstractChe
+             printError(pkg, 'non-lsb-compliant-package-name', name)
+ 
+         version = pkg[rpm.RPMTAG_VERSION]
+-        if version and not version_regex.search(version):
+-            printError(pkg, 'non-lsb-compliant-version', version)
+        if version:
+            version = version.decode()
+            if not version_regex.search(version):
+                printError(pkg, 'non-lsb-compliant-version', version)
+ 
+         release = pkg[rpm.RPMTAG_RELEASE]
+-        if release and not version_regex.search(release):
+-            printError(pkg, 'non-lsb-compliant-release', release)
+        if release:
+            release = release.decode()
+            if not version_regex.search(release):
+                printError(pkg, 'non-lsb-compliant-release', release)
+ 
+ # Create an object to enable the auto registration of the test
+ check = LSBCheck()
+Index: rpmlint-1.5/MenuCheck.py
+===================================================================
+--- rpmlint-1.5.orig/MenuCheck.py
+++ rpmlint-1.5/MenuCheck.py
+@@ -178,9 +178,9 @@ class MenuCheck(AbstractCheck.AbstractCh
+                 else:
+                     if basename != pkg.name:
+                         printWarning(pkg, 'non-coherent-menu-filename', fname)
+-                    if mode & 0444 != 0444:
+                    if mode & int("444", 8) != int("444", 8):
+                         printError(pkg, 'non-readable-menu-file', fname)
+-                    if mode & 0111 != 0:
+                    if mode & int("111", 8):
+                         printError(pkg, 'executable-menu-file', fname)
+                     menus.append(fname)
+             else:
+Index: rpmlint-1.5/MenuXDGCheck.py
+===================================================================
+--- rpmlint-1.5.orig/MenuXDGCheck.py
+++ rpmlint-1.5/MenuXDGCheck.py
+@@ -9,7 +9,10 @@
+ from Filter import addDetails, printError, printWarning
+ from Pkg import getstatusoutput, is_utf8
+ import AbstractCheck
+-from ConfigParser import RawConfigParser
+try:
+    from ConfigParser import RawConfigParser
+except:
+    from configparser import RawConfigParser
+ import os
+ 
+ STANDARD_BIN_DIRS = ['/bin/','/sbin/','/usr/bin/','/usr/sbin/']
+Index: rpmlint-1.5/SourceCheck.py
+===================================================================
+--- rpmlint-1.5.orig/SourceCheck.py
+++ rpmlint-1.5/SourceCheck.py
+@@ -14,7 +14,7 @@ import AbstractCheck
+ import Config
+ 
+ 
+-DEFAULT_VALID_SRC_PERMS = (0644, 0755)
+DEFAULT_VALID_SRC_PERMS = (int("644", 8), int("755", 8))
+ 
+ source_regex = re.compile('\\.(tar|patch|tgz|diff)$')
+ compress_ext = Config.getOption("CompressExtension", "bz2")
+@@ -43,7 +43,7 @@ class SourceCheck(AbstractCheck.Abstract
+                     not fname.endswith(compress_ext):
+                 printWarning(pkg, 'source-or-patch-not-compressed',
+                              compress_ext, fname)
+-            perm = pkgfile.mode & 07777
+            perm = pkgfile.mode & int("7777", 8)
+             if perm not in valid_src_perms:
+                 printWarning(pkg, 'strange-permission', fname, oct(perm))
+ 
+Index: rpmlint-1.5/TagsCheck.py
+===================================================================
+--- rpmlint-1.5.orig/TagsCheck.py
+++ rpmlint-1.5/TagsCheck.py
+@@ -534,7 +534,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+     def _unexpanded_macros(self, pkg, tagname, value, is_url=False):
+         if not value:
+             return
+-        for match in AbstractCheck.macro_regex.findall(str(value)):
+        for match in AbstractCheck.macro_regex.findall(value):
+             # Do not warn about %XX URL escapes
+             if is_url and re.match('^%[0-9A-F][0-9A-F]$', match, re.I):
+                 continue
+@@ -543,28 +543,33 @@ class TagsCheck(AbstractCheck.AbstractCh
+     def check(self, pkg):
+ 
+         packager = pkg[rpm.RPMTAG_PACKAGER]
+-        self._unexpanded_macros(pkg, 'Packager', packager)
+-        if not packager:
+        if packager:
+            packager = packager.decode()
+            self._unexpanded_macros(pkg, 'Packager', packager)
+            if Config.getOption('Packager') and \
+               not packager_regex.search(packager):
+                printWarning(pkg, 'invalid-packager', packager)
+        else:
+             printError(pkg, 'no-packager-tag')
+-        elif Config.getOption('Packager') and \
+-                not packager_regex.search(packager):
+-            printWarning(pkg, 'invalid-packager', packager)
+ 
+         version = pkg[rpm.RPMTAG_VERSION]
+-        self._unexpanded_macros(pkg, 'Version', version)
+-        if not version:
+-            printError(pkg, 'no-version-tag')
+-        else:
+        if version:
+            version = version.decode()
+            self._unexpanded_macros(pkg, 'Version', version)
+             res = invalid_version_regex.search(version)
+             if res:
+                 printError(pkg, 'invalid-version', version)
+        else:
+            printError(pkg, 'no-version-tag')
+ 
+         release = pkg[rpm.RPMTAG_RELEASE]
+-        self._unexpanded_macros(pkg, 'Release', release)
+-        if not release:
+        if release:
+            release = release.decode()
+            self._unexpanded_macros(pkg, 'Release', release)
+            if release_ext and not extension_regex.search(release):
+                printWarning(pkg, 'not-standard-release-extension', release)
+        else:
+             printError(pkg, 'no-release-tag')
+-        elif release_ext and not extension_regex.search(release):
+-            printWarning(pkg, 'not-standard-release-extension', release)
+ 
+         epoch = pkg[rpm.RPMTAG_EPOCH]
+         if epoch is None:
+@@ -592,7 +597,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+         is_devel = FilesCheck.devel_regex.search(name)
+         is_source = pkg.isSource()
+         for d in deps:
+-            value = apply(Pkg.formatRequire, d)
+            value = Pkg.formatRequire(*d)
+             if use_epoch and d[1] and d[2][0] is None and \
+                     not d[0].startswith('rpmlib('):
+                 printWarning(pkg, 'no-epoch-in-dependency', value)
+@@ -687,25 +692,31 @@ class TagsCheck(AbstractCheck.AbstractCh
+         ignored_words.update((x[0] for x in pkg.conflicts()))
+         ignored_words.update((x[0] for x in pkg.obsoletes()))
+ 
+        langs = pkg[rpm.RPMTAG_HEADERI18NTABLE]
+        if langs:
+            langs = [x.decode() for x in langs]
+
+         summary = pkg[rpm.RPMTAG_SUMMARY]
+-        if not summary:
+-            printError(pkg, 'no-summary-tag')
+-        else:
+-            if not pkg[rpm.RPMTAG_HEADERI18NTABLE]:
+        if summary:
+            summary = summary.decode()
+            if not langs:
+                 self._unexpanded_macros(pkg, 'Summary', summary)
+             else:
+-                for lang in pkg[rpm.RPMTAG_HEADERI18NTABLE]:
+                for lang in langs:
+                     self.check_summary(pkg, lang, ignored_words)
+        else:
+            printError(pkg, 'no-summary-tag')
+ 
+         description = pkg[rpm.RPMTAG_DESCRIPTION]
+-        if not description:
+-            printError(pkg, 'no-description-tag')
+-        else:
+-            if not pkg[rpm.RPMTAG_HEADERI18NTABLE]:
+        if description:
+            description = description.decode()
+            if not langs:
+                 self._unexpanded_macros(pkg, '%description', description)
+             else:
+-                for lang in pkg[rpm.RPMTAG_HEADERI18NTABLE]:
+                for lang in langs:
+                     self.check_description(pkg, lang, ignored_words)
+        else:
+            printError(pkg, 'no-description-tag')
+ 
+         group = pkg[rpm.RPMTAG_GROUP]
+         self._unexpanded_macros(pkg, 'Group', group)
--- a/add-weak-dependencies.diff
+++ b/add-weak-dependencies.diff
@ -2,7 +2,7 @@ Index: Pkg.py
 ===================================================================
 --- Pkg.py.orig
 +++ Pkg.py
-@@ -424,6 +424,10 @@ class Pkg:
+@@ -427,6 +427,10 @@ class Pkg:
         self._missingok_files = None
         self._files = None
         self._requires = None
@ -13,7 +13,7 @@ Index: Pkg.py
         self._req_names = -1
 
         if header:
-@@ -670,6 +674,22 @@ class Pkg:
+@@ -673,6 +677,22 @@ class Pkg:
         self._gatherDepInfo()
         return self._requires
 
@ -36,7 +36,7 @@ Index: Pkg.py
     def prereq(self):
         """Get package PreReqs as list of
            (name, flags, (epoch, version, release)) tuples."""
-@@ -706,7 +726,7 @@ class Pkg:
+@@ -709,7 +729,7 @@ class Pkg:
 
     # internal function to gather dependency info used by the above ones
     def _gather_aux(self, header, list, nametag, flagstag, versiontag,
@ -45,20 +45,22 @@ Index: Pkg.py
         names = header[nametag]
         flags = header[flagstag]
         versions = header[versiontag]
-@@ -717,7 +737,11 @@ class Pkg:
+@@ -720,8 +740,12 @@ class Pkg:
+                 evr = stringToVersion(versions[loop].decode())
                 if prereq is not None and flags[loop] & PREREQ_FLAG:
-                     prereq.append((names[loop], flags[loop] & (~PREREQ_FLAG),
-                                    evr))
+                     prereq.append((name, flags[loop] & (~PREREQ_FLAG), evr))
 -                else:
+-                    list.append((name, flags[loop], evr))
 +                elif strong_only and flags[loop] & rpm.RPMSENSE_STRONG:
 +                    list.append((names[loop], versions[loop], flags[loop] & (~rpm.RPMSENSE_STRONG)))
 +                elif  weak_only and not (flags[loop] & rpm.RPMSENSE_STRONG):
 +                    list.append((names[loop], versions[loop], flags[loop]))
 +                elif not (weak_only or strong_only):
-                     list.append((names[loop], flags[loop], evr))
+                    list.append((name, flags[loop], evr))
 
     def _gatherDepInfo(self):
-@@ -727,6 +751,10 @@ class Pkg:
+         if self._requires is None:
+@@ -730,6 +754,10 @@ class Pkg:
             self._provides = []
             self._conflicts = []
             self._obsoletes = []
@ -69,7 +71,7 @@ Index: Pkg.py
 
             self._gather_aux(self.header, self._requires,
                              rpm.RPMTAG_REQUIRENAME,
-@@ -745,6 +773,30 @@ class Pkg:
+@@ -748,6 +776,30 @@ class Pkg:
                              rpm.RPMTAG_OBSOLETENAME,
                              rpm.RPMTAG_OBSOLETEFLAGS,
                              rpm.RPMTAG_OBSOLETEVERSION)
@ -100,7 +102,7 @@ Index: Pkg.py
 
     def scriptprog(self, which):
         """Get the specified script interpreter as a string.
-@@ -758,6 +810,7 @@ class Pkg:
+@@ -761,6 +813,7 @@ class Pkg:
             prog = " ".join(prog)
         return prog
 
--- a/better-wrong-script.diff
+++ b/better-wrong-script.diff
@ -2,7 +2,7 @@ Index: FilesCheck.py
 ===================================================================
 --- FilesCheck.py.orig
 +++ FilesCheck.py
-@@ -1667,7 +1667,10 @@ executed.''',
+@@ -1670,7 +1670,10 @@ executed.''',
 executed.''',
 
 'wrong-script-interpreter',
--- a/18
+++ b/18
@ -67,6 +67,7 @@ setOption("UseUTF8", 1)
 #setOption("KernelModuleRPMsOK", 0)
 setOption("CompressExtension", None)
 setOption('UseVarLockSubsys', False)
+setOption("BadnessThreshold", 1000)

 setOption('ValidGroups', [])

@ -152,14 +153,15 @@ setOption('StandardGroups', (
    'ntop',
    'ntp',
    'oinstall',
-    'openstack-ceilometer',
-    'openstack-cinder',
-    'openstack-glance',
-    'openstack-heat',
-    'openstack-keystone',
-    'openstack-nova',
-    'openstack-quantum',
-    'openstack-swift',
+    'ceilometer',
+    'cinder',
+    'glance',
+    'heat',
+    'keystone',
+    'nova',
+    'neutron',
+    'swift',
+    'trove',
    'otrs',
    'pdns',
    'pegasus',
--- a/description-check.diff
+++ b/description-check.diff
@ -2,17 +2,17 @@ Index: TagsCheck.py
 ===================================================================
 --- TagsCheck.py.orig
 +++ TagsCheck.py
-@@ -705,6 +705,9 @@ class TagsCheck(AbstractCheck.AbstractCh
-         if not description:
-             printError(pkg, 'no-description-tag')
+@@ -715,6 +715,9 @@ class TagsCheck(AbstractCheck.AbstractCh
             else:
+                 for lang in langs:
+                     self.check_description(pkg, lang, ignored_words)
+
 +            if len(pkg[rpm.RPMTAG_DESCRIPTION].partition('Authors:')[0])-4 < len(pkg[rpm.RPMTAG_SUMMARY]):
 +                printWarning(pkg, 'description-shorter-than-summary')
-+
-             if not pkg[rpm.RPMTAG_HEADERI18NTABLE]:
-                 self._unexpanded_macros(pkg, '%description', description)
         else:
-@@ -988,6 +991,10 @@ Name tag.''',
+             printError(pkg, 'no-description-tag')
+ 
+@@ -995,6 +998,10 @@ Name tag.''',
 '''The major number of the library isn't included in the package's name.
 ''',
 
--- a/devel-provide-is-devel-package.diff
+++ b/devel-provide-is-devel-package.diff
@ -2,7 +2,7 @@ Index: FilesCheck.py
 ===================================================================
 --- FilesCheck.py.orig
 +++ FilesCheck.py
-@@ -806,6 +806,10 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -807,6 +807,10 @@ class FilesCheck(AbstractCheck.AbstractC
         # Check if the package is a development package
         devel_pkg = devel_regex.search(pkg.name)
 
--- a/libtool-wrapper-check.diff
+++ b/libtool-wrapper-check.diff
@ -2,7 +2,7 @@ Index: BinariesCheck.py
 ===================================================================
 --- BinariesCheck.py.orig
 +++ BinariesCheck.py
-@@ -309,8 +309,19 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -313,8 +313,19 @@ class BinariesCheck(AbstractCheck.Abstra
             is_ar = 'current ar archive' in pkgfile.magic
             is_ocaml_native = 'Objective caml native' in pkgfile.magic
             is_lua_bytecode = 'Lua bytecode' in pkgfile.magic
@ -22,7 +22,7 @@ Index: BinariesCheck.py
             if not is_binary:
                 if reference_regex.search(fname):
                     lines = pkg.grep(invalid_dir_ref_regex, fname)
-@@ -568,6 +579,15 @@ recompiled separately from the static li
+@@ -572,6 +583,15 @@ recompiled separately from the static li
 Another common mistake that causes this problem is linking with
 ``gcc -Wl,-shared'' instead of ``gcc -shared''.''',
 
--- a/no-badness-return.diff
+++ b/no-badness-return.diff
@ -15,9 +15,9 @@ Index: rpmlint
 ===================================================================
 --- rpmlint.orig
 +++ rpmlint
-@@ -211,7 +211,7 @@ def main():
+@@ -214,7 +214,7 @@ def main():
               % (packages_checked, specfiles_checked,
-                  printed_messages["E"], printed_messages["W"])
+                  printed_messages["E"], printed_messages["W"]))
 
 -    if printed_messages["E"] > 0:
 +    if badnessThreshold() < 0 and printed_messages["E"] > 0:
--- a/noarch-lib64.diff
+++ b/noarch-lib64.diff
@ -2,15 +2,15 @@ Index: BinariesCheck.py
 ===================================================================
 --- BinariesCheck.py.orig
 +++ BinariesCheck.py
-@@ -289,6 +289,7 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -291,6 +291,7 @@ class BinariesCheck(AbstractCheck.Abstra
         binary = False
         binary_in_usr_lib = False
         has_usr_lib_file = False
 +        file_in_lib64 = False
 
         multi_pkg = False
-         res = srcname_regex.search(pkg[rpm.RPMTAG_SOURCERPM] or '')
-@@ -305,6 +306,10 @@ class BinariesCheck(AbstractCheck.Abstra
+         srpm = pkg[rpm.RPMTAG_SOURCERPM]
+@@ -309,6 +310,10 @@ class BinariesCheck(AbstractCheck.Abstra
                     # only-non-binary-in-usr-lib false positives
                     binary_in_usr_lib = True
 
@ -21,7 +21,7 @@ Index: BinariesCheck.py
             is_elf = 'ELF' in pkgfile.magic
             is_ar = 'current ar archive' in pkgfile.magic
             is_ocaml_native = 'Objective caml native' in pkgfile.magic
-@@ -530,9 +535,12 @@ class BinariesCheck(AbstractCheck.Abstra
+@@ -534,9 +539,12 @@ class BinariesCheck(AbstractCheck.Abstra
             if version and version != -1 and version not in pkg.name:
                 printError(pkg, 'incoherent-version-in-name', version)
 
@ -35,7 +35,7 @@ Index: BinariesCheck.py
         if has_usr_lib_file and not binary_in_usr_lib:
             printWarning(pkg, 'only-non-binary-in-usr-lib')
 
-@@ -556,6 +564,11 @@ FHS and the FSSTND forbid this.''',
+@@ -560,6 +568,11 @@ FHS and the FSSTND forbid this.''',
 # 'non-sparc32-binary',
 # '',
 
--- a/only-reg-files-are-scripts.diff
+++ b/only-reg-files-are-scripts.diff
@ -2,7 +2,7 @@ Index: InitScriptCheck.py
 ===================================================================
 --- InitScriptCheck.py.orig
 +++ InitScriptCheck.py
-@@ -17,7 +17,7 @@ from Filter import addDetails, printErro
+@@ -18,7 +18,7 @@ from Filter import addDetails, printErro
 import AbstractCheck
 import Config
 import Pkg
@ -11,7 +11,7 @@ Index: InitScriptCheck.py
 
 chkconfig_content_regex = re.compile('^\s*#\s*chkconfig:\s*([-0-9]+)\s+[-0-9]+\s+[-0-9]+')
 subsys_regex = re.compile('/var/lock/subsys/([^/"\'\n\s;&|]+)', re.MULTILINE)
-@@ -63,6 +63,9 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -64,6 +64,9 @@ class InitScriptCheck(AbstractCheck.Abst
                     not fname.startswith('/etc/rc.d/init.d/'):
                 continue
 
@ -20,4 +20,4 @@ Index: InitScriptCheck.py
 +
             basename = os.path.basename(fname)
             initscript_list.append(basename)
-             if pkgfile.mode & 0500 != 0500:
+             if pkgfile.mode & int("500", 8) != int("500", 8):
--- a/rpmgroup-checks.diff
+++ b/rpmgroup-checks.diff
@ -2,7 +2,7 @@ Index: TagsCheck.py
 ===================================================================
 --- TagsCheck.py.orig
 +++ TagsCheck.py
-@@ -715,6 +715,8 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -722,6 +722,8 @@ class TagsCheck(AbstractCheck.AbstractCh
         self._unexpanded_macros(pkg, 'Group', group)
         if not group:
             printError(pkg, 'no-group-tag')
@ -11,7 +11,7 @@ Index: TagsCheck.py
         elif VALID_GROUPS and group not in VALID_GROUPS:
             printWarning(pkg, 'non-standard-group', group)
 
-@@ -1027,6 +1029,10 @@ won't fool the specfile parser, and rebu
+@@ -1034,6 +1036,10 @@ won't fool the specfile parser, and rebu
 '''There is no Group tag in your package. You have to specify a valid group
 in your spec file using the Group tag.''',
 
--- a/rpmlint-1.5-Fix-setgroups-error-name.diff
+++ b/rpmlint-1.5-Fix-setgroups-error-name.diff
@ -7,11 +7,11 @@ Subject: [PATCH] Fix setgroups error name
 BinariesCheck.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/BinariesCheck.py b/BinariesCheck.py
-index b770085..cea85b9 100644
--- a/BinariesCheck.py
-+++ b/BinariesCheck.py
-@@ -459,7 +459,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
+Index: rpmlint-1.5/BinariesCheck.py
+===================================================================
+--- rpmlint-1.5.orig/BinariesCheck.py
+++ rpmlint-1.5/BinariesCheck.py
+@@ -514,7 +514,7 @@ class BinariesCheck(AbstractCheck.Abstra
                 printError(pkg, 'missing-PT_GNU_STACK-section', fname)
 
             if bin_info.setgid and bin_info.setuid and not bin_info.setgroups:
@ -20,6 +20,3 @@ index b770085..cea85b9 100644
 
             if bin_info.chroot:
                 if not bin_info.chdir or not bin_info.chroot_near_chdir:
-- 
-1.8.1.4
-
--- a/rpmlint-checks-master.tar.gz
+++ b/rpmlint-checks-master.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:359bd3a591a2db10e13ffd840543d9520a5f665318038ed224edc73ac558dbc3
-size 30657
+oid sha256:ba2557daa77b44680c7c0039ed744466d7d4aacb2fe9f245a94578cda5fe28ec
+size 31444
--- a/rpmlint-pkg-quoting.diff
+++ b/rpmlint-pkg-quoting.diff
@ -2,12 +2,12 @@ Index: Pkg.py
 ===================================================================
 --- Pkg.py.orig
 +++ Pkg.py
-@@ -490,7 +490,7 @@ class Pkg:
+@@ -493,7 +493,7 @@ class Pkg:
                 dir = self.dirname)
             # TODO: better shell escaping or sequence based command invocation
             command_str = \
 -                'rpm2cpio "%s" | (cd "%s"; cpio -id); chmod -R +rX "%s"' % \
 +                "rpm2cpio '%s' | (cd '%s'; cpio -id); chmod -R +rX '%s'" % \
                 (self.filename, self.dirname, self.dirname)
-             cmd = commands.getstatusoutput(command_str)
+             cmd = getstatusoutput(command_str, shell=True)
             self.extracted = True
--- a/rpmlint.changes
+++ b/rpmlint.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb 21 14:53:30 UTC 2014 - dmueller@suse.com
+
+- added patches:
+  * 0001-Python-3-compatibility-tweaks.patch
+- Change openstack- related users to non-prefixed variants,
+  as they get renamed with the switch to Icehouse
+
 -------------------------------------------------------------------
 Mon Feb 10 09:52:04 UTC 2014 - krahmer@suse.com

--- a/rpmlint.spec
+++ b/rpmlint.spec
@ -58,7 +58,6 @@ Patch0:         rpmlint-suse.diff
 Patch1:         suse-checks.diff
 Patch2:         suse-version.diff
 Patch3:         suse-url-check.diff
-Patch4:         invalid-filerequires.diff
 Patch5:         suse-python3-naming-policy.diff
 Patch6:         suse-filesystem.diff
 Patch7:         suse-pkg-config-check.diff
@ -71,6 +70,7 @@ Patch13:        script-interpreter-only-for-exec-scripts.diff
 Patch14:        sourced-dirs.diff
 Patch15:        suse-filter-more-verbose.diff
 Patch17:        docdata-examples.diff
+Patch18:        0001-Python-3-compatibility-tweaks.patch
 Patch19:        yast-provides.diff
 Patch20:        xdg-paths-update.diff
 Patch22:        better-wrong-script.diff
@ -125,6 +125,7 @@ Patch91:        suse-manpages-for-rc-scripts.patch
 Patch92:        rpmlint-1.5-Fix-setgroups-error-name.diff
 Patch93:        xdg-check-exception.diff
 Patch94:        suse-ignore-specfile-errors.diff
+Patch95:        invalid-filerequires.diff

 %py_requires

@ -138,7 +139,6 @@ source packages can be checked.
 %patch1
 %patch2
 %patch3
-%patch4
 %patch5
 %patch6
 %patch7
@ -151,6 +151,7 @@ source packages can be checked.
 %patch14
 %patch15
 %patch17
+%patch18 -p1
 %patch19
 %patch20
 %patch22
@ -202,6 +203,7 @@ source packages can be checked.
 %patch92 -p1
 %patch93 -p1
 %patch94
+%patch95
 cp -p %{SOURCE2} .
 # Only move top-level python files 
 chmod 0755 rpmlint-checks-master/*.py
--- a/selfconflicts-provide.diff
+++ b/selfconflicts-provide.diff
@ -2,7 +2,7 @@ Index: TagsCheck.py
 ===================================================================
 --- TagsCheck.py.orig
 +++ TagsCheck.py
-@@ -820,6 +820,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -827,6 +827,7 @@ class TagsCheck(AbstractCheck.AbstractCh
 
         obs_names = [x[0] for x in pkg.obsoletes()]
         prov_names = [x[0].split(':/')[0] for x in pkg.provides()]
@ -10,7 +10,7 @@ Index: TagsCheck.py
 
         for o in (x for x in obs_names if x not in prov_names):
             printWarning(pkg, 'obsolete-not-provided', o)
-@@ -831,6 +832,8 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -838,6 +839,8 @@ class TagsCheck(AbstractCheck.AbstractCh
         #       https://bugzilla.redhat.com/460872
         useless_provides = []
         for p in prov_names:
@ -19,7 +19,7 @@ Index: TagsCheck.py
             if prov_names.count(p) != 1 and p not in useless_provides:
                 useless_provides.append(p)
         for p in useless_provides:
-@@ -971,6 +974,10 @@ the Release tag.''',
+@@ -978,6 +981,10 @@ the Release tag.''',
 '''There is no Name tag in your package. You have to specify a name using the
 Name tag.''',
 
--- a/stricter-interpreter-check.diff
+++ b/stricter-interpreter-check.diff
@ -2,12 +2,12 @@ Index: FilesCheck.py
 ===================================================================
 --- FilesCheck.py.orig
 +++ FilesCheck.py
-@@ -1242,7 +1242,8 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -1245,7 +1245,8 @@ class FilesCheck(AbstractCheck.AbstractC
                                  f.endswith('.la')):
                             printError(pkg, 'script-without-shebang', f)
 
-                        if mode & 0111 == 0 and not is_doc:
-+                        if mode & 0111 == 0 and not is_doc and \
+-                        if not mode_is_exec and not is_doc:
+                        if not mode_is_exec and not is_doc and \
 +                                interpreter and interpreter.startswith("/"):
                             printError(pkg, 'non-executable-script', f,
                                        oct(perm), interpreter)
--- a/suse-check-optional-dependencies.diff
+++ b/suse-check-optional-dependencies.diff
@ -2,7 +2,7 @@ Index: FilesCheck.py
 ===================================================================
 --- FilesCheck.py.orig
 +++ FilesCheck.py
-@@ -907,6 +907,16 @@ class FilesCheck(AbstractCheck.AbstractC
+@@ -908,6 +908,16 @@ class FilesCheck(AbstractCheck.AbstractC
                 if res.group(1) != pkg.name:
                     printError(pkg, 'incoherent-logrotate-file', f)
 
@ -19,7 +19,7 @@ Index: FilesCheck.py
             if link != '':
                 ext = compr_regex.search(link)
                 if ext:
-@@ -1727,6 +1737,24 @@ consequences), or other compiler flags w
+@@ -1730,6 +1740,24 @@ consequences), or other compiler flags w
 extraction not working as expected.  Verify that the binaries are not
 unexpectedly stripped and that the intended compiler flags are used.''',
 
--- a/suse-ignore-specfile-errors.diff
+++ b/suse-ignore-specfile-errors.diff
@ -1,6 +1,8 @@
--- SpecCheck.py
+Index: SpecCheck.py
+===================================================================
+--- SpecCheck.py.orig
 +++ SpecCheck.py
-@@ -524,9 +524,8 @@
+@@ -537,9 +537,8 @@ class SpecCheck(AbstractCheck.AbstractCh
                 printWarning(pkg, "patch-not-applied", "Patch%d:" % pnum,
                              pfile)
 
--- a/suse-pkg-config-check.diff
+++ b/suse-pkg-config-check.diff
@ -10,7 +10,7 @@ Index: TagsCheck.py
 license_regex = re.compile('\(([^)]+)\)|\s(?:and|or)\s')
 invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
 # () are here for grouping purpose in the regexp
-@@ -630,10 +631,12 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -626,10 +627,12 @@ class TagsCheck(AbstractCheck.AbstractCh
                 base = is_devel.group(1)
                 dep = None
                 has_so = False
@ -24,7 +24,7 @@ Index: TagsCheck.py
                 if has_so:
                     base_or_libs = base + '/' + base + '-libs/lib' + base
                     # try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
-@@ -670,6 +673,15 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -666,6 +669,15 @@ class TagsCheck(AbstractCheck.AbstractCh
                         if prov not in (x[0] for x in pkg.provides()):
                             printWarning(pkg, 'no-provides', prov)
 
@ -40,7 +40,7 @@ Index: TagsCheck.py
         # List of words to ignore in spell check
         ignored_words = set()
         for pf in pkg.files():
-@@ -1109,6 +1121,11 @@ instead or require a file in bin or /etc
+@@ -1099,6 +1111,11 @@ once.''',
 'no-url-tag',
 '''The URL tag is missing. Please add a http or ftp link to the project location.''',
 
--- a/suse-shlib-devel-dependency.diff
+++ b/suse-shlib-devel-dependency.diff
@ -2,7 +2,7 @@ Index: TagsCheck.py
 ===================================================================
 --- TagsCheck.py.orig
 +++ TagsCheck.py
-@@ -638,10 +638,10 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -639,10 +639,10 @@ class TagsCheck(AbstractCheck.AbstractCh
                     if pkg_config_regex.match(fname) and fname.endswith('.pc'):
                         has_pc = True
                 if has_so:
--- a/syntax-validator.py
+++ b/syntax-validator.py
@ -6,6 +6,6 @@ import sys
 for filename in sys.argv[1:]:
    try:
        compile(open(filename).read(), filename, 'exec')
-    except Exception, e:
-        print e
+    except Exception as e:
+        print(e)
        exit(1)
--- a/sysv5-init-checks.diff
+++ b/sysv5-init-checks.diff
@ -2,7 +2,7 @@ Index: InitScriptCheck.py
 ===================================================================
 --- InitScriptCheck.py.orig
 +++ InitScriptCheck.py
-@@ -29,6 +29,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+)
+@@ -30,6 +30,10 @@ lsb_tags_regex = re.compile('^# ([\w-]+)
 lsb_cont_regex = re.compile('^#(?:\t|  )(.*?)\s*$')
 use_subsys = Config.getOption('UseVarLockSubsys', True)
 
@ -13,7 +13,7 @@ Index: InitScriptCheck.py
 LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start',
                 'Should-Stop', 'Default-Start', 'Default-Stop',
                 'Short-Description', 'Description')
-@@ -46,6 +50,13 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -47,6 +51,13 @@ class InitScriptCheck(AbstractCheck.Abst
             return
 
         initscript_list = []
@ -27,7 +27,7 @@ Index: InitScriptCheck.py
         for fname, pkgfile in pkg.files().items():
 
             if not fname.startswith('/etc/init.d/') and \
-@@ -60,20 +71,16 @@ class InitScriptCheck(AbstractCheck.Abst
+@@ -61,20 +72,16 @@ class InitScriptCheck(AbstractCheck.Abst
             if "." in basename:
                 printError(pkg, 'init-script-name-with-dot', fname)
 
@ -56,7 +56,7 @@ Index: InitScriptCheck.py
 
             status_found = False
             reload_found = False
-@@ -274,6 +281,17 @@ of chkconfig don't work as expected with
+@@ -276,6 +283,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.''',
--- a/xdg-paths-update.diff
+++ b/xdg-paths-update.diff
@ -2,7 +2,7 @@ Index: MenuXDGCheck.py
 ===================================================================
 --- MenuXDGCheck.py.orig
 +++ MenuXDGCheck.py
-@@ -21,7 +21,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
+@@ -24,7 +24,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
         # /var/lib/menu-xdg:/usr/share
         self.cfp = RawConfigParser()
         AbstractCheck.AbstractFilesCheck.__init__(
--- a/yast-provides.diff
+++ b/yast-provides.diff
@ -2,7 +2,7 @@ Index: TagsCheck.py
 ===================================================================
 --- TagsCheck.py.orig
 +++ TagsCheck.py
-@@ -814,7 +814,7 @@ class TagsCheck(AbstractCheck.AbstractCh
+@@ -821,7 +821,7 @@ class TagsCheck(AbstractCheck.AbstractCh
                     printWarning(pkg, 'no-url-tag')
 
         obs_names = [x[0] for x in pkg.obsoletes()]