X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpostinst;h=832a1ecf542ebbd41fc0eef20101a658666aff6e;hb=1284f78d7c4454f212d1283695d76d78e23d6b4f;hp=8f1028de0d976512ee45515e6a025bbea66f052b;hpb=efdeb80407e5194d54fa4372efa6dc77ad31a63a;p=privoxy.git

diff --git a/debian/postinst b/debian/postinst
index 8f1028de..832a1ecf 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,14 +25,31 @@ set -e
 
 case "$1" in
     configure)
-        if ! grep -q '^privoxy:' /etc/passwd
-        then
-            adduser --system --home /etc/privoxy --ingroup nogroup \
-                    --disabled-password privoxy >/dev/null
-        fi
-        chown -R privoxy.adm /var/log/privoxy
+        adduser --quiet --system --home /etc/privoxy --no-create-home \
+	    --ingroup nogroup --disabled-password privoxy
+        chown -R privoxy:adm /var/log/privoxy
         chmod 750 /var/log/privoxy
-	chown privoxy /etc/privoxy/*.action /etc/privoxy/trust
+	chown privoxy /etc/privoxy/user.action /etc/privoxy/trust
+	[ -f /etc/privoxy/global.action ] \
+	    && chown privoxy /etc/privoxy/global.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
+	fi
+
+	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.7" \
+	    && grep -q '^actionsfile [a-z]*[[:space:]]*#.*$' /etc/privoxy/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 /etc/privoxy/config
+	fi	
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)