Thu Mar 24 18:59:43 2022 UTC ()
Pullup ticket #6597 - requested by bouyer
sysutils/xenkernel415: security fix
sysutils/xentools415: security fix

Revisions pulled up:
- sysutils/xenkernel415/Makefile                                1.4
- sysutils/xenkernel415/distinfo                                1.5
- sysutils/xenkernel415/patches/patch-xen_arch_x86_boot_build32.mk 1.2
- sysutils/xentools415/Makefile                                 1.10
- sysutils/xentools415/distinfo                                 1.7

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Fri Mar  4 17:54:08 UTC 2022

   Modified Files:
   	pkgsrc/sysutils/xenkernel415: Makefile distinfo
   	pkgsrc/sysutils/xenkernel415/patches:
   	    patch-xen_arch_x86_boot_build32.mk
   	pkgsrc/sysutils/xentools415: Makefile distinfo

   Log Message:
   Update xenkernel415 and xentools415 to 4.15.2
   Changes from 4.15.1 are bugfixes, some performance improvements and
   some security hardening. It also includes all fixes for XSA up to 395.


(bsiegert)
diff -r1.3 -r1.3.4.1 pkgsrc/sysutils/xenkernel415/Makefile
diff -r1.4 -r1.4.2.1 pkgsrc/sysutils/xenkernel415/distinfo
diff -r1.1 -r1.1.6.1 pkgsrc/sysutils/xenkernel415/patches/patch-xen_arch_x86_boot_build32.mk
diff -r1.8 -r1.8.2.1 pkgsrc/sysutils/xentools415/Makefile
diff -r1.6 -r1.6.2.1 pkgsrc/sysutils/xentools415/distinfo
cvs diff -r1.3 -r1.3.4.1 pkgsrc/sysutils/xenkernel415/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel415/Makefile 2021/09/21 12:23:49 1.3
+++ pkgsrc/sysutils/xenkernel415/Makefile 2022/03/24 18:59:43 1.3.4.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2021/09/21 12:23:49 bouyer Exp $ 1# $NetBSD: Makefile,v 1.3.4.1 2022/03/24 18:59:43 bsiegert Exp $
2 2
3VERSION= 4.15.1 3VERSION= 4.15.2
4DISTNAME= xen-${VERSION} 4DISTNAME= xen-${VERSION}
5PKGNAME= xenkernel415-${VERSION} 5PKGNAME= xenkernel415-${VERSION}
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 7MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
8DIST_SUBDIR= xen415 8DIST_SUBDIR= xen415
9 9
10MAINTAINER= bouyer@NetBSD.org 10MAINTAINER= bouyer@NetBSD.org
11HOMEPAGE= https://xenproject.org/ 11HOMEPAGE= https://xenproject.org/
12COMMENT= Xen 4.15.x Kernel 12COMMENT= Xen 4.15.x Kernel
13 13
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16ONLY_FOR_PLATFORM= NetBSD-*.*-x86_64 16ONLY_FOR_PLATFORM= NetBSD-*.*-x86_64
cvs diff -r1.4 -r1.4.2.1 pkgsrc/sysutils/xenkernel415/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel415/distinfo 2021/10/26 11:20:25 1.4
+++ pkgsrc/sysutils/xenkernel415/distinfo 2022/03/24 18:59:43 1.4.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 11:20:25 nia Exp $ 1$NetBSD: distinfo,v 1.4.2.1 2022/03/24 18:59:43 bsiegert Exp $
2 2
3BLAKE2s (xen415/xen-4.15.1.tar.gz) = 87499f2cbe2a81fd92e0d4803adbe8681b9a26348aa8e069890b6ea441731986 3BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0
4SHA512 (xen415/xen-4.15.1.tar.gz) = 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9 4SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
5Size (xen415/xen-4.15.1.tar.gz) = 40800852 bytes 5Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes
6SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65 6SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
7SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6 7SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
8SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac 8SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
9SHA1 (patch-xen_arch_x86_Kconfig) = df14bfa09b9a0008ca59d53c938d43a644822dd9 9SHA1 (patch-xen_arch_x86_Kconfig) = df14bfa09b9a0008ca59d53c938d43a644822dd9
10SHA1 (patch-xen_arch_x86_Rules.mk) = 54392a7d719a21bc625a96b673056f88b96df97d 10SHA1 (patch-xen_arch_x86_Rules.mk) = 54392a7d719a21bc625a96b673056f88b96df97d
11SHA1 (patch-xen_arch_x86_boot_build32.mk) = b82c20de9b86ddaa9d05bbc1ff28f970eb78473c 11SHA1 (patch-xen_arch_x86_boot_build32.mk) = c7e57ee41ebf29ced32146945bddca7b482c6a49
12SHA1 (patch-xen_arch_x86_extable.c) = e439e6f3fe704d9b2894fc6b9e8f23f321a00f05 12SHA1 (patch-xen_arch_x86_extable.c) = e439e6f3fe704d9b2894fc6b9e8f23f321a00f05
13SHA1 (patch-xen_arch_x86_mm_p2m.c) = 6e9b84dc8448eca9677f184e720bbfcb3c6d314e 13SHA1 (patch-xen_arch_x86_mm_p2m.c) = 6e9b84dc8448eca9677f184e720bbfcb3c6d314e
14SHA1 (patch-xen_drivers_passthrough_x86_iommu.c) = 8b3a36a019490b1d125ea1f74274435382797da1 14SHA1 (patch-xen_drivers_passthrough_x86_iommu.c) = 8b3a36a019490b1d125ea1f74274435382797da1
cvs diff -r1.1 -r1.1.6.1 pkgsrc/sysutils/xenkernel415/patches/patch-xen_arch_x86_boot_build32.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel415/patches/patch-xen_arch_x86_boot_build32.mk 2021/04/18 12:31:26 1.1
+++ pkgsrc/sysutils/xenkernel415/patches/patch-xen_arch_x86_boot_build32.mk 2022/03/24 18:59:43 1.1.6.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-xen_arch_x86_boot_build32.mk,v 1.1 2021/04/18 12:31:26 bouyer Exp $ 1$NetBSD: patch-xen_arch_x86_boot_build32.mk,v 1.1.6.1 2022/03/24 18:59:43 bsiegert Exp $
2linux's toolchain doesn't generate a .eh_frame section but NetBSD does. 2linux's toolchain doesn't generate a .eh_frame section but NetBSD does.
3remove it. 3remove it.
4 4
5--- xen/arch/x86/boot/build32.mk.orig 2018-04-17 19:21:31.000000000 +0200 5--- xen/arch/x86/boot/build32.mk.orig 2022-01-31 10:42:09.000000000 +0100
6+++ xen/arch/x86/boot/build32.mk 2018-04-23 13:29:47.000000000 +0200 6+++ xen/arch/x86/boot/build32.mk 2022-03-03 14:12:56.486320239 +0100
7@@ -25,7 +25,7 @@ 7@@ -25,7 +25,7 @@
8 exit $$(expr $$idx + 1);; \ 8 exit $$(expr $$idx + 1);; \
9 esac; \ 9 esac; \
10 done 10 done
11- $(OBJCOPY) -O binary -R .got.plt $< $@ 11- $(OBJCOPY) -O binary -R .got.plt $< $@
12+ $(OBJCOPY) -O binary -R .got.plt -R .eh_frame $< $@ 12+ $(OBJCOPY) -O binary -R .got.plt -R .eh_frame $< $@
13  13
14 %.lnk: %.o 14 %.lnk: %.o build32.lds
15 $(LD) $(LDFLAGS_DIRECT) -N -T build32.lds -o $@ $< 15 $(LD) $(LDFLAGS_DIRECT) -N -T build32.lds -o $@ $<
cvs diff -r1.8 -r1.8.2.1 pkgsrc/sysutils/xentools415/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/Makefile 2021/12/19 09:47:59 1.8
+++ pkgsrc/sysutils/xentools415/Makefile 2022/03/24 18:59:43 1.8.2.1
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2021/12/19 09:47:59 maya Exp $ 1# $NetBSD: Makefile,v 1.8.2.1 2022/03/24 18:59:43 bsiegert Exp $
2# 2#
3VERSION= 4.15.1 3VERSION= 4.15.2
4 4
5DIST_SUBDIR= xen415 5DIST_SUBDIR= xen415
6DISTNAME= xen-${VERSION} 6DISTNAME= xen-${VERSION}
7PKGNAME= xentools415-${VERSION} 7PKGNAME= xentools415-${VERSION}
8PKGREVISION= 2 
9CATEGORIES= sysutils 8CATEGORIES= sysutils
10MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 9MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
11 10
12DISTFILES= ${DISTNAME}.tar.gz 11DISTFILES= ${DISTNAME}.tar.gz
13 12
14SEABIOS_VERSION= 1.14.0 13SEABIOS_VERSION= 1.14.0
15SEABIOS_DIST= seabios-${SEABIOS_VERSION}.tar.gz 14SEABIOS_DIST= seabios-${SEABIOS_VERSION}.tar.gz
16DISTFILES+= ${SEABIOS_DIST} 15DISTFILES+= ${SEABIOS_DIST}
17SITES.${SEABIOS_DIST}= -http://xenbits.xen.org/gitweb/?p=seabios.git;a=snapshot;h=refs/tags/rel-${SEABIOS_VERSION};sf=tgz 16SITES.${SEABIOS_DIST}= -http://xenbits.xen.org/gitweb/?p=seabios.git;a=snapshot;h=refs/tags/rel-${SEABIOS_VERSION};sf=tgz
18 17
19IPXE_VERSION= 988d2c13cdf0f0b4140685af35ced70ac5b3283c 18IPXE_VERSION= 988d2c13cdf0f0b4140685af35ced70ac5b3283c
20IPXE_DIST= ipxe-${IPXE_VERSION}.tar.gz 19IPXE_DIST= ipxe-${IPXE_VERSION}.tar.gz
21DISTFILES+= ${IPXE_DIST}  20DISTFILES+= ${IPXE_DIST}
@@ -49,27 +48,27 @@ CONFLICTS+= xenstoretools-[0-9]* @@ -49,27 +48,27 @@ CONFLICTS+= xenstoretools-[0-9]*
49CHECK_PORTABILITY_SKIP= tools/examples/* \ 48CHECK_PORTABILITY_SKIP= tools/examples/* \
50 tools/qemu-xen/scripts/qemu-binfmt-conf.sh 49 tools/qemu-xen/scripts/qemu-binfmt-conf.sh
51CHECK_RELRO_SKIP= libexec/xen/boot/hvmloader 50CHECK_RELRO_SKIP= libexec/xen/boot/hvmloader
52CHECK_RELRO_SKIP+= libexec/xen/boot/xen-shim 51CHECK_RELRO_SKIP+= libexec/xen/boot/xen-shim
53CHECK_RELRO_SKIP+= lib/debug/usr/pkg/libexec/xen/boot/xen-shim-syms 52CHECK_RELRO_SKIP+= lib/debug/usr/pkg/libexec/xen/boot/xen-shim-syms
54 53
55EGDIR= ${PREFIX}/share/examples/xen 54EGDIR= ${PREFIX}/share/examples/xen
56MESSAGE_SUBST+= EGDIR=${EGDIR} 55MESSAGE_SUBST+= EGDIR=${EGDIR}
57 56
58USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash cmake gsed bison 57USE_TOOLS+= pod2man gmake pkg-config makeinfo perl bash cmake gsed bison
59USE_LANGUAGES= c c++ 58USE_LANGUAGES= c c++
60 59
61GNU_CONFIGURE= YES 60GNU_CONFIGURE= YES
62CONFIGURE_ARGS+= --enable-rpath 61CONFIGURE_ARGS+= --enable-rpath --disable-golang
63CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 62CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
64 63
65MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} 64MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
66MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q} 65MAKE_ENV+= APPEND_LIB=${LDFLAGS:Q}
67MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR} 66MAKE_ENV+= XEN_EXAMPLES_DIR=${EGDIR}
68MAKE_ENV+= MV=${MV:Q} CP=${CP:Q} 67MAKE_ENV+= MV=${MV:Q} CP=${CP:Q}
69MAKE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_COMMAND=${PYTHONBIN:Q} 68MAKE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_COMMAND=${PYTHONBIN:Q}
70MAKE_ENV+= SED=${SED:Q}  69MAKE_ENV+= SED=${SED:Q}
71MAKE_ENV+= V=YES 70MAKE_ENV+= V=YES
72MAKE_ENV+= BARE_CPP="gcc -E" 71MAKE_ENV+= BARE_CPP="gcc -E"
73#MAKE_ENV+= NO_WERROR=1 72#MAKE_ENV+= NO_WERROR=1
74 73
75#BUILDLINK_TRANSFORM+= rm:-Werror 74#BUILDLINK_TRANSFORM+= rm:-Werror
cvs diff -r1.6 -r1.6.2.1 pkgsrc/sysutils/xentools415/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools415/distinfo 2021/10/26 11:20:25 1.6
+++ pkgsrc/sysutils/xentools415/distinfo 2022/03/24 18:59:43 1.6.2.1
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.6 2021/10/26 11:20:25 nia Exp $ 1$NetBSD: distinfo,v 1.6.2.1 2022/03/24 18:59:43 bsiegert Exp $
2 2
3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b 3BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403 4SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes 5Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes
6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d 6BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238 7SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes 8Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
9BLAKE2s (xen415/xen-4.15.1.tar.gz) = 87499f2cbe2a81fd92e0d4803adbe8681b9a26348aa8e069890b6ea441731986 9BLAKE2s (xen415/xen-4.15.2.tar.gz) = f6e3d354a144c9ff49a198ebcafbd5e8a4414690d5672b3e2ed394c461ab8ab0
10SHA512 (xen415/xen-4.15.1.tar.gz) = 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9 10SHA512 (xen415/xen-4.15.2.tar.gz) = 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
11Size (xen415/xen-4.15.1.tar.gz) = 40800852 bytes 11Size (xen415/xen-4.15.2.tar.gz) = 40773378 bytes
12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3 12SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6 13SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21 14SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
15SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765 15SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
16SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4 16SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4
17SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81 17SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81
18SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86 18SHA1 (patch-docs_misc_block-scripts.txt) = 29a49edc4d15c4c8db822fd1d6356d07aeb27b86
19SHA1 (patch-docs_misc_vtd.txt) = 26c12a3023315f35a6f59b6715b811c989c67680 19SHA1 (patch-docs_misc_vtd.txt) = 26c12a3023315f35a6f59b6715b811c989c67680
20SHA1 (patch-tools_Makefile) = 65dcdf590339717db22fd89fadab3aaa68d9b6a4 20SHA1 (patch-tools_Makefile) = 65dcdf590339717db22fd89fadab3aaa68d9b6a4
21SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce 21SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce
22SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0 22SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0
23SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893 23SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893
24SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf 24SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf