rpms/globus-gsi-proxy-ssl/EL-4 globus-gsi-proxy-ssl-oid.patch, NONE, 1.1 globus-gsi-proxy-ssl.spec, 1.6, 1.7 import.log, 1.5, 1.6
Mattias Ellert
ellert at fedoraproject.org
Sat Jun 5 15:12:51 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1653/EL-4
Modified Files:
globus-gsi-proxy-ssl.spec import.log
Added Files:
globus-gsi-proxy-ssl-oid.patch
Log Message:
* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-2
- Fix OID registration pollution
globus-gsi-proxy-ssl-oid.patch:
proxypolicy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE globus-gsi-proxy-ssl-oid.patch ---
diff -ur globus_gsi_proxy_ssl-2.2.orig/library/proxypolicy.c globus_gsi_proxy_ssl-2.2/library/proxypolicy.c
--- globus_gsi_proxy_ssl-2.2.orig/library/proxypolicy.c 2010-02-19 22:18:52.000000000 +0100
+++ globus_gsi_proxy_ssl-2.2/library/proxypolicy.c 2010-05-31 11:40:34.468367904 +0200
@@ -72,7 +72,7 @@
ret = NULL;
M_ASN1_New_Malloc(ret, PROXYPOLICY);
- ret->policy_language = OBJ_nid2obj(OBJ_sn2nid(IMPERSONATION_PROXY_SN));
+ ret->policy_language = OBJ_nid2obj(OBJ_txt2nid(IMPERSONATION_PROXY_OID));
ret->policy = NULL;
return (ret);
M_ASN1_New_Error(ASN1_F_PROXYPOLICY_NEW);
Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-gsi-proxy-ssl.spec 16 Apr 2010 14:40:48 -0000 1.6
+++ globus-gsi-proxy-ssl.spec 5 Jun 2010 15:12:51 -0000 1.7
@@ -7,7 +7,7 @@
Name: globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus GSI Proxy SSL Library
Group: System Environment/Libraries
@@ -23,6 +23,9 @@ Source: %{_name}-%{version}.tar.gz
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9: epstopdf-2.9.5gw
+# Fix duplicate OID registrations:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7032
+Patch0: %{name}-oid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-openssl%{?_isa} >= 1
@@ -85,6 +88,7 @@ Globus GSI Proxy SSL Library Documentati
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -186,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-2
+- Fix OID registration pollution
+
* Tue Apr 13 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Update to Globus Toolkit 5.0.1
- Drop patches globus-gsi-proxy-ssl-asn1-method.patch and
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/EL-4/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 16 Apr 2010 14:40:48 -0000 1.5
+++ import.log 5 Jun 2010 15:12:51 -0000 1.6
@@ -3,3 +3,4 @@ globus-gsi-proxy-ssl-1_5-2_fc9:EL-4:glob
globus-gsi-proxy-ssl-1_5-3_fc9:EL-4:globus-gsi-proxy-ssl-1.5-3.fc9.src.rpm:1245082734
globus-gsi-proxy-ssl-2_0-1_fc12:EL-4:globus-gsi-proxy-ssl-2.0-1.fc12.src.rpm:1265701000
globus-gsi-proxy-ssl-2_2-1_fc12:EL-4:globus-gsi-proxy-ssl-2.2-1.fc12.src.rpm:1271428824
+globus-gsi-proxy-ssl-2_2-2_fc12:EL-4:globus-gsi-proxy-ssl-2.2-2.fc12.src.rpm:1275750756
More information about the scm-commits
mailing list