diff options
author | Alin Năstac <mrness@gentoo.org> | 2009-02-28 09:53:42 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2009-02-28 09:53:42 +0000 |
commit | 9a638ee1320fe4ac07e71edc751665452f428b42 (patch) | |
tree | 93ed06cec99a77dde989638a84f8535b9ce89268 /net-proxy/dante | |
parent | Replace use_with sms with use_enable sms (#260252). (diff) | |
download | gentoo-2-9a638ee1320fe4ac07e71edc751665452f428b42.tar.gz gentoo-2-9a638ee1320fe4ac07e71edc751665452f428b42.tar.bz2 gentoo-2-9a638ee1320fe4ac07e71edc751665452f428b42.zip |
Fix bashisms in dante-sockd init.d script (#260151).
(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64)
Diffstat (limited to 'net-proxy/dante')
-rw-r--r-- | net-proxy/dante/ChangeLog | 10 | ||||
-rw-r--r-- | net-proxy/dante/dante-1.1.19-r3.ebuild (renamed from net-proxy/dante/dante-1.1.19-r2.ebuild) | 4 | ||||
-rw-r--r-- | net-proxy/dante/files/dante-sockd-init | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog index d64c12727453..8bd6b0aa90b0 100644 --- a/net-proxy/dante/ChangeLog +++ b/net-proxy/dante/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-proxy/dante -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.43 2008/06/25 20:42:56 mrness Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.44 2009/02/28 09:53:41 mrness Exp $ + +*dante-1.1.19-r3 (28 Feb 2009) + + 28 Feb 2009; Alin Năstac <mrness@gentoo.org> files/dante-sockd-init, + -dante-1.1.19-r2.ebuild, +dante-1.1.19-r3.ebuild: + Fix bashisms in dante-sockd init.d script (#260151). 25 Jun 2008; Alin Năstac <mrness@gentoo.org> files/dante-1.1.19-libpam.patch: diff --git a/net-proxy/dante/dante-1.1.19-r2.ebuild b/net-proxy/dante/dante-1.1.19-r3.ebuild index 9b34fa884c81..563581d41b6d 100644 --- a/net-proxy/dante/dante-1.1.19-r2.ebuild +++ b/net-proxy/dante/dante-1.1.19-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r2.ebuild,v 1.1 2008/06/24 20:59:04 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r3.ebuild,v 1.1 2009/02/28 09:53:41 mrness Exp $ inherit eutils autotools diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init index 6753856fc052..336432f938fe 100644 --- a/net-proxy/dante/files/dante-sockd-init +++ b/net-proxy/dante/files/dante-sockd-init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.4 2007/05/02 19:25:15 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.5 2009/02/28 09:53:42 mrness Exp $ SOCKD_OPT="-D" [ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}" @@ -22,7 +22,7 @@ checkconfig() { return 1 fi - /usr/sbin/sockd -V &> /tmp/dante-sockd.checkconf + /usr/sbin/sockd -V 2>&1 >/tmp/dante-sockd.checkconf if [ $? -ne 0 ]; then cat /tmp/dante-sockd.checkconf eerror "Something is wrong with your configuration file" @@ -44,7 +44,7 @@ start() { checkconfig || return 1 ebegin "Starting dante sockd" start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} &> /dev/null + --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} 2>&1 >/dev/null eend $? "Failed to start sockd" } |