rpms/m2crypto/devel m2crypto-0.18.2-inspect.patch, NONE, 1.1 m2crypto-0.18.2-proxy-ua.patch, 1.1, 1.2 m2crypto.spec, 1.41, 1.42
Miloslav Trmac (mitr)
fedora-extras-commits at redhat.com
Sat Jun 7 23:30:30 UTC 2008
- Previous message (by thread): rpms/hal-info/F-8 hal-info.spec, 1.12, 1.13 sources, 1.9, 1.10 hal-info-20080215-kpc650.patch, 1.1, NONE
- Next message (by thread): rpms/libcompizconfig/devel import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 libcompizconfig.spec, 1.9, 1.10 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mitr
Update of /cvs/pkgs/rpms/m2crypto/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8853
Modified Files:
m2crypto-0.18.2-proxy-ua.patch m2crypto.spec
Added Files:
m2crypto-0.18.2-inspect.patch
Log Message:
* Sun Jun 8 2008 Miloslav TrmaÄ <mitr at redhat.com> - 0.18.2-6
- Don't remove the User-Agent header from proxied requests
Related: #448858
- Update m2urllib2.py to work with Python 2.5
m2crypto-0.18.2-inspect.patch:
--- NEW FILE m2crypto-0.18.2-inspect.patch ---
diff -urN m2crypto/M2Crypto/m2urllib2.py m2crypto-0.18.2/M2Crypto/m2urllib2.py
--- m2crypto/M2Crypto/m2urllib2.py 2007-06-08 20:56:57.000000000 +0200
+++ m2crypto-0.18.2/M2Crypto/m2urllib2.py 2008-06-07 22:18:26.000000000 +0200
@@ -11,6 +11,7 @@
- Add the M2Crypto HTTPSHandler when building a default opener.
"""
+import inspect
from urllib2 import *
import urlparse
m2crypto-0.18.2-proxy-ua.patch:
Index: m2crypto-0.18.2-proxy-ua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto-0.18.2-proxy-ua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- m2crypto-0.18.2-proxy-ua.patch 6 Jun 2008 23:04:12 -0000 1.1
+++ m2crypto-0.18.2-proxy-ua.patch 7 Jun 2008 23:29:08 -0000 1.2
@@ -1,14 +1,14 @@
-Allow setting User-agent on HTTPS proxy connections. Patch by
+Allow setting User-agent on HTTPS proxy connections. Based on a patch by
James Antill <james.antill at redhat.com>.
diff -urN m2crypto/M2Crypto/httpslib.py m2crypto-0.18.2/M2Crypto/httpslib.py
---- m2crypto/M2Crypto/httpslib.py 2008-06-07 00:46:44.000000000 +0200
-+++ m2crypto-0.18.2/M2Crypto/httpslib.py 2008-06-07 00:50:05.000000000 +0200
+--- m2crypto/M2Crypto/httpslib.py 2008-06-07 22:26:35.000000000 +0200
++++ m2crypto-0.18.2/M2Crypto/httpslib.py 2008-06-07 22:33:55.000000000 +0200
@@ -103,6 +103,7 @@
_ports = {'http' : 80, 'https' : 443}
_AUTH_HEADER = "Proxy-Authorization"
-+ _UA_HEADER = "User-Agent"
++ _UA_HEADER = "User-Agent"
def __init__(self, host, port=None, strict=None, username=None,
password=None, **ssl):
@@ -16,25 +16,25 @@
self._username = username
self._password = password
self._proxy_auth = None
-+ self._proxy_UA = None
++ self._proxy_UA = None
def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
#putrequest is called before connect, so can interpret url and get
-@@ -141,6 +143,8 @@
+@@ -139,6 +141,8 @@
+
+ def putheader(self, header, value):
# Store the auth header if passed in.
++ if header.lower() == self._UA_HEADER.lower():
++ self._proxy_UA = value
if header.lower() == self._AUTH_HEADER.lower():
self._proxy_auth = value
-+ elif header.lower() == self._UA_HEADER.lower():
-+ self._proxy_UA = value
else:
- HTTPSConnection.putheader(self, header, value)
-
@@ -173,6 +177,8 @@
""" Return an HTTP CONNECT request to send to the proxy. """
msg = "CONNECT %s:%d HTTP/1.1\r\n" % (self._real_host, self._real_port)
msg = msg + "Host: %s:%d\r\n" % (self._real_host, self._real_port)
+ if self._proxy_UA:
-+ msg = msg + "%s: %s\r\n" % (self._UA_HEADER, self._proxy_UA)
++ msg = msg + "%s: %s\r\n" % (self._UA_HEADER, self._proxy_UA)
if self._proxy_auth:
msg = msg + "%s: %s\r\n" % (self._AUTH_HEADER, self._proxy_auth)
msg = msg + "\r\n"
Index: m2crypto.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- m2crypto.spec 6 Jun 2008 23:04:12 -0000 1.41
+++ m2crypto.spec 7 Jun 2008 23:29:08 -0000 1.42
@@ -6,11 +6,12 @@
Summary: Support for using OpenSSL in python scripts
Name: m2crypto
Version: 0.18.2
-Release: 5
+Release: 6
Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
Patch0: m2crypto-0.18-timeouts.patch
Patch1: m2crypto-0.18-proxy.patch
Patch2: m2crypto-0.18.2-proxy-ua.patch
+Patch3: m2crypto-0.18.2-inspect.patch
License: MIT
Group: System Environment/Libraries
URL: http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
@@ -27,6 +28,7 @@
%patch0 -p1
%patch1 -p0
%patch2 -p1
+%patch3 -p1
# Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
# doesn't follow the #include.
@@ -79,6 +81,11 @@
%{python_sitearch}/M2Crypto-*.egg-info
%changelog
+* Sun Jun 8 2008 Miloslav TrmaÄ <mitr at redhat.com> - 0.18.2-6
+- Don't remove the User-Agent header from proxied requests
+ Related: #448858
+- Update m2urllib2.py to work with Python 2.5
+
* Sat Jun 7 2008 Miloslav TrmaÄ <mitr at redhat.com> - 0.18.2-5
- Use User-Agent in HTTP proxy CONNECT requests
Related: #448858
- Previous message (by thread): rpms/hal-info/F-8 hal-info.spec, 1.12, 1.13 sources, 1.9, 1.10 hal-info-20080215-kpc650.patch, 1.1, NONE
- Next message (by thread): rpms/libcompizconfig/devel import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 libcompizconfig.spec, 1.9, 1.10 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list