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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 12 insertions, 26 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/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