merge Debian changes from 3.0.7 to 3.0.10

[privoxy.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 5bc965b..832a1ec 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,18 +25,31 @@ 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/*.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)