[pkg-squid-devel] unblock: squid3/3.4.8-4

[Luigi Gangitano]

retitle 772091 unblock: squid3/3.4.8-4
thanks

I uploaded a new version with a small fix to preinst script. Please see below the debdiff since version currently in testing (3.4.8-2).

Thanks,

L

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

Please unblock package squid3 before stricter freeze policy applies

3.4.8-4 fixes an important bug (#768170) which prevents squid3 from starting after upgrade from wheezy with standard config.

diff -Nru squid3-3.4.8/debian/changelog squid3-3.4.8/debian/changelog
--- squid3-3.4.8/debian/changelog	2014-10-29 15:51:34.000000000 +0100
+++ squid3-3.4.8/debian/changelog	2014-12-05 10:46:41.000000000 +0100
@@ -1,3 +1,25 @@
+squid3 (3.4.8-4) unstable; urgency=medium
+
+  [ Luigi Gangitano <luigi at debian.org> ]
+  * debian/squid3.preinst
+    - Revert changes on abort-upgrade 
+
+ -- Luigi Gangitano <luigi at debian.org>  Fri, 05 Dec 2014 10:44:02 +0100
+
+squid3 (3.4.8-3) unstable; urgency=medium
+
+  [ Amos Jeffries <amosjeffries at squid-cache.org> ]
+  * debian/squid3.preinst
+    - Remove obsolete manager ACL definition from squid.conf
+      when upgrading squid3 package (Closes: #768170)
+
+
+  [ Luigi Gangitano <luigi at debian.org> ]
+  * debian/squid3.preinst
+    - Fix configuration file only if needed and match any uncommented line
+
+ -- Luigi Gangitano <luigi at debian.org>  Fri,  5 Dec 2014 01:27:51 +0100
+
 squid3 (3.4.8-2) unstable; urgency=medium
 
   [ Santiago Garcia Mantinan <manty at debian.org> ]
diff -Nru squid3-3.4.8/debian/squid3.preinst squid3-3.4.8/debian/squid3.preinst
--- squid3-3.4.8/debian/squid3.preinst	2014-10-29 15:51:34.000000000 +0100
+++ squid3-3.4.8/debian/squid3.preinst	2014-12-05 10:46:41.000000000 +0100
@@ -4,8 +4,24 @@
 
 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-4

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

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)

--
Luigi Gangitano -- <luigi at debian.org> -- <gangitano at lugroma3.org>
GPG: 1024D/924C0C26: 12F8 9C03 89D3 DB4A 9972  C24A F19B A618 924C 0C26
GPG: 4096R/2BA97CED: 8D48 5A35 FF1E 6EB7 90E5  0F6D 0284 F20C 2BA9 7CED