Followup-For: Bug #698577 Control: tag -1 patch Hi,
I'm adding a patch that solves the problem in a more simple approach. Andreas
diffstat for varnish-3.0.2 varnish-3.0.2 changelog | 10 ++++++++++ varnish.postinst | 7 ------- varnish.preinst | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff -Nru varnish-3.0.2/debian/changelog varnish-3.0.2/debian/changelog --- varnish-3.0.2/debian/changelog 2012-05-01 16:22:42.000000000 +0200 +++ varnish-3.0.2/debian/changelog 2013-02-03 08:59:57.000000000 +0100 @@ -1,3 +1,13 @@ +varnish (3.0.2-2.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * varnish.preinst: Undo mangling of /etc/default/varnish that happened + during lenny->squeeze upgrades. (Closes: #698577) + * varnish.postinst: Drop /etc/default/varnish mangling code that was running + during upgrades from lenny + + -- Andreas Beckmann <[email protected]> Sun, 03 Feb 2013 07:25:10 +0100 + varnish (3.0.2-2) unstable; urgency=low [ Knut Arne Bjørndal ] diff -Nru varnish-3.0.2/debian/varnish.postinst varnish-3.0.2/debian/varnish.postinst --- varnish-3.0.2/debian/varnish.postinst 2012-05-01 16:22:42.000000000 +0200 +++ varnish-3.0.2/debian/varnish.postinst 2013-02-03 08:59:57.000000000 +0100 @@ -49,12 +49,6 @@ chown -Rhf ${log_user}: ${log_dir} } -# varnish version 2.1.3-1 and older started varnishd at boot, we keep -# this default for upgrading clients -upgrade_enable_varnishd() { - sed -i '/^START=/s/no/yes/g' /etc/default/varnish -} - case ${1:-} in configure) @@ -68,7 +62,6 @@ if dpkg --compare-versions "2.1.3-2" "gt-nl" "${2:-}" ; then upgrade_change_log_permissions - upgrade_enable_varnishd fi ;; esac diff -Nru varnish-3.0.2/debian/varnish.preinst varnish-3.0.2/debian/varnish.preinst --- varnish-3.0.2/debian/varnish.preinst 1970-01-01 01:00:00.000000000 +0100 +++ varnish-3.0.2/debian/varnish.preinst 2013-02-03 08:59:57.000000000 +0100 @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +defaultsfile=/etc/default/varnish + +# Undo mangling of /etc/default/varnish that happened during lenny->squeeze +# upgrades. +if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then + if [ -f "$defaultsfile" ] \ + && dpkg --compare-versions "$2" "lt-nl" "3.0.2-2.1~" + then + md5shipped=$(dpkg-query -f '${Conffiles}' -W varnish | sed -rn '\%'"$defaultsfile "'% s/.*([A-Fa-f0-9]{32}).*/\1/p') + md5current=$(md5sum "$defaultsfile" | sed -r 's/ .*//') + if [ "$md5shipped" = "af3fd9c9e3dd6976367638113373f6f7" ] \ + && [ "$md5current" = "708e91b32d1ae5eed7f82d772c2fd421" ] + then + sed -i '/^START=/s/yes/no/g' "$defaultsfile" + fi + fi +fi + +#DEBHELPER#
