diff --git a/correct-format-for-py26.patch b/correct-format-for-py26.patch new file mode 100644 index 0000000..fd0d024 --- /dev/null +++ b/correct-format-for-py26.patch @@ -0,0 +1,73 @@ +--- a/urllib2_kerberos.py ++++ b/urllib2_kerberos.py +@@ -34,7 +34,7 @@ class AbstractKerberosAuthHandler: + """checks for "Negotiate" in proper auth header + """ + authreqs = headers.getheaders(self.auth_header) +- log.debug('authreqs = {}'.format(authreqs)) ++ log.debug('authreqs = %s', authreqs) + + if authreqs: + +@@ -44,10 +44,10 @@ class AbstractKerberosAuthHandler: + if mo: + return mo.group(1) + else: +- log.debug("regex failed on: %s" % authreq) ++ log.debug("regex failed on: %s", authreq) + + else: +- log.debug("%s header not found" % self.auth_header) ++ log.debug("%s header not found", self.auth_header) + + return None + +@@ -57,10 +57,10 @@ class AbstractKerberosAuthHandler: + + def generate_request_header(self, req, headers, neg_value): + self.retried += 1 +- log.debug("retry count: %d" % self.retried) ++ log.debug("retry count: %d", self.retried) + + host = req.get_host() +- log.debug("req.get_host() returned %s" % host) ++ log.debug("req.get_host() returned %s", host) + + tail, sep, head = host.rpartition(':') + domain = tail if tail else head +@@ -68,7 +68,7 @@ class AbstractKerberosAuthHandler: + result, self.context = k.authGSSClientInit("HTTP@%s" % domain) + + if result < 1: +- log.warning("authGSSClientInit returned result %d" % result) ++ log.warning("authGSSClientInit returned result %d", result) + return None + + log.debug("authGSSClientInit() succeeded") +@@ -76,7 +76,7 @@ class AbstractKerberosAuthHandler: + result = k.authGSSClientStep(self.context, neg_value) + + if result < 0: +- log.warning("authGSSClientStep returned result %d" % result) ++ log.warning("authGSSClientStep returned result %d", result) + return None + + log.debug("authGSSClientStep() succeeded") +@@ -97,7 +97,7 @@ class AbstractKerberosAuthHandler: + if result < 1: + # this is a critical security warning + # should change to a raise --Tim +- log.critical("mutual auth failed: authGSSClientStep returned result %d" % result) ++ log.critical("mutual auth failed: authGSSClientStep returned result %d", result) + pass + + def clean_context(self): +@@ -133,7 +133,7 @@ class AbstractKerberosAuthHandler: + return resp + + except k.GSSError, e: +- log.critical("GSSAPI Error: %s/%s" % (e[0][0], e[1][0])) ++ log.critical("GSSAPI Error: %s/%s", (e[0][0], e[1][0])) + return None + + finally: diff --git a/python-urllib2_kerberos.spec b/python-urllib2_kerberos.spec index 585215b..4dd7c08 100644 --- a/python-urllib2_kerberos.spec +++ b/python-urllib2_kerberos.spec @@ -2,7 +2,7 @@ Name: python-%{srcname} Version: 0.1.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Kerberos over HTTP Negotiate/SPNEGO support for urllib2 Group: Development/Languages @@ -17,6 +17,8 @@ Patch1: allow_client_apps_to_configure_loggers.patch Patch2: dont-panick-if-we-succeed.patch # From https://bugzilla.redhat.com/show_bug.cgi?id=578711 Patch3: port-to-python-2.4.patch +# From https://bugzilla.redhat.com/show_bug.cgi?id=1065576 +Patch4: correct-format-for-py26.patch BuildArch: noarch BuildRequires: python-setuptools @@ -36,6 +38,10 @@ urllib2 with kerberos authentication. %patch3 -p1 %endif +%if 0%{?rhel} && 0%{?rhel} <= 6 +%patch4 -p1 +%endif + # Remove "#!/usr/bin/python\n" lib=urllib2_kerberos.py sed '1{\@^#!/usr/bin/python@d}' $lib > $lib.new && \ @@ -55,6 +61,9 @@ touch -r $lib $lib.new && mv $lib.new $lib %changelog +* Thu Jul 03 2014 Matěj Cepl - 0.1.6-13 +- Fix logging format for Python 2.6 (#1065576) + * Mon Jun 30 2014 Toshio Kuratomi - 0.1.6-12 - Replace python-setuptools-devel BR with python-setuptools