From d2816932069d17427fc397a90e3fd053319f02dc Mon Sep 17 00:00:00 2001
From: Yuta Satoh <nigoro.dev@gmail.com>
Date: Thu, 28 Jan 2016 20:57:38 +0900
Subject: sys-freebsd/freebsd-sources: Fix FreeBSD-SA-16:10.linux

---
 sys-freebsd/freebsd-sources/Manifest               |   1 +
 .../freebsd-sources/freebsd-sources-10.2-r2.ebuild | 166 --------------------
 .../freebsd-sources/freebsd-sources-10.2-r3.ebuild | 167 +++++++++++++++++++++
 3 files changed, 168 insertions(+), 166 deletions(-)
 delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
 create mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.2-r3.ebuild

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index fac150cdee51..f3a152d96775 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -7,6 +7,7 @@ DIST freebsd-sources-SA-1601-sctp.patch 608 SHA256 19eb23dd143c6e5b0e3ee44d523dc
 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-sources-SA-1610-linux.patch 2505 SHA256 f631e54826aabe472598edc4faa5ad5ae6fcd2547b0863dc25c985937b40736b SHA512 02dfe342be51ff195ccdad10ec7c34bfb38adcb2c6be4a33bcf5e4806774ca82953145c2f5a12711fed61d96f04e45804608edf90df0ae79f9a717e27b755196 WHIRLPOOL 3510a824f4f2189fc777a0a57fd0af17a49c328950b52097d1a95baeed72cd66ff32fe200d5380b75f9648b535eb7df7ecd64617cf67b925389a455cf1c6a13f
 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-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
deleted file mode 100644
index 2e3b1adb8d0f..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-# Security Advisory and Errata patches.
-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"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r3.ebuild
new file mode 100644
index 000000000000..d68c8f9f2391
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="0"
+
+IUSE="+build-kernel debug dtrace zfs"
+
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
+	"SA-16:03/linux.patch"
+	"SA-16:04/linux.patch"
+	"SA-16:05/tcp.patch"
+	"SA-16:10/linux.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"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
+fi
+
+EXTRACTONLY="
+	sys/
+	contrib/bmake/
+	usr.bin/bmake/
+"
+
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!sys-freebsd/virtio-kmod
+	!sys-fs/fuse4bsd
+	!<sys-freebsd/freebsd-sources-9.2_beta1"
+DEPEND="build-kernel? (
+		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+		>=sys-freebsd/freebsd-usbin-9.1
+		=sys-freebsd/freebsd-mk-defs-${RV}*
+	)"
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+KERN_BUILD=GENTOO
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-10.0-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	"${FILESDIR}/${PN}-7.1-includes.patch"
+	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
+
+pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
+src_prepare() {
+	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 10.0-RELEASE it's 1000001.
+	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	# Set the kernel configuration using USE flags.
+	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+
+	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
+	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+	if use build-kernel ; then
+		tc-export CC
+		cd "${S}/$(tc-arch-kernel)/conf" || die
+		config ${KERN_BUILD} || die
+	fi
+}
+
+src_compile() {
+	if use build-kernel ; then
+		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
+			cd "${WORKDIR}"/usr.bin/bmake || die
+			CC=${CHOST}-gcc freebsd_src_compile
+			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
+		fi
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_compile depend
+		freebsd_src_compile
+	else
+		einfo "Nothing to compile.."
+	fi
+}
+
+src_install() {
+	if use build-kernel ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_install
+		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+		cd "${S}"
+	fi
+
+	insinto "/usr/src/sys"
+	doins -r "${S}/".
+	if use zfs ; then
+		insinto "/usr/src/cddl"
+		doins -r "${WORKDIR}/cddl/".
+	fi
+}
+
+pkg_preinst() {
+	if [[ -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys is a symlink, removing it..."
+		rm -f "${ROOT}/usr/src/sys"
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+
+	ewarn "If you want manual compile (not recommended), please don't forget the following step."
+	if ! use sparc-fbsd ; then
+		ewarn "export CC=clang"
+		ewarn "export CXX=clang++"
+	fi
+	if ! use zfs ; then
+		ewarn "export WITHOUT_CDDL="
+		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
+	fi
+	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
+		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
+	fi
+}
-- 
cgit v1.2.3-65-gdbad