gentoo resync : 11.02.2018

3 files changed, 0 insertions, 129 deletions

diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index a4962ab97ec6..7c348b8afec1 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index d85a4f69ce36..327ef408d338 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -9,7 +9,6 @@ AUX freebsd-sources-7.1-includes.patch 318 BLAKE2B e95da1360824b9a5037bf55deda2d
 AUX freebsd-sources-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f
 AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 BLAKE2B 2c783822d71de3633c5b914a38d1a80b9afd4a5e4335ac9a01da605306c8d0f5605970f808d9b7c93e9853a7b741eaec8f0b1701602160761404558eaf93f680 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5
 AUX freebsd-sources-9.0-disable-optimization.patch 927 BLAKE2B 42fff42c4d1bc57aed5c4b4dc30328f8ac3317f36cb3b4df60690e5ce9e3ef19d2a1b6a8e35082aad6c43283b47af8df6c94912710d55fc925e2eae08d275459 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b
-AUX freebsd-sources-9.0-ipv6refcount.patch 3259 BLAKE2B 48607d9851f9a37994fc507decf3fc6710406e2fc12cc24cc5a08f5a0717ebc4409ada146b795689036561481078a3cfbc74c697cb3559cc04d2f7b238ee1426 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658
 AUX freebsd-sources-9.0-sysctluint.patch 403 BLAKE2B 3860821b308a75dcad8fa5910cb6c287ca2013269d21b588d0abbb1a79197366eac7eb733c87136f77ba2556913f36784842ac5f089d5c9bdb59bdb836748049 SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c
 AUX freebsd-sources-9.1-ciss.patch 2067 BLAKE2B 7066b8b75a2e471aef295e1ff73c8b88ba9e63842376ffd60630783ec6ec28bb61d59a98c80052e0bcc785ab71600df42f811a9aa296ff543be7f9ceb08414e9 SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989
 AUX freebsd-sources-9.1-cve-2013-3077.patch 1064 BLAKE2B b38476d5c51ce2e7917e729a1d0417d9421e0caf330b32cc07637887816c417aaffb2bf0ffaeac7160f7ba8528d6196273abb97cb0b1f014da196325a0168757 SHA512 12244d1335ab626e4a391cdd1d435f9f002ec4142fa2a2a93832b554f03fff69de09e950c4e80c797fd0b568504a69e18341fd35bd952a56e01a05024de8206f
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
deleted file mode 100644
index f0984f6776c8..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: sys/netinet6/in6.c
-===================================================================
---- sys/netinet6/in6.c.orig
-+++ sys/netinet6/in6.c
-@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
- 	}
- 
- cleanup:
-+	if (ifa0 != NULL)
-+		ifa_free(ifa0);
- 
- 	plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
- 	if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
-@@ -1393,8 +1395,6 @@ cleanup:
- 			return;
- 		ia->ia_flags &= ~IFA_ROUTE;
- 	}
--	if (ifa0 != NULL)
--		ifa_free(ifa0);
- 
- 	in6_unlink_ifa(ia, ifp);
- }
-@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
- 			hostid = IFA_IN6(ifa);
- 
- 			/* prefixlen must be <= 64. */
--			if (64 < iflr->prefixlen)
-+			if (64 < iflr->prefixlen) {
-+				if (ifa != NULL)
-+					ifa_free(ifa);
- 				return EINVAL;
-+			}
- 			prefixlen = iflr->prefixlen;
- 
- 			/* hostid part must be zero. */
- 			sin6 = (struct sockaddr_in6 *)&iflr->addr;
- 			if (sin6->sin6_addr.s6_addr32[2] != 0 ||
- 			    sin6->sin6_addr.s6_addr32[3] != 0) {
-+				if (ifa != NULL)
-+					ifa_free(ifa);
- 				return EINVAL;
- 			}
- 		} else
-@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
- 		IN6_IFADDR_RUNLOCK();
- 		return (struct in6_ifaddr *)ifa;
- 	}
--	IN6_IFADDR_RUNLOCK();
- 
- 	/* use the last-resort values, that are, deprecated addresses */
--	if (dep[0])
-+	if (dep[0]) {
-+		ifa_ref((struct ifaddr *)dep[0]);
-+		IN6_IFADDR_RUNLOCK();
- 		return dep[0];
--	if (dep[1])
-+	}
-+	if (dep[1]) {
-+		ifa_ref((struct ifaddr *)dep[1]);
-+		IN6_IFADDR_RUNLOCK();
- 		return dep[1];
-+	}
- 
-+	IN6_IFADDR_RUNLOCK();
- 	return NULL;
- }
- 
-Index: sys/netinet6/ip6_input.c
-===================================================================
---- sys/netinet6/ip6_input.c.orig
-+++ sys/netinet6/ip6_input.c
-@@ -879,19 +879,23 @@ passin:
- 	 * as our interface address (e.g. multicast addresses, addresses
- 	 * within FAITH prefixes and such).
- 	 */
--	if (deliverifp && !ip6_getdstifaddr(m)) {
-+	if (deliverifp) {
- 		struct in6_ifaddr *ia6;
- 
--		ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
--		if (ia6) {
--			if (!ip6_setdstifaddr(m, ia6)) {
--				/*
--				 * XXX maybe we should drop the packet here,
--				 * as we could not provide enough information
--				 * to the upper layers.
--				 */
-+ 		if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
-+			ifa_free(&ia6->ia_ifa);
-+		} else {
-+			ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-+			if (ia6) {
-+				if (!ip6_setdstifaddr(m, ia6)) {
-+					/*
-+					 * XXX maybe we should drop the packet here,
-+					 * as we could not provide enough information
-+					 * to the upper layers.
-+					 */
-+				}
-+				ifa_free(&ia6->ia_ifa);
- 			}
--			ifa_free(&ia6->ia_ifa);
- 		}
- 	}
- 
-Index: sys/netinet/tcp_input.c
-===================================================================
---- sys/netinet/tcp_input.c.orig
-+++ sys/netinet/tcp_input.c
-@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
- 			    (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
- 		return IPPROTO_DONE;
- 	}
-+	if (ia6)
-+		ifa_free(&ia6->ia_ifa);
- 
- 	tcp_input(m, *offp);
- 	return IPPROTO_DONE;
-@@ -1240,7 +1242,8 @@ relocked:
- 				rstreason = BANDLIM_RST_OPENPORT;
- 				goto dropwithreset;
- 			}
--			ifa_free(&ia6->ia_ifa);
-+			if (ia6)
-+				ifa_free(&ia6->ia_ifa);
- 		}
- #endif /* INET6 */
- 		/*