rpms/globus-gsi-callback/F-11 globus-gsi-callback-oid.patch, NONE, 1.1 globus-gsi-callback.spec, 1.4, 1.5 import.log, 1.3, 1.4

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-callback/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5056/F-11

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


globus-gsi-callback-oid.patch:
 globus_gsi_callback.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE globus-gsi-callback-oid.patch ---
diff -ur globus_gsi_callback-2.5.orig/library/globus_gsi_callback.c globus_gsi_callback-2.5/library/globus_gsi_callback.c
--- globus_gsi_callback-2.5.orig/library/globus_gsi_callback.c	2008-09-11 19:36:54.000000000 +0200
+++ globus_gsi_callback-2.5/library/globus_gsi_callback.c	2010-05-15 20:34:51.521500619 +0200
@@ -1517,8 +1517,8 @@
 
     GLOBUS_I_GSI_CALLBACK_DEBUG_ENTER;
 
-    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);
 
     while((critical_position = 
           X509_get_ext_by_critical(x509_context->current_cert, 


Index: globus-gsi-callback.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-11/globus-gsi-callback.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-callback.spec	9 Feb 2010 07:49:13 -0000	1.4
+++ globus-gsi-callback.spec	5 Jun 2010 15:30:04 -0000	1.5
@@ -7,7 +7,7 @@
 Name:		globus-gsi-callback
 %global _name %(tr - _ <<< %{name})
 Version:	2.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - Globus GSI Callback 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
@@ -97,6 +100,7 @@ Globus GSI Callback Library Documentatio
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -202,6 +206,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.5-2
+- Fix OID registration pollution
+
 * Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-1
 - Update to Globus Toolkit 5.0.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-callback/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Feb 2010 07:49:13 -0000	1.3
+++ import.log	5 Jun 2010 15:30:04 -0000	1.4
@@ -1,3 +1,4 @@
 globus-gsi-callback-1_10-1_fc9:F-11:globus-gsi-callback-1.10-1.fc9.src.rpm:1241420499
 globus-gsi-callback-1_10-2_fc9:F-11:globus-gsi-callback-1.10-2.fc9.src.rpm:1245085048
 globus-gsi-callback-2_5-1_fc12:F-11:globus-gsi-callback-2.5-1.fc12.src.rpm:1265701739
+globus-gsi-callback-2_5-2_fc12:F-11:globus-gsi-callback-2.5-2.fc12.src.rpm:1275751789