X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpostinst;h=c841c41c9483e80e182312e147964deb70d3e0d3;hp=4f9a0e008c8f9fc50ec3d53333b7583bc16e86a9;hb=40f23d485c1e8bc8aa892b93d644dad4b8243685;hpb=6aa60a252059f209c5f3fb14502ad1deff7aba61

diff --git a/debian/postinst b/debian/postinst
index 4f9a0e00..c841c41c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -23,21 +23,64 @@ set -e
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+CONFDIR=/etc/privoxy
+CONFIG=$CONFDIR/config
+
 case "$1" in
     configure)
-        adduser --quiet --system --home /etc/privoxy --no-create-home \
+        adduser --quiet --system --home $CONFDIR --no-create-home \
 	    --ingroup nogroup --disabled-password privoxy
-        chown -R privoxy.adm /var/log/privoxy
+        chown -R privoxy:adm /var/log/privoxy
         chmod 750 /var/log/privoxy
-	chown privoxy /etc/privoxy/user.action /etc/privoxy/trust
-	[ -f /etc/privoxy/global.action ] \
-	    && chown privoxy /etc/privoxy/global.action
+	chown privoxy $CONFDIR/user.action $CONFDIR/trust
+	[ -f $CONFDIR/matcha-all.action ] \
+	    && chown privoxy $CONFDIR/match-all.action
 
 	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.4"
 	then
 	    # Upgrading from a 3.0.3* version
-	    chown root /etc/privoxy/standard.action \
-		       /etc/privoxy/default.action
+	    chown root $CONFDIR/default.action
+	fi
+
+	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.7" \
+	    && grep -q '^actionsfile [a-z]*[[:space:]]*#.*$' $CONFIG
+	then
+	    # Upgrading from version before 3.0.7 where the user kept his old 
+	    # (modified) config file:
+	    # Try to change   "actionsfile foo"  to  "actionsfile foo.action"
+	    # as needed in 3.0.7:
+	    sed 's/^actionsfile \([a-z]*\)\([ 	]*\#\)/actionsfile \1.action\2/' \
+		-i.bak $CONFIG
+	fi
+
+	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.11"
+	then
+	    # Upgrading from a version before 3.0.11
+	    # Try to work around problems with missing action files
+	    if grep -q '^actionsfile.*global.action' $CONFIG
+	    then
+		if [ -e $CONFDIR/global.action ]
+		then
+		    mv $CONFDIR/global.action $CONFDIR/global.action.dpkg-old
+		fi
+		(cd $CONFDIR; ln -s match-all.action global.action)
+	    fi
+	    if grep -q '^actionsfile.*standard.action' $CONFIG
+	    then
+		if [ -e $CONFDIR/standard.action ]
+		then
+		    if ! grep -q migration $CONFDIR/standard.action
+		    then
+			mv $CONFDIR/standard.action \
+			    $CONFDIR/standard.action.dpkg-old
+			echo "# migration file. Not used in 3.0.11 and newer" \
+			    > $CONFDIR/standard.action
+		    fi
+		else
+		    echo "# migration file. Not used in 3.0.11 and newer" \
+			> $CONFDIR/standard.action
+		fi
+	    fi
 	fi
     ;;