tags 416231 patch thanks On Tue, Mar 27, 2007 at 03:52:59AM -0500, Peter Samuelson wrote:
> reassign 416231 libapache2-mod-perl2 > thanks > The real bug here is that, at the time apache2.2-common is configured, > libapache2-mod-perl2 has not yet been configured. As a result, the > conffile /etc/apache2/mods-available/perl.conf has has not yet been > upgraded, and the old version of the conffile does not allow the new > version of apache2 to start. > As discussed with Steve L on IRC, the best solution is probably for > libapache2-mod-perl2 to _stop_ shipping the (now empty) conffile > /etc/apache2/mods-available/perl.conf, and edit out the offending line > in its prerm, in case the user has a modified copy (or, if not, just > removing the file and its symlink in mods-enabled). And here's an NMU patch. Thom, I understand per Peter that I have permission to NMU immediately, so this will be uploaded to incoming shortly, with all its perverted dpkg goodness. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u libapache2-mod-perl2-2.0.2/debian/changelog libapache2-mod-perl2-2.0.2/debian/changelog --- libapache2-mod-perl2-2.0.2/debian/changelog +++ libapache2-mod-perl2-2.0.2/debian/changelog @@ -1,3 +1,16 @@ +libapache2-mod-perl2 (2.0.2-2.4) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Drop /etc/apache2/mods-available/perl.conf as a conffile, since it no + longer contains anything of relevance; instead, manually remove the file + on purge if present, and in the preinst handle upgrading it to remove the + automatically created bits that conflict with apache2.2 so that this + conversion is done in time for the apache2.2-mpm-* configuration to run. + Closes: #416231. + + -- Steve Langasek <[EMAIL PROTECTED]> Tue, 27 Mar 2007 01:48:55 -0700 + libapache2-mod-perl2 (2.0.2-2.3) unstable; urgency=high * Non-maintainer upload. Thanks to Kjetil Kjernsmo for noticing the issues. diff -u libapache2-mod-perl2-2.0.2/debian/rules libapache2-mod-perl2-2.0.2/debian/rules --- libapache2-mod-perl2-2.0.2/debian/rules +++ libapache2-mod-perl2-2.0.2/debian/rules @@ -23,7 +23,6 @@ install/libapache2-mod-perl2:: install $(CURDIR)/src/modules/perl/mod_perl.so debian/libapache2-mod-perl2/usr/lib/apache2/modules/mod_perl.so install -m644 $(CURDIR)/debian/perl.load debian/libapache2-mod-perl2/etc/apache2/mods-available - -install -m644 $(CURDIR)/debian/perl.conf debian/libapache2-mod-perl2/etc/apache2/mods-available rm -rf debian/libapache2-mod-perl2/usr/man rm -f debian/libapache2-mod-perl2/usr/share/man/man3/mod_perl.3pm reverted: --- libapache2-mod-perl2-2.0.2/debian/perl.conf +++ libapache2-mod-perl2-2.0.2.orig/debian/perl.conf @@ -1 +0,0 @@ -# This file is a placeholder; you can safely ignore or delete it. only in patch2: unchanged: --- libapache2-mod-perl2-2.0.2.orig/debian/libapache2-mod-perl2.postrm +++ libapache2-mod-perl2-2.0.2/debian/libapache2-mod-perl2.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +CONFFILE=/etc/apache2/mods-available/perl.conf +CONFLINK=/etc/apache2/mods-enabled/perl.conf + +if [ "$1" = "purge" ]; then + rm -f $CONFFILE +fi + +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 2.0.2-2.4 \ + && [ -e /etc/apache2/mods-enabled/perl.load ] +then + ln -s "$CONFFILE" "$CONFLINK" || true +fi + +#DEBHELPER# only in patch2: unchanged: --- libapache2-mod-perl2-2.0.2.orig/debian/libapache2-mod-perl2.preinst +++ libapache2-mod-perl2-2.0.2/debian/libapache2-mod-perl2.preinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +CONFFILE=/etc/apache2/mods-available/perl.conf +CONFLINK=/etc/apache2/mods-enabled/perl.conf +if [ -n "$2" ] && [ -e "$CONFFILE" ] \ + && dpkg --compare-versions "$2" lt 2.0.2-2.4 +then + sed -i -e'/^[[:space:]]*PerlModule[[:space:]]\+Apache2[[:space:]]*/d' \ + $CONFFILE + if [ ! -s "$CONFFILE" ]; then + rm $CONFFILE + if [ -L "$CONFLINK" ]; then + rm $CONFLINK + fi + fi +fi + +#DEBHELPER#
