rpms/globus-openssl-module/F-12 .cvsignore, 1.2, 1.3 globus-openssl-module-sslinit.patch, 1.1, 1.2 globus-openssl-module.spec, 1.4, 1.5 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-openssl-module-typo.patch, 1.1, NONE

Mattias Ellert ellert at fedoraproject.org
Tue Feb 9 07:38:20 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/globus-openssl-module/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32747/F-12

Modified Files:
	.cvsignore globus-openssl-module-sslinit.patch 
	globus-openssl-module.spec import.log sources 
Removed Files:
	globus-openssl-module-typo.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1-1
- Update to Globus Toolkit 5.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	29 Apr 2009 07:59:16 -0000	1.2
+++ .cvsignore	9 Feb 2010 07:38:20 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_openssl_module-0.6.tar.gz
+globus_openssl_module-1.1.tar.gz

globus-openssl-module-sslinit.patch:
 globus_openssl.c |    1 +
 1 file changed, 1 insertion(+)

Index: globus-openssl-module-sslinit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-12/globus-openssl-module-sslinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-openssl-module-sslinit.patch	29 Apr 2009 07:59:16 -0000	1.1
+++ globus-openssl-module-sslinit.patch	9 Feb 2010 07:38:20 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur globus_openssl_module-0.6.orig/library/globus_openssl.c globus_openssl_module-0.6/library/globus_openssl.c
---- globus_openssl_module-0.6.orig/library/globus_openssl.c	2006-01-19 06:56:22.000000000 +0100
-+++ globus_openssl_module-0.6/library/globus_openssl.c	2009-01-10 08:23:45.000000000 +0100
+diff -ur globus_openssl_module-1.1.orig/library/globus_openssl.c globus_openssl_module-1.1/library/globus_openssl.c
+--- globus_openssl_module-1.1.orig/library/globus_openssl.c	2008-10-29 12:22:03.000000000 +0100
++++ globus_openssl_module-1.1/library/globus_openssl.c	2010-01-21 22:53:03.678533766 +0100
 @@ -30,6 +30,7 @@
  #include "version.h"
  #include "openssl/crypto.h"
@@ -9,11 +9,3 @@ diff -ur globus_openssl_module-0.6.orig/
  
  static int
  globus_l_openssl_activate(void);
-@@ -75,6 +76,7 @@
-     X509V3_EXT_METHOD *                 pci_x509v3_ext_meth = NULL;
-     X509V3_EXT_METHOD *                 pci_old_x509v3_ext_meth = NULL;
-     
-+    SSL_library_init();
-     globus_module_activate(GLOBUS_COMMON_MODULE);
-     globus_module_activate(GLOBUS_GSI_OPENSSL_ERROR_MODULE);
-     mutex_pool = malloc(CRYPTO_num_locks() * sizeof(globus_mutex_t));


Index: globus-openssl-module.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-12/globus-openssl-module.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-openssl-module.spec	21 Aug 2009 13:38:14 -0000	1.4
+++ globus-openssl-module.spec	9 Feb 2010 07:38:20 -0000	1.5
@@ -6,33 +6,29 @@
 
 Name:		globus-openssl-module
 %global _name %(tr - _ <<< %{name})
-Version:	0.6
-Release:	4%{?dist}
+Version:	1.1
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus OpenSSL Module Wrapper
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
 #		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-0.6
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-0.6
-#		tar -zcf globus_openssl_module-0.6.tar.gz globus_openssl_module-0.6
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
+#		mv gt5.0.0-all-source-installer/source-trees/gsi/openssl_module/source globus_openssl_module-1.1
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_openssl_module-1.1
+#		tar -zcf globus_openssl_module-1.1.tar.gz globus_openssl_module-1.1
 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
-#		Initialization of openssl module should call SSL_library_init:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=4743#c22
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
-Patch0:		%{name}-sslinit.patch
-#		Fix a typo in the metadata file:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6470
-Patch1:		%{name}-typo.patch
 #		Fixes for mingw compilation:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
-Patch2:		%{name}-mingw.patch
+Patch0:		%{name}-mingw.patch
+#		Missing include for SSL_library_init:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6921
+Patch1:		%{name}-sslinit.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -103,7 +99,6 @@ Globus OpenSSL Module Wrapper Documentat
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -205,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.1-1
+- Update to Globus Toolkit 5.0.0
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6-4
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 16:27:40 -0000	1.2
+++ import.log	9 Feb 2010 07:38:20 -0000	1.3
@@ -1,2 +1,3 @@
 globus-openssl-module-0_6-1_fc9:HEAD:globus-openssl-module-0.6-1.fc9.src.rpm:1240991918
 globus-openssl-module-0_6-2_fc9:HEAD:globus-openssl-module-0.6-2.fc9.src.rpm:1245083235
+globus-openssl-module-1_1-1_fc12:F-12:globus-openssl-module-1.1-1.fc12.src.rpm:1265701085


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-openssl-module/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	29 Apr 2009 07:59:16 -0000	1.2
+++ sources	9 Feb 2010 07:38:20 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-e6113b5c0dd91a864e8e6ee79728bd39  globus_openssl_module-0.6.tar.gz
+8d92157d0f48990500f0f57edacca7dd  globus_openssl_module-1.1.tar.gz


--- globus-openssl-module-typo.patch DELETED ---



More information about the scm-commits mailing list