X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpostinst;h=832a1ecf542ebbd41fc0eef20101a658666aff6e;hb=5ea47e7e46f25ae1cb8fe8542615293b41602507;hp=ccf2a17b1fd27b65d582aad6e666ae27e673eb0c;hpb=3445ac73d9a18f4df13df1f40682a884ccebd572;p=privoxy.git

diff --git a/debian/postinst b/debian/postinst
index ccf2a17b..832a1ecf 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,16 +25,9 @@ set -e
 
 case "$1" in
     configure)
-        if ! adduser --quiet --system --home /etc/privoxy --no-create-home \
-		     --ingroup nogroup --disabled-password privoxy
-        then
-	    # user privoxy seems to exist
-	    # -> remove him before newly adding him.
-	    deluser --quiet privoxy
-	    adduser --quiet --system --home /etc/privoxy --no-create-home \
-		    --ingroup nogroup --disabled-password privoxy
-	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/user.action /etc/privoxy/trust
 	[ -f /etc/privoxy/global.action ] \
@@ -46,6 +39,17 @@ case "$1" in
 	    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)