From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C80C6138359 for ; Tue, 29 Sep 2020 20:01:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D20CFE0B66; Tue, 29 Sep 2020 20:01:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2AB2E0B48 for ; Tue, 29 Sep 2020 20:01:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B1A3340441 for ; Tue, 29 Sep 2020 20:01:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 939F9373 for ; Tue, 29 Sep 2020 20:01:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601409689.3a434d993761f0a13deb5602cb0efb7d5c4f992a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/Manifest app-emulation/xen/xen-4.13.1-r4.ebuild app-emulation/xen/xen-4.14.0-r1.ebuild app-emulation/xen/xen-4.14.0-r2.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3a434d993761f0a13deb5602cb0efb7d5c4f992a X-VCS-Branch: master Date: Tue, 29 Sep 2020 20:01:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: de4400be-ab2a-4b71-a747-d69deccd62a6 X-Archives-Hash: 072eed1f2e62fcfef1ab092d6cfce4e2 commit: 3a434d993761f0a13deb5602cb0efb7d5c4f992a Author: Tomáš Mózes gmail com> AuthorDate: Tue Sep 22 20:03:55 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 29 20:01:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a434d99 app-emulation/xen: add upstream and security patches, drop old Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17638 Signed-off-by: Sam James gentoo.org> app-emulation/xen/Manifest | 3 ++- app-emulation/xen/{xen-4.14.0-r1.ebuild => xen-4.13.1-r4.ebuild} | 6 +++--- app-emulation/xen/{xen-4.14.0-r1.ebuild => xen-4.14.0-r2.ebuild} | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 954e9d63178..51b6a58623d 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,4 +1,5 @@ DIST xen-4.13.1-upstream-patches-2.tar.xz 53744 BLAKE2B 769b5b8022f7db66f677d8107c6473606376718bffeac7eba09c4270f4005811f472fb9ed2a2804260e0486228edbadfcf8f81bf1dae6d68df37da213d281390 SHA512 b07c865b96c6f48b9d0b4e4c2f3ec19f4dc44884f4024e440a3e537f594f9f5edd6edf805bdefc82e5f1f2520f35f940b64c158972cbf5bfdc8fb2ca7a1b0ac1 +DIST xen-4.13.1-upstream-patches-3.tar.xz 87056 BLAKE2B 01d7133b8f7e3c9a42b9771dcb7739777f79f229941114cce70ba2897dd52bf53f08de35602a0b40a120fc155c274dbf91e107856f4afdae2c4f7b4bc0a67cdd SHA512 d67e9ddfbf27dc5a23a77679b1b2524a49c2aec3ff9eb3472f9e075893d87401f8e99707b0652744eb4af7a3ed9a815c3925de49995bcd7c82d97c13a69b5309 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90 -DIST xen-4.14.0-upstream-patches-0.tar.xz 6872 BLAKE2B 958ad668362c9c02af39f2a02cde2baa9b9fc8853116c390f43a77bb17c649bfc6a4b51db5cbe564a8c3c440ce736603e44b97f45c50a7836c9a43bfb0d2255a SHA512 a30d9708e64e1405f837b14c1e5a0e28fcb9e7a177c822570e25d0ed118a9c58c380f4ed64a40bf970a9389baf9848e52f7d161efe922b883ee990c8029e7e1f +DIST xen-4.14.0-upstream-patches-1.tar.xz 45360 BLAKE2B 0f72a2cc3d18557b86a2a83f97e4141be46a20e3ba59ccc881a34a4408988eba9827e3b927bc07aba9678123d783303e7d47d789e57323a7f6691d718c019dc8 SHA512 3d5093e4367d27e7f6e8d4cc31841a5c80cc3fb870d6cb32131d064e16cbb559e9a783c70eec1ce13c960b3e2a8d5e23e18d26b936bc418b434df3bb801d3e4f DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 diff --git a/app-emulation/xen/xen-4.14.0-r1.ebuild b/app-emulation/xen/xen-4.13.1-r4.ebuild similarity index 97% copy from app-emulation/xen/xen-4.14.0-r1.ebuild copy to app-emulation/xen/xen-4.13.1-r4.ebuild index 34ea5e60db5..5bde79cb7c8 100644 --- a/app-emulation/xen/xen-4.14.0-r1.ebuild +++ b/app-emulation/xen/xen-4.13.1-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=0 + UPSTREAM_VER=3 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-r1.ebuild b/app-emulation/xen/xen-4.14.0-r2.ebuild similarity index 99% rename from app-emulation/xen/xen-4.14.0-r1.ebuild rename to app-emulation/xen/xen-4.14.0-r2.ebuild index 34ea5e60db5..2738d77fd9d 100644 --- a/app-emulation/xen/xen-4.14.0-r1.ebuild +++ b/app-emulation/xen/xen-4.14.0-r2.ebuild @@ -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=