mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 18:22:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge commit 'weasel/debian' into maint-0.2.1

Browse Source
This commit is contained in:
Nick Mathewson 2009-06-20 21:56:02 -04:00
commit 9b02ff9564
8 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
debian/changelog vendored
View File

@ -1,3 +1,31 @@
tor (0.2.1.16-rc-1) experimental; urgency=low
* New upstream version.
* 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.
* Update Standards-Version from 3.8.0 to 3.8.1. No real changes
required, we already support nocheck in DEB_BUILD_OPTIONS since
August 2004, and we already create our var/run directory in the
init script (tho we now no longer ship it either - see above).
* Change debhelper compatibility version from 4 to 5:
- Change dh_strip call from --dbg-package=tor
to --dbg-package=tor-dbg.
- Update versioned build time dependency on debhelper.
* Forward port 06_add_compile_time_defaults.
-- Peter Palfrader <weasel@debian.org> Sat, 20 Jun 2009 13:16:02 +0200
tor (0.2.1.15-rc-1) experimental; urgency=low
* New upstream version.
* Change build time dependency on gs to ghostscript.
-- Peter Palfrader <weasel@debian.org> Sat, 30 May 2009 21:10:03 +0200
tor (0.2.1.14-rc-1) experimental; urgency=low
* New upstream version.

2
debian/compat vendored
View File

@ -1 +1 @@
4
5

4
debian/control vendored
View File

@ -2,8 +2,8 @@ Source: tor
Section: comm
Priority: optional
Maintainer: Peter Palfrader <weasel@debian.org>
Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, gs, binutils (>= 2.14.90.0.7)
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, ghostscript, binutils (>= 2.14.90.0.7)
Standards-Version: 3.8.1
Homepage: https://www.torproject.org/
Package: tor

3
debian/rules vendored
View File

@ -189,8 +189,7 @@ binary-common:
dh_installinit
dh_installman
dh_link
# Change this for debhelper compatibility level 5 or later!
dh_strip --dbg-package=tor
dh_strip --dbg-package=tor-dbg
dh_compress
dh_fixperms
dh_installdeb

1
debian/tor.dirs vendored
View File

@ -1,7 +1,6 @@
etc/tor
var/lib/tor
var/log/tor
var/run/tor
usr/share/lintian/overrides
usr/bin
usr/sbin

2
debian/tor.init vendored
View File

@ -88,7 +88,7 @@ wait_for_deaddaemon () {
check_torpiddir () {
if test ! -d $TORPIDDIR; then
echo "There is no $TORPIDDIR directory. Creating one for you."
#echo "There is no $TORPIDDIR directory. Creating one for you."
mkdir -m 02700 "$TORPIDDIR"
chown debian-tor:debian-tor "$TORPIDDIR"
fi

2
debian/tor.postinst vendored
View File

@ -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
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