CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
Date: Fri, 30 Aug 2019 13:23:10 +0000

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Fri Aug 30 13:23:10 UTC 2019

Modified Files:
        pkgsrc/sysutils/xenkernel48: Makefile distinfo
        pkgsrc/sysutils/xentools48: Makefile distinfo
        pkgsrc/sysutils/xentools48/patches: patch-stubdom_Makefile
Added Files:
        pkgsrc/sysutils/xenkernel48/patches: patch-xen_arch_x86_mm.c
Removed Files:
        pkgsrc/sysutils/xentools48/patches: patch-tools_libacpi_Makefile

Log Message:
Update Xen 4.8 packages to 4.8.5. Changes since 4.8.3:
- security patch up to and including XSA-282
- others bug fixes, code cleanup and minor improvements

Note that this includes a patch to xen/arch/x86/mm.c which removes
a new ASSERT() firing when shutting down a 64bit NetBSD guest.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/xenkernel48/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xenkernel48/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xenkernel48/patches/patch-xen_arch_x86_mm.c
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/xentools48/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/xentools48/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/xentools48/patches/patch-tools_libacpi_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xenkernel48/Makefile
diff -u pkgsrc/sysutils/xenkernel48/Makefile:1.16 pkgsrc/sysutils/xenkernel48/Makefile:1.17
--- pkgsrc/sysutils/xenkernel48/Makefile:1.16   Mon Jul 15 16:24:18 2019
+++ pkgsrc/sysutils/xenkernel48/Makefile        Fri Aug 30 13:23:09 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2019/07/15 16:24:18 nia Exp $
+# $NetBSD: Makefile,v 1.17 2019/08/30 13:23:09 bouyer Exp $
 
-VERSION=       4.8.3
+VERSION=       4.8.5
 DISTNAME=      xen-${VERSION}
 PKGNAME=       xenkernel48-${VERSION}
-PKGREVISION=   1
+#PKGREVISION=  0
 CATEGORIES=    sysutils
 MASTER_SITES=  https://downloads.xenproject.org/release/xen/${VERSION}/
 DIST_SUBDIR=   xen48

Index: pkgsrc/sysutils/xenkernel48/distinfo
diff -u pkgsrc/sysutils/xenkernel48/distinfo:1.6 pkgsrc/sysutils/xenkernel48/distinfo:1.7
--- pkgsrc/sysutils/xenkernel48/distinfo:1.6    Wed Jan 24 23:29:32 2018
+++ pkgsrc/sysutils/xenkernel48/distinfo        Fri Aug 30 13:23:09 2019
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.6 2018/01/24 23:29:32 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2019/08/30 13:23:09 bouyer Exp $
 
-SHA1 (xen48/xen-4.8.3.tar.gz) = ee55e8dc1e79d16d2f85fbe1f8bbd27a2db8422f
-RMD160 (xen48/xen-4.8.3.tar.gz) = 54b7ba828d8198c2a4629eabf7acfba2e9c6561c
-SHA512 (xen48/xen-4.8.3.tar.gz) = 584d8ee6e432e291a70e8f727da6d0a71afff7509fbf2e32eeb9cfe58b8279a80770c2c5f7759dcb5c0b08ed4644039e770e280ab534673215753d598f3f6508
-Size (xen48/xen-4.8.3.tar.gz) = 22529092 bytes
+SHA1 (xen48/xen-4.8.5.tar.gz) = 9f0db2a20a8dd61a2c70143a26b0bb54fa4e8462
+RMD160 (xen48/xen-4.8.5.tar.gz) = 167df32094c37f8e437763d1ab0499b39099ff48
+SHA512 (xen48/xen-4.8.5.tar.gz) = 514ce2b56f22429a4ba792c1d19133898960403e6b31768b4b6111c45f55266d4d0216c582d3bfdd79abca0dc880111e327f9d55e5bd33144312f4fa091e518c
+Size (xen48/xen-4.8.5.tar.gz) = 22578155 bytes
 SHA1 (patch-Config.mk) = abf55aa58792315e758ee3785a763cfa8c2da68f
 SHA1 (patch-xen_Makefile) = be3f4577a205b23187b91319f91c50720919f70b
 SHA1 (patch-xen_Rules.mk) = 5f33a667bae67c85d997a968c0f8b014b707d13c
 SHA1 (patch-xen_arch_x86_Rules.mk) = e2d148fb308c37c047ca41a678471217b6166977
 SHA1 (patch-xen_arch_x86_boot_build32.mk) = 7fa0d64e88e3be0330dac9a2ddc8b0114fd7d4a5
+SHA1 (patch-xen_arch_x86_mm.c) = a7eea6643967c3c600eda074f32fb022be690ddb
 SHA1 (patch-xen_tools_symbols.c) = fdc7e4aa7b8db0854987c9d0e60c254bb9f5af4e

Index: pkgsrc/sysutils/xentools48/Makefile
diff -u pkgsrc/sysutils/xentools48/Makefile:1.28 pkgsrc/sysutils/xentools48/Makefile:1.29
--- pkgsrc/sysutils/xentools48/Makefile:1.28    Sun Aug 11 13:23:18 2019
+++ pkgsrc/sysutils/xentools48/Makefile Fri Aug 30 13:23:10 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:23:18 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/08/30 13:23:10 bouyer Exp $
 #
-VERSION=       4.8.3
+VERSION=       4.8.5
 VERSION_IPXE=  827dd1bfee67daa683935ce65316f7e0f057fe1c
 DIST_IPXE=     ipxe-git-${VERSION_IPXE}.tar.gz
 DIST_NEWLIB=   newlib-1.16.0.tar.gz
@@ -19,7 +19,7 @@ PKGNAME=              xentools48-${VERSION}
 CATEGORIES=            sysutils
 MASTER_SITES=          https://downloads.xenproject.org/release/xen/${VERSION}/
 
-PKGREVISION=           8
+#PKGREVISION=          0
 
 DISTFILES=             ${DISTNAME}.tar.gz
 

Index: pkgsrc/sysutils/xentools48/distinfo
diff -u pkgsrc/sysutils/xentools48/distinfo:1.11 pkgsrc/sysutils/xentools48/distinfo:1.12
--- pkgsrc/sysutils/xentools48/distinfo:1.11    Tue Jul  3 14:06:41 2018
+++ pkgsrc/sysutils/xentools48/distinfo Fri Aug 30 13:23:10 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/07/03 14:06:41 maya Exp $
+$NetBSD: distinfo,v 1.12 2019/08/30 13:23:10 bouyer Exp $
 
 SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c
 RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71
@@ -36,10 +36,10 @@ SHA1 (xen48/tpm_emulator-0.7.4.tar.gz) =
 RMD160 (xen48/tpm_emulator-0.7.4.tar.gz) = ded71632d316126138f2db4a5f2051b2489ae5ff
 SHA512 (xen48/tpm_emulator-0.7.4.tar.gz) = 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
 Size (xen48/tpm_emulator-0.7.4.tar.gz) = 214145 bytes
-SHA1 (xen48/xen-4.8.3.tar.gz) = ee55e8dc1e79d16d2f85fbe1f8bbd27a2db8422f
-RMD160 (xen48/xen-4.8.3.tar.gz) = 54b7ba828d8198c2a4629eabf7acfba2e9c6561c
-SHA512 (xen48/xen-4.8.3.tar.gz) = 584d8ee6e432e291a70e8f727da6d0a71afff7509fbf2e32eeb9cfe58b8279a80770c2c5f7759dcb5c0b08ed4644039e770e280ab534673215753d598f3f6508
-Size (xen48/xen-4.8.3.tar.gz) = 22529092 bytes
+SHA1 (xen48/xen-4.8.5.tar.gz) = 9f0db2a20a8dd61a2c70143a26b0bb54fa4e8462
+RMD160 (xen48/xen-4.8.5.tar.gz) = 167df32094c37f8e437763d1ab0499b39099ff48
+SHA512 (xen48/xen-4.8.5.tar.gz) = 514ce2b56f22429a4ba792c1d19133898960403e6b31768b4b6111c45f55266d4d0216c582d3bfdd79abca0dc880111e327f9d55e5bd33144312f4fa091e518c
+Size (xen48/xen-4.8.5.tar.gz) = 22578155 bytes
 SHA1 (xen48/zlib-1.2.3.tar.gz) = 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
 RMD160 (xen48/zlib-1.2.3.tar.gz) = 89a57e336c24f7f6eebda3a1724e14b71187e117
 SHA512 (xen48/zlib-1.2.3.tar.gz) = 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
@@ -62,7 +62,7 @@ SHA1 (patch-extras_mini-os_include_time.
 SHA1 (patch-extras_mini-os_lib_sys.c) = 9dd4bcab9deed5132d0fe88a0fe0d33b3fc7d09c
 SHA1 (patch-extras_mini-os_lock.c) = e28753793dee483c1ffad8ea8ed2706353046b50
 SHA1 (patch-m4_paths.m4) = 19250964fd808cad30a2aca3de011650a2788251
-SHA1 (patch-stubdom_Makefile) = 6c52ae9af4003fdc199980b6725265fde5a06545
+SHA1 (patch-stubdom_Makefile) = 7958ef91923d58e6056abe415e62f9559eaa1f92
 SHA1 (patch-stubdom_newlib.patch) = e937cd046db217e45b1de76bd0950f514666bc12
 SHA1 (patch-stubdom_vtpmmgr_marshal.h) = 63bb39894e3c6b81b699966ddfa19cb779e916fc
 SHA1 (patch-stubdom_vtpmmgr_tcg.h) = 19e3bd41d58740392f0c0ec1c8d4dee7222b8ab4
@@ -83,7 +83,6 @@ SHA1 (patch-tools_hotplug_NetBSD_vif-bri
 SHA1 (patch-tools_hotplug_NetBSD_vif-ip) = cb8fd1150f6ac24fa853444618437f7d984b4282
 SHA1 (patch-tools_hotplug_common_Makefile) = 71059eddc2d7183b8b43aa976d9ae5f3a1fd75df
 SHA1 (patch-tools_include_xen-sys_NetBSD_gntdev.h) = ce4f7160e92d23afa029c9548cead180fe980ff4
-SHA1 (patch-tools_libacpi_Makefile) = 8a98783e8fcfcd9414176fdde24e7e08b2873c7f
 SHA1 (patch-tools_libs_call_netbsd.c) = c5e166212b0069220d9155636b41028f0f7f9e9e
 SHA1 (patch-tools_libs_call_private.h) = caeaf937ae379836c3187bee97ac0b986af53f9f
 SHA1 (patch-tools_libs_evtchn_netbsd.c) = 1abb0f128ab0702b606e22f199d297d1e9c0aae5

Index: pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile
diff -u pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile:1.1 pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile:1.2
--- pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile:1.1       Thu Mar 30 09:15:10 2017
+++ pkgsrc/sysutils/xentools48/patches/patch-stubdom_Makefile   Fri Aug 30 13:23:10 2019
@@ -1,6 +1,6 @@
-$NetBSD: patch-stubdom_Makefile,v 1.1 2017/03/30 09:15:10 bouyer Exp $
---- stubdom/Makefile.orig      2016-12-05 13:03:27.000000000 +0100
-+++ stubdom/Makefile   2017-03-29 09:58:39.000000000 +0200
+$NetBSD: patch-stubdom_Makefile,v 1.2 2019/08/30 13:23:10 bouyer Exp $
+--- stubdom/Makefile.orig      2018-12-03 10:03:57.000000000 +0100
++++ stubdom/Makefile   2019-08-30 11:47:09.000000000 +0200
 @@ -6,8 +6,6 @@
  
  export stubdom=y
@@ -193,16 +193,16 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
        patch -d $@ -p1 < tpmemu-$(TPMEMU_VERSION).patch;
        patch -d $@ -p1 < vtpm-bufsize.patch
        patch -d $@ -p1 < vtpm-locality.patch
-@@ -224,7 +195,7 @@
-       patch -d $@ -p1 < vtpm-deepquote-anyloc.patch
+@@ -225,7 +196,7 @@
        patch -d $@ -p1 < vtpm-cmake-Wextra.patch
+       patch -d $@ -p1 < vtpm_TPM_ChangeAuthAsymFinish.patch
        mkdir $@/build
 -      cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
-+      cd $@/build; CC=${TARGET_CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=gnu99 -DTPM_NO_EXTERN $(VTPM_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
++      cd $@/build; CC=${TARGET_CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
        touch $@
  
  TPMEMU_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libtpm.a
-@@ -243,11 +214,8 @@
+@@ -244,11 +215,8 @@
  CAMLLIB = $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib/ocaml
  OCAML_STAMPFILE=$(CAMLLIB)/.dirstamp
  
@@ -216,7 +216,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
        cd ocaml-$(OCAML_VERSION) && patch -p0 < ../ocaml.patch
        rm -rf ocaml-$(XEN_TARGET_ARCH)
        mv ocaml-$(OCAML_VERSION) ocaml-$(XEN_TARGET_ARCH)
-@@ -260,7 +228,7 @@
+@@ -261,7 +229,7 @@
  $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
        cd ocaml-$(XEN_TARGET_ARCH) &&  ./configure -prefix $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf \
                -no-pthread -no-shared-libs -no-tk -no-curses \
@@ -225,7 +225,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
        $(foreach i,$(MINIOS_HASNOT),sed -i 's,^\(#define HAS_$(i)\),//\1,' ocaml-$(XEN_TARGET_ARCH)/config/s.h ; )
        $(MAKE) DESTDIR= -C ocaml-$(XEN_TARGET_ARCH) world
        $(MAKE) DESTDIR= -C ocaml-$(XEN_TARGET_ARCH) opt
-@@ -374,7 +342,7 @@
+@@ -375,7 +343,7 @@
  .PHONY: libxentoollog
  libxentoollog: libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a
  libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a: mk-headers-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
@@ -234,7 +234,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
  
  #######
  # libxenevtchn
-@@ -436,11 +404,12 @@
+@@ -437,11 +405,12 @@
          ( $(buildmakevars2shellvars); \
            cd ioemu ; \
            LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \
@@ -249,7 +249,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
  
  ######
  # caml
-@@ -473,7 +442,7 @@
+@@ -474,7 +443,7 @@
  
  .PHONY: vtpm
  vtpm: cross-polarssl cross-tpmemu vtpm-minios-config.mk
@@ -258,7 +258,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
  
  ######
  # VTPMMGR
-@@ -484,18 +453,14 @@
+@@ -485,18 +454,14 @@
  
  .PHONY: vtpmmgr
  vtpmmgr: cross-polarssl vtpmmgr-minios-config.mk
@@ -280,7 +280,7 @@ $NetBSD: patch-stubdom_Makefile,v 1.1 20
        for i in grub.patches/* ; do \
                patch -d $@ -p1 < $$i || exit 1; \
        done
-@@ -538,11 +503,11 @@
+@@ -539,11 +504,11 @@
  
  .PHONY: vtpm-stubdom
  vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm vtpm

Added files:

Index: pkgsrc/sysutils/xenkernel48/patches/patch-xen_arch_x86_mm.c
diff -u /dev/null pkgsrc/sysutils/xenkernel48/patches/patch-xen_arch_x86_mm.c:1.1
--- /dev/null   Fri Aug 30 13:23:10 2019
+++ pkgsrc/sysutils/xenkernel48/patches/patch-xen_arch_x86_mm.c Fri Aug 30 13:23:09 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-xen_arch_x86_mm.c,v 1.1 2019/08/30 13:23:09 bouyer Exp $
+remove assert, which fires when freeing a page table page
+
+--- xen/arch/x86/mm.c.orig     2019-08-30 12:51:48.000000000 +0200
++++ xen/arch/x86/mm.c  2019-08-30 12:52:21.000000000 +0200
+@@ -2590,7 +2590,7 @@
+         rc = 0;
+         break;
+     case PGT_l2_page_table:
+-        ASSERT(preemptible);
++        // ASSERT(preemptible);
+         rc = free_l2_table(page);
+         break;
+     case PGT_l3_page_table:

Prev by Date: CVS commit: pkgsrc/graphics/libglvnd
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/libglvnd
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index