sys-freebsd: Merge "Fix multiple Security Advisory and Errata"

Pull-Request: https://github.com/gentoo/gentoo/pull/667

4 files changed, 17 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1cbebfc5c67e..a99130f0cc51 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,6 +12,7 @@ DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe14
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-lib-EN-1517-libc.patch 24159 SHA256 d9662fc730a3cd8f45763cb23ffb8500606123b91947fe3aaad250b36791bf91 SHA512 bc08438974eafe038298f9b1c01b02b85503ac909af7aa9d852929bac3620afc24d0339cbe5b2368c05879619d3ba4fb377cd2a805c261e2f4eec3ef5bdd6da6 WHIRLPOOL 0cb41d381856e6a25ae9505f68d392646e0f47cbb8b5d395fc88da36115fa876fff55cde85c62cedbd48427dc4944b5343f49a3beb5e7a9ded544ff2c89e9363
+DIST freebsd-lib-EN-1603-yplib.patch 2358 SHA256 f4151d7188cf5a925d120008a03dd9f1088fcec20bdc46cc91b3a3bebaa712c5 SHA512 0cde2e0edbdd080a44ff90806d4a349fbffa3fae9737e10d2b22b89aaf07da95202aa520e2fcd042126ca6ebdf8504de550835d022c3d53cf16a4c4cdee35b9c WHIRLPOOL 7d1706c31ea976272761ca749aeef886c6f76163dcd6f5988b6e449125b745d25a0f85bead8ec75a93784a25caf237a15a79de0b444a2dd2ddcf73308f89c64f
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
index 7168bea50df7..e5d7309f5c0e 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild
@@ -10,7 +10,8 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:17/libc.patch" )
+UPSTREAM_PATCHES=( "EN-15:17/libc.patch"
+	"EN-16:03/yplib.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index a79317e983d9..fac150cdee51 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,12 @@
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
 DIST freebsd-sources-EN-1519-kqueue.patch 543 SHA256 09f3b3e80a9902bfea78dfcaf434daf09f7ffa4ff701a34eaf387fee36d1f4e3 SHA512 222c7256c79beefa322a20f4f35fde7ababb46b28669df491087d46f28d9dbf1eca09c9fbbef678f1262a52741eafc0701676d087025e968d34352b95b5a61f6 WHIRLPOOL c3a334188155f261036a81377940bbaa78ddfcee1727001fb71759af67300c8a3ab02a649bec239522d0a06f143064a168ea925285c6a9d7f07a05ed81999d10
 DIST freebsd-sources-EN-1520-vm.patch 1100 SHA256 cc6c4e383d53316aba079ef8047aa80e8256214877d4281049df923d6aea7098 SHA512 2a853d0a3c57832915922ab511175395b0f2d43346e3b2501e83e42f063ac32bf3317bc93f2e3151d630f34e7b0fbcd3b21092fffcf163ba1b39c156f6b3c8ce WHIRLPOOL 7999092d2c5ddffc5e9ef665536150f768de7936c38306616d7a1ee63339afae17b04ae2aa9a2b110ed219c1039beeff5dbff8e222e1ea6a921c16c4f262e587
+DIST freebsd-sources-EN-1601-filemon.patch 15491 SHA256 8237b34ca75e6991f7de33c222ef64adc2a3d9e5035d05df96ad6cd85e00967a SHA512 28926bf7f23428d3361bf97b8b0a073df0a49488cd788b28f1671d0786c7f0185c0e3e7216ac5f19be2cfd9867bbbe4a3f81b811fce0394cbaae0c301b164c02 WHIRLPOOL 825c8872d9a312cba2d9ccdeb7ff50eb330f7c13aba168a09ffde0691969412f51bf2175e72acb5210ed38fad392f4db60973049f702de1a852e5f7ade90734e
+DIST freebsd-sources-EN-1602-pf-10.2.patch 12239 SHA256 ad2bc821210a9dbca355b21c9c4577344158f3d67e9871788d9295c35e357e97 SHA512 b7aa136b9ece36525bdfe4d63711f073e070d552136663715ca98b9c3dfb58146d61d74cd9032c4f7a239c421992d19ad609a75ad106038e21c8fc6e4e77d08a WHIRLPOOL 085fdbdef54a96ad0a7a90217ff5027a69452c87d12d77e857066bfb7de4ac910371c827d10b5202331afc04c9ebc97773f91dee11f1a89b55fadc618ffea7d9
+DIST freebsd-sources-SA-1601-sctp.patch 608 SHA256 19eb23dd143c6e5b0e3ee44d523dcb340d9b36d29bcb9bb21d27a248c1b093d0 SHA512 4671377b5c9034c28d2aa3176f872dab38dbec06d5d944d99164b2e449e996bc361f7910f70046290439636c3a8a7139da382c79123518d6cfbc5aead47f9ab6 WHIRLPOOL 2e5303d45f8e6aea0accbef603ec4c9bbd1b0bb0fcf78f797f353cacbe10f5e90c0217ff7c3d1396ed59d0b08f6c60bb5b7fa70f9641cda3fc2fd64dcb5b3423
+DIST freebsd-sources-SA-1603-linux.patch 2815 SHA256 81e9590e56f091f6e67f2f6826c552f67172d5d3067defda3569377c61cb43d3 SHA512 9773a4b12c352d96a22279bdf428bef40650e38f8daec85beb8d321524ff0e45c4f31b40c897a3928261b0c9131dbfa80cb8c80ed2aa41eb4846588fc0980a63 WHIRLPOOL 15f8a62df9d5517f3f66635740069b791b676a2cdbaa696a63cf939df8926521acd891005f866a5607f235c52c737d1acdec36d72d61cc74c47c0cd075ae1180
+DIST freebsd-sources-SA-1604-linux.patch 1164 SHA256 0c1f169904600d13a5efe2bef6999f3da433a615642a80cb2ec960f164ff6208 SHA512 ccc15464071032b5bb4a5bed46a28cb036699b281b543ce5cdfb37f2cb728c66d9194080e1e010169145591ae3f4770ae84daf3149d9498c6302c0870ae2da10 WHIRLPOOL b58344e4b2b1e53e33674039882572d7f0b8987202371ff631e91f345698368d70e6af7ad43010f1d6cb7f0161b3d59587abdffd621300db461701832953dabb
+DIST freebsd-sources-SA-1605-tcp.patch 972 SHA256 171e3029d5ae440da75b4ab5fdc986d9e72ecc11cfdeae490ce401b53997c503 SHA512 e0c973b62e925f442039b1baa45b89694f2c7a25d3ee61f1238d4bea3771273945bd56694eb2f84770dabf25a252950db24ca421687c065ef84624067c37eed1 WHIRLPOOL 0d4b4025f57f956017caff98730d89f54a737e4cfd6d4588eec86d761aaf47b4242ca1a8c81245c70b9f492f36a1c771bbde5bac98061c76e556d239d25a33d8
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
index b1f9daa8f5b6..2e3b1adb8d0f 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
@@ -12,8 +12,14 @@ SLOT="0"
 IUSE="+build-kernel debug dtrace zfs"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:19/kqueue.patch"
-	"EN-15:20/vm.patch" )
+UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
+	"SA-16:03/linux.patch"
+	"SA-16:04/linux.patch"
+	"SA-16:05/tcp.patch"
+	"EN-15:19/kqueue.patch"
+	"EN-15:20/vm.patch"
+	"EN-16:01/filemon.patch"
+	"EN-16:02/pf-10.2.patch" )
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"