Install the default config files commented out since they aren't useful in the real world other than as examples #384087 by Nick Bowler.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 28 insertions, 15 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 3483eff57a43..e26485c8f837 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.191 2011/09/22 17:32:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.192 2011/09/22 19:38:41 vapier Exp $
+
+  22 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild,
+  files/dhcpd.init4:
+  Install the default config files commented out since they aren't useful in
+  the real world other than as examples #384087 by Nick Bowler.
 
   22 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild:
   Disable symtable support in local bind as it requires perl #383837 by Albert
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 2e97e4f15884..6a293b17dbb4 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -32,7 +32,7 @@ AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbce
 AUX dhcpd.conf2 1068 RMD160 35491b4bffec15f51c64946e6bc397c9a7937826 SHA1 7a90d5582aca68ea1ca90bb47a4094cc09e5fb82 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9f3c63199a8e7
 AUX dhcpd.init2 2421 RMD160 baa01ae97b227edba7653cd51735613be2dac652 SHA1 f2068ceb2d79d7992f46b31e6a6e3277a0167dce SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5
 AUX dhcpd.init3 2525 RMD160 d56c77e6f2e3981c78c3fefad04347615e9d9d60 SHA1 c04f470d0cc3b262cf87cc766ceee5a35aec8b43 SHA256 69f5e6bee391a9a03554bead07c9dd5775e1fbb2a0ae515b7930cec328a8959c
-AUX dhcpd.init4 2892 RMD160 7f8684f6ae32fded0aee6e8b499266d71cda2572 SHA1 65e8daa6529f892e36e246d131ecd4057cb016f2 SHA256 b573cf0fe9cf2f48b544901603bae78cf173757dae02212b1d88c60c3d89625e
+AUX dhcpd.init4 2902 RMD160 88a286743f43f490af36b046d271ff368369725c SHA1 c5210d65c352b35b396167a807563b7f879a2933 SHA256 6d746cf628d4dd4a191cefc4869bbe12b0fb9eb69b69c062ad4d3e3b369e9044
 AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
 AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
 AUX dhcrelay.init2 712 RMD160 2baeaf7c0fb8a5796792b5721f32104907243798 SHA1 ced20da5625b6517fa6044ce179e1c5d9a17297e SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3
@@ -44,14 +44,14 @@ EBUILD dhcp-3.1.2_p1.ebuild 7582 RMD160 d7f42417b80f9f17e0c8c217c978707506802a22
 EBUILD dhcp-3.1.3_p1.ebuild 7741 RMD160 62ef4cf524beadef2847675416ea5982f23a3f8e SHA1 3995b5c53d6b11fde440cf43c0dacac31f084d72 SHA256 7a71c86e1685858826a09f28dff77d69a98ec1d37c93bbb6e4dd216af00ce96c
 EBUILD dhcp-4.2.1_p1.ebuild 6610 RMD160 0d058e755de185a58fc62a3d047021671de9a54a SHA1 5cf96d94250ba44b3120ae6a961c04e4f01996b5 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a
 EBUILD dhcp-4.2.2-r1.ebuild 7892 RMD160 5c371acd35b9c1b287e0f476fd0b29cd8ee1e85d SHA1 b671ca999d5c7251d399c6ea6cd4bbba60abc9a0 SHA256 fbdd748e82fb55d4e222dd3846488fd273227540cd098badbc4be1bf0d7b7071
-EBUILD dhcp-4.2.2-r2.ebuild 6799 RMD160 68060d1427ba780ed070423f21de169e0e9dfb7d SHA1 7c6fa20d1eb06206239d39a86059fa04c34ca927 SHA256 91abfe344696e551041576ebfc9384d91d28824b32393329bbd782743db81769
+EBUILD dhcp-4.2.2-r2.ebuild 7118 RMD160 f411a4b634663cfcdb132437498335bbe94193b0 SHA1 060e6cda50f69ab56ee71949de6f079fda969b75 SHA256 10526ece98049240fd82a8e035d2d037dfbd009f465eca6ea660c0e5ebbfd6d3
 EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
-MISC ChangeLog 33009 RMD160 c5f57369e34e83721bf8417143e4239dbcc2c9d8 SHA1 de2eecf47864d72cc9d68865b13a2a767f994d82 SHA256 aea53a28b9e706662fd294e271f09d84fb5452148e25f85a26db5b9308a00fd7
+MISC ChangeLog 33244 RMD160 abf31e3a30c31a02cc46530de28f8b21034c460f SHA1 853ed0881683b44db0a3276d804329a04dfa045c SHA256 ca6a7f012d331dceaac84b6c1b371b8e034eb8247f3b4655ee441f0acee58007
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk57cTkACgkQaC/OocHi7JZuxgD/U4MNxavFWX+izitmWwdJ/V2e
-K1kmNykfNl3DJOmOnAkA9i2GOsFZe32CLwsECwhfrVk0G8EN5fjq9k/IbiFuXho=
-=PM5W
+iF4EAREIAAYFAk57jscACgkQaC/OocHi7JaALQD/fVFGZBi4XPqmaT8vIJXTiglk
+oNyY0Vh/Qk1zhpe2BPAA/jUYles2bHdnjDqtWXwRADRjnyXtrpeQl1chNs3qa8VC
+=Khdf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
index 02634b1ad3be..846ea9f575bb 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.4 2011/09/22 17:32:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.5 2011/09/22 19:38:41 vapier Exp $
 
 EAPI="2"
 
@@ -198,18 +198,26 @@ src_install() {
 		newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay || die
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay || die
 	fi
+
+	# the default config files aren't terribly useful #384087
+	sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
 }
 
 pkg_preinst() {
 	enewgroup dhcp
 	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 
-	# Keep the user files over the sample ones
-	local f
-	for f in dhclient dhcpd ; do
-		f="/etc/dhcp/${f}.conf"
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
 		if [ -e "${ROOT}"${f} ] ; then
-			cp -p "${ROOT}"${f} "${D}"${f}
+			case $(md5sum "${ROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${ROOT}"${f} "${D}"${f};;
+			esac
 		fi
 	done
 }
diff --git a/net-misc/dhcp/files/dhcpd.init4 b/net-misc/dhcp/files/dhcpd.init4
index ac1697c17f3f..b071d8f0c44d 100755
--- a/net-misc/dhcp/files/dhcpd.init4
+++ b/net-misc/dhcp/files/dhcpd.init4
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init4,v 1.1 2011/09/17 05:28:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init4,v 1.2 2011/09/22 19:38:41 vapier Exp $
 
-opts="configtest"
+extra_commands="configtest"
 
 : ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}