Package: release.debian.org User: release.debian....@packages.debian.org Usertags: pu Tags: jessie Severity: normal
Hello phppgadmin is a web application that supports apache2.2 When upgrading to Jessie that contains apache 2.4, the application doesn't work anymore. See #669837. The proposed update fixes that important issue. It is unclear whether it is ok to bump the severity of #669837 to RC: In a way, you can move and fix the apache conf file around yourself so it may not be RC, but another point of view is that if you had the package working on wheezy, upgrading to jessie just always breaks it. I'd like to have your opinion on that. If you agree the severity can be bumped to RC, then we could just unblock phppgadmin/5.1-1.1 Attached is the full debdiff, that will be for Jessie 8.1 I suppose. Please double check the first line of the changelog, I'm a bit lost about how to proceed with versionning, and I assumed testing-proposed-update will become proposed-update when jessie is released. Regarding the patch itself, using dh_apache2 is not a trivial change, but I believe it is less complex that trying to fix things by doing things manually in maintainer scripts. The only unnecessary thing I see there is that we stop creating obsolete /etc/apache2/conf.d/ directory, which is a good thing imho. -- System Information: Debian Release: 8.0 APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: sysvinit (via /sbin/init)
diff -Nru phppgadmin-5.1/debian/changelog phppgadmin-5.1/debian/changelog
--- phppgadmin-5.1/debian/changelog 2013-04-18 12:37:03.000000000 +0200
+++ phppgadmin-5.1/debian/changelog 2015-02-20 18:21:14.000000000 +0100
@@ -1,3 +1,20 @@
+phppgadmin (5.1-1+deb8u1) testing; urgency=low
+
+ * Non maintainer upload.
+ * Changes for apache2.4 settings (Closes: #669837)
+ . Upgrade phppgadmin.conf restriction to localhost to 2.4 format.
+ . Update rules:
+ Use "--with apache2" in rules.
+ No longer copying apache.conf, dh_apache2 does that.
+ . Rename apache.conf into phppgadmin.conf.
+ . Drop /etc/apache2/conf.d from dirs.
+ . Remove manual reload of apache in maintainer scripts, dh_apache2 does it
+ automatically.
+ . Build-depends on dh-apache2.
+ . Use {$misc:Suggests} so apache2 is no longer a direct Depends.
+
+ -- Jean-Michel Nirgal Vourgère <jmv_...@nirgal.com> Mon, 22 Jul 2013 13:01:15 +0000
+
phppgadmin (5.1-1) unstable; urgency=low
* New upstream release.
diff -Nru phppgadmin-5.1/debian/control phppgadmin-5.1/debian/control
--- phppgadmin-5.1/debian/control 2013-04-18 11:39:06.000000000 +0200
+++ phppgadmin-5.1/debian/control 2015-02-20 18:04:29.000000000 +0100
@@ -3,7 +3,7 @@
Uploaders: Peter Eisentraut <pet...@debian.org>
Section: web
Priority: extra
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), dh-apache2
Standards-Version: 3.9.3
Homepage: http://phppgadmin.sourceforge.net/
Vcs-Git: git://anonscm.debian.org/pkg-postgresql/phppgadmin.git
@@ -11,9 +11,9 @@
Package: phppgadmin
Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql, apache2 | httpd,
+Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql,
libjs-jquery
-Recommends: postgresql-doc
+Recommends: ${misc:Recommends}, postgresql-doc
Suggests: postgresql, slony1-bin
Description: web-based administration tool for PostgreSQL
phpPgAdmin is a web-based administration tool for PostgreSQL. It is perfect
diff -Nru phppgadmin-5.1/debian/dirs phppgadmin-5.1/debian/dirs
--- phppgadmin-5.1/debian/dirs 2013-04-18 11:39:06.000000000 +0200
+++ phppgadmin-5.1/debian/dirs 2015-02-20 10:28:52.000000000 +0100
@@ -1,4 +1,3 @@
usr/share/phppgadmin
usr/share/phppgadmin/conf
etc/phppgadmin
-etc/apache2/conf.d
diff -Nru phppgadmin-5.1/debian/phppgadmin.apache2 phppgadmin-5.1/debian/phppgadmin.apache2
--- phppgadmin-5.1/debian/phppgadmin.apache2 1970-01-01 01:00:00.000000000 +0100
+++ phppgadmin-5.1/debian/phppgadmin.apache2 2015-02-20 10:28:52.000000000 +0100
@@ -0,0 +1 @@
+conf debian/phppgadmin.conf
diff -Nru phppgadmin-5.1/debian/phppgadmin.conf phppgadmin-5.1/debian/phppgadmin.conf
--- phppgadmin-5.1/debian/phppgadmin.conf 1970-01-01 01:00:00.000000000 +0100
+++ phppgadmin-5.1/debian/phppgadmin.conf 2015-02-20 10:28:52.000000000 +0100
@@ -0,0 +1,29 @@
+Alias /phppgadmin /usr/share/phppgadmin
+
+<Directory /usr/share/phppgadmin>
+
+DirectoryIndex index.php
+AllowOverride None
+
+# Only allow connections from localhost:
+Require local
+
+<IfModule mod_php5.c>
+ php_flag magic_quotes_gpc Off
+ php_flag track_vars On
+ #php_value include_path .
+</IfModule>
+<IfModule !mod_php5.c>
+ <IfModule mod_actions.c>
+ <IfModule mod_cgi.c>
+ AddType application/x-httpd-php .php
+ Action application/x-httpd-php /cgi-bin/php
+ </IfModule>
+ <IfModule mod_cgid.c>
+ AddType application/x-httpd-php .php
+ Action application/x-httpd-php /cgi-bin/php
+ </IfModule>
+ </IfModule>
+</IfModule>
+
+</Directory>
diff -Nru phppgadmin-5.1/debian/phppgadmin.postinst phppgadmin-5.1/debian/phppgadmin.postinst
--- phppgadmin-5.1/debian/phppgadmin.postinst 2013-04-18 11:39:06.000000000 +0200
+++ phppgadmin-5.1/debian/phppgadmin.postinst 2015-02-20 10:28:52.000000000 +0100
@@ -2,10 +2,6 @@
set -e
-if [ "$1" = configure ]; then
- test ! -e /etc/init.d/apache2 || invoke-rc.d apache2 reload
-fi
-
# conffile converted from symlink to plain file in 5.0.3-2
if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports mv_conffile 2>/dev/null ; then
dpkg-maintscript-helper mv_conffile /etc/phppgadmin/apache.conf /etc/apache2/conf.d/phppgadmin 5.0.3-1 -- "$@"
diff -Nru phppgadmin-5.1/debian/rules phppgadmin-5.1/debian/rules
--- phppgadmin-5.1/debian/rules 2013-04-18 11:52:59.000000000 +0200
+++ phppgadmin-5.1/debian/rules 2015-02-20 10:28:52.000000000 +0100
@@ -20,8 +20,7 @@
dh_link
install: build
- dh $@
- cp debian/apache.conf debian/phppgadmin/etc/apache2/conf.d/phppgadmin
+ dh $@ --with apache2
rm debian/phppgadmin/usr/share/phppgadmin/libraries/adodb/*.txt
rm debian/phppgadmin/usr/share/phppgadmin/lang/langcheck
rm debian/phppgadmin/usr/share/phppgadmin/lang/synch
@@ -29,6 +28,6 @@
binary-arch:
binary binary-indep: install
- dh $@
+ dh $@ --with apache2
.PHONY: build build-indep install clean binary binary-indep
signature.asc
Description: OpenPGP digital signature
