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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E6E08158089 for ; Sat, 9 Sep 2023 18:01:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E10522BC025; Sat, 9 Sep 2023 18:01:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEBED2BC025 for ; Sat, 9 Sep 2023 18:01:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFFA7335C2E for ; Sat, 9 Sep 2023 18:01:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C5A5113E for ; Sat, 9 Sep 2023 18:01:40 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1694282178.90536dfa26be6a154e63ff56104297fd84bd3884.arthurzam@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.16.4.ebuild app-emulation/xen/xen-4.16.4_pre1.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 90536dfa26be6a154e63ff56104297fd84bd3884 X-VCS-Branch: master Date: Sat, 9 Sep 2023 18:01:40 +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: 334164f9-a1e4-4c4e-b144-86d9982da890 X-Archives-Hash: 0b05c43af6ca7117cdd2ea5676ee480f commit: 90536dfa26be6a154e63ff56104297fd84bd3884 Author: Tomáš Mózes gmail com> AuthorDate: Wed Sep 6 14:38:07 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Sep 9 17:56:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90536dfa app-emulation/xen: drop vulnerable Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Arthur Zamarin gentoo.org> app-emulation/xen/Manifest | 3 - app-emulation/xen/xen-4.16.4.ebuild | 174 ------------------------------- app-emulation/xen/xen-4.16.4_pre1.ebuild | 174 ------------------------------- 3 files changed, 351 deletions(-) diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 05750f4cea2b..ea4bc01e3a58 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,7 +1,4 @@ -DIST xen-4.16.3.tar.gz 45003057 BLAKE2B 6092cff33bffed1b6133daf8d3ce53c57204297e66df6ac58266b2da8d5585df62ae718cc8afaad36ebe6dabdce65b9979b0d13b88e60f2b23c01be21ae4db8e SHA512 b8cbd6f95681de5f824ada2d3cbe0653a38514a18df0dafcf811fb255219c7abec96f46217bdb0c83e1119f685da9a6af7194eeaa94f1cc3c892702782133b4f -DIST xen-4.16.4.tar.gz 45008515 BLAKE2B 6637cbebe76e48ca6d2ea885b9c52244efe2fa8188c1649f6a5444fd980a8bfcff5508c8496b89b8a31ba1c4e06f47047b7289513cf22fb86d2b76a77b3cfd21 SHA512 1b5a167a9f5537b5311ef1cb56e0e6ffda0e4e569ef0534e47b4f4a528067bda46fb58b2a01abc02e8c38b2b70207fb201a5d4d10274fba70135eaa8e318e055 DIST xen-4.16.5.tar.gz 45023770 BLAKE2B 1371bd4cdf7431c16a575d4f911cec7be25a6358bbc47648aa542c6dcb27b733a8de63f9226a9290096a84df4d602186fcfdf6d255c43140d8e9373323fa53e9 SHA512 2f370787b72b2cd9d81c0b5f138133e676d2b9c8c76e31e6439649d7145242a6b7be0d51a7ff4f4197a99e3f6b24ac50e63d2fa49368da440d3f555e70c4ebd3 DIST xen-4.17.2.tar.gz 46498038 BLAKE2B 44bb7b39dddb1dbd266a31f6e67f49e981946b78a83580ec068e02687780695d33868781b563dfb77db8ad3ffdc6fe7431ca8243650d9a08823312c430cfa5cd SHA512 0bc475483676e4aa27735695f9a8d2821059e7a55984adb8a29badb5c09a4e7cf8ea29cbc9691be616cc0d7a5ee6b6dacc59ba29c2b16e0919ebdf7dfc54201a DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e DIST xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2 4474 BLAKE2B aa367a4ccf96a61c04c52e415d7143ca946323d7d50d6ab16ad7a917279ad4b1aac802e35e7e306c3a244317db713e913dc8d6343717b2307ccd049adb956a0d SHA512 debba71b17be7b1bb9a70f01782c12c3c053cc2fb1f4ad95829356ee365878aad68430055d4b8c648ef1ff54cb9e3e7c03d40d14c560d51f8ac4fce2b8f82190 -DIST xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 60151 BLAKE2B 5c8a8f772ba6be5f776b3270b9f1e64df35c2be7b4e238262eb4ec6b4859576b3ecb448880e1e05ad53dbdaa71643e678978151b10d0d47c901ab3e3518b7eb0 SHA512 b33a9b2f602f18165e048ef6a339bc5bf3f800fb1f2449e2e1a6090774ce3ef07b1d7ea8e9e6449fae7b91afcc1a6e281c1bb218a56bca74ba7f12b491fab186 diff --git a/app-emulation/xen/xen-4.16.4.ebuild b/app-emulation/xen/xen-4.16.4.ebuild deleted file mode 100644 index c868fdb34a15..000000000000 --- a/app-emulation/xen/xen-4.16.4.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm -x86" - - XEN_GENTOO_PATCHSET_NUM=2 - XEN_GENTOO_PATCHSET_BASE=4.16.1 - XEN_PRE_PATCHSET_NUM= - XEN_PRE_VERSION_BASE= - - XEN_BASE_PV="${PV}" - if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then - XEN_BASE_PV="${XEN_PRE_VERSION_BASE}" - fi - - SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz" - - if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then - XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" - XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" - XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" - fi - if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then - XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" - XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" - XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" - fi -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://xenproject.org" - -S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+boot-symlinks debug efi flask" -REQUIRED_USE="arm? ( debug )" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 ) - flask? ( sys-apps/checkpolicy )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then - eapply "${XEN_UPSTREAM_PATCHES_DIR}" - fi - - if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then - eapply "${XEN_GENTOO_PATCHES_DIR}" - fi - - # Symlinks do not work on fat32 volumes # 829765 - if ! use boot-symlinks || use efi; then - eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch - fi - - # Workaround new gcc-11 options - sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="/boot" - fi - - default -} - -xen_make() { - # Setting clang to either 'y' or 'n' tells Xen's build system - # whether or not clang is used. - local clang=n - if tc-is-clang; then - clang=y - fi - - # Send raw LDFLAGS so that --as-needed works - emake \ - V=1 \ - LDFLAGS="$(raw-ldflags)" \ - HOSTCC="$(tc-getBUILD_CC)" \ - HOSTCXX="$(tc-getBUILD_CXX)" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - LD="$(tc-getLD)" \ - AR="$(tc-getAR)" \ - OBJDUMP="$(tc-getOBJDUMP)" \ - RANLIB="$(tc-getRANLIB)" \ - clang="${clang}" \ - "$@" -} - -src_configure() { - cd xen || die - - touch gentoo-config || die - if use arm; then - echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die - fi - if use debug; then - cat <<-EOF >> gentoo-config || die - CONFIG_DEBUG=y - CONFIG_CRASH_DEBUG=y -EOF - fi - if use flask; then - echo "CONFIG_XSM=y" >> gentoo-config || die - fi - - # remove flags - unset CFLAGS - - tc-ld-disable-gold # Bug 700374 - - xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig -} - -src_compile() { - xen_make -C xen -} - -src_install() { - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - xen_make DESTDIR="${D}" -C xen install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} diff --git a/app-emulation/xen/xen-4.16.4_pre1.ebuild b/app-emulation/xen/xen-4.16.4_pre1.ebuild deleted file mode 100644 index 805cef3cffc9..000000000000 --- a/app-emulation/xen/xen-4.16.4_pre1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - - XEN_GENTOO_PATCHSET_NUM=2 - XEN_GENTOO_PATCHSET_BASE=4.16.1 - XEN_PRE_PATCHSET_NUM=0 - XEN_PRE_VERSION_BASE=4.16.3 - - XEN_BASE_PV="${PV}" - if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then - XEN_BASE_PV="${XEN_PRE_VERSION_BASE}" - fi - - SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz" - - if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then - XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" - XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" - XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" - fi - if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then - XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" - XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" - XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" - fi -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://xenproject.org" - -S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+boot-symlinks debug efi flask" -REQUIRED_USE="arm? ( debug )" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 ) - flask? ( sys-apps/checkpolicy )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then - eapply "${XEN_UPSTREAM_PATCHES_DIR}" - fi - - if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then - eapply "${XEN_GENTOO_PATCHES_DIR}" - fi - - # Symlinks do not work on fat32 volumes # 829765 - if ! use boot-symlinks || use efi; then - eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch - fi - - # Workaround new gcc-11 options - sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="/boot" - fi - - default -} - -xen_make() { - # Setting clang to either 'y' or 'n' tells Xen's build system - # whether or not clang is used. - local clang=n - if tc-is-clang; then - clang=y - fi - - # Send raw LDFLAGS so that --as-needed works - emake \ - V=1 \ - LDFLAGS="$(raw-ldflags)" \ - HOSTCC="$(tc-getBUILD_CC)" \ - HOSTCXX="$(tc-getBUILD_CXX)" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - LD="$(tc-getLD)" \ - AR="$(tc-getAR)" \ - OBJDUMP="$(tc-getOBJDUMP)" \ - RANLIB="$(tc-getRANLIB)" \ - clang="${clang}" \ - "$@" -} - -src_configure() { - cd xen || die - - touch gentoo-config || die - if use arm; then - echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die - fi - if use debug; then - cat <<-EOF >> gentoo-config || die - CONFIG_DEBUG=y - CONFIG_CRASH_DEBUG=y -EOF - fi - if use flask; then - echo "CONFIG_XSM=y" >> gentoo-config || die - fi - - # remove flags - unset CFLAGS - - tc-ld-disable-gold # Bug 700374 - - xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig -} - -src_compile() { - xen_make -C xen -} - -src_install() { - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - xen_make DESTDIR="${D}" -C xen install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -}