Remove bashisms from dhcrelay script, #171766 thanks to Natanael Copa.

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index cdf3782cc2efce06171a1fc5a8e7e27fec283340..6398491b0c4dee74a36b2fb49c458e7b305c15d4 100644 (file)
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.124 2007/03/10 20:21:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.125 2007/03/22 15:36:59 uberlord Exp $
+
+  22 Mar 2007; Roy Marples <uberlord@gentoo.org> files/dhcrelay.init:
+  Remove bashisms from dhcrelay script, #171766 thanks to Natanael Copa.
 
 *dhcp-3.0.5-r1 (10 Mar 2007)
 

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index efdc1e08a4a4c03a70844230fcca922aa3556b21..88d75d53ef6160c9f3cd6fe94f7a2cdef899ab96 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -86,10 +86,10 @@ AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecd
 MD5 db84514fe15fd7d81136afbaae738f55 files/dhcrelay.conf 421
 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c files/dhcrelay.conf 421
 SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730 files/dhcrelay.conf 421
-AUX dhcrelay.init 748 RMD160 da83794f49e52f072924386b2fd4511d07d985e6 SHA1 fc84da7339a230717a067d9135c6dece038dfb0b SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee
-MD5 6e2bc3e08290c60d4f339ab9182fce07 files/dhcrelay.init 748
-RMD160 da83794f49e52f072924386b2fd4511d07d985e6 files/dhcrelay.init 748
-SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee files/dhcrelay.init 748
+AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
+MD5 9f70b45b7b2247173dd7fe0f8672e294 files/dhcrelay.init 736
+RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 files/dhcrelay.init 736
+SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c files/dhcrelay.init 736
 DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
 DIST dhcp-3.0.5.tar.gz 876591 RMD160 b968e7520fd936bd6f888f77734f3db7df23a636 SHA1 6501ba0e3dbd83ff57d3274538c4e4a1848ffc64 SHA256 dd445fb2a341cdd69e85693dce6f8fda1a1c9d0e98d34c01afc3e68d8037ffb6
 DIST dhcp-3.1.0a2.tar.gz 776040 RMD160 21419b31dc75fce67d86222277282ffa2a9c9007 SHA1 cc8eca9477f7d60f74c77ff0c556212835aa6b8f SHA256 81e4e068df774f473c36999236fab16d742e3c74ae162dfb990db7b134e87a85
@@ -109,10 +109,10 @@ EBUILD dhcp-3.1.0_alpha2.ebuild 7488 RMD160 180e7406863a20922f73f8273b1976f51efe
 MD5 66d222e5100d4834035faedbaa768540 dhcp-3.1.0_alpha2.ebuild 7488
 RMD160 180e7406863a20922f73f8273b1976f51efeeac3 dhcp-3.1.0_alpha2.ebuild 7488
 SHA256 de65ac6cc9760efeb51dd830ab65cc126367708cdf3c6a2f2e4bac676c581d2d dhcp-3.1.0_alpha2.ebuild 7488
-MISC ChangeLog 21382 RMD160 91f3e23e32e49479853aa5b5a76444490542082f SHA1 ffe310782e7a5356bb9d450eb390b881e0d8051c SHA256 631e03f69a95b390fa3859e2ee8d6af44c6edb2bb1160acb3be10b88d4c3db0a
-MD5 1a40250ea79caecb4326930c3c9f71d4 ChangeLog 21382
-RMD160 91f3e23e32e49479853aa5b5a76444490542082f ChangeLog 21382
-SHA256 631e03f69a95b390fa3859e2ee8d6af44c6edb2bb1160acb3be10b88d4c3db0a ChangeLog 21382
+MISC ChangeLog 21526 RMD160 3306df1e89edf9489709cf4180124e9bde9e91e6 SHA1 8806ba1741e73b92d1de9916acb18ce881caa571 SHA256 c684e7acd08ef546bda7cda7292064dd7c043e0a700d04ecb99d371cee740af0
+MD5 98c51d72016d41a8070efeae70ed6b4a ChangeLog 21526
+RMD160 3306df1e89edf9489709cf4180124e9bde9e91e6 ChangeLog 21526
+SHA256 c684e7acd08ef546bda7cda7292064dd7c043e0a700d04ecb99d371cee740af0 ChangeLog 21526
 MISC metadata.xml 441 RMD160 489c700355a49fda7d249a7b3f72066add57e779 SHA1 f2013226d45685a4bd06c3f7723df78e134486d4 SHA256 16dccfd59e8db49b0c9b9bb34f99188f9773a2ef00757d4fb429fea4293ac44e
 MD5 3ccab43e194be4b8df2632546cbd028e metadata.xml 441
 RMD160 489c700355a49fda7d249a7b3f72066add57e779 metadata.xml 441

diff --git a/net-misc/dhcp/files/dhcrelay.init b/net-misc/dhcp/files/dhcrelay.init
index c373f4a6eac2fb67d0b5f4b61adf937efb074dc4..2f92956be8fc7d9f24e2cc6d9f4eb80fc2ad603a 100644 (file)
--- a/net-misc/dhcp/files/dhcrelay.init
+++ b/net-misc/dhcp/files/dhcrelay.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-misc/dhcp/files/dhcrelay.init,v 1.1 2005/12/07 13:59:32 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init,v 1.2 2007/03/22 15:36:59 uberlord Exp $
 
 depend() {
        need net
@@ -9,19 +9,19 @@ depend() {
 }
 
 start() {
-       if [[ -z ${DHCRELAY_SERVERS} ]]; then
+       if [ -z "${DHCRELAY_SERVERS}" ]; then
                eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
                return 1
        fi
 
-       local IFACES="" i
+       local IFACES= i=
        for i in ${IFACE} ; do
                IFACES="${IFACES} -i ${i}"
        done
 
        ebegin "Starting dhcrelay"
-       eval start-stop-daemon --start --exec /usr/sbin/dhcrelay \
-               -- "${IFACES}" -q "${DHCRELAY_OPTS}" "${DHCRELAY_SERVERS}"
+       start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+               -- -q ${IFACES} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
        eend $?
 }