Stripped all MIT kerberos dependencies for Debian: 1) mod_gridsite.so (apache2-prefork-dev) 2) ht* commands (libcurl4-openssl-dev) Patch for gridsite >= 2.0.5. diff --git a/project/debian.control b/project/debian.control index bfbbf69..057bf06 100644 --- a/project/debian.control +++ b/project/debian.control @@ -3,10 +3,8 @@ Section: main Priority: optional Maintainer: EMI CESNET security Build-Depends: debhelper (>= 7.0.50~), - apache2-prefork-dev, gsoap, libcanl-c-dev, - libcurl4-openssl-dev, doxygen, libxml2, libxml2-dev, @@ -20,7 +18,7 @@ Vcs-Cvs: :pserver:anonymous@jra1mw.cvs.cern.ch:/cvs/jra1mw/org.gridsite.core Package: gridsite Section: httpd Architecture: any -Replaces: gridsite-apache (<= 1.7.21), gridsite-services (<= 1.7.21) +Replaces: gridsite-services (<= 1.7.21) Depends: \${shlibs:Depends}, \${misc:Depends} Description: GridSite mod_gridsite module and CGI binaries for Apache httpd GridSite Apache module and CGI binaries. diff --git a/src/Makefile b/src/Makefile index 4807f0f..f83351c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -115,7 +115,7 @@ GRIDSITE_NOSSL_OBJS=grst_err_nossl.lo grst_gacl_nossl.lo grst_http_nossl.lo grst # Build # -build: apidoc build-lib htcp mod_gridsite.so urlencode findproxyfile \ +build: apidoc build-lib urlencode findproxyfile \ real-gridsite-admin.cgi gridsite-delegation.cgi build-lib: libgridsite_globus.la libgridsite_globus.a \ @@ -374,7 +374,6 @@ distclean: install: apidoc install-lib mkdir -p $(DESTDIR)$(prefix)/include \ - $(DESTDIR)$(prefix)/$(libdir)/$(httpd_name)/modules \ $(DESTDIR)$(prefix)/bin \ $(DESTDIR)$(prefix)/sbin \ $(DESTDIR)$(prefix)/share/man/man1 \ @@ -389,28 +388,13 @@ install: apidoc install-lib cp -f ../CHANGES ../README ../INSTALL ../LICENSE ../VERSION \ $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) cp -f ../doc/index.html ../doc/*.conf ../doc/*.sh ../doc/*.spec \ - mod_gridsite_example.c \ $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) - for i in htcp.1 htfind.1 htll.1 htls.1 htmkdir.1 htmv.1 htping.1 \ + for i in htfind.1 htll.1 htls.1 htmkdir.1 htmv.1 htping.1 \ htrm.1 urlencode.1 findproxyfile.1 ; do \ cp -f ../doc/$$i.html $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ cp -f ../doc/$$i $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ cp -f ../doc/$$i $(DESTDIR)$(prefix)/share/man/man1 ; \ gzip -f $(DESTDIR)$(prefix)/share/man/man1/$$i ; done - for i in mod_gridsite.8 ; do \ - cp -f ../doc/$$i.html $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ - cp -f ../doc/$$i $(DESTDIR)$(prefix)/share/doc/gridsite-$(MINOR_VERSION) ; \ - cp -f ../doc/$$i $(DESTDIR)$(prefix)/share/man/man8 ; \ - gzip -f $(DESTDIR)$(prefix)/share/man/man8/$$i ; done - $(INSTALL) htcp $(DESTDIR)$(prefix)/bin - ln -sf htcp $(DESTDIR)$(prefix)/bin/htls - ln -sf htcp $(DESTDIR)$(prefix)/bin/htll - ln -sf htcp $(DESTDIR)$(prefix)/bin/htrm - ln -sf htcp $(DESTDIR)$(prefix)/bin/htmkdir - ln -sf htcp $(DESTDIR)$(prefix)/bin/htmv - ln -sf htcp $(DESTDIR)$(prefix)/bin/htping - ln -sf htcp $(DESTDIR)$(prefix)/bin/htfind - cp -f mod_gridsite.so $(DESTDIR)$(prefix)/$(libdir)/$(httpd_name)/modules install-lib: mkdir -p $(DESTDIR)$(prefix)/$(libdir)/pkgconfig diff --git a/src/make-debian-files b/src/make-debian-files index 61c3016..b54e23b 100755 --- a/src/make-debian-files +++ b/src/make-debian-files @@ -32,42 +32,23 @@ echo "3.0 (quilt)" > source/format # main (apache, cgi, delegation) cat > gridsite.install < gridsite.manpages < gridsite.docs < gridsite-commands.install < gridsite-commands.manpages <