From 9ddb6a39f4891f484c53df258efed38b868b4c91 Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@cepl.eu>
Date: Jan 23 2015 19:30:18 +0000
Subject: Don’t change debugging level ... RHBZ #1185370


---

diff --git a/add-logging.patch b/add-logging.patch
deleted file mode 100644
index fc69418..0000000
--- a/add-logging.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/urllib2_kerberos.py
-+++ b/urllib2_kerberos.py
-@@ -24,7 +24,16 @@ import urllib2 as u2
- 
- import kerberos as k
- 
--log = logging.getLogger("http_kerberos_auth_handler")
-+def getLogger():
-+    log = logging.getLogger("http_kerberos_auth_handler")
-+    handler = logging.StreamHandler()
-+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-+    handler.setFormatter(formatter)
-+    log.addHandler(handler)
-+    return log
-+
-+log = getLogger()
-+log.setLevel(logging.INFO)
- 
- class AbstractKerberosAuthHandler:
-     """auth handler for urllib2 that does Kerberos HTTP Negotiate Authentication
-@@ -126,6 +135,8 @@ class AbstractKerberosAuthHandler:
- 
-             req.add_unredirected_header(self.authz_header, neg_hdr)
-             resp = self.parent.open(req)
-+            log.debug('resp = {0}'.format(resp))
-+            log.debug('resp = type {0}'.format(type(resp)))
- 
-             if resp.getcode() != 200:
-                 self.authenticate_server(resp.info())
diff --git a/dont-panick-if-we-succeed.patch b/dont-panick-if-we-succeed.patch
index ecc330a..050a023 100644
--- a/dont-panick-if-we-succeed.patch
+++ b/dont-panick-if-we-succeed.patch
@@ -1,6 +1,6 @@
 --- a/urllib2_kerberos.py
 +++ b/urllib2_kerberos.py
-@@ -34,6 +34,7 @@ class AbstractKerberosAuthHandler:
+@@ -42,6 +42,7 @@ class AbstractKerberosAuthHandler:
          """checks for "Negotiate" in proper auth header
          """
          authreqs = headers.getheaders(self.auth_header)
@@ -8,7 +8,7 @@
  
          if authreqs:
  
-@@ -43,10 +44,10 @@ class AbstractKerberosAuthHandler:
+@@ -51,10 +52,10 @@ class AbstractKerberosAuthHandler:
                  if mo:
                      return mo.group(1)
                  else:
@@ -21,7 +21,7 @@
  
          return None
  
-@@ -56,10 +57,10 @@ class AbstractKerberosAuthHandler:
+@@ -64,10 +65,10 @@ class AbstractKerberosAuthHandler:
  
      def generate_request_header(self, req, headers, neg_value):
          self.retried += 1
@@ -34,7 +34,7 @@
  
          tail, sep, head = host.rpartition(':')
          domain = tail if tail else head
-@@ -67,7 +68,7 @@ class AbstractKerberosAuthHandler:
+@@ -75,7 +76,7 @@ class AbstractKerberosAuthHandler:
          result, self.context = k.authGSSClientInit("HTTP@%s" % domain)
  
          if result < 1:
@@ -43,7 +43,7 @@
              return None
  
          log.debug("authGSSClientInit() succeeded")
-@@ -75,7 +76,7 @@ class AbstractKerberosAuthHandler:
+@@ -83,7 +84,7 @@ class AbstractKerberosAuthHandler:
          result = k.authGSSClientStep(self.context, neg_value)
  
          if result < 0:
@@ -52,7 +52,7 @@
              return None
  
          log.debug("authGSSClientStep() succeeded")
-@@ -96,7 +97,7 @@ class AbstractKerberosAuthHandler:
+@@ -104,7 +105,7 @@ class AbstractKerberosAuthHandler:
          if  result < 1:
              # this is a critical security warning
              # should change to a raise --Tim
@@ -61,7 +61,7 @@
              pass
  
      def clean_context(self):
-@@ -126,12 +127,13 @@ class AbstractKerberosAuthHandler:
+@@ -134,12 +135,13 @@ class AbstractKerberosAuthHandler:
              req.add_unredirected_header(self.authz_header, neg_hdr)
              resp = self.parent.open(req)
  
diff --git a/python-urllib2_kerberos.spec b/python-urllib2_kerberos.spec
index 43d64d5..b18a8c0 100644
--- a/python-urllib2_kerberos.spec
+++ b/python-urllib2_kerberos.spec
@@ -1,8 +1,8 @@
-%global srcname urllib2_kerberos 
+%global srcname urllib2_kerberos
 
 Name:           python-%{srcname}
 Version:        0.1.6
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Kerberos over HTTP Negotiate/SPNEGO support for urllib2
 
 Group:          Development/Languages
@@ -12,13 +12,13 @@ Source0:        http://pypi.python.org/packages/source/u/%{srcname}/%{srcname}-%
 # From https://bitbucket.org/tolsen/urllib2_kerberos/issue/1/
 Patch0:         multiple-auth-headers.patch
 # From https://bitbucket.org/tolsen/urllib2_kerberos/pull-request/2/
+# Breaks debugging ... RHBZ #1185370
 Patch1:         allow_client_apps_to_configure_loggers.patch
 # From https://github.com/mcepl/urllib2_kerberos/commit/7b52c4c749
 # also https://bugzilla.redhat.com/show_bug.cgi?id=1065576
 Patch2:         dont-panick-if-we-succeed.patch
 # From https://bugzilla.redhat.com/show_bug.cgi?id=578711
 Patch3:         port-to-python-2.4.patch
-Patch4:         add-logging.patch
 
 BuildArch:      noarch
 BuildRequires:  python-setuptools
@@ -31,15 +31,13 @@ urllib2 with kerberos authentication.
 %setup -q -n %{srcname}-%{version}
 
 %patch0 -p1
-%patch1 -p1
+#%#patch1 -p1
 %patch2 -p1
 
 %if 0%{?rhel} == 5
 %patch3 -p1
 %endif
 
-%patch4 -p1
-
 # Remove "#!/usr/bin/python\n"
 lib=urllib2_kerberos.py
 sed '1{\@^#!/usr/bin/python@d}' $lib > $lib.new && \
@@ -60,6 +58,9 @@ touch -r $lib $lib.new && mv $lib.new $lib
 # TODO this should be fix for #1065576, #578711, and #1115513
 
 %changelog
+* Fri Jan 23 2015 Matej Cepl <mcepl@redhat.com> - 0.1.6-15
+- Don’t change debugging level ... RHBZ #1185370
+
 * Wed Oct 08 2014 Steve Traylen <steve.traylen@cern.ch> - 0.1.6-14
 - Remove debug from add-logging.patch. #1065576