From: Peter Palfrader Date: Sun, 31 May 2009 10:41:08 +0000 (+0000) Subject: Remove /var/run/tor from package. X-Git-Tag: tor-0.2.1.17-rc~20^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa278d3181c50df98b7ab0802794ed78616427f0;p=thirdparty%2Ftor.git Remove /var/run/tor from package. Stop shipping /var/run/tor in the package. Only clean up permissions of /var/run/tor in postinst if the directory actually exists. --- diff --git a/debian/changelog b/debian/changelog index 42c7c47ecc..9e7a9622db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,11 @@ tor (0.2.1.15-rc-X) XXperimental; urgency=low * No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is completely normal now so our message was just noise. + * Stop shipping /var/run/tor in the package. + * Only clean up permissions of /var/run/tor in postinst if the + directory actually exists. - -- Peter Palfrader Sun, 31 May 2009 10:37:22 +0000 + -- Peter Palfrader Sun, 31 May 2009 10:40:29 +0000 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/tor.dirs b/debian/tor.dirs index ca9f98af2d..72d914a77b 100644 --- a/debian/tor.dirs +++ b/debian/tor.dirs @@ -1,7 +1,6 @@ etc/tor var/lib/tor var/log/tor -var/run/tor usr/share/lintian/overrides usr/bin usr/sbin diff --git a/debian/tor.postinst b/debian/tor.postinst index 29d0984298..b9ac61596f 100644 --- a/debian/tor.postinst +++ b/debian/tor.postinst @@ -43,9 +43,11 @@ find /var/lib/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -p find /var/lib/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02700 find /var/lib/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 -find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor -find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750 -find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 +if [ -e /var/run/tor ]; then + find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor + find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750 + find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 +fi find /var/log/tor \( \( ! -user debian-tor \) -o \( ! -group adm \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:adm find /var/log/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750