gentoo resync : 27.03.2018

3 files changed, 2 insertions, 64 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 64636b482c70..1c39cda37296 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,4 +1,3 @@
-AUX dhcpcd-6.11.1-arp-conflict.patch 1765 BLAKE2B a137044bc06a29e23bbebd383337f2166acb0a312ca866f31c7e5b70c15350cbbfe8653b703b6738e4e2ac05700cfbc493f868633561ada6b6de7a90659f862d SHA512 f0b7f53f30d178a4536113fb01efe177db73f609cf1cbba2fe603a619c7417067ad070318c50c363a30f4c87315aac27118ad088cdbeed3575fb640c9632ad95
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
@@ -8,6 +7,6 @@ DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802e
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
 EBUILD dhcpcd-6.11.5.ebuild 3283 BLAKE2B 076c24a2f93e8690512aa99a456127c451d8698a1afa215774627c0a807e7138c33f5470eff2b9bd8025f9a2dc022b9649782d31add8113859ca29c1fba8e625 SHA512 da6c981fd5f6d41642af69b1af8cdd040bbeaba44b00c20cea07664b331649c960fa988a1991c611542bc7f3571d3bb2c83af9dde90ea64d2e88bd0efa294c76
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
-EBUILD dhcpcd-7.0.1.ebuild 4444 BLAKE2B 7c5cad435b1ffd2777d34255b6e29561ad08d4516720e72e1b0fcf3d4a5b713a6d628c4ac9a3d3e0bcefaf7227f0a3225fccddaf665ed29d7912c6421c12811b SHA512 cd9e147be14732fc5b513e77236f9e3a0827c583496441c09ed993e3a916a93fd0a051bbfb422fdb6f6503baa1741aec0a9bc1db77b140d9f9348642eccc887d
+EBUILD dhcpcd-7.0.1.ebuild 4443 BLAKE2B 1da08d80ffce56a39d59fd25a07c14a7f8054ba3eb54f8014c3f3fc8fadcc2bd63bc2222c783f6cd5db6a35a2c8eee14ccfd2c2f41f36528e9788a4f1fe6252f SHA512 7c5ce49c59b75f8bf33735bb4402ff81a2d0bde9bf55b26822a732454fb4ae3700bd5ea9739dec612aeb2627e96caa2146fe9310a85771a74bdd95738628bcd9
 EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index 6d3ad075110b..7b212c0f4e6b 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch b/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
deleted file mode 100644
index ae7da3fbd8a9..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-6.11.1-arp-conflict.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: ipv4ll.c
-==================================================================
---- a/ipv4ll.c
-+++ b/ipv4ll.c
-@@ -242,31 +242,33 @@
- 	assert(astate != NULL);
- 	assert(astate->iface != NULL);
- 	ifp = astate->iface;
- 	state = IPV4LL_STATE(ifp);
- 	assert(state != NULL);
--	assert(state->addr != NULL);
- 
- 	fail = 0;
- 	/* RFC 3927 2.2.1, Probe Conflict Detection */
- 	if (amsg == NULL ||
- 	    (amsg->sip.s_addr == astate->addr.s_addr ||
- 	    (amsg->sip.s_addr == 0 && amsg->tip.s_addr == astate->addr.s_addr)))
- 		fail = astate->addr.s_addr;
- 
- 	/* RFC 3927 2.5, Conflict Defense */
--	if (IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
-+	if (state->addr != NULL &&
-+	    IN_LINKLOCAL(ntohl(state->addr->addr.s_addr)) &&
- 	    amsg && amsg->sip.s_addr == state->addr->addr.s_addr)
- 		fail = state->addr->addr.s_addr;
- 
- 	if (fail == 0)
- 		return;
- 
- 	astate->failed.s_addr = fail;
- 	arp_report_conflicted(astate, amsg);
- 
--	if (astate->failed.s_addr == state->addr->addr.s_addr) {
-+	if (state->addr != NULL &&
-+	    astate->failed.s_addr == state->addr->addr.s_addr)
-+	{
- 		struct timespec now, defend;
- 
- 		/* RFC 3927 Section 2.5 says a defence should
- 		 * broadcast an ARP announcement.
- 		 * Because the kernel will also unicast a reply to the
-@@ -378,16 +380,18 @@
- 	astate->conflicted_cb = ipv4ll_conflicted;
- 	astate->free_cb = ipv4ll_arpfree;
- 
- 	/* Find an existing IPv4LL address and ensure we can work with it. */
- 	ia = ipv4_iffindlladdr(ifp);
-+
- #ifdef IN_IFF_TENTATIVE
- 	if (ia != NULL && ia->addr_flags & IN_IFF_DUPLICATED) {
- 		ipv4_deladdr(ia, 0);
- 		ia = NULL;
- 	}
- #endif
-+
- 	if (ia != NULL) {
- 		astate->addr = ia->addr;
- #ifdef IN_IFF_TENTATIVE
- 		if (ia->addr_flags & (IN_IFF_TENTATIVE | IN_IFF_DETACHED)) {
- 			logger(ifp->ctx, LOG_INFO,
-