summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2008-09-06 19:34:09 +0000
committerChristian Faulhammer <opfer@gentoo.org>2008-09-06 19:34:09 +0000
commitc45da7093688fc4a691959a2e0990e867b9d3365 (patch)
treeef69b6545c8a1a39249fe076104e5cd6d702ae82 /net-misc/tor
parentCommit again to do treesigning (diff)
downloadgentoo-2-c45da7093688fc4a691959a2e0990e867b9d3365.tar.gz
gentoo-2-c45da7093688fc4a691959a2e0990e867b9d3365.tar.bz2
gentoo-2-c45da7093688fc4a691959a2e0990e867b9d3365.zip
remove bashisms from init file, as reported in bug 236857 by Martin Väth <vaeth AT mathematik DOT uni-wuerzburg DOT de>
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc/tor')
-rw-r--r--net-misc/tor/ChangeLog6
-rw-r--r--net-misc/tor/files/tor.initd-r46
2 files changed, 8 insertions, 4 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 7bab0360be13..1a16230f2619 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/tor
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.130 2008/09/06 19:30:07 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.131 2008/09/06 19:34:09 opfer Exp $
+
+ 06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> files/tor.initd-r4:
+ remove bashisms from init file, as reported in bug 236857 by Martin Väth
+ <vaeth AT mathematik DOT uni-wuerzburg DOT de>
06 Sep 2008; Christian Faulhammer <opfer@gentoo.org> -files/tor.initd-r3,
-files/tor.logrotate.patch, -tor-0.1.2.19-r2.ebuild, -tor-0.2.0.30.ebuild:
diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4
index 58631d29965c..fb98a925debd 100644
--- a/net-misc/tor/files/tor.initd-r4
+++ b/net-misc/tor/files/tor.initd-r4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.1 2008/09/03 06:57:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r4,v 1.2 2008/09/06 19:34:09 opfer Exp $
opts="${opts} checkconfig reload"
PIDFILE=/var/run/tor/tor.pid
@@ -20,7 +20,7 @@ checkconfig() {
fi
# now verify whether the configuration is valid
- /usr/bin/tor --verify-config -f ${CONFFILE} &> /dev/null
+ /usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
if [ $? -eq 0 ] ; then
einfo "Tor configuration (${CONFFILE}) is valid."
return 0
@@ -35,7 +35,7 @@ start() {
checkconfig || return 1
ebegin "Starting Tor"
HOME=/var/lib/tor
- start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- --runasdaemon 1 --PidFile "${PIDFILE}" &> /dev/null
+ start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor -- --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
eend $?
}