From: Andrew McNab Date: Tue, 16 Nov 2004 14:27:33 +0000 (+0000) Subject: Updates for JRA1 Cruise Control X-Git-Tag: glite-lb-client-interface_R_0_3_0~91 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=98e63cddd5189dd7625873b4d470e41491f3d828;p=jra1mw.git Updates for JRA1 Cruise Control --- diff --git a/org.gridsite.core/interface/gridsite.h b/org.gridsite.core/interface/gridsite.h index 7f614f5..febda2c 100644 --- a/org.gridsite.core/interface/gridsite.h +++ b/org.gridsite.core/interface/gridsite.h @@ -34,11 +34,11 @@ *---------------------------------------------------------------*/ #ifndef HEADER_SSL_H -#include +#include #endif #ifndef HEADER_CRYPTO_H -#include +#include #endif #ifndef FALSE diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml index 82737d0..4de77eb 100644 --- a/org.gridsite.core/project/configure.properties.xml +++ b/org.gridsite.core/project/configure.properties.xml @@ -4,5 +4,5 @@ + value="prefix=${stage.abs.dir}" GSOAPDIR=${with.gsoap.prefix}"/> diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties index 6ffc0fc..31449ed 100644 --- a/org.gridsite.core/project/version.properties +++ b/org.gridsite.core/project/version.properties @@ -1,4 +1,4 @@ -#Tue Nov 16 02:04:11 CET 2004 -module.version=1.0.4 -module.build=45 +#Mon Nov 15 02:04:48 CET 2004 +module.version=1.3.1 +module.build=46 module.age=5 diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 635510f..f074c85 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -58,7 +58,7 @@ endif # build: libgridsite.so.$(VERSION) libgridsite.a htcp mod_gridsite.so \ - urlencode findproxyfile real-gridsite-admin.cgi wtf + urlencode findproxyfile real-gridsite-admin.cgi libgridsite.so.$(VERSION): grst_x509.o grst_gacl.o grst_http.o gcc -shared -Wl,-soname,libgridsite.so.$(MINOR_VERSION) \ @@ -68,21 +68,21 @@ 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) -I/usr/include/openssl \ + gcc $(MYCFLAGS) \ -I/usr/kerberos/include -c grst_x509.c grst_gacl.o: grst_gacl.c ../interface/gridsite.h - gcc $(MYCFLAGS) -I/usr/include/openssl \ + gcc $(MYCFLAGS) \ -I/usr/kerberos/include `xml2-config --cflags` -c grst_gacl.c grst_http.o: grst_http.c ../interface/gridsite.h - gcc $(MYCFLAGS) -I/usr/include/openssl \ + gcc $(MYCFLAGS) \ -I/usr/kerberos/include -c grst_http.c urlencode: urlencode.c libgridsite.a gcc -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) \ -o urlencode urlencode.c -L. \ - -I/usr/include/openssl -I/usr/kerberos/include -lgridsite + -I/usr/kerberos/include -lgridsite htcp: htcp.c gcc -DVERSION=\"$(PATCH_VERSION)\" -I. -o htcp htcp.c \ @@ -90,7 +90,7 @@ htcp: htcp.c mod_gridsite.so: mod_gridsite.c mod_ssl-private.h libgridsite.a gcc $(MYCFLAGS) -shared -Wl,-soname=gridsite_module \ - -I/usr/include/openssl -I/usr/kerberos/include \ + -I/usr/kerberos/include \ -I/usr/include/libxml2 \ -DVERSION=\"$(VERSION)\" -o mod_gridsite.so \ mod_gridsite.c $(MYLDFLAGS) -lxml2 -lm -lz -lgridsite @@ -101,13 +101,13 @@ real-gridsite-admin.cgi: grst_admin_main.c grst_admin_gacl.c \ grst_admin_main.c \ grst_admin_gacl.c \ grst_admin_file.c \ - -I/usr/include/openssl -I/usr/kerberos/include \ + -I/usr/kerberos/include \ -DVERSION=\"$(VERSION)\" -lgridsite -lssl -lcrypto -lxml2 -lz -lm findproxyfile: findproxyfile.c libgridsite.a gcc -DVERSION=\"$(PATCH_VERSION)\" $(MYCFLAGS) $(MYLDFLAGS) \ -o findproxyfile findproxyfile.c -L. \ - -I/usr/include/openssl -I/usr/kerberos/include -lgridsite \ + -I/usr/kerberos/include -lgridsite \ -lssl -lcrypto -lxml2 -lz -lm apidoc: @@ -115,16 +115,18 @@ apidoc: gaclexample: gaclexample.c libgridsite.a gcc -o gaclexample gaclexample.c -I. -L. \ - -I/usr/include/openssl -I/usr/kerberos/include -lgridsite \ + -I/usr/kerberos/include -lgridsite \ -lssl -lcrypto -lxml2 -lz -lm # # Delegation machinery, including SOAP delegation portType. To build this # you need to install gSOAP and set GSOAPDIR to the directory containing -# soapcpp2 and stdsoap2.h +# soapcpp2 and stdsoap2.h (unless GSOAPDIR is set already) # -GSOAPDIR=/usr/local/lib/gsoap +ifndef GSOAPDIR +export GSOAPDIR=/usr/local/lib/gsoap +endif delegation.wsdl: delegation.h $(GSOAPDIR)/soapcpp2 -c delegation.h @@ -137,7 +139,7 @@ gridsite-delegation.cgi: grst-delegation.c delegation.h delegation.wsdl \ libstdsoap2.a soapC.c soapServer.c gcc $(MYCFLAGS) $(MYLDFLAGS) -o gridsite-delegation.cgi \ grst-delegation.c \ - -I/usr/include/openssl -I/usr/kerberos/include -I$(GSOAPDIR) \ + -I/usr/kerberos/include -I$(GSOAPDIR) \ -DVERSION=\"$(VERSION)\" \ soapC.c soapServer.c libstdsoap2.a \ -lgridsite -lcurl -lz -lssl -lcrypto -lxml2 -lm @@ -146,7 +148,7 @@ htproxyput: htproxyput.c delegation.h delegation.wsdl \ soapC.c soapServer.c libstdsoap2.a gcc $(MYCFLAGS) $(MYLDFLAGS) -o htproxyput \ htproxyput.c \ - -I/usr/include/openssl -I/usr/kerberos/include \ + -I/usr/kerberos/include \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR) -DWITH_OPENSSL \ soapC.c soapClient.c libstdsoap2.a \ @@ -156,7 +158,7 @@ proxyput-example: proxyput-example.c delegation.h delegation.wsdl \ soapC.c soapServer.c libstdsoap2.a gcc $(MYCFLAGS) $(MYLDFLAGS) -o proxyput-example \ proxyput-example.c \ - -I/usr/include/openssl -I/usr/kerberos/include \ + -I/usr/kerberos/include \ -g -DVERSION=\"$(VERSION)\" \ -I$(GSOAPDIR) -DWITH_OPENSSL \ soapC.c soapClient.c libstdsoap2.a \ @@ -197,7 +199,7 @@ install: apidoc cp -f ../doc/*.html ../doc/*.conf ../doc/*.1 ../doc/*.sh \ $(prefix)/share/doc/gridsite-$(VERSION) cp -f ../doc/*.1 $(prefix)/share/man/man1 - gzip $(prefix)/share/man/man1/*.1 + gzip -f $(prefix)/share/man/man1/*.1 cd ../doc ; for i in *.1 ; do ../src/roffit < $$i \ > $(prefix)/share/doc/gridsite-$(VERSION)/$$i.html ; done cp -f htcp $(prefix)/bin diff --git a/org.gridsite.core/src/htcp b/org.gridsite.core/src/htcp index 77f51e3..ac0153b 100644 Binary files a/org.gridsite.core/src/htcp and b/org.gridsite.core/src/htcp differ diff --git a/org.gridsite.core/src/mod_ssl-private.h b/org.gridsite.core/src/mod_ssl-private.h index 2a60edf..7b0b784 100644 --- a/org.gridsite.core/src/mod_ssl-private.h +++ b/org.gridsite.core/src/mod_ssl-private.h @@ -65,7 +65,7 @@ * CLEARLY, THIS WILL BREAK IF THERE ARE MAJOR CHANGES TO ssl_private.h!!! */ -#include +#include typedef enum { SSL_SHUTDOWN_TYPE_UNSET, diff --git a/org.gridsite.core/src/real-gridsite-admin.cgi b/org.gridsite.core/src/real-gridsite-admin.cgi index 0b34aae..74a0010 100644 Binary files a/org.gridsite.core/src/real-gridsite-admin.cgi and b/org.gridsite.core/src/real-gridsite-admin.cgi differ