From 820809466b66b1eff698e824cd20a9031deb6c17 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:27:05 +0000
Subject: import rhnlib-2.5.65-8.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
index 9a4dc05..a6b64e6 100644
--- 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
@@ -1,5 +1,5 @@
 diff --git a/rhn/connections.py b/rhn/connections.py
-index c237fc4..d615a8c 100644
+index c237fc4677..d615a8c063 100644
 --- a/rhn/connections.py
 +++ b/rhn/connections.py
 @@ -7,7 +7,7 @@
@@ -42,7 +42,7 @@ index c237fc4..d615a8c 100644
              break
  
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 1b85fb2..8828a35 100644
+index 1b85fb24fe..8828a35524 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -5,7 +5,7 @@ Name: rhnlib
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
index 61d4f21..5d7a35c 100644
--- 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
@@ -1,5 +1,5 @@
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 8828a35..8ed4fad 100644
+index 8828a35524..8ed4fada7a 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -5,7 +5,7 @@ Name: rhnlib
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
index 23b48a2..4f7791b 100644
--- 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
@@ -1,5 +1,5 @@
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 8ed4fad..2de48689 100644
+index 8ed4fada7a..2de48689f4 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -5,7 +5,7 @@ Name: rhnlib
diff --git a/SOURCES/rhnlib-2.5.65-4-el7-to-rhnlib-2.5.65-5-el7.patch b/SOURCES/rhnlib-2.5.65-4-el7-to-rhnlib-2.5.65-5-el7.patch
index 70153f5..20df5f2 100644
--- a/SOURCES/rhnlib-2.5.65-4-el7-to-rhnlib-2.5.65-5-el7.patch
+++ b/SOURCES/rhnlib-2.5.65-4-el7-to-rhnlib-2.5.65-5-el7.patch
@@ -1,5 +1,5 @@
 diff --git a/rhn/SSL.py b/rhn/SSL.py
-index db26fd8..c3d3388 100644
+index db26fd8541..c3d338868f 100644
 --- a/rhn/SSL.py
 +++ b/rhn/SSL.py
 @@ -28,6 +28,7 @@ from OpenSSL import SSL
@@ -32,7 +32,7 @@ index db26fd8..c3d3388 100644
          self._closed = 1
  
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 2de48689..57e2128 100644
+index 2de48689f4..57e2128001 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -5,7 +5,7 @@ Name: rhnlib
diff --git a/SOURCES/rhnlib-2.5.65-5-el7-to-rhnlib-2.5.65-6-el7.patch b/SOURCES/rhnlib-2.5.65-5-el7-to-rhnlib-2.5.65-6-el7.patch
index 624190f..8754acb 100644
--- a/SOURCES/rhnlib-2.5.65-5-el7-to-rhnlib-2.5.65-6-el7.patch
+++ b/SOURCES/rhnlib-2.5.65-5-el7-to-rhnlib-2.5.65-6-el7.patch
@@ -1,5 +1,5 @@
 diff --git a/rhn/connections.py b/rhn/connections.py
-index d615a8c..6a1ea1d 100644
+index d615a8c063..6a1ea1d131 100644
 --- a/rhn/connections.py
 +++ b/rhn/connections.py
 @@ -15,7 +15,6 @@ import httplib
@@ -33,7 +33,7 @@ index d615a8c..6a1ea1d 100644
              break
  
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 57e2128..36543c0 100644
+index 57e2128001..36543c0ff4 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -5,7 +5,7 @@ Name: rhnlib
diff --git a/SOURCES/rhnlib-2.5.65-6-el7-to-rhnlib-2.5.65-7-el7.patch b/SOURCES/rhnlib-2.5.65-6-el7-to-rhnlib-2.5.65-7-el7.patch
index 23c3339..8cbedc0 100644
--- a/SOURCES/rhnlib-2.5.65-6-el7-to-rhnlib-2.5.65-7-el7.patch
+++ b/SOURCES/rhnlib-2.5.65-6-el7-to-rhnlib-2.5.65-7-el7.patch
@@ -1,5 +1,5 @@
 diff --git a/rhnlib.spec b/rhnlib.spec
-index 36543c0..64d5224 100644
+index 36543c0ff4..64d5224123 100644
 --- a/rhnlib.spec
 +++ b/rhnlib.spec
 @@ -2,10 +2,10 @@
diff --git a/SOURCES/rhnlib-2.5.65-7-el7-to-rhnlib-2.5.65-8-el7.patch b/SOURCES/rhnlib-2.5.65-7-el7-to-rhnlib-2.5.65-8-el7.patch
new file mode 100644
index 0000000..5e243f1
--- /dev/null
+++ b/SOURCES/rhnlib-2.5.65-7-el7-to-rhnlib-2.5.65-8-el7.patch
@@ -0,0 +1,37 @@
+diff --git a/rhn/SSL.py b/rhn/SSL.py
+index c3d338868f..5ffadf5858 100644
+--- a/rhn/SSL.py
++++ b/rhn/SSL.py
+@@ -85,6 +85,8 @@ class SSLSocket:
+         self._check_closed()
+         # Get a context
+         self._ctx = SSL.Context(self._ssl_method)
++        self._ctx.set_options(SSL.OP_NO_SSLv2)
++        self._ctx.set_options(SSL.OP_NO_SSLv3)
+         if self._trusted_certs:
+             # We have been supplied with trusted CA certs
+             for f in self._trusted_certs:
+diff --git a/rhnlib.spec b/rhnlib.spec
+index 64d5224123..281156930a 100644
+--- a/rhnlib.spec
++++ b/rhnlib.spec
+@@ -5,7 +5,7 @@ Name: rhnlib
+ URL:     https://github.com/spacewalkproject/spacewalk
+ Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
+ Version: 2.5.65
+-Release: 7%{?dist}
++Release: 8%{?dist}
+ 
+ Group: Development/Libraries
+ License: GPLv2
+@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
+ %{python_sitelib}/*
+ 
+ %changelog
++* Fri Jul 27 2018 Tomas Kasparek <tkasparek@redhat.com> 2.5.65-8
++- Resolves: #1608425 - forbid old SSL versions during negotiation
++  (tkasparek@redhat.com)
++
+ * Thu Oct 19 2017 Tomas Kasparek <tkasparek@redhat.com> 2.5.65-7
+ - Resolves: #1503953 - upstream project has migrated to github
+   (tkasparek@redhat.com)
diff --git a/SPECS/rhnlib.spec b/SPECS/rhnlib.spec
index d688945..8b92e1e 100644
--- a/SPECS/rhnlib.spec
+++ b/SPECS/rhnlib.spec
@@ -10,8 +10,9 @@ Patch2: rhnlib-2.5.65-3-el7-to-rhnlib-2.5.65-4-el7.patch
 Patch3: rhnlib-2.5.65-4-el7-to-rhnlib-2.5.65-5-el7.patch
 Patch4: rhnlib-2.5.65-5-el7-to-rhnlib-2.5.65-6-el7.patch
 Patch5: rhnlib-2.5.65-6-el7-to-rhnlib-2.5.65-7-el7.patch
+Patch6: rhnlib-2.5.65-7-el7-to-rhnlib-2.5.65-8-el7.patch
 Version: 2.5.65
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Group: Development/Libraries
 License: GPLv2
@@ -43,6 +44,7 @@ rhnlib is a collection of python modules used by the Spacewalk (http://spacewalk
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 if [ ! -e setup.py ]; then
     sed -e 's/@VERSION@/%{version}/' -e 's/@NAME@/%{name}/' setup.py.in > setup.py
 fi
@@ -71,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Fri Jul 27 2018 Tomas Kasparek <tkasparek@redhat.com> 2.5.65-8
+- Resolves: #1608425 - forbid old SSL versions during negotiation
+  (tkasparek@redhat.com)
+
 * Thu Oct 19 2017 Tomas Kasparek <tkasparek@redhat.com> 2.5.65-7
 - Resolves: #1503953 - upstream project has migrated to github
   (tkasparek@redhat.com)