From ffbb839f9168e56e3e5885948a4aa992be6f8004 Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Wed, 18 Apr 2012 17:50:09 +0200 Subject: [PATCH] More move to dh_apache2 (no longer compatible with apache < 2.4) --- debian/control | 4 +-- debian/libapache2-mod-suphp.apache2 | 1 + debian/libapache2-mod-suphp.install | 3 -- debian/libapache2-mod-suphp.postinst | 63 ------------------------------------ debian/libapache2-mod-suphp.prerm | 51 ----------------------------- debian/rules | 6 ++-- debian/suphp-common.install | 2 +- 7 files changed, 7 insertions(+), 123 deletions(-) delete mode 100644 debian/libapache2-mod-suphp.install delete mode 100644 debian/libapache2-mod-suphp.postinst delete mode 100644 debian/libapache2-mod-suphp.prerm diff --git a/debian/control b/debian/control index d2a671f..64e7e32 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: suphp Section: httpd Priority: optional Maintainer: Emmanuel Lacour -Build-Depends: debhelper (>= 9), apache2-prefork-dev (>= 2.2.0) | apache2-dev (>= 2.4), apache2-api-20120211 | apache2-mpm-prefork (>= 2.2.0) | apache2-mpm-worker (>= 2.2.0), libapr1-dev, docbook-to-man, pkg-config, dh-autoreconf, autotools-dev, quilt, dh-apache2 +Build-Depends: debhelper (>= 9), apache2-dev (>= 2.4), apache2-api-20120211, libapr1-dev, docbook-to-man, pkg-config, dh-autoreconf, autotools-dev, quilt, dh-apache2 Standards-Version: 3.9.3 Package: suphp-common @@ -16,7 +16,7 @@ Description: Common files for mod suphp Package: libapache2-mod-suphp Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version}), apache2-api-20120211 | apache2.2-common +Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version}), apache2-api-20120211 Description: Apache2 module to run PHP scripts with the owner permissions With the use of the suphp setuid root binary (from suphp-common package), this Apache2 module change the uid of the process executing the PHP diff --git a/debian/libapache2-mod-suphp.apache2 b/debian/libapache2-mod-suphp.apache2 index 50f049a..f2a9d91 100644 --- a/debian/libapache2-mod-suphp.apache2 +++ b/debian/libapache2-mod-suphp.apache2 @@ -1,2 +1,3 @@ +mod src/apache2/.libs/mod_suphp.so mod debian/conf/suphp.conf mod debian/conf/suphp.load diff --git a/debian/libapache2-mod-suphp.install b/debian/libapache2-mod-suphp.install deleted file mode 100644 index 17c9b7f..0000000 --- a/debian/libapache2-mod-suphp.install +++ /dev/null @@ -1,3 +0,0 @@ -src/apache2/.libs/mod_suphp.so.0.0.0 usr/lib/apache2/modules/ -debian/conf/suphp.load etc/apache2/mods-available/ -debian/conf/suphp.conf etc/apache2/mods-available/ diff --git a/debian/libapache2-mod-suphp.postinst b/debian/libapache2-mod-suphp.postinst deleted file mode 100644 index 1b5bad0..0000000 --- a/debian/libapache2-mod-suphp.postinst +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh -# postinst script for libapache-mod-suphp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -reload_apache() -{ - if apache2ctl configtest 2>/dev/null; then - invoke-rc.d apache2 force-reload || true - else - echo "Your apache2 configuration is broken, so we're not restarting it for you." - fi -} - - -case "$1" in - configure) - # Reload the module on upgrade if enabled - if [ -n "$2" ]; then - if [ -e /etc/apache2/mods-enabled/suphp.load ]; then - reload_apache - fi - else - # Enable the module - if [ -e /etc/apache2/apache2.conf ]; then - a2enmod suphp >/dev/null || true - reload_apache - fi - 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/libapache2-mod-suphp.prerm b/debian/libapache2-mod-suphp.prerm deleted file mode 100644 index c4b0f51..0000000 --- a/debian/libapache2-mod-suphp.prerm +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# prerm script for libapache-mod-suphp -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -reload_apache() -{ - if apache2ctl configtest 2>/dev/null; then - invoke-rc.d apache2 force-reload || true - else - echo "Your apache2 configuration is broken, so we're not restarting it for you." - fi -} - - -case "$1" in - remove) - if [ -e /etc/apache2/mods-enabled/suphp.load ]; then - a2dismod suphp >/dev/null || true - reload_apache - 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 2dc1388..40250c3 100755 --- a/debian/rules +++ b/debian/rules @@ -21,14 +21,14 @@ override_dh_auto_configure: --with-setid-mode=owner \ --with-logfile=/var/log/suphp/suphp.log +override_dh_auto_install: override_dh_install: dh_install 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/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so - + rm -f src/apache2/.libs/mod_suphp.so + mv src/apache2/.libs/mod_suphp.so.0.0.0 src/apache2/.libs/mod_suphp.so override_dh_installdocs: dh_installdocs diff --git a/debian/suphp-common.install b/debian/suphp-common.install index 9463c42..78f12c7 100644 --- a/debian/suphp-common.install +++ b/debian/suphp-common.install @@ -1,2 +1,2 @@ src/suphp usr/lib/suphp/ -doc/suphp.conf-example etc/suphp/ +doc/suphp.conf-example -- 2.11.0