Stop dhclient-script forcing bash, #158540 thanks to Nick Fortune.

Package-Manager: portage-2.1.2_rc3-r8

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 2bdfb89dee74075727e3a630e3b208951e9c47d1..61d07c3a7ae380a51ae1ecb5cc217d53d275bb8e 100644 (file)
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.122 2006/12/13 20:21:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.123 2006/12/20 12:35:53 uberlord Exp $
+
+  20 Dec 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.5.ebuild,
+  dhcp-3.1.0_alpha2.ebuild:
+  Stop dhclient-script forcing bash, #158540 thanks to Nick Fortune.
 
 *dhcp-3.1.0_alpha2 (13 Dec 2006)
 

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index bbae4d228a84d4af1f79266a0dafb3f07d5232f8..95af68be23e72cdae482d2df787a3667b3462b9d 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -97,18 +97,18 @@ EBUILD dhcp-3.0.3-r9.ebuild 7090 RMD160 39faccca29004357a6982530b476a58ef0724eac
 MD5 91749ab205c46ac726bcc8b75279e6de dhcp-3.0.3-r9.ebuild 7090
 RMD160 39faccca29004357a6982530b476a58ef0724eac dhcp-3.0.3-r9.ebuild 7090
 SHA256 a98505b8c62a03cb7e712b2f5fc1b7190f64314eb4a9bacdf5b45f373dc53aca dhcp-3.0.3-r9.ebuild 7090
-EBUILD dhcp-3.0.5.ebuild 7327 RMD160 67a8073856cf20171a58bb379e78ef00c0639702 SHA1 6a9c2e2f9a736365e6dd77810d838690d7c722df SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748
-MD5 1b7c5d90f4175a525c7ef9e834b3a07e dhcp-3.0.5.ebuild 7327
-RMD160 67a8073856cf20171a58bb379e78ef00c0639702 dhcp-3.0.5.ebuild 7327
-SHA256 121da4e6de2ea1f09798616c4209ea0cbd0bbf9c89d1085091488957eb6a8748 dhcp-3.0.5.ebuild 7327
-EBUILD dhcp-3.1.0_alpha2.ebuild 7365 RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c SHA1 b9870df36088ffac3e0148201d6280c67adde11f SHA256 1d1fac9804aa7a93bc3c91559687c2896eb3b3a062c4affd7af36274ddffe1e1
-MD5 3a350e42276b7b8863a0423d4f9dde10 dhcp-3.1.0_alpha2.ebuild 7365
-RMD160 6ff4c8a27483a9d1ba7726e61e8fb5fd8b2a4e8c dhcp-3.1.0_alpha2.ebuild 7365
-SHA256 1d1fac9804aa7a93bc3c91559687c2896eb3b3a062c4affd7af36274ddffe1e1 dhcp-3.1.0_alpha2.ebuild 7365
-MISC ChangeLog 21015 RMD160 3f63255a5e2692bcb39b165308fac2df9105daed SHA1 bc9b91999b2ec32416116da60b43fe99c7385317 SHA256 0b9c305b3f519a51b09b0144138bb9926decf242ad9c1951843c2354359bafe8
-MD5 4ccf2773a8145f4fe03eb41f62b92a58 ChangeLog 21015
-RMD160 3f63255a5e2692bcb39b165308fac2df9105daed ChangeLog 21015
-SHA256 0b9c305b3f519a51b09b0144138bb9926decf242ad9c1951843c2354359bafe8 ChangeLog 21015
+EBUILD dhcp-3.0.5.ebuild 7450 RMD160 eec91623a55c4ec96c656ecf7929c1f04cc2e5f0 SHA1 3d5aae026bab18e813000d0cfe9d6f0e02a2b6fa SHA256 2a5f48c77a0f61f2312e83b6e4179d508a645d6f097f3724d79af7d5d082c690
+MD5 f6b88e5f550f0c8ebc0e96a7d0ac8d21 dhcp-3.0.5.ebuild 7450
+RMD160 eec91623a55c4ec96c656ecf7929c1f04cc2e5f0 dhcp-3.0.5.ebuild 7450
+SHA256 2a5f48c77a0f61f2312e83b6e4179d508a645d6f097f3724d79af7d5d082c690 dhcp-3.0.5.ebuild 7450
+EBUILD dhcp-3.1.0_alpha2.ebuild 7488 RMD160 180e7406863a20922f73f8273b1976f51efeeac3 SHA1 304d38f467150665f076d5fb0621c1f55dd4beea SHA256 de65ac6cc9760efeb51dd830ab65cc126367708cdf3c6a2f2e4bac676c581d2d
+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 21181 RMD160 215b7e5d7e31a009610d7cb1d59b86b33f96826b SHA1 d0a08ab160577c02a199f2c27984b5c57c587903 SHA256 a524baa62472bbc135e425994b650d1b0d648cdb14dbaf6d30b487892d9c5ca9
+MD5 1a83352e70de84335c24148f8b3af430 ChangeLog 21181
+RMD160 215b7e5d7e31a009610d7cb1d59b86b33f96826b ChangeLog 21181
+SHA256 a524baa62472bbc135e425994b650d1b0d648cdb14dbaf6d30b487892d9c5ca9 ChangeLog 21181
 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/dhcp-3.0.5.ebuild b/net-misc/dhcp/dhcp-3.0.5.ebuild
index e13bb57a63cab21d7e3dee7846d740e5cc865dc4..0e4bd9de180a5b55386a7bf2220a5a1d1772d105 100644 (file)
--- a/net-misc/dhcp/dhcp-3.0.5.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.5.ebuild,v 1.1 2006/11/06 09:35:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.5.ebuild,v 1.2 2006/12/20 12:35:53 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -78,6 +78,9 @@ src_unpack() {
                -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
                client/scripts/* || die
 
+       # No need for the linux script to force bash, #158540.
+       sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
        # Quiet the freebsd logger a little
        sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
 

diff --git a/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild b/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild
index 0ce156b3e8235b0a90c919457b1529508408b93a..4de0f5641429b2c5ddd3b723cbdf575f10651c9d 100644 (file)
--- a/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild
+++ b/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild,v 1.1 2006/12/13 20:21:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild,v 1.2 2006/12/20 12:35:53 uberlord Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -79,6 +79,9 @@ src_unpack() {
                -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
                client/scripts/* || die
 
+       # No need for the linux script to force bash, #158540.
+       sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
        # Quiet the freebsd logger a little
        sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die