rpms/globus-proxy-utils/EL-6 .cvsignore, 1.4, 1.5 globus-proxy-utils-mingw.patch, 1.1, 1.2 globus-proxy-utils.spec, 1.7, 1.8 import.log, 1.5, 1.6 sources, 1.4, 1.5 globus-proxy-utils-oid.patch, 1.1, NONE

Mattias Ellert ellert at fedoraproject.org
Sat Jul 17 17:10:28 UTC 2010


Author: ellert

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

Modified Files:
	.cvsignore globus-proxy-utils-mingw.patch 
	globus-proxy-utils.spec import.log sources 
Removed Files:
	globus-proxy-utils-oid.patch 
Log Message:
* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.9-1
- Update to Globus Toolkit 5.0.2
- Drop patch globus-proxy-utils-oid.patch (fixed upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	16 Apr 2010 15:16:13 -0000	1.4
+++ .cvsignore	17 Jul 2010 17:10:27 -0000	1.5
@@ -1 +1 @@
-globus_proxy_utils-3.7.tar.gz
+globus_proxy_utils-3.9.tar.gz

globus-proxy-utils-mingw.patch:
 grid_cert_diagnostics.c |    3 +++
 grid_proxy_destroy.c    |    2 +-
 grid_proxy_info.c       |    2 +-
 grid_proxy_init.c       |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

Index: globus-proxy-utils-mingw.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-6/globus-proxy-utils-mingw.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-proxy-utils-mingw.patch	15 Jun 2009 17:44:42 -0000	1.1
+++ globus-proxy-utils-mingw.patch	17 Jul 2010 17:10:28 -0000	1.2
@@ -1,19 +1,19 @@
-diff -ur globus_proxy_utils-2.5.orig/programs/grid_cert_diagnostics.c globus_proxy_utils-2.5/programs/grid_cert_diagnostics.c
---- globus_proxy_utils-2.5.orig/programs/grid_cert_diagnostics.c	2008-08-20 20:08:04.000000000 +0200
-+++ globus_proxy_utils-2.5/programs/grid_cert_diagnostics.c	2009-05-09 13:54:37.000000000 +0200
-@@ -3,6 +3,9 @@
- #include "globus_gsi_credential.h"
+diff -ur globus_proxy_utils-3.9.orig/programs/grid_cert_diagnostics.c globus_proxy_utils-3.9/programs/grid_cert_diagnostics.c
+--- globus_proxy_utils-3.9.orig/programs/grid_cert_diagnostics.c	2010-03-29 14:59:01.000000000 +0200
++++ globus_proxy_utils-3.9/programs/grid_cert_diagnostics.c	2010-07-17 09:48:11.642554728 +0200
+@@ -20,6 +20,9 @@
  #include "globus_gss_assist.h"
  #include "openssl/bn.h"
+ #include <regex.h>
 +#ifdef WIN32
 +#include "openssl/applink.c"
 +#endif
  
  char *
  indent_string(const char * str)
-diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_destroy.c globus_proxy_utils-2.5/programs/grid_proxy_destroy.c
---- globus_proxy_utils-2.5.orig/programs/grid_proxy_destroy.c	2009-05-09 14:10:54.000000000 +0200
-+++ globus_proxy_utils-2.5/programs/grid_proxy_destroy.c	2009-05-09 13:54:08.000000000 +0200
+diff -ur globus_proxy_utils-3.9.orig/programs/grid_proxy_destroy.c globus_proxy_utils-3.9/programs/grid_proxy_destroy.c
+--- globus_proxy_utils-3.9.orig/programs/grid_proxy_destroy.c	2010-03-18 18:11:09.000000000 +0100
++++ globus_proxy_utils-3.9/programs/grid_proxy_destroy.c	2010-07-17 09:46:56.955557156 +0200
 @@ -34,7 +34,7 @@
  #include "globus_gsi_credential.h"
  #include "globus_gsi_system_config.h"
@@ -23,9 +23,9 @@ diff -ur globus_proxy_utils-2.5.orig/pro
  #endif
  
  int                                     debug = 0;
-diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_info.c globus_proxy_utils-2.5/programs/grid_proxy_info.c
---- globus_proxy_utils-2.5.orig/programs/grid_proxy_info.c	2009-05-09 14:10:54.000000000 +0200
-+++ globus_proxy_utils-2.5/programs/grid_proxy_info.c	2009-05-09 13:53:41.000000000 +0200
+diff -ur globus_proxy_utils-3.9.orig/programs/grid_proxy_info.c globus_proxy_utils-3.9/programs/grid_proxy_info.c
+--- globus_proxy_utils-3.9.orig/programs/grid_proxy_info.c	2008-11-17 23:27:38.000000000 +0100
++++ globus_proxy_utils-3.9/programs/grid_proxy_info.c	2010-07-17 09:46:56.955557156 +0200
 @@ -34,7 +34,7 @@
  #include "globus_gsi_credential.h"
  #include "globus_openssl.h"
@@ -35,9 +35,9 @@ diff -ur globus_proxy_utils-2.5.orig/pro
  #endif
  
  int                                     debug = 0;
-diff -ur globus_proxy_utils-2.5.orig/programs/grid_proxy_init.c globus_proxy_utils-2.5/programs/grid_proxy_init.c
---- globus_proxy_utils-2.5.orig/programs/grid_proxy_init.c	2009-05-09 14:10:54.000000000 +0200
-+++ globus_proxy_utils-2.5/programs/grid_proxy_init.c	2009-05-09 13:52:56.000000000 +0200
+diff -ur globus_proxy_utils-3.9.orig/programs/grid_proxy_init.c globus_proxy_utils-3.9/programs/grid_proxy_init.c
+--- globus_proxy_utils-3.9.orig/programs/grid_proxy_init.c	2010-06-28 21:17:37.000000000 +0200
++++ globus_proxy_utils-3.9/programs/grid_proxy_init.c	2010-07-17 09:46:56.956556933 +0200
 @@ -36,7 +36,7 @@
  #include "proxycertinfo.h"
  #include "openssl/asn1.h"


Index: globus-proxy-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-6/globus-proxy-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- globus-proxy-utils.spec	5 Jun 2010 16:01:07 -0000	1.7
+++ globus-proxy-utils.spec	17 Jul 2010 17:10:28 -0000	1.8
@@ -6,26 +6,23 @@
 
 Name:		globus-proxy-utils
 %global _name %(tr - _ <<< %{name})
-Version:	3.7
-Release:	2%{?dist}
+Version:	3.9
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy Utility Programs
 
 Group:		Applications/Internet
 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/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.1-all-source-installer.tar.bz2
-#		mv gt5.0.1-all-source-installer/source-trees/gsi/proxy/proxy_utils/source globus_proxy_utils-3.7
-#		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_proxy_utils-3.7
-#		tar -zcf globus_proxy_utils-3.7.tar.gz globus_proxy_utils-3.7
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.2/installers/src/gt5.0.2-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.2-all-source-installer.tar.bz2
+#		mv gt5.0.2-all-source-installer/source-trees/gsi/proxy/proxy_utils/source globus_proxy_utils-3.9
+#		cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_proxy_utils-3.9
+#		tar -zcf globus_proxy_utils-3.9.tar.gz globus_proxy_utils-3.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
@@ -56,7 +53,6 @@ Globus GSI Proxy Utility Programs
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -97,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.9-1
+- Update to Globus Toolkit 5.0.2
+- Drop patch globus-proxy-utils-oid.patch (fixed upstream)
+
 * Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.7-2
 - Fix OID registration pollution
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-6/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	5 Jun 2010 16:01:07 -0000	1.5
+++ import.log	17 Jul 2010 17:10:28 -0000	1.6
@@ -3,3 +3,4 @@ globus-proxy-utils-2_5-2_fc9:HEAD:globus
 globus-proxy-utils-3_5-1_fc12:F-12:globus-proxy-utils-3.5-1.fc12.src.rpm:1265703044
 globus-proxy-utils-3_7-1_fc12:F-12:globus-proxy-utils-3.7-1.fc12.src.rpm:1271430952
 globus-proxy-utils-3_7-2_fc12:EL-6:globus-proxy-utils-3.7-2.fc12.src.rpm:1275753652
+globus-proxy-utils-3_9-1_fc12:EL-6:globus-proxy-utils-3.9-1.fc12.src.rpm:1279386612


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-proxy-utils/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Apr 2010 15:16:13 -0000	1.4
+++ sources	17 Jul 2010 17:10:28 -0000	1.5
@@ -1 +1 @@
-a89e32302a8c1078ac5fe536060d71f3  globus_proxy_utils-3.7.tar.gz
+c41ac521b3005d5b217bb7ab3884e6ef  globus_proxy_utils-3.9.tar.gz


--- globus-proxy-utils-oid.patch DELETED ---



More information about the scm-commits mailing list