From 1d15ef480be7fe8fb7c5be03bb6d7a9027156c27 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:40:26 +0000 Subject: import rhnlib-2.5.65-4.el7 --- diff --git a/SOURCES/rhnlib-2.5.65-1-to-rhnlib-2.5.65-2-el7.patch b/SOURCES/rhnlib-2.5.65-1-to-rhnlib-2.5.65-2-el7.patch new file mode 100644 index 0000000..9a4dc05 --- /dev/null +++ b/SOURCES/rhnlib-2.5.65-1-to-rhnlib-2.5.65-2-el7.patch @@ -0,0 +1,67 @@ +diff --git a/rhn/connections.py b/rhn/connections.py +index c237fc4..d615a8c 100644 +--- a/rhn/connections.py ++++ b/rhn/connections.py +@@ -7,7 +7,7 @@ + + # $Id$ + +- ++import sys + import base64 + import SSL + import nonblocking +@@ -15,6 +15,7 @@ import httplib + import xmlrpclib + import encodings.idna + import socket ++import errno + from platform import python_version + + # Import into the local namespace some httplib-related names +@@ -169,16 +170,13 @@ class HTTPSConnection(HTTPConnection): + af, socktype, proto, canonname, sa = r + try: + sock = socket.socket(af, socktype, proto) +- except socket.error, msg: +- sock = None +- continue +- +- try: + sock.connect((self.host, self.port)) + sock.settimeout(self.timeout) +- except socket.error, e: +- sock.close() +- sock = None ++ except socket.error: ++ e = sys.exc_info()[1] ++ if e.errno != errno.EINTR: ++ sock.close() ++ sock = None + continue + break + +diff --git a/rhnlib.spec b/rhnlib.spec +index 1b85fb2..8828a35 100644 +--- a/rhnlib.spec ++++ b/rhnlib.spec +@@ -5,7 +5,7 @@ Name: rhnlib + URL: https://fedorahosted.org/spacewalk + Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz + Version: 2.5.65 +-Release: 1%{?dist} ++Release: 2%{?dist} + + Group: Development/Libraries + License: GPLv2 +@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT + %{python_sitelib}/* + + %changelog ++* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-2 ++- fix except in rhnlib to make it compatible with Python 2.4 (galt@redhat.com) ++- 1409577 - Reboot loop - rhn_check, rhnsd (jdostal@redhat.com) ++ + * Wed Jul 17 2013 Tomas Kasparek 2.5.65-1 + - updating copyright years + diff --git a/SOURCES/rhnlib-2.5.65-2-el7-to-rhnlib-2.5.65-3-el7.patch b/SOURCES/rhnlib-2.5.65-2-el7-to-rhnlib-2.5.65-3-el7.patch new file mode 100644 index 0000000..61d4f21 --- /dev/null +++ b/SOURCES/rhnlib-2.5.65-2-el7-to-rhnlib-2.5.65-3-el7.patch @@ -0,0 +1,23 @@ +diff --git a/rhnlib.spec b/rhnlib.spec +index 8828a35..8ed4fad 100644 +--- a/rhnlib.spec ++++ b/rhnlib.spec +@@ -5,7 +5,7 @@ Name: rhnlib + URL: https://fedorahosted.org/spacewalk + Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz + Version: 2.5.65 +-Release: 2%{?dist} ++Release: 3%{?dist} + + Group: Development/Libraries + License: GPLv2 +@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT + %{python_sitelib}/* + + %changelog ++* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-3 ++1409577 - bump release verion ++ + * Mon Mar 06 2017 Gennadii Altukhov 2.5.65-2 + - fix except in rhnlib to make it compatible with Python 2.4 (galt@redhat.com) + - 1409577 - Reboot loop - rhn_check, rhnsd (jdostal@redhat.com) diff --git a/SOURCES/rhnlib-2.5.65-3-el7-to-rhnlib-2.5.65-4-el7.patch b/SOURCES/rhnlib-2.5.65-3-el7-to-rhnlib-2.5.65-4-el7.patch new file mode 100644 index 0000000..23b48a2 --- /dev/null +++ b/SOURCES/rhnlib-2.5.65-3-el7-to-rhnlib-2.5.65-4-el7.patch @@ -0,0 +1,26 @@ +diff --git a/rhnlib.spec b/rhnlib.spec +index 8ed4fad..2de48689 100644 +--- a/rhnlib.spec ++++ b/rhnlib.spec +@@ -5,7 +5,7 @@ Name: rhnlib + URL: https://fedorahosted.org/spacewalk + Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz + Version: 2.5.65 +-Release: 3%{?dist} ++Release: 4%{?dist} + + Group: Development/Libraries + License: GPLv2 +@@ -59,8 +59,11 @@ rm -rf $RPM_BUILD_ROOT + %{python_sitelib}/* + + %changelog ++* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-4 ++- Resolves: #1409577 - fixed BZ ID in changelog (galt@redhat.com) ++ + * Mon Mar 06 2017 Gennadii Altukhov 2.5.65-3 +-1409577 - bump release verion ++- 1409577 - bump release verion + + * Mon Mar 06 2017 Gennadii Altukhov 2.5.65-2 + - fix except in rhnlib to make it compatible with Python 2.4 (galt@redhat.com) diff --git a/SPECS/rhnlib.spec b/SPECS/rhnlib.spec index e7120b8..43cf6cf 100644 --- a/SPECS/rhnlib.spec +++ b/SPECS/rhnlib.spec @@ -4,8 +4,11 @@ Summary: Python libraries for the Spacewalk project Name: rhnlib URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz +Patch0: rhnlib-2.5.65-1-to-rhnlib-2.5.65-2-el7.patch +Patch1: rhnlib-2.5.65-2-el7-to-rhnlib-2.5.65-3-el7.patch +Patch2: rhnlib-2.5.65-3-el7-to-rhnlib-2.5.65-4-el7.patch Version: 2.5.65 -Release: 2%{?dist} +Release: 4%{?dist} Group: Development/Libraries License: GPLv2 @@ -31,6 +34,9 @@ rhnlib is a collection of python modules used by the Spacewalk (http://spacewalk %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 if [ ! -e setup.py ]; then sed -e 's/@VERSION@/%{version}/' -e 's/@NAME@/%{name}/' setup.py.in > setup.py fi @@ -59,8 +65,15 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog -* Fri Dec 27 2013 Daniel Mach - 2.5.65-2 -- Mass rebuild 2013-12-27 +* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-4 +- Resolves: #1409577 - fixed BZ ID in changelog (galt@redhat.com) + +* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-3 +- 1409577 - bump release verion + +* Mon Mar 06 2017 Gennadii Altukhov 2.5.65-2 +- fix except in rhnlib to make it compatible with Python 2.4 (galt@redhat.com) +- 1409577 - Reboot loop - rhn_check, rhnsd (jdostal@redhat.com) * Wed Jul 17 2013 Tomas Kasparek 2.5.65-1 - updating copyright years