diff options
| author | Peter Palfrader <peter@palfrader.org> | 2007-06-01 00:42:13 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2007-06-01 00:42:13 +0000 |
| commit | 02b9ed24553660d4a34ce4ca875b5ae1c4c9f243 (patch) | |
| tree | f9101912f610011be4f70244013feb8921b2e58a | |
| parent | 6bb65fa3713873b9e18a297426780b737cc2b0ce (diff) | |
| download | tor-02b9ed24553660d4a34ce4ca875b5ae1c4c9f243.tar.gz tor-02b9ed24553660d4a34ce4ca875b5ae1c4c9f243.zip | |
Merge 10037:10432 into trunk, also brings in a newer trunk changelog with no real news
svn:r10433
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/tor.init | 12 |
2 files changed, 21 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 5fc09a0d8b..d928d5b572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ tor (0.2.0.0-alpha-1~~pre.1) unstable; urgency=low - * svn r10063. + * svn r10403. * Forward port 06_add_compile_time_defaults. - -- Peter Palfrader <weasel@debian.org> Mon, 30 Apr 2007 17:00:11 +0200 + -- Peter Palfrader <weasel@debian.org> Tue, 29 May 2007 23:06:11 +0200 + +tor (0.1.2.14-1) unstable; urgency=low + + * New upstream version. + + -- Peter Palfrader <weasel@debian.org> Fri, 25 May 2007 21:49:20 +0200 + +tor (0.1.2.13-3) unstable; urgency=low + + * Always give a shell (/bin/sh) when we use su(1) in our init script + (closes: #421465). + + -- Peter Palfrader <weasel@debian.org> Sun, 6 May 2007 14:44:11 +0200 tor (0.1.2.13-2) unstable; urgency=low diff --git a/debian/tor.init b/debian/tor.init index 7a69ae621a..e4a9310666 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -90,9 +90,9 @@ case "$1" in fi echo "Starting $DESC: $NAME..." - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi @@ -131,9 +131,9 @@ case "$1" in exit 0 fi - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi @@ -148,9 +148,9 @@ case "$1" in fi ;; restart) - if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then + if ! su -s /bin/sh -c "$DAEMON --verify-config" debian-tor > /dev/null; then echo "Restarting Tor ABORTED: Tor configuration invalid:" >&2 - su -c "$DAEMON --verify-config" debian-tor >&2 + su -s /bin/sh -c "$DAEMON --verify-config" debian-tor >&2 exit 1 fi |