Processed: Re: Bug#709462: suphp: Apache 2.4 moves to Unstable

2013-07-12 Thread Debian Bug Tracking System
Processing control commands:

 tag -1 pending
Bug #709462 [src:suphp] suphp: Apache 2.4 moves to Unstable
Added tag(s) pending.

-- 
709462: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709462
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#709462: suphp: Apache 2.4 moves to Unstable

2013-07-12 Thread Colin Watson
Control: tag -1 pending

On Wed, Jul 10, 2013 at 11:13:43PM +0100, Colin Watson wrote:
 On Thu, May 23, 2013 at 03:42:42PM +0200, a...@debian.org wrote:
  we are ready to upload Apache2 2.4 to Debian Sid now. This means the
  transition is effectively starting now, and going to break your modules.
  Since your package suphp is already fixed in Experimental, all you
  should have to do is another upload of your package to Sid.
 
 I'm not quite sure why the response to this was apparently:
 
   http://packages.qa.debian.org/s/suphp/news/20120628T091202Z.html
 
 ... given that Apache 2.4 should have been installable in unstable at
 that point.

I misread the year of this upload; how embarrassing ...

I've prepared an NMU for suphp (versioned as 0.7.1-3.1) and uploaded it
to DELAYED/2.  Please feel free to tell me if I should delay it longer.

The diff from 0.7.1-2 follows, since it's short; the full NMU diff is
attached.

diff -Nru suphp-0.7.1/debian/changelog suphp-0.7.1/debian/changelog
--- suphp-0.7.1/debian/changelog2012-04-18 17:27:35.0 +0100
+++ suphp-0.7.1/debian/changelog2013-07-12 09:15:38.0 +0100
@@ -1,3 +1,18 @@
+suphp (0.7.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Revert to 0.7.1-2 for Apache 2.4 transition (closes: #709462).
+  * Remove hardcoded Build-Depends/Depends: apache2-api-20120211.
+
+ -- Colin Watson cjwat...@debian.org  Fri, 12 Jul 2013 09:15:32 +0100
+
+suphp (0.7.1-3) unstable; urgency=low
+
+  * Remove support for apache 2.4 debian package (stalled in
+experimental)
+
+ -- Emmanuel Lacour elac...@home-dn.net  Tue, 26 Jun 2012 15:30:52 +0200
+
 suphp (0.7.1-2) experimental; urgency=low
 
   * Lintian cleanup: 
diff -Nru suphp-0.7.1/debian/control suphp-0.7.1/debian/control
--- suphp-0.7.1/debian/control  2012-04-18 16:34:21.0 +0100
+++ suphp-0.7.1/debian/control  2013-07-10 23:06:29.0 +0100
@@ -2,7 +2,7 @@
 Section: httpd
 Priority: optional
 Maintainer: Emmanuel Lacour elac...@home-dn.net
-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
+Build-Depends: debhelper (= 9), apache2-dev (= 2.4), 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 @@
 
 Package: libapache2-mod-suphp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= 
${binary:Version}), apache2-api-20120211
+Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version})
 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

Regards,

-- 
Colin Watson   [cjwat...@debian.org]
diff -Nru suphp-0.7.1/debian/changelog suphp-0.7.1/debian/changelog
--- suphp-0.7.1/debian/changelog	2012-06-26 14:32:06.0 +0100
+++ suphp-0.7.1/debian/changelog	2013-07-12 09:15:38.0 +0100
@@ -1,3 +1,11 @@
+suphp (0.7.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Revert to 0.7.1-2 for Apache 2.4 transition (closes: #709462).
+  * Remove hardcoded Build-Depends/Depends: apache2-api-20120211.
+
+ -- Colin Watson cjwat...@debian.org  Fri, 12 Jul 2013 09:15:32 +0100
+
 suphp (0.7.1-3) unstable; urgency=low
 
   * Remove support for apache 2.4 debian package (stalled in
diff -Nru suphp-0.7.1/debian/control suphp-0.7.1/debian/control
--- suphp-0.7.1/debian/control	2012-06-26 14:11:53.0 +0100
+++ suphp-0.7.1/debian/control	2013-07-10 23:06:29.0 +0100
@@ -2,7 +2,7 @@
 Section: httpd
 Priority: optional
 Maintainer: Emmanuel Lacour elac...@home-dn.net
-Build-Depends: debhelper (= 9), 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, dh-autoreconf, autotools-dev, quilt
+Build-Depends: debhelper (= 9), apache2-dev (= 2.4), 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 @@
 
 Package: libapache2-mod-suphp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version}), apache2.2-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version})
 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 -Nru suphp-0.7.1/debian/libapache2-mod-suphp.apache2 suphp-0.7.1/debian/libapache2-mod-suphp.apache2
--- suphp-0.7.1/debian/libapache2-mod-suphp.apache2	1970-01-01 01:00:00.0 +0100
+++ suphp-0.7.1/debian/libapache2-mod-suphp.apache2	2013-07-10 23:06:14.0 

Bug#709462: suphp: Apache 2.4 moves to Unstable

2013-07-10 Thread Colin Watson
On Thu, May 23, 2013 at 03:42:42PM +0200, a...@debian.org wrote:
 we are ready to upload Apache2 2.4 to Debian Sid now. This means the
 transition is effectively starting now, and going to break your modules.
 Since your package suphp is already fixed in Experimental, all you
 should have to do is another upload of your package to Sid.

I'm not quite sure why the response to this was apparently:

  http://packages.qa.debian.org/s/suphp/news/20120628T091202Z.html

... given that Apache 2.4 should have been installable in unstable at
that point.  But regardless, it's definitely possible to convert suphp
to Apache 2.4 now, and it should happen.

The following diff returns the package to a state identical to 0.7.1-2
except for the changelog and dropping the incorrectly-hardcoded
(build-)dependencies on apache2-api-20120211.  I've confirmed that
dh_apache2 generates the correct run-time dependency.

diff -Nru suphp-0.7.1/debian/changelog suphp-0.7.1/debian/changelog
--- suphp-0.7.1/debian/changelog2012-06-26 14:32:06.0 +0100
+++ suphp-0.7.1/debian/changelog2013-07-10 23:07:11.0 +0100
@@ -1,3 +1,11 @@
+suphp (0.7.1-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Revert to 0.7.1-2 for Apache 2.4 transition (closes: #709462).
+  * Remove hardcoded Build-Depends/Depends: apache2-api-20120211.
+
+ -- Colin Watson cjwat...@debian.org  Wed, 10 Jul 2013 23:06:34 +0100
+
 suphp (0.7.1-3) unstable; urgency=low
 
   * Remove support for apache 2.4 debian package (stalled in
diff -Nru suphp-0.7.1/debian/control suphp-0.7.1/debian/control
--- suphp-0.7.1/debian/control  2012-06-26 14:11:53.0 +0100
+++ suphp-0.7.1/debian/control  2013-07-10 23:06:29.0 +0100
@@ -2,7 +2,7 @@
 Section: httpd
 Priority: optional
 Maintainer: Emmanuel Lacour elac...@home-dn.net
-Build-Depends: debhelper (= 9), 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, dh-autoreconf, autotools-dev, quilt
+Build-Depends: debhelper (= 9), apache2-dev (= 2.4), 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 @@
 
 Package: libapache2-mod-suphp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= 
${binary:Version}), apache2.2-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, suphp-common (= ${binary:Version})
 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 -Nru suphp-0.7.1/debian/libapache2-mod-suphp.apache2 
suphp-0.7.1/debian/libapache2-mod-suphp.apache2
--- suphp-0.7.1/debian/libapache2-mod-suphp.apache2 1970-01-01 
01:00:00.0 +0100
+++ suphp-0.7.1/debian/libapache2-mod-suphp.apache2 2013-07-10 
23:06:14.0 +0100
@@ -0,0 +1,3 @@
+mod src/apache2/.libs/mod_suphp.so
+mod debian/conf/suphp.conf
+mod debian/conf/suphp.load
diff -Nru suphp-0.7.1/debian/libapache2-mod-suphp.install 
suphp-0.7.1/debian/libapache2-mod-suphp.install
--- suphp-0.7.1/debian/libapache2-mod-suphp.install 2012-06-26 
14:11:10.0 +0100
+++ suphp-0.7.1/debian/libapache2-mod-suphp.install 1970-01-01 
01:00:00.0 +0100
@@ -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 -Nru suphp-0.7.1/debian/libapache2-mod-suphp.postinst 
suphp-0.7.1/debian/libapache2-mod-suphp.postinst
--- suphp-0.7.1/debian/libapache2-mod-suphp.postinst2012-06-26 
14:11:10.0 +0100
+++ suphp-0.7.1/debian/libapache2-mod-suphp.postinst1970-01-01 
01:00:00.0 +0100
@@ -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:
-#* 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
-#
-
-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