commit: 020afb78fe20be70e4b09664867bc9aa9148a90f
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Dec 13 06:17:44 2019 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 09:46:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020afb78
app-emulation/xen: bump to 4.12.1-r4
Fix XSA-{307,308,309,310,311}
Closes: https://bugs.gentoo.org/700374
Cloese: https://github.com/gentoo/gentoo/pull/13966
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-emulation/xen/Manifest | 2 +-
app-emulation/xen/{xen-4.12.1-r3.ebuild => xen-4.12.1-r4.ebuild} | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index f2f3a60bdef..12f882e6c57 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,6 +3,6 @@ DIST xen-4.11.2-upstream-patches-3.tar.xz 98796 BLAKE2B
5bfb86a54b5bb1452849ac78
DIST xen-4.11.2.tar.gz 25164925 BLAKE2B
11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310
SHA512
48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B
c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287
SHA512
e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
DIST xen-4.11.3.tar.gz 25180826 BLAKE2B
56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172
SHA512
2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
-DIST xen-4.12.1-upstream-patches-3.tar.xz 84912 BLAKE2B
4e8ee83d9f48f9ceadf401c069627c4ca91f70b726c4de9806070aaa090df912dfb15251be0d79829e249600451cf42621e722b739eb0961189b6bafcf1c5c57
SHA512
ae8f902cc39f3b0b99520d932e3be9ae51d00a997f3a008562bf39c63ba0ee9fc0a5f00d03027d4a9bf7de777bd8f1a41ffb10d52bee5b92a05364e9fb5434eb
+DIST xen-4.12.1-upstream-patches-4.tar.xz 128244 BLAKE2B
881a4efe2552cdcff705325eeb1eee19338dc69e110efa8bf3e7fb57d5a6ca306c4848d61149a74c6827e938934963bc54f7ff8b939fc43198e8a892ac8f0708
SHA512
cec14e2000d6686c46c286e70bb4af29a13e06fc7aaca9bd1008564d346c99ea8909a1175eaf9a771524c6cfe4b313a3e35c9fd8bbf4f1a6778dc0cbe3134bc5
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B
ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed
SHA512
be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
DIST xen-4.13.0-rc4.tar.gz 39003881 BLAKE2B
21352f0984f1c46f8f3a4e8420ec9eabeff65d47c61bbb16dadca6087a53a975285fd58f3c9d810a874b95059eb2538d989921e2acd0b23f46baa3668c4737e9
SHA512
cbea9cc6cbc2b80ba9bec840b9c08d90884e908ec9675000df75a483ee1f2c70ce09c97d69d923a6530726b92fe6bee7b22aeee71ce5e9530c2eba984c7f57f4
diff --git a/app-emulation/xen/xen-4.12.1-r3.ebuild
b/app-emulation/xen/xen-4.12.1-r4.ebuild
similarity index 97%
rename from app-emulation/xen/xen-4.12.1-r3.ebuild
rename to app-emulation/xen/xen-4.12.1-r4.ebuild
index 2f5212664be..3ee8dd94a9c 100644
--- a/app-emulation/xen/xen-4.12.1-r3.ebuild
+++ b/app-emulation/xen/xen-4.12.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=3
+ UPSTREAM_VER=4
SECURITY_VER=
GENTOO_VER=
@@ -98,7 +98,7 @@ src_prepare() {
# Gentoo's patchset
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't
drop"
@@ -120,6 +120,8 @@ src_configure() {
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
}
src_compile() {
