From: Andrew McNab Date: Sat, 12 Feb 2005 15:17:47 +0000 (+0000) Subject: libgridsite_globus[.so|.a] X-Git-Tag: gridsite-core_R_1_1_5~6 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=100fea233dd351c7f1fe787f36c9628d2136e015;p=jra1mw.git libgridsite_globus[.so|.a] --- diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index b500a1c..304408a 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -5,6 +5,8 @@ - Change ordering of output proxy file produced by GRSTx509CacheProxy so proxy private key is the 2nd PEM encoded block (rather than at the end.) Bug #6365 +- Add libgridsite_globus[.so|.a] in preparation for + separate Globus OpenSSL and system OpenSSL versions * Tue Feb 8 2005 Andrew McNab - ==== GridSite version 1.1.5 ==== * Tue Dec 14 2004 Andrew McNab diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml index 19887fb..0d134dc 100644 --- a/org.gridsite.core/project/configure.properties.xml +++ b/org.gridsite.core/project/configure.properties.xml @@ -4,6 +4,6 @@ + value="prefix=${stage.abs.dir} GSOAPDIR=${with.gsoap.prefix} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/gcc32 OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_gcc32" /> diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 5df145b..3a130cf 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -1,6 +1,6 @@ # # Andrew McNab and Shiv Kaushal, University of Manchester. -# Copyright (c) 2002-4. All rights reserved. +# Copyright (c) 2002-5. All rights reserved. # # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the following @@ -48,18 +48,18 @@ ifndef MYCFLAGS export MYCFLAGS=-I. -I../interface -I/usr/include/httpd -I/usr/include/apr-0 -I/opt/glite/include endif -ifndef OPENSSL_FLAGS -export OPENSSL_FLAGS=-I/usr/include -endif +#ifndef OPENSSL_FLAGS +#export OPENSSL_FLAGS=-I/usr/include +#endif ifndef MYLDFLAGS export MYLDFLAGS=-L. # export MYLDFLAGS=-L. -L/opt/glite/lib -lvomsc endif -ifndef OPENSSL_LIBS -export OPENSSL_LIBS=-L/usr/lib -endif +#ifndef OPENSSL_GLOBUS_LIBS +#export OPENSSL_GLOBUS_LIBS=-L/usr/lib +#endif # # Build @@ -69,6 +69,10 @@ build: libgridsite.so.$(VERSION) libgridsite.a htcp mod_gridsite.so \ urlencode findproxyfile real-gridsite-admin.cgi \ # gridsite-delegation.cgi # htproxyput +build: libgridsite_globus.so.$(VERSION) libgridsite_globus.a + +# First, normal versions using system OpenSSL rather than Globus OpenSSL + libgridsite.so.$(VERSION): grst_x509.o grst_gacl.o grst_http.o gcc -shared -Wl,-soname,libgridsite.so.$(MINOR_VERSION) \ -o libgridsite.so.$(PATCH_VERSION) grst_x509.o grst_gacl.o grst_http.o @@ -77,21 +81,59 @@ libgridsite.a: grst_x509.o grst_gacl.o grst_http.o ar src libgridsite.a grst_x509.o grst_gacl.o grst_http.o grst_x509.o: grst_x509.c ../interface/gridsite.h - gcc $(MYCFLAGS) $(OPENSSL_FLAGS) \ + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ -I/usr/kerberos/include -c grst_x509.c grst_gacl.o: grst_gacl.c ../interface/gridsite.h - gcc $(MYCFLAGS) $(OPENSSL_FLAGS) \ + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ -I/usr/kerberos/include `xml2-config --cflags` -c grst_gacl.c grst_http.o: grst_http.c ../interface/gridsite.h - gcc $(MYCFLAGS) $(OPENSSL_FLAGS) \ + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ -I/usr/kerberos/include -c grst_http.c +# Then build versions using Globus OpenSSL if configured + +ifdef OPENSSL_GLOBUS_LIBS + +libgridsite_globus.so.$(VERSION): grst_x509.o grst_gacl.o grst_http.o + gcc -shared -Wl,-soname,libgridsite_globus.so.$(MINOR_VERSION) \ + -o libgridsite_globus.so.$(PATCH_VERSION) \ + grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o + +libgridsite_globus.a: grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o + ar src libgridsite_globus.a \ + grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o + +grst_x509_globus.o: grst_x509_globus.c ../interface/gridsite.h + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ + -I/usr/kerberos/include -c grst_x509.c \ + -o grst_x509_globus.o + +grst_gacl_globus.o: grst_gacl_globus.c ../interface/gridsite.h + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ + -I/usr/kerberos/include `xml2-config --cflags` -c grst_gacl.c \ + -o grst_gacl_globus.o + +grst_http_globus.o: grst_http_globus.c ../interface/gridsite.h + gcc $(MYCFLAGS) $(OPENSSL_GLOBUS_FLAGS) \ + -I/usr/kerberos/include -c grst_http.c \ + -o grst_http_globus.o + +else + +libgridsite_globus.so.$(VERSION): libgridsite.so.$(VERSION) + cp -f libgridsite.so.$(VERSION) libgridsite_globus.so.$(VERSION) + +libgridsite_globus.a: libgridsite.a + cp -f libgridsite.a libgridsite_globus.a + +endif + urlencode: urlencode.c libgridsite.a gcc -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) \ -o urlencode urlencode.c -L. \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include -lgridsite + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include -lgridsite htcp: htcp.c gcc -DVERSION=\"$(PATCH_VERSION)\" -I. -o htcp htcp.c \ @@ -99,7 +141,7 @@ htcp: htcp.c mod_gridsite.so: mod_gridsite.c mod_ssl-private.h libgridsite.a gcc $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include \ + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include \ -I/usr/include/libxml2 \ -DVERSION=\"$(VERSION)\" -o mod_gridsite.so \ mod_gridsite.c $(MYLDFLAGS) -lxml2 -lm -lz -lgridsite @@ -110,22 +152,22 @@ real-gridsite-admin.cgi: grst_admin_main.c grst_admin_gacl.c \ grst_admin_main.c \ grst_admin_gacl.c \ grst_admin_file.c \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include \ - -DVERSION=\"$(VERSION)\" $(OPENSSL_LIBS) -lgridsite -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include \ + -DVERSION=\"$(VERSION)\" $(OPENSSL_GLOBUS_LIBS) -lgridsite -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lz -lm findproxyfile: findproxyfile.c libgridsite.a gcc -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) $(MYLDFLAGS) \ -o findproxyfile findproxyfile.c -L. \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include -lgridsite \ - $(OPENSSL_LIBS) -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include -lgridsite \ + $(OPENSSL_GLOBUS_LIBS) -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lz -lm apidoc: doxygen Doxyfile gaclexample: gaclexample.c libgridsite.a gcc -o gaclexample gaclexample.c -I. -L. \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include -lgridsite \ - -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lz -lm + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include -lgridsite \ + -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lz -lm # # Delegation machinery, including SOAP delegation portType. To build this @@ -149,30 +191,30 @@ gridsite-delegation.cgi: grst-delegation.c delegation.h delegation.wsdl \ soapC.c soapServer.c gcc $(MYCFLAGS) $(MYLDFLAGS) -o gridsite-delegation.cgi \ grst-delegation.c \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include -I$(GSOAPDIR)/include \ + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include -I$(GSOAPDIR)/include \ -DVERSION=\"$(VERSION)\" -L$(GSOAPDIR)/lib \ soapC.c soapServer.c -lgsoap \ - -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lm htproxyput: htproxyput.c delegation.h delegation.wsdl \ soapC.c soapServer.c gcc $(MYCFLAGS) $(MYLDFLAGS) -o htproxyput \ htproxyput.c \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include \ + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR)/include -DWITH_OPENSSL -L$(GSOAPDIR)/lib \ soapC.c soapClient.c -lgsoap \ - -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lm proxyput-example: proxyput-example.c delegation.h delegation.wsdl \ soapC.c soapServer.c libstdsoap2.a gcc $(MYCFLAGS) $(MYLDFLAGS) -o proxyput-example \ proxyput-example.c \ - $(OPENSSL_FLAGS) -I/usr/kerberos/include \ + $(OPENSSL_GLOBUS_FLAGS) -I/usr/kerberos/include \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR) -DWITH_OPENSSL \ soapC.c soapClient.c libstdsoap2.a \ - -lgridsite -lcurl -lz -lssl$(FLAVOR_EXT) -lcrypto$(FLAVOR_EXT) -lxml2 -lm + -lgridsite -lcurl -lz -lssl$(FLAVOR_GLOBUS_EXT) -lcrypto$(FLAVOR_GLOBUS_EXT) -lxml2 -lm clean: @@ -192,8 +234,8 @@ install: apidoc cp -f ../interface/gridsite-gacl.h $(prefix)/include cp -f urlencode $(prefix)/bin cp -f findproxyfile $(prefix)/bin - cp -f libgridsite.a $(prefix)/lib cp -f real-gridsite-admin.cgi $(prefix)/sbin + cp -f libgridsite.a $(prefix)/lib cp -f libgridsite.so.$(PATCH_VERSION) $(prefix)/lib ln -sf libgridsite.so.$(PATCH_VERSION) \ $(prefix)/lib/libgridsite.so @@ -201,6 +243,14 @@ install: apidoc $(prefix)/lib/libgridsite.so.$(MAJOR_VERSION) ln -sf libgridsite.so.$(PATCH_VERSION) \ $(prefix)/lib/libgridsite.so.$(MINOR_VERSION) + cp -f libgridsite_globus.a $(prefix)/lib + cp -f libgridsite_globus.so.$(PATCH_VERSION) $(prefix)/lib + ln -sf libgridsite_globus.so.$(PATCH_VERSION) \ + $(prefix)/lib/libgridsite_globus.so + ln -sf libgridsite_globus.so.$(PATCH_VERSION) \ + $(prefix)/lib/libgridsite_globus.so.$(MAJOR_VERSION) + ln -sf libgridsite_globus.so.$(PATCH_VERSION) \ + $(prefix)/lib/libgridsite_globus.so.$(MINOR_VERSION) cp -f doxygen/index.html \ $(prefix)/share/doc/gridsite-$(PATCH_VERSION)/doxygen-index.html cp -f doxygen/* $(prefix)/share/doc/gridsite-$(PATCH_VERSION) diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec index e71749f..7e4a5ef 100644 --- a/org.gridsite.core/src/gridsite.spec +++ b/org.gridsite.core/src/gridsite.spec @@ -1,6 +1,6 @@ Name: gridsite Version: %(echo ${MYVERSION:-1.1.x}) -Release: 3 +Release: 1 Summary: GridSite Copyright: Modified BSD Group: System Environment/Daemons @@ -54,6 +54,8 @@ rm -f %(echo ${MYPREFIX:-/usr})/share/doc/gridsite %files %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite.so.%{version} %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite.so +%attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite_globus.so.%{version} +%attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite_globus.so %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/bin/urlencode %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/bin/findproxyfile %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/share/doc/gridsite-%{version} @@ -62,6 +64,7 @@ rm -f %(echo ${MYPREFIX:-/usr})/share/doc/gridsite %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/include/gridsite.h %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/include/gridsite-gacl.h %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite.a +%attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/libgridsite_globus.a %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/lib/httpd/modules/mod_gridsite.so %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/sbin/real-gridsite-admin.cgi diff --git a/org.gridsite.core/src/htcp b/org.gridsite.core/src/htcp index ac0153b..5140cf5 100644 Binary files a/org.gridsite.core/src/htcp and b/org.gridsite.core/src/htcp differ diff --git a/org.gridsite.core/src/real-gridsite-admin.cgi b/org.gridsite.core/src/real-gridsite-admin.cgi index 74a0010..aa3f9e1 100644 Binary files a/org.gridsite.core/src/real-gridsite-admin.cgi and b/org.gridsite.core/src/real-gridsite-admin.cgi differ