Switch to UPSTREAM_PATCHES. Part of https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/126 by nigoro.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 28 insertions, 43 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 96bb705c80bf..af9c5a24172c 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.209 2015/05/24 11:24:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.210 2015/05/24 11:25:44 mgorny Exp $
+
+  24 May 2015; Michał Górny <mgorny@gentoo.org>
+  -files/freebsd-lib-10.1-cve-2014-8611.patch, freebsd-lib-10.1.ebuild:
+  Switch to UPSTREAM_PATCHES. Part of https://github.com/gentoo/gentoo-portage-
+  rsync-mirror/pull/126 by nigoro.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org>
   -files/freebsd-lib-9.2-liblink.patch, -freebsd-lib-9.2.ebuild,
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index a5182a74cb7b..6474546a2ca1 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -5,7 +5,6 @@ AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
 AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
-AUX freebsd-lib-10.1-cve-2014-8611.patch 605 SHA256 f8e3556e82a9d256bd42be796dd1a8672b84259087369087ecf8fb2ddcdbdbd7 SHA512 9462e5e4a8a04999b0d434e47bd6891e638281d13f2aba1ff7e2fd6f2b3a698f1339aac2b257404eb52498b14bcdb7b512b82ea203b176a0cb42891da292e691 WHIRLPOOL 942287e5fe27452d1c5c046d00d1e33cf57052ad3429a81ef5da2b4eb93d96aad734d31f0e1c196278a9ab232ec6efc4217c2ff28b271ed63878c6677f4753dc
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e
 AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f
@@ -64,28 +63,28 @@ DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c
 DIST freebsd-usbin-10.1.tar.xz 2596760 SHA256 3b6472768fedbec4d7d82e2c60ec337931cdec571f5d6a0017308c767dacb41a SHA512 6a76a1b6304b5aea8fe33074b705138396633fd31eb2c000d681a8befaefc816519de40e9d1b8c2a7e36628152b8185c9e796af30cf136cd8490a8c15458daea WHIRLPOOL 17949b8bbf8705fb91472db6ab0aedd851162c6fe87f6236a0dfd8cfd46756d7d9e53ba3c8618f8f899d7259f7fb228966a6fb88a1c1b58b26fb08739f62c665
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
-EBUILD freebsd-lib-10.1.ebuild 19669 SHA256 219e4f7e9dd02b1369659ac46dcd7c64da269e042fec4935a4d51031e9126bf6 SHA512 0e81da5dfa8fa5fb76b82b82bda894e4f5b1b702d04d67b051849ff71aee85a2332662118e924394b4a1a3899b50915b1559203fd73e3ced17116fc9b12156d7 WHIRLPOOL 4353baf8a0bb02fe19660164317a159659aeddad68691ce7970b0fcf78dc4ffa4411d8368f510d7f844b478545017b3db5418679160960a299e068e6e778d771
+EBUILD freebsd-lib-10.1.ebuild 19739 SHA256 d7f595232a6580a095a1d0e1029b4ac17ea744df4baac279d489d7979bf7f9c5 SHA512 0fe86845b7632e24cd05342f87f598ac39155a905caba0166a8048171a2066c9abc0e2fb26d6238ed2ba0010afcf7277007bf7b25bc0bb73a19ef9f1547ad237 WHIRLPOOL 40337148760e648f5c1fc7eb9a6050edc8208583a628d51af1fb060d046136d01e259e60b0555ebb7ab7ede3ecfcb578e07fa5e9cb0baae19fb0756c695ae970
 EBUILD freebsd-lib-8.2-r1.ebuild 15803 SHA256 6ed08aaa4950f1c5f92736e403f27eaaa7e4059f6d8c0d3cb416d5ec3859dd96 SHA512 32abfc388bdfe628634d46a686437cbfbe01d0fb99c85a75a3ccc67869a19ace1c3341b2ca468643a1c0d544ef8ad0b041cd1c882767cab57337813b8b3d8b63 WHIRLPOOL 250d59a4bee40b369d1d683e26e70ac15c02044af13c604c885c41a0463470555ba92124bc58adea34fdd922fbc79406e4c376f9cef08ca6569c7cf432c6a2a8
 EBUILD freebsd-lib-9.1-r10.ebuild 18625 SHA256 9bad00d447b28f362910eaf85782a1caac4da475d4e83cfb6de583456891b3c5 SHA512 1b67821daa1ca31220542d404f8a9268a35462eb0a86bc76882a9e31159af87e62f06dd6d64192b123ea2c019581829cd3da8e9b6bb443279b55d5e3ed4c1d63 WHIRLPOOL 6fc1ec14acc67d2fa6ccf55ddc77aa89bafab102e5fc12dea833dcc2eb0628b5e87e7ae4cdab679e5fecbd688395d794550f1761cc688dcfe8786d0d1c6ad6ba
 EBUILD freebsd-lib-9.1-r11.ebuild 18936 SHA256 a450ef603f4d8ddcfa67a1ab37492e97b06aa6e7ff55d9a52818338def7a2c61 SHA512 dcfe7645fd9c75a6eaa5934fa3975a5584294f31851a724cc63f27cfe6c698206a81553400f09c522649fcbf169107253147f8855c641e323c3abdef1dc344ee WHIRLPOOL 7f6e33a601ceac7fee197eb0ea609cbc6ac2207bc65608585c8f8137f8b052e8f50df8d031c311312af542b83a1a14f85d8559de52bf3091946e6322626ef7db
-MISC ChangeLog 42775 SHA256 116416b2d41df386ef3fab29507799ce865389f6b05ac8aa0aec14a562b0dcde SHA512 9961f26a149bf0a9ebbcf4f414e8b3ab6dba0101aba9507be9accdde4e563854eaea86c9c09a73d7f6135d3796e0faf60fdbb1ed8b1c885629a9062c6b3edb5e WHIRLPOOL 8723ccd782ca52e45ba713cdf031138d8eb3829c907cf6e3b08d992edfd233c38bf649038527c39ba131c09138bd8b589a48a2ad2c3ec437ee31a6f3374099b1
+MISC ChangeLog 43013 SHA256 b22ec02285cde51bbf1701178319ab4e58a3e787a8c3bcfd272501dfb08a5311 SHA512 2894fbd3d343ae0531c93eacb9ae9dcf9c8f6851ebc52229f1713eaa4c244b10ca816325570fcf2d91a4272dd1a1afcf0e4870351cfa74c54e4d81083901f4de WHIRLPOOL 2cc5659694c94ad7025ff955b802f2e8bdc3bc65c11eaf64b8bd6bdf8daf96a819c386645358721b4af01cbac7fbdc4a90d51cdd9d2453b6e6daa97b188e7108
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVYbTYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVYbU6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKsIQAKjSpCLEcRvQ6U4JsJa31WDD
-rKpRRpySANCJ/ItMo9RVsDZ/9t76Iatd7Qgn4L+bkzWR6u0ej56uRK3sDQe8mMpx
-w1Xb3XCHDfBms+AxhRE1tTl+QvORBPP+56VmMerzwIIvJf11MXoJEono1/iHfoym
-go6pssb3Hkuu+S8NdeTLSeHPjamQbEDComRGzGJKYvRi7DAP1txurw71ULMs3URn
-sc05K7xjiwqpEvURdq4c/fr2KNstcgxUJQbWtoMBjMQprKOEthlnv2q5aSsZLS40
-pJ5TSI+hZYwLrATUYNeT1jfsTi8/lvNN+9EmTuSpWfyTbSW6M0m63ZWi/lsnGnfT
-IXtOvdKsBEQZJdZsnCLeEhztzNucSQWekz+mzatCIAKYBOfrSSXBVIDeNlAC2jee
-RYIjPM+VxHCShfjbHAz09buQgOXhnDoIb4uM6kz2TvO1SwiVuMR6gWvVGtmmLDi0
-TG0uVTSycj11HrqjEgXV0GtZO0rQUqbAnWHMt8RQ6NjwNixTGwaCA7dQaNmdU5sY
-i5CJ2NRbiQGd8yo+935oKU6NST/qao9VQ21SrF22LXRzwX+g1D/I+5Paja68z5uI
-4HpN8rqyN/S6ZtbflKliy0ChUvyXPOs5/g2SDfD+EPAf5XdZzvEQU1GPej76Q2zf
-5azaP8NOpvQfWNSpdU0L
-=gGYc
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOSi8QAJine6Ev1nsiquagB6W6aeo/
+yKEg2pfLAT62tJLPovZW0otpANDOY4i016eghE3DzcBmrwKoy6xXI9o6orPZ0TpB
+pesbNtUCJvlQSF4jCW2rD6il6oH0F4dCpICL2JzFXiczjEoPRb8jn0OfNFNSZpMJ
+KNkrrnatJZeHaowOROYOKBZ6PeXbDjfmZrO2IeGKqCMwymqbOu8og0NbzyW6ZH50
+g57Rr3VauxmsNZlX9FNKAopWsiyVY45ys8s+evFB70ucRORzqEXqNMoUmLgiwEXa
+Fcs63ZL9xyKmvjuBPNmSS0G8w0Isz9Gv22FxBYtThWmG3nmbHSnFn3Nte5Ixw8ku
+PoWANR0cNcE/d63mGwHHQgzSjwyTRQtQATmrl+NYXzhLpgeEGdBt+U7KWT6qthB2
+Vu01uTGek/3INJlgzBy/OX0ombfB6HP024ISOj4qiVv+mlOBt+/Dk9+MOT3sV4dH
+BT5Kc3aTU/ZEJpfCCxhXp2qGLD9Cuz6aTBldQup/N897KBOlxagnN+hDEs7Hrh+x
+82GC3HEcGJC7qNZXtskG5JIbY6WtglOnaiCXtIV2YT1gA6Xe04qQAlK7dshIGhVJ
+BIX9YR6eVcW+hBDUg0HGbfft6miAhZgHxCnVDv/wrNfrzhIe5czYE+h70o1xqM43
+WKI8N7d2KxCKu0j2q++3
+=L9/r
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch
deleted file mode 100644
index e22504215e30..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/libc/stdio/fflush.c
-===================================================================
---- lib/libc/stdio/fflush.c.orig
-+++ lib/libc/stdio/fflush.c
-@@ -124,11 +124,13 @@
- 		t = _swrite(fp, (char *)p, n);
- 		if (t <= 0) {
- 			/* Reset _p and _w. */
--			if (p > fp->_p)	/* Some was written. */
-+			if (p > fp->_p) {
-+				/* Some was written. */
- 				memmove(fp->_p, p, n);
--			fp->_p += n;
--			if ((fp->_flags & (__SLBF | __SNBF)) == 0)
--				fp->_w -= n;
-+				fp->_p += n;
-+				if ((fp->_flags & (__SLBF | __SNBF)) == 0)
-+					fp->_w -= n;
-+			}
- 			fp->_flags |= __SERR;
- 			return (EOF);
- 		}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
index 642a156b5f70..b0fe3b6e0ff6 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.2 2015/05/24 11:25:44 mgorny Exp $
 
 EAPI=5
 
@@ -9,6 +9,9 @@ inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild mu
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "SA-14:27/stdio.patch" )
+
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
 # extracting the whole tarball
@@ -24,7 +27,8 @@ if [[ ${PV} != *9999* ]]; then
 			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${GNU}.tar.xz
 			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SECURE}.tar.xz
 			build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz )
-			zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )"
+			zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )
+			$(freebsd_upstream_patches)"
 fi
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
@@ -105,7 +109,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
 	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8611.patch"
 	)
 
 # Here we disable and remove source which we don't need or want