[pkg-squid-devel] Bug#773290: unblock: squid3/3.4.8-5

[Luigi Gangitano]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package squid3

This versione fixes serious bug #773032, which affects upgrades from wheezy to jessie when no change has been made to the original configuration file.

diff -Nru squid3-3.4.8/debian/changelog squid3-3.4.8/debian/changelog
--- squid3-3.4.8/debian/changelog	2014-12-05 10:46:41.000000000 +0100
+++ squid3-3.4.8/debian/changelog	2014-12-16 14:33:14.000000000 +0100
@@ -1,3 +1,11 @@
+squid3 (3.4.8-5) unstable; urgency=medium
+
+  [ Luigi Gangitano <luigi at debian.org> ]
+  * debian/squid3.{pre,post}inst
+    - Moved ACL manager fix to postinst (Closes: #773032)
+
+ -- Luigi Gangitano <luigi at debian.org>  Tue, 16 Dec 2014 13:43:03 +0100
+
 squid3 (3.4.8-4) unstable; urgency=medium
 
   [ Luigi Gangitano <luigi at debian.org> ]
diff -Nru squid3-3.4.8/debian/squid3.postinst squid3-3.4.8/debian/squid3.postinst
--- squid3-3.4.8/debian/squid3.postinst	2014-12-05 10:46:41.000000000 +0100
+++ squid3-3.4.8/debian/squid3.postinst	2014-12-16 14:33:14.000000000 +0100
@@ -62,8 +62,28 @@
 			echo "Creating Squid HTTP proxy 3.x spool directory structure"
 			squid3 -z
 		fi
+
+		#
+		# Remove obsolete manager ACL definition.
+		# It will halt upgrade with fatal error if left.
+		#
+		if test -f /etc/squid3/squid.conf && dpkg --compare-versions "$2" lt '3.4' && grep -q "^[[:blank:]]*acl manager" /etc/squid3/squid.conf ; then
+			echo "Filtering squid.conf manager ACL."
+			cp /etc/squid3/squid.conf /etc/squid3/squid.conf.pre_3.4_upgrade
+			sed -e "s/^\([ \t]*acl manager.*\)/# \1 # Commented out on upgrade to 3.4/" </etc/squid3/squid.conf.pre_3.4_upgrade >/etc/squid3/squid.conf
+		fi
+		;;
+	abort-upgrade)
+		#
+		# Revert the automated configuration changes we may have done
+		#
+		if test -f /etc/squid3/squid.conf.pre_3.4_upgrade; then
+			echo "Removing squid.conf changes."
+			mv /etc/squid3/squid.conf.pre_3.4_upgrade /etc/squid3/squid.conf
+		fi
+		exit 0
 		;;
-	abort-upgrade|abort-remove|abort-deconfigure)
+	abort-remove|abort-deconfigure)
 		;;
 	*)
 		#
diff -Nru squid3-3.4.8/debian/squid3.preinst squid3-3.4.8/debian/squid3.preinst
--- squid3-3.4.8/debian/squid3.preinst	2014-12-05 10:46:41.000000000 +0100
+++ squid3-3.4.8/debian/squid3.preinst	2014-12-16 14:33:14.000000000 +0100
@@ -4,24 +4,8 @@
 
 case "$1" in
 	upgrade|install-upgrade)
-		#
-		# Remove obsolete manager ACL definition.
-		# It will halt upgrade with fatal error if left.
-		#
-		if test -f /etc/squid3/squid.conf && dpkg --compare-versions "$2" lt '3.4.8-3' && grep -q "^[[:blank:]]*acl manager" /etc/squid3/squid.conf ; then
-			echo "Filtering squid.conf manager ACL."
-			cp /etc/squid3/squid.conf /etc/squid3/squid.conf.pre_3.4_upgrade
-			sed -e "s/^\([ \t]*acl manager.*\)/# \1 # Commented out on upgrade to 3.4/" </etc/squid3/squid.conf.pre_3.4_upgrade >/etc/squid3/squid.conf
-		fi
 		;;
 	abort-upgrade)
-		#
-		# Revert the automated configuration changes we may have done
-		#
-		if test -f /etc/squid3/squid.conf.pre_3.4_upgrade; then
-			echo "Removing squid.conf changes."
-			mv /etc/squid3/squid.conf.pre_3.4_upgrade /etc/squid3/squid.conf
-		fi
 		exit 0
 		;;
 esac

unblock squid3/3.4.8-5

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Foreign Architectures: amd64

Kernel: Linux 3.16.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)