Merge 10037:10432 into trunk, also brings in a newer trunk changelog with no real news

svn:r10433

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
 

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