From 1fc84a5fa9e7ded8cf1a8678e77a48ad7e2184f0 Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Tue, 27 Jun 2006 16:47:57 +0000 Subject: [PATCH] Add gridsite-ws back in --- org.gridsite.core/CHANGES | 2 + org.gridsite.core/src/Makefile | 44 ++++++++++------- org.gridsite.core/src/make-gridsite-spec | 85 ++++++++++++++++++++++++++++++-- 3 files changed, 110 insertions(+), 21 deletions(-) diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index 24d7b9e..d6ae19e 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -1,3 +1,5 @@ +* Tue Jun 27 2006 Andrew McNab +- Merge delegation services back into core. * Thu Jun 22 2006 Andrew McNab - Lots of additions to SiteCast/SlashGrid, including /grid/local/ filesystem with DNs from gridmapdir diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile index 38de96f..83e3d4d 100644 --- a/org.gridsite.core/src/Makefile +++ b/org.gridsite.core/src/Makefile @@ -328,13 +328,19 @@ install: apidoc install-lib cp -f gridsite-copy.cgi $(prefix)/sbin cp -f ../CHANGES ../README ../INSTALL ../LICENSE ../VERSION \ $(prefix)/share/doc/gridsite-$(MINOR_VERSION) - cp -f ../doc/*.html ../doc/*.conf ../doc/*.1 ../doc/*.8 ../doc/*.sh \ - ../doc/*.spec \ + cp -f ../doc/index.html ../doc/*.conf ../doc/*.sh ../doc/*.spec \ $(prefix)/share/doc/gridsite-$(MINOR_VERSION) - cp -f ../doc/*.1 $(prefix)/share/man/man1 - cp -f ../doc/*.8 $(prefix)/share/man/man8 - gzip -f $(prefix)/share/man/man1/*.1 - gzip -f $(prefix)/share/man/man8/*.8 + for i in htcp.1 htfind.1 htll.1 htls.1 htmkdir.1 htmv.1 htping.1 \ + htrm.1 urlencode.1 findproxyfile.1 ; do \ + cp -f ../doc/$$i.html $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/man/man1 ; \ + gzip -f $(prefix)/share/man/man1/$$i ; done + for i in mod_gridsite.8 gsexec.8 ; do \ + cp -f ../doc/$$i.html $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/man/man8 ; \ + gzip -f $(prefix)/share/man/man8/$$i ; done cp -f htcp $(prefix)/bin ln -sf htcp $(prefix)/bin/htls ln -sf htcp $(prefix)/bin/htll @@ -380,16 +386,18 @@ install-ws: gridsite-delegation.cgi htproxyput $(prefix)/share/man/man1 \ $(prefix)/share/man/man8 \ $(prefix)/share/doc/gridsite-$(MINOR_VERSION) - for i in CHANGES README INSTALL LICENSE VERSION ; \ - do cp -f ../$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION)/$$i-services ; done - for i in CHANGES README INSTALL LICENSE VERSION ; \ - do cp -f ../$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION)/$$i-commands ; done - cp -f ../doc/*.1 ../doc/*.8 \ - ../doc/*.wsdl $(prefix)/share/doc/gridsite-$(MINOR_VERSION) - cp -f ../doc/*.1 $(prefix)/share/man/man1 - cp -f ../doc/*.8 $(prefix)/share/man/man8 - gzip -f $(prefix)/share/man/man1/*.1 - gzip -f $(prefix)/share/man/man8/*.8 + cp -f ../doc/*.wsdl $(prefix)/share/doc/gridsite-$(MINOR_VERSION) + for i in htproxyput.1 htproxytime.1 htproxyrenew.1 htproxydestroy.1 \ + htproxyunixtime.1 ; do \ + cp -f ../doc/$$i.html $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/man/man1 ; \ + gzip -f $(prefix)/share/man/man1/$$i ; done + for i in gridsite-delegation.8 ; do \ + cp -f ../doc/$$i.html $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ + cp -f ../doc/$$i $(prefix)/share/man/man8 ; \ + gzip -f $(prefix)/share/man/man8/$$i ; done cp -f htproxyput $(prefix)/bin ln -sf htproxyput $(prefix)/bin/htproxydestroy ln -sf htproxyput $(prefix)/bin/htproxytime @@ -411,12 +419,12 @@ dist: cp -f Makefile grst*.c htcp.c slashgrid.c slashgrid.init \ urlencode.c findproxyfile.c gaclexample.c mod_gridsite.c \ htproxyput.c grst_admin.h mod_ssl-private.h \ - gsexec.c gsexec.h gridsite-copy.c fuse-test.c gsoap-test.c \ + gsexec.c gsexec.h gridsite-copy.c delegation.h \ roffit make-gridsite-spec \ Doxyfile doxygen.css doxyheader.html \ ../dist/gridsite-$(PATCH_VERSION)/src cp -f ../doc/*.html ../doc/*.1 ../doc/*.8 ../doc/*.conf ../doc/*.sh \ - ../doc/*.spec \ + ../doc/*.spec ../doc/*.wsdl \ ../dist/gridsite-$(PATCH_VERSION)/doc cp -f ../interface/*.h \ ../dist/gridsite-$(PATCH_VERSION)/interface diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec index 32ada41..11aed3b 100755 --- a/org.gridsite.core/src/make-gridsite-spec +++ b/org.gridsite.core/src/make-gridsite-spec @@ -1,6 +1,6 @@ #!/bin/sh -# test to see if fuse-devel (or fuse.h and libfuse) are installed +# test to see if fuse-devel (or fuse.h and libfuse) is installed # cat <fuse-test.c #include @@ -10,6 +10,17 @@ EOF make fuse-test if [ $? = 0 ] ; then have_fuse=1 ; fi +# test to see if gsoap-devel (or stdsoap2.h and libgsoapssl) is installed +# +cat <gsoap-test.c +#include +#ifdef SOAP_BEGIN +main() { return; } +#endif +EOF +make GSOAPDIR=$GSOAPDIR gsoap-test +if [ $? = 0 ] ; then have_gsoap=1 ; fi + cat <gridsite.spec # # Autogenerated by make-gridsite-spec @@ -109,7 +120,19 @@ if [ $have_fuse ] ; then cat <>gridsite.spec make prefix=\$RPM_BUILD_ROOT/%{prefix} \ GSOAPDIR=\$GSOAPDIR OPENSSL_FLAGS=\$OPENSSL_FLAGS \ - OPENSSL_LIBS=\$OPENSSL_LIBS FLAVOR_EXT=\$FLAVOR_EXT slashgrid + OPENSSL_LIBS=\$OPENSSL_LIBS FLAVOR_EXT=\$FLAVOR_EXT \ + slashgrid + +EOF +fi + +if [ $have_gsoap ] ; then +cat <>gridsite.spec +make prefix=\$RPM_BUILD_ROOT/%{prefix} \ + GSOAPDIR=\$GSOAPDIR OPENSSL_FLAGS=\$OPENSSL_FLAGS \ + OPENSSL_LIBS=\$OPENSSL_LIBS FLAVOR_EXT=\$FLAVOR_EXT \ + gridsite-delegation.cgi htproxyput + EOF fi @@ -128,7 +151,17 @@ cat <>gridsite.spec mkdir -p \$RPM_BUILD_ROOT/etc/rc.d/init.d make install-slashgrid prefix=\$RPM_BUILD_ROOT/%{prefix} \ - OPENSSL_FLAGS=\$OPENSSL_FLAGS \ + GSOAPDIR=\$GSOAPDIR OPENSSL_FLAGS=\$OPENSSL_FLAGS \ + OPENSSL_LIBS=\$OPENSSL_LIBS FLAVOR_EXT=\$FLAVOR_EXT +EOF +fi + +if [ $have_gsoap ] ; then + +cat <>gridsite.spec + +make install-ws prefix=\$RPM_BUILD_ROOT/%{prefix} \ + GSOAPDIR=$GSOAPDIR OPENSSL_FLAGS=\$OPENSSL_FLAGS \ OPENSSL_LIBS=\$OPENSSL_LIBS FLAVOR_EXT=\$FLAVOR_EXT EOF fi @@ -216,3 +249,49 @@ EOF fi +if [ $have_gsoap ] ; then + +cat <>gridsite.spec +%package services +Group: Applications/Internet +Summary: GridSite WS gridsite-delegation.cgi + +%description services +GridSite WS delegation service, gridsite-delegation.cgi + +%files services +%attr(-, root, root) %{prefix}/sbin/gridsite-delegation.cgi +%attr(-, root, root) %{prefix}/share/man/man8/gridsite-delegation.8.gz +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/delegation-1.1.0.wsdl +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/gridsite-delegation.8 + +%package service-clients +Group: Applications/Internet +Summary: GridSite WS htproxyput +Requires: curl, gridsite-shared + +%description service-clients +GridSite WS delegation client, htproxyput + +See http://www.gridsite.org/ for details. + +%files service-clients +%attr(-, root, root) %{prefix}/bin/htproxyput +%attr(-, root, root) %{prefix}/bin/htproxydestroy +%attr(-, root, root) %{prefix}/bin/htproxytime +%attr(-, root, root) %{prefix}/bin/htproxyunixtime +%attr(-, root, root) %{prefix}/bin/htproxyrenew +%attr(-, root, root) %{prefix}/share/man/man1/htproxyput.1.gz +%attr(-, root, root) %{prefix}/share/man/man1/htproxydestroy.1.gz +%attr(-, root, root) %{prefix}/share/man/man1/htproxytime.1.gz +%attr(-, root, root) %{prefix}/share/man/man1/htproxyunixtime.1.gz +%attr(-, root, root) %{prefix}/share/man/man1/htproxyrenew.1.gz +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/htproxyput.1 +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/htproxydestroy.1 +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/htproxytime.1 +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/htproxyunixtime.1 +%attr(-, root, root) %{prefix}/share/doc/gridsite-${MINOR_VERSION:-1.x}/htproxyrenew.1 +EOF + +fi + -- 1.8.2.3