[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/boot0/

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/boot0/

[Alexis Ballier]

commit:     8c30a0f821910f6a7c373ac7aef78135dd1eb2dc
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue Apr  5 12:33:11 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 12:33:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c30a0f8

sys-freebsd/boot0: drop die from newins and doenvd.

 sys-freebsd/boot0/boot0-10.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/boot0/boot0-10.3.ebuild b/sys-freebsd/boot0/boot0-10.3.ebuild
index a6361bf..49521d0 100644
--- a/sys-freebsd/boot0/boot0-10.3.ebuild
+++ b/sys-freebsd/boot0/boot0-10.3.ebuild
@@ -76,8 +76,8 @@ src_install() {
 
 	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
 	insinto /boot
-	newins GENERIC.hints device.hints || die
+	newins GENERIC.hints device.hints
 
 	echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
-	doenvd "${T}"/50boot0 || die
+	doenvd "${T}"/50boot0
 }

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/boot0/

[Patrice Clement]

commit:     302313f8fc9c41bd80955e9d28127c47171f2045
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Mon Oct 31 15:51:58 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 22:04:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302313f8

sys-freebsd/boot0: fix FreeBSD-EN-16:18.loader.

Closes: https://github.com/gentoo/gentoo/pull/2707

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 sys-freebsd/boot0/Manifest                                    | 1 +
 sys-freebsd/boot0/{boot0-11.0.ebuild => boot0-11.0-r1.ebuild} | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 7b7f95b..215e793 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,3 +1,4 @@
+DIST boot0-EN-1618-loader.patch 1092 SHA256 9c145ceeebcf96e562933ec824a942baa9098177b9c01e5bd56d670f6514030e SHA512 c2d28dc48289683c009a783db59ce62008a8d9231d4ea5b1ebe6dac2d6d0d86a285524195be9a806c23fbc2ceb6e159fcd7a7e8d01fe973b6ea6d154bfca298c WHIRLPOOL f2e7d87ec26b2607ad99eed5516bfd28b6d31fee495fc0c031e7c47bcd6d049ed6ccc7f6c6675c35f1afd3e5ae294584e66d49052a16230bfe15f3e29f177d0f
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad

diff --git a/sys-freebsd/boot0/boot0-11.0.ebuild b/sys-freebsd/boot0/boot0-11.0-r1.ebuild
similarity index 93%
rename from sys-freebsd/boot0/boot0-11.0.ebuild
rename to sys-freebsd/boot0/boot0-11.0-r1.ebuild
index d108508..abe37ea 100644
--- a/sys-freebsd/boot0/boot0-11.0.ebuild
+++ b/sys-freebsd/boot0/boot0-11.0-r1.ebuild
@@ -11,8 +11,13 @@ SLOT="0"
 
 IUSE="bzip2 ieee1394 tftp zfs"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-16:18/loader.patch" )
+
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="${SRC_URI}
+		$(freebsd_upstream_patches)"
 fi
 
 EXTRACTONLY="