From 485f08c85ff02b5ebde0333a37f83ddb5764dbdd Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Oct 01 2018 10:53:19 +0000 Subject: https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aae4771..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -urllib2_kerberos-0.1.6.tar.gz diff --git a/allow_client_apps_to_configure_loggers.patch b/allow_client_apps_to_configure_loggers.patch deleted file mode 100644 index 92ce752..0000000 --- a/allow_client_apps_to_configure_loggers.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/urllib2_kerberos.py -+++ b/urllib2_kerberos.py -@@ -24,15 +24,7 @@ import urllib2 as u2 - - import kerberos as k - --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 = logging.getLogger("http_kerberos_auth_handler") - - class AbstractKerberosAuthHandler: - """auth handler for urllib2 that does Kerberos HTTP Negotiate Authentication -@@ -179,7 +171,8 @@ class HTTPKerberosAuthHandler(u2.BaseHan - return retry - - def test(): -- log.setLevel(logging.DEBUG) -+ logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', -+ level=logging.DEBUG) - log.info("starting test") - opener = u2.build_opener() - opener.add_handler(HTTPKerberosAuthHandler()) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fb1bcd9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal diff --git a/dont-panick-if-we-succeed.patch b/dont-panick-if-we-succeed.patch deleted file mode 100644 index 050a023..0000000 --- a/dont-panick-if-we-succeed.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/urllib2_kerberos.py -+++ b/urllib2_kerberos.py -@@ -42,6 +42,7 @@ class AbstractKerberosAuthHandler: - """checks for "Negotiate" in proper auth header - """ - authreqs = headers.getheaders(self.auth_header) -+ log.debug('authreqs = %s', authreqs) - - if authreqs: - -@@ -51,10 +52,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 - -@@ -64,10 +65,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 -@@ -75,7 +76,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") -@@ -83,7 +84,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") -@@ -104,7 +105,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): -@@ -134,12 +135,13 @@ class AbstractKerberosAuthHandler: - req.add_unredirected_header(self.authz_header, neg_hdr) - resp = self.parent.open(req) - -- self.authenticate_server(resp.info()) -+ if resp.getcode() != 200: -+ self.authenticate_server(resp.info()) - - 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/multiple-auth-headers.patch b/multiple-auth-headers.patch deleted file mode 100644 index bb597e2..0000000 --- a/multiple-auth-headers.patch +++ /dev/null @@ -1,38 +0,0 @@ -# HG changeset patch -# User Wagner Bruna -# Date 1338402998 10800 -# Node ID 5e53d94fdf9cb73304790a38ba24b19415de73ea -# Parent 08f4f4f83058d9896a0debc2ff3899a9a358f942 -deal with multiple WWW-Authenticate headers - -A server supporting both Negotiate and Basic authentication methods -could send both headers at once, but the get() method returns only -the last one. - ---- a/urllib2_kerberos.py -+++ b/urllib2_kerberos.py -@@ -41,15 +41,17 @@ class AbstractKerberosAuthHandler: - def negotiate_value(self, headers): - """checks for "Negotiate" in proper auth header - """ -- authreq = headers.get(self.auth_header, None) -+ authreqs = headers.getheaders(self.auth_header) -+ -+ if authreqs: - -- if authreq: - rx = re.compile('(?:.*,)*\s*Negotiate\s*([^,]*),?', re.I) -- mo = rx.search(authreq) -- if mo: -- return mo.group(1) -- else: -- log.debug("regex failed on: %s" % authreq) -+ for authreq in authreqs: -+ mo = rx.search(authreq) -+ if mo: -+ return mo.group(1) -+ else: -+ log.debug("regex failed on: %s" % authreq) - - else: - log.debug("%s header not found" % self.auth_header) diff --git a/port-to-python-2.4.patch b/port-to-python-2.4.patch deleted file mode 100644 index 7586a10..0000000 --- a/port-to-python-2.4.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/urllib2_kerberos.py -+++ b/urllib2_kerberos.py -@@ -62,8 +62,8 @@ class AbstractKerberosAuthHandler: - host = req.get_host() - log.debug("req.get_host() returned %s" % host) - -- tail, sep, head = host.rpartition(':') -- domain = tail if tail else head -+ cindex = host.rfind(':') -+ domain = (cindex == -1) and host or host[:cindex] - - result, self.context = k.authGSSClientInit("HTTP@%s" % domain) - -@@ -130,15 +130,15 @@ class AbstractKerberosAuthHandler: - if resp.getcode() != 200: - self.authenticate_server(resp.info()) - -+ self.clean_context() -+ self.retried = 0 - return resp - - except k.GSSError, e: - log.critical("GSSAPI Error: %s/%s" % (e[0][0], e[1][0])) -- return None -- -- finally: - self.clean_context() - self.retried = 0 -+ return None - - class ProxyKerberosAuthHandler(u2.BaseHandler, AbstractKerberosAuthHandler): - """Kerberos Negotiation handler for HTTP proxy auth diff --git a/python-urllib2_kerberos.spec b/python-urllib2_kerberos.spec deleted file mode 100644 index 5877ab7..0000000 --- a/python-urllib2_kerberos.spec +++ /dev/null @@ -1,146 +0,0 @@ -%global srcname urllib2_kerberos - -Name: python-%{srcname} -Version: 0.1.6 -Release: 26%{?dist} -Summary: Kerberos over HTTP Negotiate/SPNEGO support for urllib2 - -Group: Development/Languages -License: ASL 2.0 -URL: http://pypi.python.org/pypi/%{srcname}/ -Source0: http://pypi.python.org/packages/source/u/%{srcname}/%{srcname}-%{version}.tar.gz -# From https://bitbucket.org/tolsen/urllib2_kerberos/issue/1/ -Patch0: multiple-auth-headers.patch -# From https://bitbucket.org/tolsen/urllib2_kerberos/pull-request/2/ -# UNUSED 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 - -BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%global _description\ -urllib2 with kerberos authentication. - -%description %_description - -%package -n python2-%{srcname} -Summary: %summary -Requires: python2-kerberos -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} %_description - -%prep -%setup -q -n %{srcname}-%{version} - -%patch0 -p1 -%patch2 -p1 - -%if 0%{?rhel} == 5 -%patch3 -p1 -%endif - -# Remove "#!/usr/bin/python\n" -lib=urllib2_kerberos.py -sed '1{\@^#!/usr/bin/python@d}' $lib > $lib.new && \ -touch -r $lib $lib.new && mv $lib.new $lib - - -%build -%py2_build - - -%install -%py2_install - - -%files -n python2-%{srcname} -%{python2_sitelib}/%{srcname}* - -# TODO this should be fix for #1065576, #578711, and #1115513 - -%changelog -* Sat Jul 14 2018 Fedora Release Engineering - 0.1.6-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Feb 12 2018 Iryna Shcherbina - 0.1.6-25 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.1.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.1.6-23 -- Python 2 binary package renamed to python2-urllib2_kerberos - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Fri Aug 11 2017 Iryna Shcherbina - 0.1.6-22 -- Add a build-time dependency on python2-devel and modernize spec file - -* Thu Jul 27 2017 Fedora Release Engineering - 0.1.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.1.6-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 0.1.6-19 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Feb 04 2016 Fedora Release Engineering - 0.1.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 0.1.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jan 23 2015 Matej Cepl - 0.1.6-15 -- Don’t change debugging level ... RHBZ #1185370 - -* Wed Oct 08 2014 Steve Traylen - 0.1.6-14 -- Remove debug from add-logging.patch. #1065576 - -* 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 - -* Tue Jun 10 2014 Matěj Cepl - 0.1.6-11 -- Add all patches I could find. -- Also add RHEL5 patch porting to python 2.4 (RHBZ# 578711) - -* Sun Jun 08 2014 Fedora Release Engineering - 0.1.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.1.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.1.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 27 2012 Tomas Dabasinskas - 0.1.6-7 -- python-kerberos is required by this package - -* Wed Jul 11 2012 Tomas Dabasinskas - 0.1.6-6 -- Rebuilding retired package -- fixed spec file to comply with fedora-review - -* Thu Jul 22 2010 David Malcolm - 0.1.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 0.1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 18 2009 Matěj Cepl - 0.1.6-3 -- don't preserve attributes of the file you modified. - -* Wed Jun 17 2009 Matěj Cepl - 0.1.6-2 -- add BuildRequires: python-setuptools-devel. - -* Thu Jun 11 2009 Matěj Cepl - 0.1.6-1 -- Initial packaging effort diff --git a/sources b/sources deleted file mode 100644 index 0420f79..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -9a22d5d243103e17ca0ccf64b51f54ec urllib2_kerberos-0.1.6.tar.gz diff --git a/test_trac.py b/test_trac.py deleted file mode 100644 index f5449ed..0000000 --- a/test_trac.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python -import urllib2 -import cookielib -import urllib2_kerberos - - -cj = cookielib.CookieJar() -opener = urllib2.build_opener(urllib2.HTTPSHandler(debuglevel=2), - urllib2.HTTPRedirectHandler, - urllib2.HTTPCookieProcessor(cj), - urllib2_kerberos.HTTPKerberosAuthHandler) - -response = opener.open('URL of the webpage')