gentoo resync : 16.06.2018

19 files changed, 0 insertions, 633 deletions

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 165c4f5fd4d3..a278f0e37493 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -3,28 +3,10 @@ AUX freebsd-sources-10.1-gcc48.patch 452 BLAKE2B d1d9efc7be5bed287bbc2c9b05dc2db
 AUX freebsd-sources-11.0-gentoo-gcc.patch 430 BLAKE2B fadee46d0d675fe69d256d93c287f0cc11cfce7e9c7a5ba0e3bb7e51155ab1b8766df3508fc5672db10b8849fecb0cb1f32e4d2fa64e68ecd50f08b1d58bd9c2 SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe
 AUX freebsd-sources-11.0-gentoo.patch 852 BLAKE2B 81306d42748674cf550d5399a1ab02f183f2db82e1247a5d79acae77fee459a8f1a5265bc54a0d94f3310f1758e9bc97855b22c1c58d4f54cb573fcc9a8de6b7 SHA512 11f65627bb5436052b227d884c384e888bb8f44696c36b80a8715c912e41c953b57c1420b37030155c2751c72289470c4f681d14ed149e4f6aa82d8b63766ade
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 BLAKE2B 7644dccfb8ad6242c903fb0d5d81601c9ab395628a1cfdc299a31575db4ea6656ac1d3e6c15c751e96a7ce384909e95a90928b3cd1caa9de7d926a3ad9682092 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64
-AUX freebsd-sources-6.1-ntfs.patch 1043 BLAKE2B cf7777656f4d49975c7ad4cb5786c0534c80db87cdc3ecc46619d4f757ad087527fbbd96a436a309255e8968341c9dda71cc485277ee485ab5b8127482120e03 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad
-AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 BLAKE2B 86ef2add961195d4429db30e7d43ba3f6d43c1c2316e269e952e8e0c84da82fc6ec77fc84e7c3be2d5a5f76bec9e093b7d748ffbb57fa168f31c007066ae64d2 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7
 AUX freebsd-sources-7.1-includes.patch 318 BLAKE2B e95da1360824b9a5037bf55deda2d92a72a08e0e42f8ecd4080863bed69f10137b2c2637bafbe1088fe6bf2bfed7f83a748cab42a14b41b7243efd524ae15589 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7
-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-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
-AUX freebsd-sources-9.1-cve-2013-3266.patch 535 BLAKE2B a6dcaa98e9903efb2ffac0419585a263156dcfea26b711c3f5b51e79da499ab42bdb86a470e1777fae37b00915f339d4e6a8c2ed9eaddfefd9a4b726fddf628b SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7
-AUX freebsd-sources-9.1-cve-2013-5209.patch 645 BLAKE2B 7a4f9324c802a2918bcd5ca528f7a180b868c4189eea31abb1a5cb964211111e472e70027545a27d02fee70fad62996920c3b9eae0364c26307244617b7c5361 SHA512 1ed132883d22aaf48be98dd9adaa48cea0023f3c986cedb45f986676f1c4a40d3d5463006f516d78fe77a408e5f4821cb7b26d8fbff7091bc2aad9faac2e728a
-AUX freebsd-sources-9.1-cve-2013-5691.patch 2854 BLAKE2B d1eadf08700469b54ed2bc64d362e4afc9a09885e2199c65f0b1156e4e832d5a7246f34d4076917b51ce45395aa46d1e824c3f849a706b529c3ea8f763d1f527 SHA512 6c3342e79fe3de90d37d82415b186f5012597dfbc5f522f9aadfa5420d601e4e6042b899ed348b581537491d4c49d6b4959ca3b438f9bda454b8d9b494120534
-AUX freebsd-sources-9.1-cve-2013-5710.patch 704 BLAKE2B f29c817b961defbf834a5c6d4a627ca12672271c71963f8010410c951506b204b089d24aec75fe168cbaab2d6184cef5f3145684661dc5cb57a5e0db08b4b2ee SHA512 a87d571aa060f435e0ac53816307703e300e16365df13c88be0a982d5851d3c224e0cc23b32ef61445413abda86762e0e43b964d475f1d816ca83d2c6b3f7d58
-AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 BLAKE2B 8b4f1e8d6c036f4129abbe28c132f601cc5a9ed7d875bbaa50602c30f9cc9a6909b19e8951ac236207e9d63d2b4f7e0b5bd8606ba72185071c0e31bf4f7ed707 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1
-AUX freebsd-sources-9.1-exec.patch 2032 BLAKE2B 1079d529142b8824216cef324683d08429fd83c89cf24695198c9ef8b92b2e50321ee443d30cbe61aa907908fd510b64a99ece126d449e956c34df2ddfb54cab SHA512 db2ac3a96b9c2bfc3e785a6ea8060e7cf516e6cb25629749a7cae4ca8171b0f3b8f1128c5b646f8dfcd78c21fb3859b548907ba1781a698235dd5cf6a90f824b
-AUX freebsd-sources-9.1-gentoo.patch 743 BLAKE2B 0183c1e76a28e2c8473c5926ff89284ebf4f157929e6bb87ddbd9458ac6df8842e77644f38baeed76c03d0fcae4a6aa2fc7f2759ae2688abc83c0a1fa434a96c SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c
-AUX freebsd-sources-9.1-ktrace.patch 463 BLAKE2B c9cb0728fddd3a34738c4a4ff19666cc82b093229dd926ff4014cb7020f878b3d9edc49be932e90dcac9a53f92e38df66bd8a93f336e6847f5b5276a3773055f SHA512 b0cf73180320e0d1295fcde2c19a281575150f28d71fecd31c5793b6f0e9784005745fbc56b8578d40615e9276cfadf25d6fd3ea5e21f315e3c6beedc0476ffa
-AUX freebsd-sources-9.1-mmap-2014.patch 758 BLAKE2B 8c7ed2f76fc376316efd32480b51b4fdc4b2adff454ff8144ea72d556b287cbebcf716351209a35f62456e41db453cd372b2ec03fafc31eec8538c02604e58fd SHA512 fb1f28268355ad0a25705fecb7555222b53b04fd92b1b80af2db4b6f2ac02bf5a948ba0521d1674e31da57a1baf037fe0fe581c03a437d86325e185a8050aaa3
-AUX freebsd-sources-9.1-mmap.patch 676 BLAKE2B 17fb129a34eb0280b1edfdb2a5b1384438092578c0f803b55c1585f7baa4ccdd556acd9b2db33d7905c0ca93bc536b09f8f7608885cccf8489271389795b7c13 SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b
-AUX freebsd-sources-9.1-nfsserver.patch 650 BLAKE2B d719735cfe035de970f42cc40dded1785c038ce03c568dd7ccaf5a3715f658131cb02e1291b2a327b54fdff1f58f76c5deb41332ba4a125cded18344e21a0a17 SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe
-AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770a8541d3a3c0ede353a535f7e93f33ff62c800e9cf775e1bb56b5ba00917d1cd81294404dd660c6e954c01e352a5f413f9 SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99
-AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e
 DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7
 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15
 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
deleted file mode 100644
index e74fcd3f9b88..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- sys/fs/ntfs/ntfs_vnops.c.orig	2006-10-17 17:31:36 -0300
-+++ sys/fs/ntfs/ntfs_vnops.c	2006-10-17 17:30:24 -0300
-@@ -507,8 +507,12 @@
- 
- 	/* Simulate . in every dir except ROOT */
- 	if( ip->i_number != NTFS_ROOTINO ) {
--		struct dirent dot = { NTFS_ROOTINO,
--				sizeof(struct dirent), DT_DIR, 1, "." };
-+		struct dirent dot;
-+		dot.d_fileno	= NTFS_ROOTINO;
-+		dot.d_reclen	= sizeof(struct dirent);
-+		dot.d_type	= DT_DIR;
-+		dot.d_namlen	= 1;
-+		bcopy(".", dot.d_name, 1);
- 
- 		if( uio->uio_offset < sizeof(struct dirent) ) {
- 			dot.d_fileno = ip->i_number;
-@@ -522,8 +526,12 @@
- 
- 	/* Simulate .. in every dir including ROOT */
- 	if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
--		struct dirent dotdot = { NTFS_ROOTINO,
--				sizeof(struct dirent), DT_DIR, 2, ".." };
-+		struct dirent dotdot;
-+		dotdot.d_fileno	= NTFS_ROOTINO;
-+		dotdot.d_reclen	= sizeof(struct dirent);
-+		dotdot.d_type	= DT_DIR;
-+		dotdot.d_namlen	= 2;
-+		bcopy("..", dotdot.d_name, 2);
- 
- 		error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
- 		if(error)
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
deleted file mode 100644
index 13524efa6e00..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c
---- sys/fs/tmpfs.orig/tmpfs_vnops.c	2008-06-22 12:17:48 -0300
-+++ sys/fs/tmpfs/tmpfs_vnops.c	2008-06-28 12:05:10 -0300
-@@ -1459,6 +1459,30 @@
- 	return (0);
- }
- 
-+
-+/* --------------------------------------------------------------------- */
-+/* This does absolutely nothing */
-+#ifdef GENTOO_LIVECD
-+static int
-+tmpfs_whiteout(struct vop_whiteout_args *ap)
-+{
-+	switch (ap->a_flags) {
-+	case LOOKUP:
-+		return (0);
-+		break;
-+	case CREATE:
-+		return(EOPNOTSUPP);
-+		break;
-+	case DELETE:
-+		return (0);
-+		break;
-+	default:
-+		return(EOPNOTSUPP);
-+	}
-+	return(0);
-+}
-+#endif
-+
- /* --------------------------------------------------------------------- */
- 
- /*
-@@ -1484,6 +1508,9 @@
- 	.vop_mkdir =			tmpfs_mkdir,
- 	.vop_rmdir =			tmpfs_rmdir,
- 	.vop_symlink =			tmpfs_symlink,
-+#ifdef GENTOO_LIVECD
-+	.vop_whiteout =			tmpfs_whiteout,
-+#endif
- 	.vop_readdir =			tmpfs_readdir,
- 	.vop_readlink =			tmpfs_readlink,
- 	.vop_inactive =			tmpfs_inactive,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2d16a6..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@freebsd.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
deleted file mode 100644
index 697984b92e74..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: sys/dev/ciss/ciss.c
-===================================================================
---- sys/dev/ciss/ciss.c	(revision 264510)
-+++ sys/dev/ciss/ciss.c	(revision 264511)
-@@ -180,8 +180,6 @@
- static void	ciss_cam_poll(struct cam_sim *sim);
- static void	ciss_cam_complete(struct ciss_request *cr);
- static void	ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
--static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
--					   int bus, int target);
- static int	ciss_name_device(struct ciss_softc *sc, int bus, int target);
- 
- /* periodic status monitoring */
-@@ -3398,27 +3396,6 @@
- 
- 
- /********************************************************************************
-- * Find a peripheral attached at (target)
-- */
--static struct cam_periph *
--ciss_find_periph(struct ciss_softc *sc, int bus, int target)
--{
--    struct cam_periph	*periph;
--    struct cam_path	*path;
--    int			status;
--
--    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
--			     target, 0);
--    if (status == CAM_REQ_CMP) {
--	periph = cam_periph_find(path, NULL);
--	xpt_free_path(path);
--    } else {
--	periph = NULL;
--    }
--    return(periph);
--}
--
--/********************************************************************************
-  * Name the device at (target)
-  *
-  * XXX is this strictly correct?
-@@ -3427,12 +3404,22 @@
- ciss_name_device(struct ciss_softc *sc, int bus, int target)
- {
-     struct cam_periph	*periph;
-+    struct cam_path	*path;
-+    int			status;
- 
-     if (CISS_IS_PHYSICAL(bus))
- 	return (0);
--    if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
-+
-+    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
-+			     target, 0);
-+
-+    if (status == CAM_REQ_CMP) {
-+    	mtx_lock(&sc->ciss_mtx);
-+	periph = cam_periph_find(path, NULL);
- 	sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
- 		periph->periph_name, periph->unit_number);
-+    	mtx_unlock(&sc->ciss_mtx);
-+	xpt_free_path(path);
- 	return(0);
-     }
-     sc->ciss_logical[bus][target].cl_name[0] = 0;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch
deleted file mode 100644
index 23f68ed9c3db..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/netinet/in_mcast.c
-===================================================================
---- sys/netinet/in_mcast.c	(revision 254252)
-+++ sys/netinet/in_mcast.c	(working copy)
-@@ -1648,6 +1648,8 @@
- 	 * has asked for, but we always tell userland how big the
- 	 * buffer really needs to be.
- 	 */
-+	if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
-+		msfr.msfr_nsrcs = in_mcast_maxsocksrc;
- 	tss = NULL;
- 	if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
- 		tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
-Index: sys/netinet6/in6_mcast.c
-===================================================================
---- sys/netinet6/in6_mcast.c	(revision 254252)
-+++ sys/netinet6/in6_mcast.c	(working copy)
-@@ -1625,6 +1625,8 @@
- 	 * has asked for, but we always tell userland how big the
- 	 * buffer really needs to be.
- 	 */
-+	if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc)
-+		msfr.msfr_nsrcs = in6_mcast_maxsocksrc;
- 	tss = NULL;
- 	if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
- 		tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
deleted file mode 100644
index 0d1a89419e5f..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sys/fs/nfsserver/nfs_nfsdport.c
-===================================================================
---- sys/fs/nfsserver/nfs_nfsdport.c	(revision 249651)
-+++ sys/fs/nfsserver/nfs_nfsdport.c	(working copy)
-@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg
- 			nd->nd_repstat = NFSERR_BAD_COOKIE;
- #endif
- 	}
-+	if (!nd->nd_repstat && vp->v_type != VDIR)
-+		nd->nd_repstat = NFSERR_NOTDIR;
- 	if (nd->nd_repstat == 0 && cnt == 0) {
- 		if (nd->nd_flag & ND_NFSV2)
- 			/* NFSv2 does not have NFSERR_TOOSMALL */
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch
deleted file mode 100644
index e6710e3bcb8b..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: sys/netinet/sctp_output.c
-===================================================================
---- sys/netinet/sctp_output.c	(revision 254337)
-+++ sys/netinet/sctp_output.c	(revision 254338)
-@@ -5406,6 +5406,14 @@
- 	}
- 	SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk);
- 
-+	/*
-+	 * We might not overwrite the identification[] completely and on
-+	 * some platforms time_entered will contain some padding. Therefore
-+	 * zero out the cookie to avoid putting uninitialized memory on the
-+	 * wire.
-+	 */
-+	memset(&stc, 0, sizeof(struct sctp_state_cookie));
-+
- 	/* the time I built cookie */
- 	(void)SCTP_GETTIME_TIMEVAL(&stc.time_entered);
- 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch
deleted file mode 100644
index 9aef1503f770..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: sys/net/if.c
-===================================================================
---- sys/net/if.c	(revision 254941)
-+++ sys/net/if.c	(working copy)
-@@ -2553,11 +2553,23 @@
- 		CURVNET_RESTORE();
- 		return (EOPNOTSUPP);
- 	}
-+
-+	/*
-+	 * Pass the request on to the socket control method, and if the
-+	 * latter returns EOPNOTSUPP, directly to the interface.
-+	 *
-+	 * Make an exception for the legacy SIOCSIF* requests.  Drivers
-+	 * trust SIOCSIFADDR et al to come from an already privileged
-+	 * layer, and do not perform any credentials checks or input
-+	 * validation.
-+	 */
- #ifndef COMPAT_43
- 	error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
- 								 data,
- 								 ifp, td));
--	if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL)
-+	if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL &&
-+	    cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
-+	    cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
- 		error = (*ifp->if_ioctl)(ifp, cmd, data);
- #else
- 	{
-@@ -2601,7 +2613,9 @@
- 								   data,
- 								   ifp, td));
- 		if (error == EOPNOTSUPP && ifp != NULL &&
--		    ifp->if_ioctl != NULL)
-+		    ifp->if_ioctl != NULL &&
-+		    cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
-+		    cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
- 			error = (*ifp->if_ioctl)(ifp, cmd, data);
- 		switch (ocmd) {
- 
-Index: sys/netinet6/in6.c
-===================================================================
---- sys/netinet6/in6.c	(revision 254941)
-+++ sys/netinet6/in6.c	(working copy)
-@@ -431,6 +431,18 @@
- 	case SIOCGIFSTAT_ICMP6:
- 		sa6 = &ifr->ifr_addr;
- 		break;
-+	case SIOCSIFADDR:
-+	case SIOCSIFBRDADDR:
-+	case SIOCSIFDSTADDR:
-+	case SIOCSIFNETMASK:
-+		/*
-+		 * Although we should pass any non-INET6 ioctl requests
-+		 * down to driver, we filter some legacy INET requests.
-+		 * Drivers trust SIOCSIFADDR et al to come from an already
-+		 * privileged layer, and do not perform any credentials
-+		 * checks or input validation.
-+		 */
-+		return (EINVAL);
- 	default:
- 		sa6 = NULL;
- 		break;
-Index: sys/netnatm/natm.c
-===================================================================
---- sys/netnatm/natm.c	(revision 254941)
-+++ sys/netnatm/natm.c	(working copy)
-@@ -339,6 +339,21 @@
- 	npcb = (struct natmpcb *)so->so_pcb;
- 	KASSERT(npcb != NULL, ("natm_usr_control: npcb == NULL"));
- 
-+	switch (cmd) {
-+	case SIOCSIFADDR:
-+	case SIOCSIFBRDADDR:
-+	case SIOCSIFDSTADDR:
-+	case SIOCSIFNETMASK:
-+		/*
-+		 * Although we should pass any non-ATM ioctl requests
-+		 * down to driver, we filter some legacy INET requests.
-+		 * Drivers trust SIOCSIFADDR et al to come from an already
-+		 * privileged layer, and do not perform any credentials
-+		 * checks or input validation.
-+		 */
-+		return (EINVAL);
-+	}
-+
- 	if (ifp == NULL || ifp->if_ioctl == NULL)
- 		return (EOPNOTSUPP);
- 	return ((*ifp->if_ioctl)(ifp, cmd, arg));
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch
deleted file mode 100644
index 83f30e84fe9e..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: sys/fs/nullfs/null_vnops.c
-===================================================================
---- sys/fs/nullfs/null_vnops.c	(revision 254941)
-+++ sys/fs/nullfs/null_vnops.c	(working copy)
-@@ -858,6 +858,15 @@
- 	return (error);
- }
- 
-+static int
-+null_link(struct vop_link_args *ap)
-+{
-+
-+	if (ap->a_tdvp->v_mount != ap->a_vp->v_mount)
-+		return (EXDEV);
-+	return (null_bypass((struct vop_generic_args *)ap));
-+}
-+
- /*
-  * Global vfs data structures
-  */
-@@ -871,6 +880,7 @@
- 	.vop_getwritemount =	null_getwritemount,
- 	.vop_inactive =		null_inactive,
- 	.vop_islocked =		vop_stdislocked,
-+	.vop_link =		null_link,
- 	.vop_lock1 =		null_lock,
- 	.vop_lookup =		null_lookup,
- 	.vop_open =		null_open,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
deleted file mode 100644
index fe9e97efd298..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: sys/fs/nfsserver/nfs_nfsdserv.c
-===================================================================
---- sys/fs/nfsserver/nfs_nfsdserv.c	(revision 264251)
-+++ sys/fs/nfsserver/nfs_nfsdserv.c	(working copy)
-@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		nfsvno_relpathbuf(&fromnd);
- 		goto out;
- 	}
-+	/*
-+	 * Unlock dp in this code section, so it is unlocked before
-+	 * tdp gets locked. This avoids a potential LOR if tdp is the
-+	 * parent directory of dp.
-+	 */
- 	if (nd->nd_flag & ND_NFSV4) {
- 		tdp = todp;
- 		tnes = *toexp;
--		tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0);
-+		if (dp != tdp) {
-+			NFSVOPUNLOCK(dp, 0);
-+			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
-+			    p, 0);	/* Might lock tdp. */
-+		} else {
-+			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
-+			    p, 1);
-+			NFSVOPUNLOCK(dp, 0);
-+		}
- 	} else {
- 		tfh.nfsrvfh_len = 0;
- 		error = nfsrv_mtofh(nd, &tfh);
-@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 			tnes = *exp;
- 			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
- 			    p, 1);
-+			NFSVOPUNLOCK(dp, 0);
- 		} else {
-+			NFSVOPUNLOCK(dp, 0);
- 			nd->nd_cred->cr_uid = nd->nd_saveduid;
- 			nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL,
--			    0, p);
-+			    0, p);	/* Locks tdp. */
- 			if (tdp) {
- 				tdirfor_ret = nfsvno_getattr(tdp, &tdirfor,
- 				    nd->nd_cred, p, 1);
-@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		if (error) {
- 			if (tdp)
- 				vrele(tdp);
--			vput(dp);
-+			vrele(dp);
- 			nfsvno_relpathbuf(&fromnd);
- 			nfsvno_relpathbuf(&tond);
- 			goto out;
-@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		}
- 		if (tdp)
- 			vrele(tdp);
--		vput(dp);
-+		vrele(dp);
- 		nfsvno_relpathbuf(&fromnd);
- 		nfsvno_relpathbuf(&tond);
- 		goto out;
-@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 	/*
- 	 * Done parsing, now down to business.
- 	 */
--	nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp);
-+	nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp);
- 	if (nd->nd_repstat) {
- 		if (nd->nd_flag & ND_NFSV3) {
- 			nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret,
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch
deleted file mode 100644
index c36bed59b39e..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: sys/kern/kern_exec.c
-===================================================================
---- sys/kern/kern_exec.c	(revision 266979)
-+++ sys/kern/kern_exec.c	(working copy)
-@@ -280,6 +280,7 @@ kern_execve(td, args, mac_p)
- 	struct mac *mac_p;
- {
- 	struct proc *p = td->td_proc;
-+	struct vmspace *oldvmspace;
- 	int error;
- 
- 	AUDIT_ARG_ARGV(args->begin_argv, args->argc,
-@@ -296,6 +297,8 @@ kern_execve(td, args, mac_p)
- 		PROC_UNLOCK(p);
- 	}
- 
-+	KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve"));
-+	oldvmspace = td->td_proc->p_vmspace;
- 	error = do_execve(td, args, mac_p);
- 
- 	if (p->p_flag & P_HADTHREADS) {
-@@ -310,6 +313,12 @@ kern_execve(td, args, mac_p)
- 			thread_single_end();
- 		PROC_UNLOCK(p);
- 	}
-+	if ((td->td_pflags & TDP_EXECVMSPC) != 0) {
-+		KASSERT(td->td_proc->p_vmspace != oldvmspace,
-+		    ("oldvmspace still used"));
-+		vmspace_free(oldvmspace);
-+		td->td_pflags &= ~TDP_EXECVMSPC;
-+	}
- 
- 	return (error);
- }
-Index: sys/sys/proc.h
-===================================================================
---- sys/sys/proc.h	(revision 266979)
-+++ sys/sys/proc.h	(working copy)
-@@ -968,4 +968,5 @@ curthread_pflags_restore(int save)
- 
- #endif	/* _KERNEL */
- 
-+#define	TDP_EXECVMSPC	0x40000000 /* Execve destroyed old vmspace */
- #endif	/* !_SYS_PROC_H_ */
-Index: sys/vm/vm_map.c
-===================================================================
---- sys/vm/vm_map.c	(revision 266979)
-+++ sys/vm/vm_map.c	(working copy)
-@@ -3631,6 +3631,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
- 	struct vmspace *oldvmspace = p->p_vmspace;
- 	struct vmspace *newvmspace;
- 
-+	KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0,
-+	    ("vmspace_exec recursed"));
- 	newvmspace = vmspace_alloc(minuser, maxuser);
- 	if (newvmspace == NULL)
- 		return (ENOMEM);
-@@ -3647,7 +3649,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
- 	PROC_VMSPACE_UNLOCK(p);
- 	if (p == curthread->td_proc)
- 		pmap_activate(curthread);
--	vmspace_free(oldvmspace);
-+	curthread->td_pflags |= TDP_EXECVMSPC;
- 	return (0);
- }
- 
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
deleted file mode 100644
index b02d8b68870c..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
---- sys.orig/conf/kern.mk	2012-07-12 13:26:37.000000000 +0900
-+++ sys/conf/kern.mk	2012-07-16 02:32:19.000000000 +0900
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
- #
-@@ -52,7 +52,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	-mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch
deleted file mode 100644
index 0fb6df7600ef..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: sys/kern/kern_ktrace.c
-===================================================================
---- sys/kern/kern_ktrace.c	(revision 266771)
-+++ sys/kern/kern_ktrace.c	(working copy)
-@@ -119,6 +119,7 @@ static int data_lengths[] = {
- 	0,					/* KTR_SYSCTL */
- 	sizeof(struct ktr_proc_ctor),		/* KTR_PROCCTOR */
- 	0,					/* KTR_PROCDTOR */
-+	0,					/* unused */
- 	sizeof(struct ktr_fault),		/* KTR_FAULT */
- 	sizeof(struct ktr_faultend),		/* KTR_FAULTEND */
- };
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
deleted file mode 100644
index fd4040a88166..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: sys/vm/vm_map.c
-===================================================================
---- sys/vm/vm_map.c	(revision 259950)
-+++ sys/vm/vm_map.c	(revision 259951)
-@@ -1207,6 +1207,7 @@ charged:
- 	}
- 	else if ((prev_entry != &map->header) &&
- 		 (prev_entry->eflags == protoeflags) &&
-+		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
- 		 (prev_entry->end == start) &&
- 		 (prev_entry->wired_count == 0) &&
- 		 (prev_entry->cred == cred ||
-@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm
- 	 * NOTE: We explicitly allow bi-directional stacks.
- 	 */
- 	orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
--	cow &= ~orient;
- 	KASSERT(orient != 0, ("No stack grow direction"));
- 
- 	if (addrbos < vm_map_min(map) ||
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch
deleted file mode 100644
index ef2d0a78206b..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://www.freebsd.org/security/advisories/FreeBSD-SA-13:06.mmap.asc
-https://bugs.gentoo.org/show_bug.cgi?id=473688
-
-Index: sys/vm/vm_map.c
-===================================================================
---- sys/vm/vm_map.c	(revision 251636)
-+++ sys/vm/vm_map.c	(working copy)
-@@ -3761,6 +3761,12 @@ RetryLookup:;
- 		vm_map_unlock_read(map);
- 		return (KERN_PROTECTION_FAILURE);
- 	}
-+	if ((fault_typea & VM_PROT_COPY) != 0 &&
-+	    (entry->max_protection & VM_PROT_WRITE) == 0 &&
-+	    (entry->eflags & MAP_ENTRY_COW) == 0) {
-+		vm_map_unlock_read(map);
-+		return (KERN_PROTECTION_FAILURE);
-+	}
- 
- 	/*
- 	 * If this page is not pageable, we have to get it for all possible
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch
deleted file mode 100644
index 767588fc86f6..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://www.freebsd.org/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
-https://bugs.gentoo.org/show_bug.cgi?id=478314
-
-Index: sys/kern/vfs_export.c
-===================================================================
---- sys/kern/vfs_export.c	(revision 253367)
-+++ sys/kern/vfs_export.c	(working copy)
-@@ -208,7 +208,7 @@
- 	np->netc_anon = crget();
- 	np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
- 	crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
--	    np->netc_anon->cr_groups);
-+	    argp->ex_anon.cr_groups);
- 	np->netc_anon->cr_prison = &prison0;
- 	prison_hold(np->netc_anon->cr_prison);
- 	np->netc_numsecflavors = argp->ex_numsecflavors;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
deleted file mode 100644
index bb3caba00137..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: sys/dev/random/probe.c
-===================================================================
---- sys/dev/random/probe.c	(revision 260523)
-+++ sys/dev/random/probe.c	(working copy)
-@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
- 
- #include <sys/types.h>
- #include <sys/param.h>
-+#include <sys/systm.h>
-+#include <sys/kernel.h>
- #include <sys/malloc.h>
- #include <sys/random.h>
- #include <sys/selinfo.h>
-@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat
- 	/* Then go looking for hardware */
- #if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
- 	if (via_feature_rng & VIA_HAS_RNG) {
--		*systat = random_nehemiah;
-+		int enable;
-+
-+		enable = 0;
-+		TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
-+		if (enable)
-+			*systat = random_nehemiah;
- 	}
- #endif
- }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
deleted file mode 100644
index 2f82a5f98a58..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: sys/netinet/tcp_reass.c
-===================================================================
---- sys/netinet/tcp_reass.c	(revision 264836)
-+++ sys/netinet/tcp_reass.c	(working copy)
-@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 	 * Investigate why and re-evaluate the below limit after the behaviour
- 	 * is understood.
- 	 */
--	if (th->th_seq != tp->rcv_nxt &&
-+	if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) &&
- 	    tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) {
- 		V_tcp_reass_overflows++;
- 		TCPSTAT_INC(tcps_rcvmemdrop);
-@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 	 */
- 	te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT);
- 	if (te == NULL) {
--		if (th->th_seq != tp->rcv_nxt) {
-+		if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) {
- 			TCPSTAT_INC(tcps_rcvmemdrop);
- 			m_freem(m);
- 			*tlenp = 0;
-@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 				TCPSTAT_INC(tcps_rcvduppack);
- 				TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp);
- 				m_freem(m);
--				uma_zfree(V_tcp_reass_zone, te);
-+				if (te != &tqs)
-+					uma_zfree(V_tcp_reass_zone, te);
- 				tp->t_segqlen--;
- 				/*
- 				 * Try to present any queued data