[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     dc90e227ae3deca9ab53fc45c08a0857b472f9e4
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Dec 16 09:21:46 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:20:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc90e227

app-emulation/xen: add security patches, drop vulnerable

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-emulation/xen/Manifest                                       | 3 ++-
 app-emulation/xen/{xen-4.14.0-r6.ebuild => xen-4.13.2-r3.ebuild} | 4 ++--
 app-emulation/xen/{xen-4.14.0-r6.ebuild => xen-4.14.0-r7.ebuild} | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index ba2a63dde3c..03ed8781964 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,4 +1,5 @@
 DIST xen-4.13.2-upstream-patches-1.tar.xz 15832 BLAKE2B 4e20a1e2d575ed7e1d21f3b34ed0d8bf6e1405cb39cc5c6ffc099614ea833ac9794bfcfcdea0893fdf81b318f536017ac3a023ad096bc8a8c7390c01f1d513ed SHA512 48dda9dadec1e87fb7b6952636e73057f6e0a5501f9727d05ac636fd47747194501db709c8ffa7154e79b6b612a98b658a03bc083c5065ff851ac57f454b599e
+DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.0-upstream-patches-5.tar.xz 79424 BLAKE2B d2c6ec53e02fb306a7d7f7e8e6711f3e0523919d8dfb3e4e4b7ea66b618511c035e88e015e1028e6684bc6486e8e71b52e280c2f52c34357441870cd866b2672 SHA512 218657053c24330b0c9072fa32b9cc9619b6ceed0592114445651977c335fef0748160e89da2194456d4e0761b6314aed7a5f1992fa996c62eb191431b678e40
+DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0

diff --git a/app-emulation/xen/xen-4.14.0-r6.ebuild b/app-emulation/xen/xen-4.13.2-r3.ebuild
similarity index 98%
copy from app-emulation/xen/xen-4.14.0-r6.ebuild
copy to app-emulation/xen/xen-4.13.2-r3.ebuild
index 3a4fdc8209c..79234b62328 100644
--- a/app-emulation/xen/xen-4.14.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=5
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -98,7 +98,7 @@ src_prepare() {
 	# Gentoo's patchset
 	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
 
-	eapply "${FILESDIR}"/${PN}-4.14-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"

diff --git a/app-emulation/xen/xen-4.14.0-r6.ebuild b/app-emulation/xen/xen-4.14.0-r7.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.14.0-r6.ebuild
rename to app-emulation/xen/xen-4.14.0-r7.ebuild
index 3a4fdc8209c..7febeaacb94 100644
--- a/app-emulation/xen/xen-4.14.0-r6.ebuild
+++ b/app-emulation/xen/xen-4.14.0-r7.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=5
+	UPSTREAM_VER=6
 	SECURITY_VER=
 	GENTOO_VER=