rpms/globus-gsi-credential/devel globus-gsi-credential-oid.patch, NONE, 1.1 globus-gsi-credential.spec, 1.7, 1.8 import.log, 1.4, 1.5
Mattias Ellert
ellert at fedoraproject.org
Sat Jun 5 15:36:49 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/globus-gsi-credential/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7022/devel
Modified Files:
globus-gsi-credential.spec import.log
Added Files:
globus-gsi-credential-oid.patch
Log Message:
* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.3-2
- Fix OID registration pollution
globus-gsi-credential-oid.patch:
globus_gsi_credential.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE globus-gsi-credential-oid.patch ---
diff -ur globus_gsi_credential-3.3.orig/library/globus_gsi_credential.c globus_gsi_credential-3.3/library/globus_gsi_credential.c
--- globus_gsi_credential-3.3.orig/library/globus_gsi_credential.c 2008-11-12 18:13:03.000000000 +0100
+++ globus_gsi_credential-3.3/library/globus_gsi_credential.c 2010-05-15 20:30:45.423249163 +0200
@@ -1862,8 +1862,8 @@
*proxycertinfo = NULL;
- 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);
if(pci_NID == NID_undef || pci_old_NID == NID_undef)
{
GLOBUS_GSI_CRED_ERROR_RESULT(
Index: globus-gsi-credential.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/devel/globus-gsi-credential.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- globus-gsi-credential.spec 16 Apr 2010 14:54:31 -0000 1.7
+++ globus-gsi-credential.spec 5 Jun 2010 15:36:49 -0000 1.8
@@ -7,7 +7,7 @@
Name: globus-gsi-credential
%global _name %(tr - _ <<< %{name})
Version: 3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus GSI Credential 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 Credential Library Documentat
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -198,6 +202,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.3-2
+- Fix OID registration pollution
+
* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.3-1
- Update to Globus Toolkit 5.0.1
- Drop patch globus-gsi-credential-openssl.patch (fixed upstream)
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-credential/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 16 Apr 2010 14:54:31 -0000 1.4
+++ import.log 5 Jun 2010 15:36:49 -0000 1.5
@@ -2,3 +2,4 @@ globus-gsi-credential-2_2-1_fc9:HEAD:glo
globus-gsi-credential-2_2-2_fc9:HEAD:globus-gsi-credential-2.2-2.fc9.src.rpm:1245085335
globus-gsi-credential-3_2-1_fc12:HEAD:globus-gsi-credential-3.2-1.fc12.src.rpm:1265701869
globus-gsi-credential-3_3-1_fc12:HEAD:globus-gsi-credential-3.3-1.fc12.src.rpm:1271429655
+globus-gsi-credential-3_3-2_fc12:HEAD:globus-gsi-credential-3.3-2.fc12.src.rpm:1275752193
More information about the scm-commits
mailing list