As 3.0.4 is a bust for 64-bit servers, push fixes downto 3.0.3-r8.

Package-Manager: portage-2.1_rc2

4 files changed, 266 insertions, 34 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 4a2f41f098f7..b6162f2ad209 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2006/05/11 15:05:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.98 2006/05/23 09:14:12 uberlord Exp $
+
+*dhcp-3.0.3-r8 (23 May 2006)
+
+  23 May 2006; Roy Marples <uberlord@gentoo.org> +dhcp-3.0.3-r8.ebuild:
+  As 3.0.4 is a bust for 64-bit servers, push fixes downto 3.0.3-r8.
 
 *dhcp-3.0.4-r1 (11 May 2006)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index a0c0b1b5b658..b143ae336064 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,114 +1,118 @@
-AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018 size 485
+AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0-fix-perms.patch 485
 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 files/dhcp-3.0-fix-perms.patch 485
 SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018 files/dhcp-3.0-fix-perms.patch 485
-AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae size 5366
+AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
 MD5 66becf9870e0293bbd35d1fba770751a files/dhcp-3.0-paranoia.patch 5366
 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c files/dhcp-3.0-paranoia.patch 5366
 SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae files/dhcp-3.0-paranoia.patch 5366
-AUX dhcp-3.0.2-gmake.patch 1872 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e SHA1 f60c89233f06ca8554cd5cc9ed0301b597a724f7 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215 size 1872
+AUX dhcp-3.0.2-gmake.patch 1872 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e SHA1 f60c89233f06ca8554cd5cc9ed0301b597a724f7 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215
 MD5 d0f61288e81ce020573f3f6965af8489 files/dhcp-3.0.2-gmake.patch 1872
 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e files/dhcp-3.0.2-gmake.patch 1872
 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215 files/dhcp-3.0.2-gmake.patch 1872
-AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b54219c4b6f SHA1 74760ca00712ff529e6b97457408515098563f88 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4 size 2774
+AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b54219c4b6f SHA1 74760ca00712ff529e6b97457408515098563f88 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4
 MD5 eef265cca1745a6efdfc8d4d1ca2c453 files/dhcp-3.0.3-dhclient-dbus.patch 2774
 RMD160 250582d89894a58a297786c4a6884b54219c4b6f files/dhcp-3.0.3-dhclient-dbus.patch 2774
 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4 files/dhcp-3.0.3-dhclient-dbus.patch 2774
-AUX dhcp-3.0.3-dhclient-hostname.patch 437 RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 SHA1 80c9c65de30628b7df6d15db9f7b6ae814675c78 SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383 size 437
+AUX dhcp-3.0.3-dhclient-hostname.patch 437 RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 SHA1 80c9c65de30628b7df6d15db9f7b6ae814675c78 SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383
 MD5 79cefb676f3abc197b30c120c09e46b0 files/dhcp-3.0.3-dhclient-hostname.patch 437
 RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 files/dhcp-3.0.3-dhclient-hostname.patch 437
 SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383 files/dhcp-3.0.3-dhclient-hostname.patch 437
-AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d size 7270
+AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d
 MD5 f63ddf696f98bd5e300aae865cdbfdb9 files/dhcp-3.0.3-dhclient-metric.patch 7270
 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 files/dhcp-3.0.3-dhclient-metric.patch 7270
 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d files/dhcp-3.0.3-dhclient-metric.patch 7270
-AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06 size 6413
+AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06
 MD5 3bcd2752845eff3da0231a6eccee762a files/dhcp-3.0.3-dhclient-mtu.patch 6413
 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 files/dhcp-3.0.3-dhclient-mtu.patch 6413
 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06 files/dhcp-3.0.3-dhclient-mtu.patch 6413
-AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44 size 2332
+AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44
 MD5 0579a1b0e12f48c466ba6893d76c5fff files/dhcp-3.0.3-dhclient-no-down.patch 2332
 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c files/dhcp-3.0.3-dhclient-no-down.patch 2332
 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44 files/dhcp-3.0.3-dhclient-no-down.patch 2332
-AUX dhcp-3.0.3-dhclient-ntp.patch 5868 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa SHA1 48b5dd346e714880f8b4af1d95f3ec2ce8074a66 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65 size 5868
+AUX dhcp-3.0.3-dhclient-ntp.patch 5868 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa SHA1 48b5dd346e714880f8b4af1d95f3ec2ce8074a66 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65
 MD5 3eab8a40f0a84d3b2d9d406fa4b687c0 files/dhcp-3.0.3-dhclient-ntp.patch 5868
 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa files/dhcp-3.0.3-dhclient-ntp.patch 5868
 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65 files/dhcp-3.0.3-dhclient-ntp.patch 5868
-AUX dhcp-3.0.3-dhclient-resolvconf.patch 6637 RMD160 503b6f57d96a35c720f4b06f0805cac759ddbe23 SHA1 e25ee7bf29dbbaca7d0cc7261862c1d77ad24dbf SHA256 f63a89f0954724a5b06785ecd712cfdb45901808c1f9dd8483a00fbb79c01106 size 6637
+AUX dhcp-3.0.3-dhclient-resolvconf.patch 6637 RMD160 503b6f57d96a35c720f4b06f0805cac759ddbe23 SHA1 e25ee7bf29dbbaca7d0cc7261862c1d77ad24dbf SHA256 f63a89f0954724a5b06785ecd712cfdb45901808c1f9dd8483a00fbb79c01106
 MD5 893c47e09146c07511fc583d4e79db92 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
 RMD160 503b6f57d96a35c720f4b06f0805cac759ddbe23 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
 SHA256 f63a89f0954724a5b06785ecd712cfdb45901808c1f9dd8483a00fbb79c01106 files/dhcp-3.0.3-dhclient-resolvconf.patch 6637
-AUX dhcp-3.0.3-dhclient-stdin-conf.patch 1948 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c SHA1 ac7afd5ecbde5348e9acea532dab1e01e3a58e8b SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae size 1948
+AUX dhcp-3.0.3-dhclient-stdin-conf.patch 1948 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c SHA1 ac7afd5ecbde5348e9acea532dab1e01e3a58e8b SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae
 MD5 d81606fd8cdd2376018c6466fe9cf0ef files/dhcp-3.0.3-dhclient-stdin-conf.patch 1948
 RMD160 42f32a5bbfe2a937827c2972ef84cfa78c2c401c files/dhcp-3.0.3-dhclient-stdin-conf.patch 1948
 SHA256 e1bfd26b7da10acc4bd718e35aae4235308abcacde78dedf39533b11ab18b3ae files/dhcp-3.0.3-dhclient-stdin-conf.patch 1948
-AUX dhcp-3.0.3-libdst.patch 322 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 SHA1 804bab67ae06269336c51183d5ff1e8ba45c20b5 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca size 322
+AUX dhcp-3.0.3-libdst.patch 322 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 SHA1 804bab67ae06269336c51183d5ff1e8ba45c20b5 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca
 MD5 2bfa28477aff891d25c06a00677d261c files/dhcp-3.0.3-libdst.patch 322
 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 files/dhcp-3.0.3-libdst.patch 322
 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca files/dhcp-3.0.3-libdst.patch 322
-AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 SHA1 99a9fe69988226d29ccc6c2dc745ffab9b66817c SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb size 3002
+AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 SHA1 99a9fe69988226d29ccc6c2dc745ffab9b66817c SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb
 MD5 85a5d65a92d74e828c539b6642962463 files/dhcp-3.0.3-no_isc_blurb.patch 3002
 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 files/dhcp-3.0.3-no_isc_blurb.patch 3002
 SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb files/dhcp-3.0.3-no_isc_blurb.patch 3002
-AUX dhcp-3.0.3-tr.patch 377 RMD160 fe81fefb55796b4e06fa73ec180026dceef5599d SHA1 947a4002e7e2b21cd80fe0a3d0f6f044d5c6faff SHA256 05f81ad7c0e8cd2d2f3e81c0cd1aecc0f2a2787672037eca87e66a814150f5c8 size 377
+AUX dhcp-3.0.3-tr.patch 377 RMD160 fe81fefb55796b4e06fa73ec180026dceef5599d SHA1 947a4002e7e2b21cd80fe0a3d0f6f044d5c6faff SHA256 05f81ad7c0e8cd2d2f3e81c0cd1aecc0f2a2787672037eca87e66a814150f5c8
 MD5 ce6d18eef914ac8a39b0cb1bc4d63de2 files/dhcp-3.0.3-tr.patch 377
 RMD160 fe81fefb55796b4e06fa73ec180026dceef5599d files/dhcp-3.0.3-tr.patch 377
 SHA256 05f81ad7c0e8cd2d2f3e81c0cd1aecc0f2a2787672037eca87e66a814150f5c8 files/dhcp-3.0.3-tr.patch 377
-AUX dhcp-3.0.3-x-option.patch 6478 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 SHA1 4c77474307f9e657e45618f93ba9120eafd83a9e SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7 size 6478
+AUX dhcp-3.0.3-x-option.patch 6478 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 SHA1 4c77474307f9e657e45618f93ba9120eafd83a9e SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7
 MD5 1145d8fd3020b1997955cd84b9730702 files/dhcp-3.0.3-x-option.patch 6478
 RMD160 a0fa5b3c7caf2d303a76c3d6fc135783cfa2bbc6 files/dhcp-3.0.3-x-option.patch 6478
 SHA256 6628629a95ee7e711f9dbce6b7d527b15f98eaf7592a1d0855d7bf65961bc3f7 files/dhcp-3.0.3-x-option.patch 6478
-AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f size 2176
+AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
 MD5 f47ef574359340021a78f5c2f67e4954 files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f files/dhcp-3.0.4-dhclient-stdin-conf.patch 2176
-AUX dhcp.conf 792 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 SHA1 b1730b8bc57800e7201bb304be7b5af7d91374b4 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0 size 792
+AUX dhcp.conf 792 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 SHA1 b1730b8bc57800e7201bb304be7b5af7d91374b4 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0
 MD5 0ab9c8e1c34a43a23d47d9649cd3ddcf files/dhcp.conf 792
 RMD160 7c4ffbe4f47f4fad210c48eb4f92ee15cf651f72 files/dhcp.conf 792
 SHA256 dad532fc00d98edce2da5c1fcce16db42a0084eefc6da00599a7fcfb8faac0f0 files/dhcp.conf 792
-AUX dhcp.init 1530 RMD160 3a26ae62f15a8a3a3c92c68f8afe8bd4d61e9ec2 SHA1 6ce14226da6fd8c160984b00fdf9f7f994efe5c5 SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57 size 1530
+AUX dhcp.init 1530 RMD160 3a26ae62f15a8a3a3c92c68f8afe8bd4d61e9ec2 SHA1 6ce14226da6fd8c160984b00fdf9f7f994efe5c5 SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57
 MD5 a68019721576cb5e96df2d55130c9e9e files/dhcp.init 1530
 RMD160 3a26ae62f15a8a3a3c92c68f8afe8bd4d61e9ec2 files/dhcp.init 1530
 SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57 files/dhcp.init 1530
-AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 size 1092
+AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
 MD5 3f165a207e98ea92deb7ebfbbf4c2cf7 files/dhcpd.conf 1092
 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 files/dhcpd.conf 1092
 SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 files/dhcpd.conf 1092
-AUX dhcpd.init 2071 RMD160 05e493d00fb94814255d6f262bd8bdbe3f0af0a8 SHA1 8c794b9fe3bf07cf87e1ef90dc2e1b96f4e56786 SHA256 ce40811360f87baf6c608be23a9c0f9de5faa07021db9da5424f2f214bb5dfa4 size 2071
+AUX dhcpd.init 2071 RMD160 05e493d00fb94814255d6f262bd8bdbe3f0af0a8 SHA1 8c794b9fe3bf07cf87e1ef90dc2e1b96f4e56786 SHA256 ce40811360f87baf6c608be23a9c0f9de5faa07021db9da5424f2f214bb5dfa4
 MD5 f2163f74f1d3467a579961d79a629b69 files/dhcpd.init 2071
 RMD160 05e493d00fb94814255d6f262bd8bdbe3f0af0a8 files/dhcpd.init 2071
 SHA256 ce40811360f87baf6c608be23a9c0f9de5faa07021db9da5424f2f214bb5dfa4 files/dhcpd.init 2071
-AUX dhcrelay.conf 408 RMD160 943d64b87699f4c0aa498a425b692fc84af882ea SHA1 96ec9f4b9ad9721da67df927a2f43fa6457aa818 SHA256 78cf04d4e32f937bfc658a11492811a0570499481ffc12f2ffb78dc69ca9fad4 size 408
+AUX dhcrelay.conf 408 RMD160 943d64b87699f4c0aa498a425b692fc84af882ea SHA1 96ec9f4b9ad9721da67df927a2f43fa6457aa818 SHA256 78cf04d4e32f937bfc658a11492811a0570499481ffc12f2ffb78dc69ca9fad4
 MD5 7d49ecbe9f433f8c00d1fafe087abb9b files/dhcrelay.conf 408
 RMD160 943d64b87699f4c0aa498a425b692fc84af882ea files/dhcrelay.conf 408
 SHA256 78cf04d4e32f937bfc658a11492811a0570499481ffc12f2ffb78dc69ca9fad4 files/dhcrelay.conf 408
-AUX dhcrelay.init 748 RMD160 da83794f49e52f072924386b2fd4511d07d985e6 SHA1 fc84da7339a230717a067d9135c6dece038dfb0b SHA256 0d16910b1197946165da7812acffecef8ee3b31cdf8f9a596ca6ecb19756fcee size 748
+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
-DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe size 870240
-DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7 size 883245
-EBUILD dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 SHA1 ac1c0205c709db260c22e6ee9782583b18749e83 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a size 4062
+DIST dhcp-3.0.3.tar.gz 870240 RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 SHA1 1e2e6c3ecdb8046a39aaabe1a36171e1d45d21e4 SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe
+DIST dhcp-3.0.4.tar.gz 883245 RMD160 f5636d87e1e2138bd239157f54d8f73c73af73ac SHA1 2efe316d69563bf2440cbb4efc2bc06ef9445db3 SHA256 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
+EBUILD dhcp-3.0.3-r4.ebuild 4062 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 SHA1 ac1c0205c709db260c22e6ee9782583b18749e83 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a
 MD5 b268712b328548de32d5db06619787a8 dhcp-3.0.3-r4.ebuild 4062
 RMD160 310de76cfa0feff02e9620ed113e5c2647b3b8c8 dhcp-3.0.3-r4.ebuild 4062
 SHA256 a2083988469dbf8795387c94da9cff44b8f2dadf89048b32f261954dae3a434a dhcp-3.0.3-r4.ebuild 4062
-EBUILD dhcp-3.0.3-r7.ebuild 6692 RMD160 f6e41e7e5b6ee75768fbbd237637897a1aac7dae SHA1 7af7df5c0e5846af3878cb44030c86d65e4c62f6 SHA256 ff347e2631f2deb5205bfb4f30435b4c3cb1ac22e68f84da0b7d930ac0381949 size 6692
+EBUILD dhcp-3.0.3-r7.ebuild 6692 RMD160 f6e41e7e5b6ee75768fbbd237637897a1aac7dae SHA1 7af7df5c0e5846af3878cb44030c86d65e4c62f6 SHA256 ff347e2631f2deb5205bfb4f30435b4c3cb1ac22e68f84da0b7d930ac0381949
 MD5 b76ff640c8b5fae6c5de95a3e41bc316 dhcp-3.0.3-r7.ebuild 6692
 RMD160 f6e41e7e5b6ee75768fbbd237637897a1aac7dae dhcp-3.0.3-r7.ebuild 6692
 SHA256 ff347e2631f2deb5205bfb4f30435b4c3cb1ac22e68f84da0b7d930ac0381949 dhcp-3.0.3-r7.ebuild 6692
-EBUILD dhcp-3.0.4-r1.ebuild 6731 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f SHA1 cc14f9d851d4cd4971491c38b39470917cb7661a SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3 size 6731
+EBUILD dhcp-3.0.3-r8.ebuild 6804 RMD160 a605f131412eb10d0d63ab21f8db7e4a3a042a5d SHA1 f635f91db16366283d165b0ec87c6393d864ec61 SHA256 ffbf698673c7992304cc701bc23cca640b3fbf650cc8cc156595a089c02fafd5
+MD5 792b1e5a4412b68186c953afb8ca672d dhcp-3.0.3-r8.ebuild 6804
+RMD160 a605f131412eb10d0d63ab21f8db7e4a3a042a5d dhcp-3.0.3-r8.ebuild 6804
+SHA256 ffbf698673c7992304cc701bc23cca640b3fbf650cc8cc156595a089c02fafd5 dhcp-3.0.3-r8.ebuild 6804
+EBUILD dhcp-3.0.4-r1.ebuild 6731 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f SHA1 cc14f9d851d4cd4971491c38b39470917cb7661a SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3
 MD5 457ed83ee767022057c8b34ff843749e dhcp-3.0.4-r1.ebuild 6731
 RMD160 2479e6c57f8f979357d341e3bcab07ff9dfda80f dhcp-3.0.4-r1.ebuild 6731
 SHA256 2e849d07ba7a4de47750e209bab5e4e46b9d661eb4a58f08f1375404a8c630c3 dhcp-3.0.4-r1.ebuild 6731
-EBUILD dhcp-3.0.4.ebuild 6728 RMD160 474958f105901448503494b90762f26206f087bf SHA1 f63e75ce924f51594235e74e8183087ecb2ee5f3 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1 size 6728
+EBUILD dhcp-3.0.4.ebuild 6728 RMD160 474958f105901448503494b90762f26206f087bf SHA1 f63e75ce924f51594235e74e8183087ecb2ee5f3 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1
 MD5 659d30979078da7726375d8a45b9093d dhcp-3.0.4.ebuild 6728
 RMD160 474958f105901448503494b90762f26206f087bf dhcp-3.0.4.ebuild 6728
 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1 dhcp-3.0.4.ebuild 6728
-MISC ChangeLog 17354 RMD160 46ced5dc97c06b087e03d508c2703fd63214039f SHA1 40c0e96f9365d2e2d7b827a647381316a804753b SHA256 21afdc624f016e96b6eba63084ba88cef9a2db510124a194c830190589c8eda0 size 17354
-MD5 66c1cfa8b135df482a329701fbf2cddf ChangeLog 17354
-RMD160 46ced5dc97c06b087e03d508c2703fd63214039f ChangeLog 17354
-SHA256 21afdc624f016e96b6eba63084ba88cef9a2db510124a194c830190589c8eda0 ChangeLog 17354
-MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af size 330
+MISC ChangeLog 17526 RMD160 2ec16870af2160e809b723c96ddb8378df00512d SHA1 a6f89358a344c486bad50b3ecfe048fb11b957dd SHA256 23f6e79fbdf3505e3d0ba14dd3e36f3f3f62b771c5e22e1d56ee8dc537f6a79e
+MD5 b76d1d54ad222174cb1f9413a03dc438 ChangeLog 17526
+RMD160 2ec16870af2160e809b723c96ddb8378df00512d ChangeLog 17526
+SHA256 23f6e79fbdf3505e3d0ba14dd3e36f3f3f62b771c5e22e1d56ee8dc537f6a79e ChangeLog 17526
+MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af
 MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330
 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330
 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af metadata.xml 330
@@ -118,6 +122,9 @@ SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/di
 MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r7 232
 RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r7 232
 SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r7 232
+MD5 414325430622f5011079cd7fd5517485 files/digest-dhcp-3.0.3-r8 232
+RMD160 a8cec86f840528ab049182c2d0f0768d7eaa03dc files/digest-dhcp-3.0.3-r8 232
+SHA256 cbcca1aed82577796a5287973fc78c3d4f5011a7279852b5fdf3e3e368067f14 files/digest-dhcp-3.0.3-r8 232
 MD5 3ac42f4c7431bc78613c2e61b0a79075 files/digest-dhcp-3.0.4 232
 RMD160 d5e0c33365d8dc2d37caf86a277a0dbfe0b98565 files/digest-dhcp-3.0.4 232
 SHA256 fbea6a9170dda5da61af6c7c6f629d33b642ca3fbfa7f64537bd783e283be420 files/digest-dhcp-3.0.4 232
diff --git a/net-misc/dhcp/dhcp-3.0.3-r8.ebuild b/net-misc/dhcp/dhcp-3.0.3-r8.ebuild
new file mode 100644
index 000000000000..7b37a42832da
--- /dev/null
+++ b/net-misc/dhcp/dhcp-3.0.3-r8.ebuild
@@ -0,0 +1,217 @@
+# 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.3-r8.ebuild,v 1.1 2006/05/23 09:14:12 uberlord Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="isc-dhcp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )"
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/dhcpc"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Gentoo patches - these will probably never be accepted upstream
+	# Enable chroot support
+	epatch "${FILESDIR}/${PN}-3.0-paranoia.patch"
+	# Fix some permission issues
+	epatch "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-ntp.patch"
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-resolvconf.patch"
+	# Fix setting hostnames on Linux
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-hostname.patch"
+	# Allow mtu settings
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-mtu.patch"
+	# Allow dhclient to use IF_METRIC to set route metrics
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-metric.patch"
+	# Stop downing the interface on Linux as that breaks link dameons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
+	# Quiet the isc blurb
+	epatch "${FILESDIR}/${PN}-3.0.3-no_isc_blurb.patch"
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-stdin-conf.patch"
+
+	# General fixes which will probably be accepted upstream eventually
+	# Fix token ring compiling, #102473
+	epatch "${FILESDIR}/${P}-tr.patch"
+	# Install libdst, #75544
+	epatch "${FILESDIR}/${PN}-3.0.3-libdst.patch"
+	# Fix building on Gentoo/FreeBSD
+	epatch "${FILESDIR}/${PN}-3.0.2-gmake.patch"
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Enable eXtended options
+	epatch "${FILESDIR}/${PN}-3.0.3-x-option.patch"
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}/${PN}-3.0.3-dhclient-dbus.patch"
+
+	# Brand the version with Gentoo
+	# include revision if >0
+	local newver="${MY_PV}-Gentoo"
+	[[ ${PR} != "r0" ]] && newver="${newver}-${PR}"
+	sed -i -e '/^#define DHCP_VERSION[ \t]\+/ s/'"${MY_PV}/${newver}/g" \
+		includes/version.h
+
+	# Change the hook script locations of the scripts
+	sed -i -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/*
+
+	# Remove these options from the sample config
+	sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf
+
+	# Build sed man pages as we don't ever support BSD 4.4 and older, #130251.
+	local x=
+	for x in Makefile.dist $(ls */Makefile.dist) ; do
+		sed -i -e 's/$(CATMANPAGES)/$(SEDMANPAGES)/g' "${x}"
+	done
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+
+	# Now remove the non-english docs so there are no errors later
+	[[ -d doc/ja_JP.eucJP ]] && rm -rf doc/ja_JP.eucJP
+}
+
+src_compile() {
+	# 01/Mar/2003: Fix for bug #11960 by Jason Wever <weeve@gentoo.org>
+	[[ ${ARCH} == "sparc" ]] && filter-flags -O3 -O2 -O
+
+	use static && append-ldflags -static
+
+	cat <<-END >> includes/site.h
+	#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+	#define _PATH_DHCPD_PID "/var/run/dhcp/dhcpd.pid"
+	#define _PATH_DHCPD_DB "/var/lib/dhcp/dhcpd.leases"
+	#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+	#define _PATH_DHCLIENT_DB "/var/lib/dhcp/dhclient.leases"
+	#define _PATH_DHCLIENT_PID "/var/run/dhcp/dhclient.pid"
+	#define DHCPD_LOG_FACILITY LOG_LOCAL1
+	END
+
+	cat <<-END > site.conf
+	CC = $(tc-getCC)
+	LFLAGS = ${LDFLAGS}
+	LIBDIR = /usr/$(get_libdir)
+	INCDIR = /usr/include
+	ETC = /etc/dhcp
+	VARDB = /var/lib/dhcp
+	VARRUN = /var/run/dhcp
+	ADMMANDIR = /usr/share/man/man8
+	ADMMANEXT = .8
+	FFMANDIR = /usr/share/man/man5
+	FFMANEXT = .5
+	LIBMANDIR = /usr/share/man/man3
+	LIBMANEXT = .3
+	USRMANDIR = /usr/share/man/man1
+	USRMANEXT = .1
+	MANCAT = man
+	END
+
+	./configure --copts "-DPARANOIA -DEARLY_CHROOT -DEXTENDED_NEW_OPTION_INFO \
+		${CFLAGS}" || die "configure failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	insinto /etc/dhcp
+	newins server/dhcpd.conf dhcpd.conf.sample
+	newins client/dhclient.conf dhclient.conf.sample
+
+	dodoc README RELNOTES doc/*
+	newdoc client/dhclient.conf dhclient.conf.sample
+	newdoc client/scripts/linux dhclient-script.sample
+	newdoc server/dhcpd.conf dhcpd.conf.sample
+
+	newinitd "${FILESDIR}/dhcpd.init" dhcpd
+	newinitd "${FILESDIR}/dhcrelay.init" dhcrelay
+	insinto /etc/conf.d
+	newins "${FILESDIR}/dhcpd.conf" dhcpd
+	newins "${FILESDIR}/dhcrelay.conf" dhcrelay
+
+	keepdir /var/{lib,run}/dhcp
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
+
+pkg_postinst() {
+	chown dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
+
+	if [[ -e "${ROOT}/etc/init.d/dhcp" ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+
+	einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
+	einfo
+	einfo "If you would like to run dhcpd in a chroot, simply configure the"
+	einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
+	einfo "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local CHROOT="$(
+		sed -n 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
+		/etc/conf.d/dhcpd
+	)"
+
+	if [[ -z ${CHROOT} ]]; then
+		eerror "CHROOT not defined in /etc/conf.d/dhcpd"
+		return 1
+	fi
+
+	if [[ -d ${CHROOT} ]] ; then
+		ewarn "${CHROOT} already exists - aborting"
+		return 0
+	fi
+
+	ebegin "Setting up the chroot directory"
+	mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
+	cp /etc/{localtime,resolv.conf} "${CHROOT}/etc"
+	cp -R /etc/dhcp "${CHROOT}/etc/"
+	cp -R /var/lib/dhcp "${CHROOT}/var/lib"
+	chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
+	eend
+
+	local logger="$(best_version virtual/logger)"
+	einfo "To enable logging from the dhcpd server, configure your"
+	einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
+}
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.3-r8 b/net-misc/dhcp/files/digest-dhcp-3.0.3-r8
new file mode 100644
index 000000000000..bfdf4cb56303
--- /dev/null
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.3-r8
@@ -0,0 +1,3 @@
+MD5 f91416a0b8ed3fd0601688cf0b7df58f dhcp-3.0.3.tar.gz 870240
+RMD160 bcbd1f8b49f17809a3473103a7b5e096c45855d7 dhcp-3.0.3.tar.gz 870240
+SHA256 c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe dhcp-3.0.3.tar.gz 870240