Removed apache 1.x module build

diff --git a/debian/changelog b/debian/changelog
index ad5426f..a3215e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+suphp (0.6.2-2) unstable; urgency=low
+
+  * remove apache 1.x package (closes: #429079, closes: #429923)
+
+ -- Emmanuel Lacour <elacour@home-dn.net>  Sun, 14 Oct 2007 19:42:30 +0200
+

 suphp (0.6.2-1) unstable; urgency=low
 
   * New uptream release (closes: #405059)
 suphp (0.6.2-1) unstable; urgency=low
 
   * New uptream release (closes: #405059)

diff --git a/debian/control b/debian/control
index f9e458c..c9512a8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: suphp
 Section: web
 Priority: optional
 Maintainer: Emmanuel Lacour <elacour@home-dn.net>
 Section: web
 Priority: optional
 Maintainer: Emmanuel Lacour <elacour@home-dn.net>

-Build-Depends: debhelper (>> 4.1.16), apache-dev (>= 1.3.20), apache2-prefork-dev (>= 2.2.0), apache2-mpm-prefork (>= 2.2.0) | apache2-mpm-worker (>= 2.2.0), libapr1-dev, docbook-to-man, pkg-config, dpatch
+Build-Depends: debhelper (>> 4.1.16), apache2-prefork-dev (>= 2.2.0), apache2-mpm-prefork (>= 2.2.0) | apache2-mpm-worker (>= 2.2.0), libapr1-dev, docbook-to-man, pkg-config, dpatch

 Standards-Version: 3.7.2
 
 Package: suphp-common
 Standards-Version: 3.7.2
 
 Package: suphp-common


@@ -14,14 +14,6 @@ Description: Common files for mod suphp
  module to change the uid of the process executing the PHP interpreter to the
  owner of the php script.
 
  module to change the uid of the process executing the PHP interpreter to the
  owner of the php script.
 

-Package: libapache-mod-suphp
-Architecture: any
-Depends: ${shlibs:Depends}, suphp-common (= ${Source-Version}), apache-common (>= 1.3.20)
-Description: Apache module to run php scripts with the owner permissions
- With the use of the suphp setuid root binary (from suphp-common package),
- this Apache module change the uid of the process executing the PHP
- interpreter to the owner of the php script
-

 Package: libapache2-mod-suphp
 Architecture: any
 Depends: ${shlibs:Depends}, suphp-common (= ${Source-Version}), apache2.2-common
 Package: libapache2-mod-suphp
 Architecture: any
 Depends: ${shlibs:Depends}, suphp-common (= ${Source-Version}), apache2.2-common

diff --git a/debian/libapache-mod-suphp.copyright b/debian/libapache-mod-suphp.copyright
deleted file mode 100644 (file)
index 863f38e..0000000
--- a/debian/libapache-mod-suphp.copyright
+++ /dev/null
@@ -1,70 +0,0 @@
-This package was debianized by Emmanuel Lacour <elacour@home-dn.net> on
-Fri, 19 Sep 2003 15:25:44 +0200.
-
-It was downloaded from http://www.suphp.org/download/
-
-Upstream Author: Sebastian Marsching <sebastian.marsching@suphp.org>
-
-Copyright:
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-"This product includes software developed by the
- Apache Software Foundation (http://www.apache.org/)."
- 

diff --git a/debian/libapache-mod-suphp.dirs b/debian/libapache-mod-suphp.dirs
deleted file mode 100644 (file)
index 554b50e..0000000
--- a/debian/libapache-mod-suphp.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/apache/1.3

diff --git a/debian/libapache-mod-suphp.docs b/debian/libapache-mod-suphp.docs
deleted file mode 100644 (file)
index 35add4c..0000000
--- a/debian/libapache-mod-suphp.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/apache/INSTALL
-doc/apache/CONFIG

diff --git a/debian/libapache-mod-suphp.install b/debian/libapache-mod-suphp.install
deleted file mode 100644 (file)
index 63b0385..0000000
--- a/debian/libapache-mod-suphp.install
+++ /dev/null
@@ -1,3 +0,0 @@
-src/apache/.libs/mod_suphp.so.0.0.0 usr/lib/apache/1.3/
-debian/conf/500mod_suphp.info usr/lib/apache/1.3/
-debian/conf/suphp.conf etc/apache/conf.d/

diff --git a/debian/libapache-mod-suphp.postinst b/debian/libapache-mod-suphp.postinst
deleted file mode 100644 (file)
index bffad91..0000000
--- a/debian/libapache-mod-suphp.postinst
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-# postinst script for libapache-mod-suphp
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure)
-        if [ -n "$2" ]; then
-       # we're upgrading. don't ask again
-           exit 0
-        fi
-        if [ -x /usr/sbin/apache-modconf ]; then
-        for i in apache apache-perl apache-ssl; do
-            if [ -e /etc/$i/httpd.conf ]; then
-            apache-modconf $i enable mod_suphp
-            fi
-        done
-        fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/libapache-mod-suphp.prerm b/debian/libapache-mod-suphp.prerm
deleted file mode 100644 (file)
index 0fac5c4..0000000
--- a/debian/libapache-mod-suphp.prerm
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# prerm script for libapache-mod-suphp
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove)
-        if [ -x /usr/sbin/apache-modconf ]; then
-            for i in apache apache-perl apache-ssl; do
-                if [ -e /etc/$i/httpd.conf ]; then
-                    apache-modconf $i disable mod_suphp quiet
-                fi
-            done
-        fi
-
-        ;;
-    upgrade|failed-upgrade|deconfigure)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/rules b/debian/rules
index ac86eff..9a88938 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,17 +24,6 @@ endif
 patch:
        dpatch apply-all
 
 patch:
        dpatch apply-all
 

-configure-apache: patch
-       dh_testdir
-       ./configure --prefix=/usr \
-       --sysconfdir=/etc/suphp \
-       --with-apxs=/usr/bin/apxs \
-       --with-apache-user=www-data \
-       --with-php=/usr/bin/php-cgi \
-       --sbindir=/usr/lib/suphp \
-       --with-setid-mode=owner \
-       --with-logfile=/var/log/suphp/suphp.log
-

 configure-apache2: patch
        dh_testdir
        CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \
 configure-apache2: patch
        dh_testdir
        CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \


@@ -47,10 +36,6 @@ configure-apache2: patch
        --with-logfile=/var/log/suphp/suphp.log
 
 
        --with-logfile=/var/log/suphp/suphp.log
 
 

-build-apache: configure-apache
-       dh_testdir
-       $(MAKE)
-

 build-apache2: configure-apache2
        dh_testdir
        $(MAKE)
 build-apache2: configure-apache2
        dh_testdir
        $(MAKE)


@@ -71,7 +56,7 @@ clean:
        dpatch deapply-all
        rm -rf debian/patched
 
        dpatch deapply-all
        rm -rf debian/patched
 

-install: build-apache build-apache2
+install: build-apache2

        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k


@@ -81,7 +66,6 @@ install: build-apache build-apache2
        docbook-to-man debian/suphp-common.manpage.sgml > debian/suphp-common/usr/share/man/man8/suphp.8
        install -m 644 debian/suphp-common.lintian-override debian/suphp-common/usr/share/lintian/overrides/suphp-common
        mv debian/suphp-common/etc/suphp/suphp.conf-example debian/suphp-common/etc/suphp/suphp.conf
        docbook-to-man debian/suphp-common.manpage.sgml > debian/suphp-common/usr/share/man/man8/suphp.8
        install -m 644 debian/suphp-common.lintian-override debian/suphp-common/usr/share/lintian/overrides/suphp-common
        mv debian/suphp-common/etc/suphp/suphp.conf-example debian/suphp-common/etc/suphp/suphp.conf

-       mv debian/libapache-mod-suphp/usr/lib/apache/1.3/mod_suphp.so.0.0.0 debian/libapache-mod-suphp/usr/lib/apache/1.3/mod_suphp.so

        mv debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so
 
 
        mv debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so
 
 


@@ -95,7 +79,6 @@ binary-arch: install
        dh_testroot
 #      dh_installdebconf       
        dh_installdocs
        dh_testroot
 #      dh_installdebconf       
        dh_installdocs

-       mv debian/libapache-mod-suphp/usr/share/doc/libapache-mod-suphp/INSTALL debian/libapache-mod-suphp/usr/share/doc/libapache-mod-suphp/README

        mv debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/INSTALL debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/README
 #      dh_installexamples
 #      dh_installmenu
        mv debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/INSTALL debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/README
 #      dh_installexamples
 #      dh_installmenu


@@ -122,4 +105,4 @@ binary-arch: install
        dh_builddeb
 
 binary: binary-indep binary-arch
        dh_builddeb
 
 binary: binary-indep binary-arch

-.PHONY: configure build build-apache build-apache2 clean binary-indep binary-arch binary install patch unpatch
+.PHONY: configure build build-apache2 clean binary-indep binary-arch binary install patch unpatch