[apache2] 01/01: Fix conffile upgrade logic when upgrading from wheezy

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch jessie
in repository apache2.

commit 84253d3a88ffa6ca60282271da58756a60fff110
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Aug 21 17:23:32 2015 +0200

    Fix conffile upgrade logic when upgrading from wheezy
    
    When upgrading from wheezy with apache2.2-common but without apache2
    installed to jessie, part of the conffile handling logic would not run
    because the one instance of the MOVED_CONFFILES_IN variable has been
    overlooked when refactoring the logic to use the MOVED_CONFFILES
    variable with different contents.
    
    This causes the content from wheezy to be kept for all renamed
    conffiles. Fix this so that at least upgrades from wheezy directly to
    the newest jessie point release won't have this problem.
    
    Installations that have already been upgraded to a broken version will
    be fixed during the upgrade to stretch.
    
    See bug #794933
---
 debian/apache2.preinst | 5 +++--
 debian/changelog       | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/apache2.preinst b/debian/apache2.preinst
index ed5a382..1adc647 100644
--- a/debian/apache2.preinst
+++ b/debian/apache2.preinst
@@ -49,8 +49,9 @@ obsolete_conffile_exists()
 		fi
 	done
 
-	for CONFFILE in $MOVED_CONFFILES_IN ; do
-		if [ -e "/etc/apache2/conf.d/$CONFFILE" ] ; then
+	for CONFFILE in $MOVED_CONFFILES ; do
+		CONFFILE=$( echo "$CONFFILE" | cut -d: -f1 )
+		if [ -e "$CONFFILE" ] ; then
 			return 0
 		fi
 	done
diff --git a/debian/changelog b/debian/changelog
index 6352d7d..4adcdfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 apache2 (2.4.10-10+deb8u2) UNRELEASED; urgency=medium
 
   [ Stefan Fritsch ]
+  * Fix upgrade logic: When upgrading from wheezy with apache2.2-common
+    but without apache2 installed to jessie, part of the conffile handling
+    logic would not run, causing outdated conffile content to be kept.
+    This is part of the solution for bug #794933. The other part will be
+    included in the upgrade to Debian 9 (stretch).
   * core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
     This could cause all kinds of strange behavior. PR 56008. PR 57328
   * mpm_event: Fix process deadlock when shutting down a worker. PR 56960

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git