app-emulation/xen: bump to 4.11.3-r1
authorTomas Mozes <hydrapolic@gmail.com>
Fri, 13 Dec 2019 06:15:44 +0000 (07:15 +0100)
committerYixun Lan <dlan@gentoo.org>
Fri, 13 Dec 2019 09:46:17 +0000 (09:46 +0000)
Fix XSA-{307,308,309,310,311}

Closes: https://bugs.gentoo.org/700374
Cloese: https://github.com/gentoo/gentoo/pull/13966
Bug: https://bugs.gentoo.org/702644
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
app-emulation/xen/Manifest
app-emulation/xen/files/xen-4.11-efi.patch [new file with mode: 0644]
app-emulation/xen/xen-4.11.3-r1.ebuild [moved from app-emulation/xen/xen-4.11.3.ebuild with 97% similarity]

index 1e3cea990b92edcb97618467c69f4fdf3d369d97..f2f3a60bdefb12be048de7c04a2365faedaef1fe 100644 (file)
@@ -1,7 +1,7 @@
 DIST xen-4.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e
 DIST xen-4.11.2-upstream-patches-3.tar.xz 98796 BLAKE2B 5bfb86a54b5bb1452849ac78eabf49c4622010f089f20d334fd5d6bf8537c6ccf179dc6f9ff5c1208c8e6b3276ef8b37f42360cbba4f83cfbbdae6f3475d88d2 SHA512 5e8cf109b9a00acea6e843f5793f01a14edb0f29573a12b632b93b328393b0cbf5f048088d9a82b2eb0aa51b4d355509921e63696225c355fe667b5b1da6b5d9
 DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
+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.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch
new file mode 100644 (file)
index 0000000..c7173d9
--- /dev/null
@@ -0,0 +1,36 @@
+diff --git a/xen/Makefile b/xen/Makefile
+index af27147777..a5299b3868 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
+@@ -57,9 +57,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
+ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
+       [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
+       $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
+-      ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
+-      ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
+-      ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
++      if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
++              ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++              ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++              ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++      else \
++              $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
++              $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
++              $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
++      fi;
+       [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
+       $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
+       $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+index ec02972f2b..628c245564 100644
+--- a/xen/arch/x86/Makefile
++++ b/xen/arch/x86/Makefile
+@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms
+               --rename-section=.data=.note.gnu.build-id -S $@.bin $@
+       rm -f $@.bin
+-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
+ EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
+ EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
+ EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
similarity index 97%
rename from app-emulation/xen/xen-4.11.3.ebuild
rename to app-emulation/xen/xen-4.11.3-r1.ebuild
index 6d135ed74c970d756d7ae8783eecb2ff74ba77c3..3fb983d401665f681be07b2088d1ba2b51d0d187 100644 (file)
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
        SRC_URI=""
 else
        KEYWORDS="~amd64 ~arm -x86"
-       UPSTREAM_VER=0
+       UPSTREAM_VER=1
        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() {