Block old versions of dhcpcd to stop bugs like #143885.

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 25 insertions, 18 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 5fc1fb58f35d..7e75d1acb23f 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.342 2006/08/15 21:45:33 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.343 2006/08/16 10:37:50 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  16 Aug 2006; Roy Marples <uberlord@gentoo.org>
+  baselayout-1.12.4-r6.ebuild:
+  Block old versions of dhcpcd to stop bugs like #143885.
+
 *baselayout-1.12.4-r6 (15 Aug 2006)
 
   15 Aug 2006; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index ae5d9a69d693..2e68851a5424 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -82,7 +82,7 @@ AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-DIST baselayout-1.12.1.tar.bz2 217006 RMD160 28b8ab53428dbde1f928f0bb1c796738fdf9b3fb SHA1 7e24707f012952278dc335199e4a44e9a7af2bb8 SHA256 750a7d5b36175acbde212cc6068502f4f9586068ec7bffb69a4653f729f415b2
+DIST baselayout-1.12.1.tar.bz2 215516 RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 SHA1 acb35aa453147a7b1c08d7047a9bf21931aa9688 SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5
 DIST baselayout-1.12.4.tar.bz2 216448 RMD160 125e0b8c0f02266fa72ce95d4d3ba93311871d57 SHA1 26a2fa93db01aecd92d2ae47f193fad0949dc316 SHA256 f09ae36d84ff7f52baf44494dedafcb26a1cbb4e5a0f9ba5ef5f553bc21373da
 DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0
 DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA1 428f5971116b1c8d6465e6b826c5cc89621d84db SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee
@@ -123,18 +123,18 @@ EBUILD baselayout-1.12.4-r5.ebuild 19755 RMD160 a229415148927b491c91627564a906c3
 MD5 6a66a671393364a5b19cb2f74b85a851 baselayout-1.12.4-r5.ebuild 19755
 RMD160 a229415148927b491c91627564a906c3c3342917 baselayout-1.12.4-r5.ebuild 19755
 SHA256 1853fde8770a1a0946aa038ca5cfd13bac377199dc481a4be5585ecc1781e6b7 baselayout-1.12.4-r5.ebuild 19755
-EBUILD baselayout-1.12.4-r6.ebuild 19792 RMD160 3f2c3808be6d2a2c54551c414576892db1879f87 SHA1 90c2c078f77d280dfc4e561c4cdfd800104a7f94 SHA256 7bfb28977694d343bc71123bbce38974fa5b8f3680fa83841adeedbc65ec0565
-MD5 295495d118e020fa7e7d1eeecf632227 baselayout-1.12.4-r6.ebuild 19792
-RMD160 3f2c3808be6d2a2c54551c414576892db1879f87 baselayout-1.12.4-r6.ebuild 19792
-SHA256 7bfb28977694d343bc71123bbce38974fa5b8f3680fa83841adeedbc65ec0565 baselayout-1.12.4-r6.ebuild 19792
+EBUILD baselayout-1.12.4-r6.ebuild 19949 RMD160 8f0a9b4981e08b7167626a6f849ee7893ca799e1 SHA1 e7bdde5763063c17b4a7af8ed1c19c3155fcee75 SHA256 265002b7f939f2c9d995bd99fc2b00ad01da9482b687c486233be5ab51ff0723
+MD5 9e1b5c12d914d920ef39e655870a62cc baselayout-1.12.4-r6.ebuild 19949
+RMD160 8f0a9b4981e08b7167626a6f849ee7893ca799e1 baselayout-1.12.4-r6.ebuild 19949
+SHA256 265002b7f939f2c9d995bd99fc2b00ad01da9482b687c486233be5ab51ff0723 baselayout-1.12.4-r6.ebuild 19949
 EBUILD baselayout-1.12.4.ebuild 19415 RMD160 57574bfc1b7e851d378032cacb438ac2c3eafc9e SHA1 7048b04aefacff91aef0c742fdcb317ec711777a SHA256 5cb28241d589a2f494b42552b1e52bf9e4026e1fb9eaa6d9288603e7b79e6c41
 MD5 daa582ec8c3e2890cb66b659cce7e017 baselayout-1.12.4.ebuild 19415
 RMD160 57574bfc1b7e851d378032cacb438ac2c3eafc9e baselayout-1.12.4.ebuild 19415
 SHA256 5cb28241d589a2f494b42552b1e52bf9e4026e1fb9eaa6d9288603e7b79e6c41 baselayout-1.12.4.ebuild 19415
-MISC ChangeLog 78313 RMD160 d4e6597e29d664978e18fbad14f8eb7641c8ce9e SHA1 fc8b4404d02f2393be16f239283b16462a18b21d SHA256 fc1a839339ba8a75c4e4fdec4d45cdb5a3fbdf730ac1b46bacb23478dc8fb5fd
-MD5 8ad3d57576781936c193e6ac53c3799c ChangeLog 78313
-RMD160 d4e6597e29d664978e18fbad14f8eb7641c8ce9e ChangeLog 78313
-SHA256 fc1a839339ba8a75c4e4fdec4d45cdb5a3fbdf730ac1b46bacb23478dc8fb5fd ChangeLog 78313
+MISC ChangeLog 78452 RMD160 2489d2b85c9e70a23c5166dd206581294759e556 SHA1 44fc7e6f13b6c3aa6d74d3381cd504d86b491453 SHA256 daff7f3036cec2264cddc7881d1cef59ab0210d97ba5753228d33c775827c752
+MD5 a918dac28a8f99b375e156b5480a3a66 ChangeLog 78452
+RMD160 2489d2b85c9e70a23c5166dd206581294759e556 ChangeLog 78452
+SHA256 daff7f3036cec2264cddc7881d1cef59ab0210d97ba5753228d33c775827c752 ChangeLog 78452
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -148,9 +148,9 @@ SHA256 939da19d06f033b18784c7ab4a9d168d9b68caaf4cdbafde33ae754a10af754d files/di
 MD5 45d5d54f514daeb8d7eedb2a553101b0 files/digest-baselayout-1.11.15-r3 256
 RMD160 5e19a5d090c498d3b79d59e869a95a7a05cfe562 files/digest-baselayout-1.11.15-r3 256
 SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/digest-baselayout-1.11.15-r3 256
-MD5 e90f3a344e28bd2bf69250e2f72bbb72 files/digest-baselayout-1.12.1 256
-RMD160 99e12ff7ae89dea0b2db97e2c66a1c90443a0174 files/digest-baselayout-1.12.1 256
-SHA256 0b55a83728fc41ddfdd330cbccba8a50f3a5bc2aae7f17f59e266f15064148bf files/digest-baselayout-1.12.1 256
+MD5 3a465bae830e121519bef9682559a6a2 files/digest-baselayout-1.12.1 256
+RMD160 173a3f9fce25eeb8def155ca3c8de3d2c8e64586 files/digest-baselayout-1.12.1 256
+SHA256 26098d67da6a8b829a372e3a74eded308b9e24ae3440552e57f4f23c23b15e67 files/digest-baselayout-1.12.1 256
 MD5 74e011b91fea32a3e88247cf09e24790 files/digest-baselayout-1.12.4 256
 RMD160 e55e4eb4ede73a8b9a8b542a45ba9cedcbee69c7 files/digest-baselayout-1.12.4 256
 SHA256 a5d5b90fb977a6aa1d11b1d41e921709965cc1205d74a66f59d23e39ac1d2676 files/digest-baselayout-1.12.4 256
diff --git a/sys-apps/baselayout/baselayout-1.12.4-r6.ebuild b/sys-apps/baselayout/baselayout-1.12.4-r6.ebuild
index 3c3f0a08bca4..21daa715581b 100644
--- a/sys-apps/baselayout/baselayout-1.12.4-r6.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.4-r6.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/sys-apps/baselayout/baselayout-1.12.4-r6.ebuild,v 1.1 2006/08/15 21:45:33 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r6.ebuild,v 1.2 2006/08/16 10:37:50 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -19,12 +19,15 @@ IUSE="bootstrap build static unicode"
 # This version of baselayout needs gawk in /bin, but as we do not have
 # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
 # or "build" are in USE.
+# We need to block old dhcpcd versions as they are no longer in system
+# but may not be in users world file either. See bug #143885
 RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	!build? ( !bootstrap? (
 		>=sys-libs/readline-5.0-r1
 		>=app-shells/bash-3.1_p7
 		>=sys-apps/coreutils-5.2.1
-	) )"
+	) )
+	!<net-misc/dhcpcd-2.0.0"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
 PROVIDE="virtual/baselayout"
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1
index 80e34bba3fee..3d246268d4c3 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1
@@ -1,3 +1,3 @@
-MD5 f9f6b189e7e0c30f49ca643a4b5c4846 baselayout-1.12.1.tar.bz2 217006
-RMD160 28b8ab53428dbde1f928f0bb1c796738fdf9b3fb baselayout-1.12.1.tar.bz2 217006
-SHA256 750a7d5b36175acbde212cc6068502f4f9586068ec7bffb69a4653f729f415b2 baselayout-1.12.1.tar.bz2 217006
+MD5 a06d07824f5b619403020288b392b27b baselayout-1.12.1.tar.bz2 215516
+RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 baselayout-1.12.1.tar.bz2 215516
+SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 baselayout-1.12.1.tar.bz2 215516