Update rpm and debian packaging, update source tarball.

diff --git a/org.gridsite.core/project/debian.control b/org.gridsite.core/project/debian.control
index eae58f5..0dc50ae 100644 (file)
--- a/org.gridsite.core/project/debian.control
+++ b/org.gridsite.core/project/debian.control
@@ -5,10 +5,10 @@ Maintainer: EMI CESNET security <emi-lb@metacentrum.cz>
 Build-Depends: debhelper (>= 7.0.50~),
        apache2-prefork-dev,
        gsoap,
+       libcanl-c-dev,
        libglobus-gssapi-gsi-dev,
        libcurl4-openssl-dev,
        doxygen,
-       libfuse-dev,
        libxml2,
        libxml2-dev,
        libssl-dev,
@@ -53,24 +53,6 @@ Description: HTTP(S) read/write client and other GridSite commands
  onto remote servers using HTTPS. htcp is similar to scp(1), but uses
  HTTP/HTTPS rather than ssh as its transfer protocol.
 
-Package: gridsite-gsexec
-Section: web
-Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends}
-Description: gsexec binary for the Apache HTTP server
- This package includes the /usr/sbin/gsexec binary which can be installed
- to allow the Apache HTTP server to run CGI programs (and any programs
- executed by SSI pages) as a user other than the 'apache' user. gsexec
- is a drop-in replacement for suexec, with extended functionality for use
- with GridSite and Grid Security credentials.
-
-Package: gridsite-slashgrid
-Section: web
-Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends}, libcurl3 (>=7.12.1), fuse-utils
-Description: SlashGrid daemon
- SlashGrid provides remote virtual filesystems under /grid (\"slash grid\").
-
 Package: gridsite-service-clients
 Section: web
 Architecture: any

diff --git a/org.gridsite.core/project/debian.rules b/org.gridsite.core/project/debian.rules
index 8ecc773..35b926b 100644 (file)
--- a/org.gridsite.core/project/debian.rules
+++ b/org.gridsite.core/project/debian.rules
@@ -1,10 +1,10 @@
 #! /usr/bin/make -f
 
 override_dh_auto_build:
-       \$(MAKE) -C src prefix=/usr build gridsite-delegation.cgi htproxyput slashgrid
+       \$(MAKE) -C src prefix=/usr build gridsite-delegation.cgi htproxyput
 
 override_dh_auto_install:
-       \$(MAKE) -C src prefix=../debian/tmp/usr httpd_name=apache2 RPM_BUILD_ROOT=../debian/tmp install install-ws install-slashgrid post-install-debian
+       \$(MAKE) -C src prefix=../debian/tmp/usr httpd_name=apache2 RPM_BUILD_ROOT=../debian/tmp install install-ws post-install-debian
 
 %:
        dh -Smakefile -Dsrc \$@

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index b6c5e98..966b55e 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -562,6 +562,7 @@ 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 \
+                 canl_mod_gridsite.c canl_mod_ssl-private.h \
                  gsexec.c gsexec.h gridsite-copy.c gridsite-storage.c \
                  delegation.h \
                  roffit make-gridsite-spec make-debian-files \

diff --git a/org.gridsite.core/src/make-debian-files b/org.gridsite.core/src/make-debian-files
index e2f13bf..79a4532 100644 (file)
--- a/org.gridsite.core/src/make-debian-files
+++ b/org.gridsite.core/src/make-debian-files
@@ -34,9 +34,7 @@ echo "3.0 (quilt)" > source/format
 cat > gridsite.install <<EOF
 usr/lib/apache2/modules/mod_gridsite.so
 usr/sbin/real-gridsite-admin.cgi
-usr/sbin/gridsite-copy.cgi
 usr/sbin/gridsite-delegation.cgi
-usr/sbin/gridsite-storage.cgi
 EOF
 cat > gridsite.manpages <<EOF
 doc/gridsite-delegation.8
@@ -74,14 +72,6 @@ doc/urlencode.1
 doc/findproxyfile.1
 EOF
 
-# gsexec
-cat > gridsite-gsexec.install <<EOF
-usr/sbin/gsexec
-EOF
-cat > gridsite-gsexec.manpages <<EOF
-doc/gsexec.8
-EOF
-
 # service-clients
 cat > gridsite-service-clients.install <<EOF
 usr/bin/htproxyput
@@ -100,19 +90,6 @@ doc/htproxyrenew.1
 doc/htproxyinfo.1
 EOF
 
-# slashgrid
-cat > gridsite-slashgrid.dirs <<EOF
-etc/init.d
-EOF
-cat > gridsite-slashgrid.install <<EOF
-usr/sbin/slashgrid
-etc/rc.d/init.d/slashgrid etc/init.d
-var/spool/slashgrid
-EOF
-cat > gridsite-slashgrid.manpages <<EOF
-doc/slashgrid.8
-EOF
-
 # shared
 cat > libgridsite${MINOR_VERSION}.docs <<EOF
 CHANGES

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 983af49..a1b172e 100755 (executable)
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -1,15 +1,5 @@
 #!/bin/sh
 
-# test to see if fuse-devel (or fuse.h and libfuse) is installed
-#
-cat <<EOF >fuse-test.c
-#include <fuse.h>
-int main() { struct fuse_context ctx;
-return fuse_main(0, (char **) 0, (struct fuse_operations *) 0); }
-EOF
-make fuse-test
-if [ $? = 0 ] ; then have_fuse=1 ; fi
-
 if [ x"$project" = x"glite" ]; then
        globusdep=',vdt_globus_sdk'
 else
@@ -38,9 +28,6 @@ make gridsite-delegation.cgi
 if [ $? = 0 ] ; then have_gsoap=1 ; fi
 rm -f a.out
 
-if [ "$have_fuse" = "1" ]; then
-       fusedep=',fuse-devel'
-fi
 if [ "$have_gsoap" = "1" ]; then
        gsoapdep=',gsoap-devel'
 fi
@@ -62,8 +49,9 @@ Source: %{name}-%{version}.src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.gridsite.org/
 Vendor: GridPP
-Buildrequires: libxml2-devel,curl-devel,httpd-devel,openssl-devel,pkgconfig
-Buildrequires: doxygen${gsoapdep}${fusedep}${globusdep}
+BuildRequires: libxml2-devel%{?_isa},curl-devel%{?_isa},httpd-devel%{?_isa},openssl-devel%{?_isa},pkgconfig
+BuildRequires: doxygen${gsoapdep}${globusdep}
+BuildRequires: canl-c-devel%{?_isa}
 Packager: Andrew McNab <Andrew.McNab@manchester.ac.uk>
 Provides: gridsite-apache = %{version}-%{release}
 Obsoletes: gridsite-apache <= 1.7.21
@@ -114,19 +102,6 @@ HTTP/HTTPS rather than ssh as its transfer protocol.
 
 See http://www.gridsite.org/ for details.
 
-%package gsexec
-Group: Applications/Internet
-Summary: gsexec binary for the Apache HTTP server
-
-%description gsexec
-This package includes the /usr/sbin/gsexec binary which can be installed
-to allow the Apache HTTP server to run CGI programs (and any programs
-executed by SSI pages) as a user other than the 'apache' user. gsexec
-is a drop-in replacement for suexec, with extended functionality for use
-with GridSite and Grid Security credentials.
-
-See http://www.gridsite.org/ for details.
-
 %prep
 
 %setup -q
@@ -137,13 +112,6 @@ make prefix=%{_prefix}
 
 EOF
 
-if [ $have_fuse ] ; then
-cat <<EOF >>gridsite.spec
-make prefix=%{_prefix} slashgrid
-
-EOF
-fi
-
 if [ $have_gsoap ] ; then
 cat <<EOF >>gridsite.spec
 make prefix=%{_prefix} gridsite-delegation.cgi htproxyput
@@ -161,15 +129,6 @@ cd src
 make install prefix=\$RPM_BUILD_ROOT/%{_prefix} libdir=%{_lib}
 EOF
 
-if [ $have_fuse ] ; then
-
-cat <<EOF >>gridsite.spec
-
-mkdir -p \$RPM_BUILD_ROOT/etc/rc.d/init.d
-make install-slashgrid prefix=\$RPM_BUILD_ROOT/%{_prefix}
-EOF
-fi
-
 if [ $have_gsoap ] ; then
 
 cat <<EOF >>gridsite.spec
@@ -196,8 +155,6 @@ fi
 %attr(-, root, root) %{_prefix}/share/man/man8/mod_gridsite.8.gz
 %attr(-, root, root) %{_prefix}/%{_lib}/httpd/modules/mod_gridsite.so
 %attr(-, root, root) %{_prefix}/sbin/real-gridsite-admin.cgi
-%attr(-, root, root) %{_prefix}/sbin/gridsite-copy.cgi
-%attr(-, root, root) %{_prefix}/sbin/gridsite-storage.cgi
 EOF
 
 if [ $have_gsoap ] ; then
@@ -255,39 +212,8 @@ cat <<EOF >>gridsite.spec
 %attr(-, root, root) %{_prefix}/share/man/man1/htfind.1.gz
 %attr(-, root, root) %{_prefix}/share/man/man1/urlencode.1.gz
 %attr(-, root, root) %{_prefix}/share/man/man1/findproxyfile.1.gz
-
-%files gsexec
-%attr(4510, root, apache) %{_prefix}/sbin/gsexec
-%attr(-, root, root) %{_prefix}/share/man/man8/gsexec.8.gz
-EOF
-
-if [ $have_fuse ] ; then
-
-cat <<EOF >>gridsite.spec
-%package slashgrid
-Group: Applications/Internet
-Summary: slashgrid daemon
-Requires: curl >= 7.12.1,fuse
-
-%description slashgrid
-SlashGrid daemon
-
-%post slashgrid
-mkdir -p /grid
-
-%preun slashgrid
-/sbin/service slashgrid stop ; :
-
-%files slashgrid
-%attr(0744, root, root) %{_prefix}/sbin/slashgrid
-%attr(0744, root, root) /etc/rc.d/init.d/slashgrid
-%attr(0700, root, root) /var/spool/slashgrid
-%attr(-, root, root) %{_prefix}/share/man/man8/slashgrid.8.gz
-
 EOF
 
-fi
-
 if [ $have_gsoap ] ; then
 
 cat <<EOF >>gridsite.spec
@@ -325,7 +251,7 @@ EOF
 
 LC_TIME=C cat >> gridsite.spec <<EOF
 %changelog
-* `date '+%a %b %d %Y'` - autobuild@`hostname -f`
+* `date '+%a %b %d %Y'` autobuild@`hostname -f` - ${PATCH_VERSION:-1.x.x}-${RELEASE_VERSION:-1}
 - automatically generated package
 EOF