Install newer init.d script #383961 by Andreas Schürch.

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

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index e26485c8f837bd75e440c49413c2771aef47a912..bdf2a97e9eb6e92aee00e0b8296a376a7c990cdb 100644 (file)
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,9 @@
 # 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.192 2011/09/22 19:38:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.193 2011/09/23 14:11:48 vapier Exp $
+
+  23 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild:
+  Install newer init.d script #383961 by Andreas Schürch.
 
   22 Sep 2011; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.2-r2.ebuild,
   files/dhcpd.init4:

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 6a293b17dbb403eb2b2337370bb482823c2329cc..c7953e9070286c8ee13bcb734cdc475beba1b6ff 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -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 7118 RMD160 f411a4b634663cfcdb132437498335bbe94193b0 SHA1 060e6cda50f69ab56ee71949de6f079fda969b75 SHA256 10526ece98049240fd82a8e035d2d037dfbd009f465eca6ea660c0e5ebbfd6d3
+EBUILD dhcp-4.2.2-r2.ebuild 7118 RMD160 242b147dcb0a0a6affa3a9da16afa27d5e829e7e SHA1 c194d741ded2f673d7014d17a4595fef75c7646c SHA256 5ce7ad5d1d82042c9e519dda9ae2ce47b675b3e81f72f0b05288f0a0fcc5cb52
 EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
-MISC ChangeLog 33244 RMD160 abf31e3a30c31a02cc46530de28f8b21034c460f SHA1 853ed0881683b44db0a3276d804329a04dfa045c SHA256 ca6a7f012d331dceaac84b6c1b371b8e034eb8247f3b4655ee441f0acee58007
+MISC ChangeLog 33376 RMD160 6ccde48a972efc13f38f6abe8798a7515660b5af SHA1 a472ab2eddf1d19c7c05bf7900e4b099ff989989 SHA256 14b205786e24064470d8af179d9db0ce42f11ee3a2d404de0ed4a21390372417
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk57jscACgkQaC/OocHi7JaALQD/fVFGZBi4XPqmaT8vIJXTiglk
-oNyY0Vh/Qk1zhpe2BPAA/jUYles2bHdnjDqtWXwRADRjnyXtrpeQl1chNs3qa8VC
-=Khdf
+iF4EAREIAAYFAk58k98ACgkQaC/OocHi7Jb6MgD+LKN4p+YpnlhFbUgBmKONFT3y
+n6UhV48ViF6RA7yMTaMA/j/3LnmlxNOedUn2I2jRWpuXqvD6U5GN25GYOJdIF5xi
+=kq91
 -----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 846ea9f575bb7eda2bd6dc65a10a52bc98c40a80..9854ee42ca29e093ae370293510976f37a160eee 100644 (file)
--- 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.5 2011/09/22 19:38:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.6 2011/09/23 14:11:48 vapier Exp $
 
 EAPI="2"
 
@@ -193,7 +193,7 @@ src_install() {
                        dosbin contrib/ldap/dhcpd-conf-to-ldap || die
                fi
 
-               newinitd "${FILESDIR}"/dhcpd.init3 dhcpd || die
+               newinitd "${FILESDIR}"/dhcpd.init4 dhcpd || die
                newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd || die
                newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay || die
                newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay || die