diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-06-14 21:59:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-06-14 21:59:03 +0000 |
| commit | 63ddf90376bd4bb420b18a76e4cdbb82ec031ca9 (patch) | |
| tree | 54f347cae03a33994644b4e80ef472b5ec4549a0 /www-servers/webfs | |
| parent | keystone fixed for CVE-2013-2157 bug 473304 (diff) | |
| download | gentoo-2-63ddf90376bd4bb420b18a76e4cdbb82ec031ca9.tar.gz gentoo-2-63ddf90376bd4bb420b18a76e4cdbb82ec031ca9.tar.bz2 gentoo-2-63ddf90376bd4bb420b18a76e4cdbb82ec031ca9.zip | |
Fix bashisms in init script.
(Portage version: 2.2.0_alpha179/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'www-servers/webfs')
| -rw-r--r-- | www-servers/webfs/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/webfs/files/webfs.initd-r1 | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/www-servers/webfs/ChangeLog b/www-servers/webfs/ChangeLog index 299c7a3ff143..c50bd6a4e34e 100644 --- a/www-servers/webfs/ChangeLog +++ b/www-servers/webfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/webfs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.32 2013/02/19 05:01:01 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.33 2013/06/14 21:59:03 zmedico Exp $ + + 14 Jun 2013; Zac Medico <zmedico@gentoo.org> files/webfs.initd-r1: + Fix bashisms in init script. 19 Feb 2013; Zac Medico <zmedico@gentoo.org> webfs-1.21-r2.ebuild: Add ~arm-linux keyword. diff --git a/www-servers/webfs/files/webfs.initd-r1 b/www-servers/webfs/files/webfs.initd-r1 index 43302a2c269c..aa8d513f4a75 100644 --- a/www-servers/webfs/files/webfs.initd-r1 +++ b/www-servers/webfs/files/webfs.initd-r1 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/files/webfs.initd-r1,v 1.1 2012/03/24 10:44:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/files/webfs.initd-r1,v 1.2 2013/06/14 21:59:02 zmedico Exp $ depend() { need net @@ -9,14 +9,14 @@ depend() { start() { WEBFS_OPTS="-p ${WEBFS_PORT:-80} -f ${WEBFS_INDEX:-index.html} ${WEBFS_OPTS}" - [[ -n "${WEBFS_DOCROOT}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -r ${WEBFS_DOCROOT}" - [[ -n "${WEBFS_CHROOT}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -R ${WEBFS_CHROOT}" - [[ -n "${WEBFS_LOG}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -L ${WEBFS_LOG}" - [[ -n "${WEBFS_MAXCONN}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -c ${WEBFS_MAXCONN}" - [[ -n "${WEBFS_IPV6}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -6" - [[ -n "${WEBFS_SSL}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -S" - [[ -n "${WEBFS_SERVNAME}" ]] && WEBFS_OPTS="${WEBFS_OPTS} -n ${WEBFS_SERVNAME}" - [[ -n "${WEBFS_DIR_LIST}" ]] || WEBFS_OPTS="${WEBFS_OPTS} -j" + [ -n "${WEBFS_DOCROOT}" ] && WEBFS_OPTS="${WEBFS_OPTS} -r ${WEBFS_DOCROOT}" + [ -n "${WEBFS_CHROOT}" ] && WEBFS_OPTS="${WEBFS_OPTS} -R ${WEBFS_CHROOT}" + [ -n "${WEBFS_LOG}" ] && WEBFS_OPTS="${WEBFS_OPTS} -L ${WEBFS_LOG}" + [ -n "${WEBFS_MAXCONN}" ] && WEBFS_OPTS="${WEBFS_OPTS} -c ${WEBFS_MAXCONN}" + [ -n "${WEBFS_IPV6}" ] && WEBFS_OPTS="${WEBFS_OPTS} -6" + [ -n "${WEBFS_SSL}" ] && WEBFS_OPTS="${WEBFS_OPTS} -S" + [ -n "${WEBFS_SERVNAME}" ] && WEBFS_OPTS="${WEBFS_OPTS} -n ${WEBFS_SERVNAME}" + [ -n "${WEBFS_DIR_LIST}" ] || WEBFS_OPTS="${WEBFS_OPTS} -j" ebegin "Starting webfsd" start-stop-daemon --start --quiet --exec /usr/bin/webfsd -- ${WEBFS_OPTS} |