rpms/m2crypto/devel m2crypto-0.20-gcc_macros.patch, NONE, 1.1 m2crypto-0.20-merge.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 m2crypto.spec, 1.55, 1.56 sources, 1.11, 1.12 m2crypto-0.18-gcc_macros.patch, 1.1, NONE m2crypto-0.19.1-close-HTTPResponse.patch, 1.1, NONE m2crypto-0.19.1-locking.patch, 1.1, NONE m2crypto-0.19.1-no-dns-in-altname.patch, 1.1, NONE m2crypto-0.19.1-ssl-selector.patch, 1.1, NONE

Miloslav Trmac mitr at fedoraproject.org
Tue Aug 11 12:41:05 UTC 2009 

Author: mitr

Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16226

Modified Files:
	.cvsignore m2crypto.spec sources 
Added Files:
	m2crypto-0.20-gcc_macros.patch m2crypto-0.20-merge.patch 
Removed Files:
	m2crypto-0.18-gcc_macros.patch 
	m2crypto-0.19.1-close-HTTPResponse.patch 
	m2crypto-0.19.1-locking.patch 
	m2crypto-0.19.1-no-dns-in-altname.patch 
	m2crypto-0.19.1-ssl-selector.patch 
Log Message:
* Tue Aug 11 2009 Miloslav Trmač <mitr at volny.cz> - 0.20-1
- Update to m2crypto-0.20
- Fix incorrect merge in HTTPS CONNNECT proxy support


m2crypto-0.20-gcc_macros.patch:
 _m2crypto.i |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE m2crypto-0.20-gcc_macros.patch ---
diff -up M2Crypto-0.20/SWIG/_m2crypto.i.gcc_macros M2Crypto-0.20/SWIG/_m2crypto.i
--- M2Crypto-0.20/SWIG/_m2crypto.i.gcc_macros	2009-08-11 05:05:22.000000000 +0200
+++ M2Crypto-0.20/SWIG/_m2crypto.i	2009-08-11 13:24:52.943706097 +0200
@@ -4,6 +4,7 @@
  * Portions created by Open Source Applications Foundation (OSAF) are
  * Copyright (C) 2004-2006 OSAF. All Rights Reserved.
  */
+%import "gcc_macros.h"
 
 %module(threads=1) _m2crypto
 /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.

m2crypto-0.20-merge.patch:
 httpslib.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE m2crypto-0.20-merge.patch ---
diff -up M2Crypto-0.20/M2Crypto/httpslib.py.merge M2Crypto-0.20/M2Crypto/httpslib.py
--- M2Crypto-0.20/M2Crypto/httpslib.py.merge	2009-08-11 13:38:10.538989545 +0200
+++ M2Crypto-0.20/M2Crypto/httpslib.py	2009-08-11 13:46:59.310956095 +0200
@@ -4,7 +4,7 @@ Copyright (c) 1999-2004 Ng Pheng Siong. 
 
 import string, sys
 import socket
-from urlparse import urlsplit
+from urlparse import urlsplit, urlunsplit
 import base64
 
 from httplib import *
@@ -122,7 +122,7 @@ class ProxyHTTPSConnection(HTTPSConnecti
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         #putrequest is called before connect, so can interpret url and get
         #real host/port to be used to make CONNECT request to proxy
-        proto, netloc, path, query, fraqment = urlsplit(url)
+        proto, netloc, path, query, fragment = urlsplit(url)
         if not proto:
             raise ValueError, "unknown URL type: %s" % url
         
@@ -144,6 +144,7 @@ class ProxyHTTPSConnection(HTTPSConnecti
 
         self._real_host = host
         self._real_port = int(port)
+        rest = urlunsplit((None, None, path, query, fragment))
         HTTPSConnection.putrequest(self, method, rest, skip_host, skip_accept_encoding)
 
     def putheader(self, header, value):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	13 Oct 2008 13:17:09 -0000	1.11
+++ .cvsignore	11 Aug 2009 12:41:04 -0000	1.12
@@ -1 +1 @@
-M2Crypto-0.19.1.tar.gz
+M2Crypto-0.20.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- m2crypto.spec	25 Jul 2009 11:35:53 -0000	1.55
+++ m2crypto.spec	11 Aug 2009 12:41:04 -0000	1.56
@@ -5,22 +5,15 @@
 
 Summary: Support for using OpenSSL in python scripts
 Name: m2crypto
-Version: 0.19.1
-Release: 10
+Version: 0.20
+Release: 1
 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
 # This is only precautionary, it does fix anything - not sent upstream
-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
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=9605
-Patch4: m2crypto-0.19.1-no-dns-in-altname.patch
-# https://bugzilla.osafoundation.org/show_bug.cgi?id=12847
-Patch5: m2crypto-0.19.1-locking.patch
+Patch1: m2crypto-0.20-gcc_macros.patch
+# https://bugzilla.osafoundation.org/show_bug.cgi?id=12857
+Patch2: m2crypto-0.20-merge.patch
 License: MIT
 Group: System Environment/Libraries
 URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -36,10 +29,7 @@ This package allows you to call OpenSSL 
 %setup -q -n M2Crypto-%{version}
 %patch0 -p1
 %patch1 -p1 -b .gcc_macros
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
+%patch2 -p1 -b .merge
 
 # Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
 # doesn't follow the #include.
@@ -102,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/M2Crypto-*.egg-info
 
 %changelog
+* Tue Aug 11 2009 Miloslav Trmač <mitr at volny.cz> - 0.20-1
+- Update to m2crypto-0.20
+- Fix incorrect merge in HTTPS CONNNECT proxy support
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	13 Oct 2008 13:17:09 -0000	1.11
+++ sources	11 Aug 2009 12:41:04 -0000	1.12
@@ -1 +1 @@
-c92286fdf0a75f017e72122c2832d5ff  M2Crypto-0.19.1.tar.gz
+43a4d958a6c892a37ca02ffcc650b66b  M2Crypto-0.20.tar.gz


--- m2crypto-0.18-gcc_macros.patch DELETED ---


--- m2crypto-0.19.1-close-HTTPResponse.patch DELETED ---


--- m2crypto-0.19.1-locking.patch DELETED ---


--- m2crypto-0.19.1-no-dns-in-altname.patch DELETED ---


--- m2crypto-0.19.1-ssl-selector.patch DELETED ---

More information about the fedora-extras-commits mailing list