diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-06-14 21:59:04 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-06-14 21:59:04 +0000 |
| commit | e09bbf240753b0518e83ce6fde8f753a710dc6e7 (patch) | |
| tree | 7e9236e8692459b62522005949a0e8177dcbb378 | |
| parent | keystone fixed for CVE-2013-2157 bug 473304 (diff) | |
| download | historical-e09bbf240753b0518e83ce6fde8f753a710dc6e7.tar.gz historical-e09bbf240753b0518e83ce6fde8f753a710dc6e7.tar.bz2 historical-e09bbf240753b0518e83ce6fde8f753a710dc6e7.zip | |
Fix bashisms in init script.
Package-Manager: portage-2.2.0_alpha179/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3
| -rw-r--r-- | www-servers/webfs/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/webfs/Manifest | 12 | ||||
| -rw-r--r-- | www-servers/webfs/files/webfs.initd-r1 | 20 |
3 files changed, 20 insertions, 17 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/Manifest b/www-servers/webfs/Manifest index 61a397f98482..cbca95be1101 100644 --- a/www-servers/webfs/Manifest +++ b/www-servers/webfs/Manifest @@ -3,15 +3,15 @@ Hash: SHA256 AUX webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch 478 SHA256 42ca9c91a9d231f9c11f74461bd9700d76a3edb71b561bea0e615e42b1221791 SHA512 c77374124f2b7fea459f5ec594f0a03d4900ca7d4f5c2c8d2518372e59143d3f0be014d803df374f90fe615be1edd96253dbb878d3d727724032b1b0d5569377 WHIRLPOOL b9fc7a37c3d310ca254dbb48f0878506ce0ce65a826b9580b5b24864b25b0292cf637cd0736415ed6bf7928eed74c4c8c9552dab0a943410221ffd08038ffd63 AUX webfs.confd 606 SHA256 8ee86ded9ed145546477eb04c6cc68701fd36be3c35d537e45a987b4c9a4f237 SHA512 ec7bbba41e68972c4139ddbfd00b54b956a3dfe747c5a6a22702d2ded53cc1dd07aa4383540a120b1e62c9d514c38bc3c96bcea5b3f00b10f72269acd32f4526 WHIRLPOOL 7ff3681d5b8d46cd2944633e2b162b61783cc159f33bc25b22b1f22e9768ad848f7f99640fe9ccc9ebff72f0863164ecc70c4f388e7e7e3147d0bed9a08de7ae -AUX webfs.initd-r1 1186 SHA256 959000e490503b67517912b0a8ee9610596635faca1becaa89d9808a590e470a SHA512 f33265c127b0143c354cc5ef0a6b1766eea993ddc7921f063849f79f091488ddd1381e664d0f6b8c22ec0a1e90476425de176dc5b30a128fc81417a51fa35a98 WHIRLPOOL 5fad61525db13f1f2e2eac06efe42fd53005414880b01e746f5601e27fc67554a1f3454c1e5889d3717a921fa8505284fa8c8d6e69afead9b3a2c05c0273ef03 +AUX webfs.initd-r1 1172 SHA256 fad475ad87034f24522d3864ee509e34bac162b296b069300ec2c43657e7f9be SHA512 f07457247506b538741ffe27f229b09d007d1fc10a541a9b9bbb48ae67a1e51b7bedf05c4c6b4b3c6d1ef908992fa8d03cb9eb65baf7acc5bb7c8eb865ed66a0 WHIRLPOOL 32467b72a8b4897fb78bd081401b1f431eb92b970c7ccb51d478bbee40ce4c6d3a77e34b9895bbd694fe6971840370e60ca7df47b6605dfd502c716f50ee8f39 DIST webfs-1.21.tar.gz 44249 SHA256 98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a SHA512 68b9b3163a21be8a549e395295b27dd8ce9b575183d6c36b05b98bdc310917cf2dc653ff73bdb78a8c063674a8e9480211ec5c28b8a676f9cee41fa962cfd473 WHIRLPOOL 6d5b1d079c98d2125b6a57d56f4c8fa7693c43bc20c1c29a1ff64db9c9217c85a13f9ae784eee2505b580260d72919970fa875d93c3d31d9c0d10d6307309d9e EBUILD webfs-1.21-r2.ebuild 1207 SHA256 56cd53438e85fb8501e1f188df5360f5c76dc419b4b6b88f2a6cf5f6fc3cacbe SHA512 d467069d5042eb095bd7cf0942ba53eb3d2d1cc7620cac975d83c61c2ac8bc713d84aae373cf0e2a825c3a55a7b4339b65d2c8722a856590cd3ac95d2a7ac89b WHIRLPOOL c61f989d9bb76e9e4899c5b54f953c6ae461d5bc3ca4271f34869bdbab501b2d967352f2e4d49850e7c063b732f781ed7a4c5432b5513ec4f5c3a1fd399f1be2 -MISC ChangeLog 4626 SHA256 ab6e8d4a23cd2ba2864f3e043517aff52258eb41d425c2208cdb4708611e2e6e SHA512 45f919186b416e9d903d0f8d9215cae1705cf072bed52420f614e5b86d1f201d7422b97094708b3feea58ed5cef1cc4660e5bf24dd5a5dd6863979ae61c499e3 WHIRLPOOL c6bf17a03e9d351545dcd3fbd8614e1cb7519d2977270077970fda17dbc046ce7208f7ea86e21eadce5ccf502521711a6d8f632eb5e3d6270aeb5fe39b05c77d +MISC ChangeLog 4727 SHA256 477c9efc176e9003cb097594d64c5c39d6da86247dc2edd0ccc050fabeea0ee3 SHA512 09cfee4a4107b87ade676311959a2b6fb98b4756bba65ca2866f33dd4c33c2309efc6978d67c9ec525ca4cd6d65ecfe4d3d9a9b32c85a01007ea33dffe27ed91 WHIRLPOOL 98643e38dec5066ac03240a201af51da49707f9b6b39755b042c75d8b902c06851e9c3c537a5b341bc8f5e7e7fce8801d3accf2adc14e83d5e4e6c3b65ff413a MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlEjBw4ACgkQ/ejvha5XGaPurwCfZu8WDjm3jCCuZnqr9J56kbIF -YZEAnRK/267qtNP52EKpA5N+dh4W47B3 -=Xdzx +iEYEAREIAAYFAlG7kigACgkQ/ejvha5XGaMvQQCgzlSPExW/lPZdGeSPS8xTlpx5 +qtkAn2/kpyDV4A2kjt5e7IH0FO5eSQ6p +=fgjr -----END PGP SIGNATURE----- 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} |