Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Aug 2019 13:39:58 +0000 (UTC)
From:      =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= <royger@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508824 - in head: emulators/xen-kernel emulators/xen-kernel/files sysutils/xen-tools sysutils/xen-tools/files
Message-ID:  <201908131339.x7DDdwPa032852@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: royger (src committer)
Date: Tue Aug 13 13:39:58 2019
New Revision: 508824
URL: https://svnweb.freebsd.org/changeset/ports/508824

Log:
  xen-{tools/kernel}: update to 4.12.1
  
  Sponsored by:		Citrix Systems R&D
  Approved by:		mat
  Differential revision:	https://reviews.freebsd.org/D21227

Deleted:
  head/emulators/xen-kernel/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch
  head/emulators/xen-kernel/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch
  head/emulators/xen-kernel/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch
  head/emulators/xen-kernel/files/xsa297-4.12-1.patch
  head/emulators/xen-kernel/files/xsa297-4.12-2.patch
  head/emulators/xen-kernel/files/xsa297-4.12-3.patch
  head/emulators/xen-kernel/files/xsa297-4.12-4.patch
  head/emulators/xen-kernel/files/xsa297-4.12-5.patch
  head/emulators/xen-kernel/files/xsa297-4.12-6.patch
  head/emulators/xen-kernel/files/xsa297-4.12-7.patch
  head/sysutils/xen-tools/files/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch
  head/sysutils/xen-tools/files/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch
  head/sysutils/xen-tools/files/0001-xen-mapcache-use-MAP_FIXED-flag-so-the-mmap-address-qemuu.patch
  head/sysutils/xen-tools/files/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch
  head/sysutils/xen-tools/files/xsa297-4.12-1.patch
  head/sysutils/xen-tools/files/xsa297-4.12-2.patch
  head/sysutils/xen-tools/files/xsa297-4.12-3.patch
  head/sysutils/xen-tools/files/xsa297-4.12-4.patch
  head/sysutils/xen-tools/files/xsa297-4.12-5.patch
  head/sysutils/xen-tools/files/xsa297-4.12-6.patch
  head/sysutils/xen-tools/files/xsa297-4.12-7.patch
Modified:
  head/emulators/xen-kernel/Makefile
  head/emulators/xen-kernel/distinfo
  head/sysutils/xen-tools/Makefile
  head/sysutils/xen-tools/distinfo

Modified: head/emulators/xen-kernel/Makefile
==============================================================================
--- head/emulators/xen-kernel/Makefile	Tue Aug 13 13:38:25 2019	(r508823)
+++ head/emulators/xen-kernel/Makefile	Tue Aug 13 13:39:58 2019	(r508824)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xen
-PORTVERSION=	4.12.0
-PORTREVISION=	4
+PORTVERSION=	4.12.1
+PORTREVISION=	0
 CATEGORIES=	emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
 PKGNAMESUFFIX=	-kernel
@@ -24,20 +24,6 @@ NO_MTREE=	yes
 STRIP=		#
 PLIST_FILES=	/boot/xen \
 		lib/debug/boot/xen.debug
-
-# Pre-patches for XSA-297 to apply cleanly
-EXTRA_PATCHES+=	${PATCHDIR}/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch:-p1 \
-		${PATCHDIR}/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch:-p1 \
-		${PATCHDIR}/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch:-p1
-
-# Fixes for XSA-297 (MDS)
-EXTRA_PATCHES+=	${PATCHDIR}/xsa297-4.12-1.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-2.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-3.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-4.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-5.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-6.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-7.patch:-p1
 
 # LLD 8 changed the behaviour re the placement of orphaned sections, which
 # produces a non-bootable Xen kernel:

Modified: head/emulators/xen-kernel/distinfo
==============================================================================
--- head/emulators/xen-kernel/distinfo	Tue Aug 13 13:38:25 2019	(r508823)
+++ head/emulators/xen-kernel/distinfo	Tue Aug 13 13:39:58 2019	(r508824)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555345627
-SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64
-SIZE (xen-4.12.0.tar.gz) = 26949697
+TIMESTAMP = 1565595632
+SHA256 (xen-4.12.1.tar.gz) = 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159
+SIZE (xen-4.12.1.tar.gz) = 26970584

Modified: head/sysutils/xen-tools/Makefile
==============================================================================
--- head/sysutils/xen-tools/Makefile	Tue Aug 13 13:38:25 2019	(r508823)
+++ head/sysutils/xen-tools/Makefile	Tue Aug 13 13:39:58 2019	(r508824)
@@ -2,8 +2,8 @@
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
-PORTVERSION=	4.12.0
-PORTREVISION=	2
+PORTVERSION=	4.12.1
+PORTREVISION=	0
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
 
@@ -55,20 +55,6 @@ INSTALL_TARGET=		install-tools
 DOCS_INSTALL_TARGET=	install-docs
 
 EXTRA_PATCHES+=	${PATCHDIR}/0001-tools-include-propagate-python-interpreter-path.patch:-p1
-
-# Pre-patches for XSA-297 to apply cleanly
-EXTRA_PATCHES+=	${PATCHDIR}/0001-x86-tsx-Implement-controls-for-RTM-force-abort-mode.patch:-p1 \
-		${PATCHDIR}/0001-x86-msr-Shorten-ARCH_CAPABILITIES_-constants.patch:-p1 \
-		${PATCHDIR}/0002-x86-spec-ctrl-Extend-repoline-safey-calcuations-for-.patch:-p1
-
-# Fixes for XSA-297 (MDS)
-EXTRA_PATCHES+=	${PATCHDIR}/xsa297-4.12-1.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-2.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-3.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-4.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-5.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-6.patch:-p1 \
-		${PATCHDIR}/xsa297-4.12-7.patch:-p1
 
 # LLD 8 changed the behaviour re the placement of orphaned sections, which
 # produces a non-bootable Xen kernel:

Modified: head/sysutils/xen-tools/distinfo
==============================================================================
--- head/sysutils/xen-tools/distinfo	Tue Aug 13 13:38:25 2019	(r508823)
+++ head/sysutils/xen-tools/distinfo	Tue Aug 13 13:39:58 2019	(r508824)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555345627
-SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64
-SIZE (xen-4.12.0.tar.gz) = 26949697
+TIMESTAMP = 1565599755
+SHA256 (xen-4.12.1.tar.gz) = 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159
+SIZE (xen-4.12.1.tar.gz) = 26970584



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908131339.x7DDdwPa032852>