diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-12-20 12:35:53 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-12-20 12:35:53 +0000 |
| commit | 57e2ae753d124ea9dc4194b5cbe71111e577a5e0 (patch) | |
| tree | 04fa6127b20f63351492451f87ef568a4ab283e4 /net-misc/dhcp | |
| parent | Punt old versions (diff) | |
| download | gentoo-2-57e2ae753d124ea9dc4194b5cbe71111e577a5e0.tar.gz gentoo-2-57e2ae753d124ea9dc4194b5cbe71111e577a5e0.tar.bz2 gentoo-2-57e2ae753d124ea9dc4194b5cbe71111e577a5e0.zip | |
Stop dhclient-script forcing bash, #158540 thanks to Nick Fortune.
(Portage version: 2.1.2_rc3-r8)
Diffstat (limited to 'net-misc/dhcp')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-3.0.5.ebuild | 5 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-3.1.0_alpha2.ebuild | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 2bdfb89dee74..61d07c3a7ae3 100644 --- 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/dhcp-3.0.5.ebuild b/net-misc/dhcp/dhcp-3.0.5.ebuild index e13bb57a63ca..0e4bd9de180a 100644 --- 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 0ce156b3e823..4de0f5641429 100644 --- 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 |