From 8ac18cd1d790ef1163245b0f46fa717408d35a9e Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Jun 03 2009 15:15:50 +0000
Subject: - Only send the selector in SSL HTTP requests. Patch by James Bowes

    <jbowes@redhat.com>. Resolves: #491674

---

diff --git a/m2crypto-0.19.1-ssl-selector.patch b/m2crypto-0.19.1-ssl-selector.patch
new file mode 100644
index 0000000..65ecba4
--- /dev/null
+++ b/m2crypto-0.19.1-ssl-selector.patch
@@ -0,0 +1,24 @@
+diff -urN M2Crypto/M2Crypto/httpslib.py M2Crypto-0.19.1/M2Crypto/httpslib.py
+--- M2Crypto/M2Crypto/httpslib.py	2008-10-13 06:47:33.000000000 +0200
++++ M2Crypto-0.19.1/M2Crypto/httpslib.py	2009-06-03 16:57:25.000000000 +0200
+@@ -137,7 +137,7 @@
+                 raise ValueError, "unknown protocol for: %s" % url
+         self._real_host = host
+         self._real_port = port
+-        HTTPSConnection.putrequest(self, method, url, skip_host, skip_accept_encoding)
++        HTTPSConnection.putrequest(self, method, rest, skip_host, skip_accept_encoding)
+ 
+     def putheader(self, header, value):
+         # Store the auth header if passed in.
+diff -urN M2Crypto/M2Crypto/m2urllib2.py M2Crypto-0.19.1/M2Crypto/m2urllib2.py
+--- M2Crypto/M2Crypto/m2urllib2.py	2009-06-03 16:56:43.000000000 +0200
++++ M2Crypto-0.19.1/M2Crypto/m2urllib2.py	2009-06-03 16:57:25.000000000 +0200
+@@ -80,7 +80,7 @@
+         # request.
+         headers["Connection"] = "close"
+         try:
+-            h.request(req.get_method(), req.get_full_url(), req.data, headers)
++            h.request(req.get_method(), req.get_selector(), req.data, headers)
+             r = h.getresponse()
+         except socket.error, err: # XXX what error?
+             raise URLError(err)
diff --git a/m2crypto.spec b/m2crypto.spec
index 145426a..5fd45e7 100644
--- a/m2crypto.spec
+++ b/m2crypto.spec
@@ -6,7 +6,7 @@
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
 Version: 0.19.1
-Release: 6
+Release: 7
 Source0: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=2341
 Patch0: m2crypto-0.18-timeouts.patch
@@ -14,6 +14,9 @@ Patch0: m2crypto-0.18-timeouts.patch
 Patch1: m2crypto-0.18-gcc_macros.patch
 # https://bugzilla.osafoundation.org/show_bug.cgi?id=12718
 Patch2: m2crypto-0.19.1-close-HTTPResponse.patch
+# Half in upstream SVN
+# Half is https://bugzilla.osafoundation.org/show_bug.cgi?id=12760
+Patch3: m2crypto-0.19.1-ssl-selector.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -30,6 +33,7 @@ This package allows you to call OpenSSL functions from python scripts.
 %patch0 -p1
 %patch1 -p1 -b .gcc_macros
 %patch2 -p1
+%patch3 -p1
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -92,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Wed Jun  3 2009 Miloslav Trmač <mitr@redhat.com> - 0.19.1-7
+- Only send the selector in SSL HTTP requests.  Patch by James Bowes
+  <jbowes@redhat.com>.
+  Resolves: #491674
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild