rpms/globus-proxy-utils/EL-4 globus-proxy-utils-oid.patch, NONE, 1.1 globus-proxy-utils.spec, 1.5, 1.6 import.log, 1.4, 1.5

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-proxy-utils/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11809/EL-4

Modified Files:
	globus-proxy-utils.spec import.log 
Added Files:
	globus-proxy-utils-oid.patch 
Log Message:
* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.7-2
- Fix OID registration pollution


globus-proxy-utils-oid.patch:
 grid_proxy_init.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-proxy-utils-oid.patch ---
diff -ur globus_proxy_utils-3.7.orig/programs/grid_proxy_init.c globus_proxy_utils-3.7/programs/grid_proxy_init.c
--- globus_proxy_utils-3.7.orig/programs/grid_proxy_init.c	2008-09-09 15:55:12.000000000 +0200
+++ globus_proxy_utils-3.7/programs/grid_proxy_init.c	2010-05-15 19:57:29.935498747 +0200
@@ -1172,8 +1172,8 @@
     int                                 pci_NID;
     int                                 pci_old_NID;
 
-    pci_NID = OBJ_sn2nid(PROXYCERTINFO_SN);
-    pci_old_NID = OBJ_sn2nid(PROXYCERTINFO_OLD_SN);
+    pci_NID = OBJ_txt2nid(PROXYCERTINFO_OID);
+    pci_old_NID = OBJ_txt2nid(PROXYCERTINFO_OLD_OID);
     extension_object = X509_EXTENSION_get_object(extension);
     nid = OBJ_obj2nid(extension_object);
 


Index: globus-proxy-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-4/globus-proxy-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-proxy-utils.spec	16 Apr 2010 15:18:37 -0000	1.5
+++ globus-proxy-utils.spec	5 Jun 2010 16:02:28 -0000	1.6
@@ -7,7 +7,7 @@
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
 Version:	3.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Utility Programs
 
 Group:		Applications/Internet
@@ -23,6 +23,9 @@ Source:		%{_name}-%{version}.tar.gz
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
 Patch0:		%{name}-mingw.patch
+#		Fix duplicate OID registrations:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7032
+Patch1:		%{name}-oid.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -53,6 +56,7 @@ Globus GSI Proxy Utility Programs
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -93,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.7-2
+- Fix OID registration pollution
+
 * Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.7-1
 - Update to Globus Toolkit 5.0.1
 - Drop patches globus-proxy-utils-ldflag-overwrt.patch and


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-4/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	16 Apr 2010 15:18:37 -0000	1.4
+++ import.log	5 Jun 2010 16:02:28 -0000	1.5
@@ -2,3 +2,4 @@ globus-proxy-utils-2_5-1_fc9:EL-4:globus
 globus-proxy-utils-2_5-2_fc9:EL-4:globus-proxy-utils-2.5-2.fc9.src.rpm:1245088134
 globus-proxy-utils-3_5-1_fc12:EL-4:globus-proxy-utils-3.5-1.fc12.src.rpm:1265703164
 globus-proxy-utils-3_7-1_fc12:EL-4:globus-proxy-utils-3.7-1.fc12.src.rpm:1271431100
+globus-proxy-utils-3_7-2_fc12:EL-4:globus-proxy-utils-3.7-2.fc12.src.rpm:1275753733