summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaik Broemme2018-07-12 17:04:36 +0200
committerMaik Broemme2018-07-12 17:04:36 +0200
commitb7852c6ac460f2a3a524fbf6b7fb594123af13d6 (patch)
tree361cadc2777c0e6e890e4e264baaabdf41f21ea0
parent7534135d2ff3e7eff43c0775a4fbe8bf5675aa95 (diff)
downloadaur-b7852c6ac460f2a3a524fbf6b7fb594123af13d6.tar.gz
Update to 4.11.0-1
-rw-r--r--.SRCINFO46
-rw-r--r--ChangeLog4
-rw-r--r--PKGBUILD62
-rw-r--r--ocaml-unsafe-string.patch27
-rw-r--r--xen-gcc-8-tools-fix-format-truncation-warnings.patch13
5 files changed, 18 insertions, 134 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f4b5cffa0e..42fb9e9b59b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xen
- pkgver = 4.10.1
- pkgrel = 3
+ pkgver = 4.11.0
+ pkgrel = 1
url = http://www.xenproject.org/
changelog = ChangeLog
arch = x86_64
@@ -45,56 +45,24 @@ pkgbase = xen
noextract = ipxe-git.tar.gz
options = !buildflags
options = !strip
- source = https://downloads.xenproject.org/release/xen/4.10.1/xen-4.10.1.tar.gz
- source = https://downloads.xenproject.org/release/xen/4.10.1/xen-4.10.1.tar.gz.sig
+ source = https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz
+ source = https://downloads.xenproject.org/release/xen/4.11.0/xen-4.11.0.tar.gz.sig
source = ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz
- source = https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-1.patch
- source = https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-2.patch
- source = https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-3.patch
- source = https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-4.patch
- source = https://xenbits.xen.org/xsa/xsa261.patch
- source = https://xenbits.xen.org/xsa/xsa262-4.10.patch
source = grub-mkconfig-helper
source = efi-xen.cfg
source = grub.conf
source = xen.conf
source = tmpfiles.conf
- source = ocaml-unsafe-string.patch
- source = qemu-xen-memfd.patch::https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch
- source = xen-gcc-8-libxc-fix-strncpy-size.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=fa7789ef18bd2e716997937af71b2e4b5b00a159
- source = xen-gcc-8-misc-fix-hypothetical-buffer-overflow-in-xen-lowmemd.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=27751d89248c8c5eef6d8b56eb8f7d2084145080
- source = xen-gcc-8-fix-possible-null-truncation.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=938c8f53b1f80175c6f7a1399efdb984abb0cb8b
- source = xen-gcc-8-gdbsx-fix-wstringop-truncation-warning.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=7f601f7c341c80d554615556d60e3b8ed1e5ad4f
- source = xen-gcc-8-blktap2-fix-possible-null-truncation.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=850e89b3ef1a7be6b71fa7ae22333c884e08431a
- source = xen-gcc-8-blktap2-fix-hypothetical-buffer-overflow.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=3a633c261426f06627d88bf7feca6ff87f692f16
- source = xen-gcc-8-kdd-mute-spurious-gcc-warning.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=437e00fea04becc91c1b6bc1c0baa636b067a5cc
- source = xen-gcc-8-tools-fix-format-truncation-warnings.patch
source = ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch::https://git.ipxe.org/ipxe.git/patch/7c395b0e21806b946fe944a27fc273407f357ea1
validpgpkeys = 23E3222C145F4475FA8060A783FE14C957E82BD9
- sha256sums = 570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf
+ sha256sums = 826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643
sha256sums = SKIP
sha256sums = 251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4
- sha256sums = ffac7ab75bf65f8286b37d21cb4a4401d898670a4e52af88d8202ce4fe66edef
- sha256sums = fe85832a9b5b1076b3a9bdbd28a2f3be57cd019d66a725ce64698b1bd74145a8
- sha256sums = 1955aed73828e23da871ef10e5ec49670ce59bdd06af2772e978f8e817e0319f
- sha256sums = 8f504f8fcf100f8a00bece9c4df8b8933dceeaf29b50492317f9cbf74aaf4aa4
- sha256sums = 175501977204db84d08a6fd81d9fd4b69f97f70cbf6f65e6ce0abfeab03eae95
- sha256sums = 91d3b329131b6d434b268c0c55fd4900033fce8b2582bd9278ae967efc980fb0
sha256sums = 23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e
sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
sha256sums = 50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c
sha256sums = 40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf
- sha256sums = 7c76b116ce09a53708306682f04e1460a788fe66f832091b7003a5d8e1fee312
- sha256sums = 29004b3b9f79bb2cdb0553c5a77c8d748a92e628405b7d9f9ae46693515757bb
- sha256sums = fc1a4ce85795a9a00161d5188b61db5054c462db9a65a8073a5b55b49b089e4d
- sha256sums = 3fefa746363a0b05e4b90b18f4a510cd1eb10cd4ea2b845fa6099a5622490724
- sha256sums = 4e5a7c72ed9b40c9f1f47d2dce3d4501d293bec208cd170ff5702cf9a1fc3a01
- sha256sums = 332874f3e83da80c8a53b49e95db2fdd36b94da3ac053089276ae1e34880e585
- sha256sums = 591dcf7b3fd48c5532c69ea12d7d1d1c39afa1cc81c8025dcced86b72c35dbf7
- sha256sums = 1fc533158855b38d0b44e52865417d883ab7a165d1b22090c351ad683d43a06f
- sha256sums = 06d9d454f888eeb18189c22398b67395e410d43a14e91752fa36f367e7e9d81f
- sha256sums = ac929c45e2319c80d6e6bbab6a5a2e4190741892dd32d25bcdd5aa00cfa2f251
sha256sums = 51ff22b2d0f7e9d7a13666adb2c32321e725e9c0bf0f434b3cc7c760d88620c6
pkgname = xen
@@ -124,7 +92,7 @@ pkgname = xen
optdepends = openvswitch: Optional Networking support
optdepends = seabios: Boot VMs with BIOS
optdepends = ovmf: Boot VMs with UEFI
- provides = xen-4.10.1
+ provides = xen-4.11.0
backup = etc/conf.d/xencommons
backup = etc/conf.d/xendomains
backup = etc/xen/efi-xen.cfg
@@ -136,5 +104,5 @@ pkgname = xen
pkgname = xen-docs
pkgdesc = Virtual Machine Hypervisor documentation
arch = any
- provides = xen-docs-4.10.1
+ provides = xen-docs-4.11.0
diff --git a/ChangeLog b/ChangeLog
index 8a6f300d35a..a67d84bea25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-12 Maik Broemme
+ * 4.11.0-1
+ Xen 4.11.0
+
2018-05-15 Maik Broemme
* 4.10.1-3
Apply XSA patches: 260 261 262
diff --git a/PKGBUILD b/PKGBUILD
index 873c7536ff1..9c794e8b559 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ _build_stubdom=${build_stubdom:-false}
pkgbase="xen"
pkgname=("xen" "xen-docs")
-pkgver="4.10.1"
-pkgrel="3"
+pkgver="4.11.0"
+pkgrel="1"
arch=("x86_64") # TODO What about ARM?
url="http://www.xenproject.org/"
license=("GPL2")
@@ -64,14 +64,6 @@ source=(
"https://downloads.xenproject.org/release/xen/${pkgver}/${pkgbase}-${pkgver}.tar.gz.sig"
"ipxe-git.tar.gz::http://xenbits.xen.org/xen-extfiles/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz"
- # XSA patches.
- "https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-1.patch"
- "https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-2.patch"
- "https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-3.patch"
- "https://xenbits.xen.org/xsa/xsa260-4.10/xsa260-4.patch"
- "https://xenbits.xen.org/xsa/xsa261.patch"
- "https://xenbits.xen.org/xsa/xsa262-4.10.patch"
-
# Helper and config files.
"grub-mkconfig-helper"
"efi-xen.cfg"
@@ -79,32 +71,16 @@ source=(
"${pkgbase}.conf"
"tmpfiles.conf"
+ # XSA patches.
+
# Compile fixes.
- "ocaml-unsafe-string.patch"
- "qemu-xen-memfd.patch::https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"
- "xen-gcc-8-libxc-fix-strncpy-size.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=fa7789ef18bd2e716997937af71b2e4b5b00a159"
- "xen-gcc-8-misc-fix-hypothetical-buffer-overflow-in-xen-lowmemd.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=27751d89248c8c5eef6d8b56eb8f7d2084145080"
- "xen-gcc-8-fix-possible-null-truncation.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=938c8f53b1f80175c6f7a1399efdb984abb0cb8b"
- "xen-gcc-8-gdbsx-fix-wstringop-truncation-warning.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=7f601f7c341c80d554615556d60e3b8ed1e5ad4f"
- "xen-gcc-8-blktap2-fix-possible-null-truncation.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=850e89b3ef1a7be6b71fa7ae22333c884e08431a"
- "xen-gcc-8-blktap2-fix-hypothetical-buffer-overflow.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=3a633c261426f06627d88bf7feca6ff87f692f16"
- "xen-gcc-8-kdd-mute-spurious-gcc-warning.patch::https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=437e00fea04becc91c1b6bc1c0baa636b067a5cc"
- "xen-gcc-8-tools-fix-format-truncation-warnings.patch"
"ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch::https://git.ipxe.org/ipxe.git/patch/7c395b0e21806b946fe944a27fc273407f357ea1"
)
sha256sums=(
- "570d654f357d4085accdf752989c1cbc33e2075feac8fcc505d68bdb81b1a0cf"
+ "826e3a9f6d0eac94a825d272cc2c1294e22640ae75af906eb13920f9ad667643"
"SKIP"
"251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4"
- # XSA patches.
- "ffac7ab75bf65f8286b37d21cb4a4401d898670a4e52af88d8202ce4fe66edef"
- "fe85832a9b5b1076b3a9bdbd28a2f3be57cd019d66a725ce64698b1bd74145a8"
- "1955aed73828e23da871ef10e5ec49670ce59bdd06af2772e978f8e817e0319f"
- "8f504f8fcf100f8a00bece9c4df8b8933dceeaf29b50492317f9cbf74aaf4aa4"
- "175501977204db84d08a6fd81d9fd4b69f97f70cbf6f65e6ce0abfeab03eae95"
- "91d3b329131b6d434b268c0c55fd4900033fce8b2582bd9278ae967efc980fb0"
-
# Helper and config files.
"23c3b0eab4cb06260bd07324d2060356560c9bc52270aaaf6130e1c130fc6e5e"
"ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f"
@@ -112,17 +88,9 @@ sha256sums=(
"50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c"
"40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf"
+ # XSA patches.
+
# Compile fixes.
- "7c76b116ce09a53708306682f04e1460a788fe66f832091b7003a5d8e1fee312"
- "29004b3b9f79bb2cdb0553c5a77c8d748a92e628405b7d9f9ae46693515757bb"
- "fc1a4ce85795a9a00161d5188b61db5054c462db9a65a8073a5b55b49b089e4d"
- "3fefa746363a0b05e4b90b18f4a510cd1eb10cd4ea2b845fa6099a5622490724"
- "4e5a7c72ed9b40c9f1f47d2dce3d4501d293bec208cd170ff5702cf9a1fc3a01"
- "332874f3e83da80c8a53b49e95db2fdd36b94da3ac053089276ae1e34880e585"
- "591dcf7b3fd48c5532c69ea12d7d1d1c39afa1cc81c8025dcced86b72c35dbf7"
- "1fc533158855b38d0b44e52865417d883ab7a165d1b22090c351ad683d43a06f"
- "06d9d454f888eeb18189c22398b67395e410d43a14e91752fa36f367e7e9d81f"
- "ac929c45e2319c80d6e6bbab6a5a2e4190741892dd32d25bcdd5aa00cfa2f251"
"51ff22b2d0f7e9d7a13666adb2c32321e725e9c0bf0f434b3cc7c760d88620c6"
)
noextract=(
@@ -175,12 +143,6 @@ prepare() {
# XSA patches.
msg2 'Applying XSA patches...'
- patch -Np1 -i "${srcdir}/xsa260-1.patch"
- patch -Np1 -i "${srcdir}/xsa260-2.patch"
- patch -Np1 -i "${srcdir}/xsa260-3.patch"
- patch -Np1 -i "${srcdir}/xsa260-4.patch"
- patch -Np1 -i "${srcdir}/xsa261.patch"
- patch -Np1 -i "${srcdir}/xsa262-4.10.patch"
# Security patches and compile fixes (qemu-xen-traditional).
msg2 'Applying tools patches (qemu-xen-traditional)...'
@@ -190,20 +152,10 @@ prepare() {
# Security patches and compile fixes (qemu-xen).
msg2 'Applying tools patches (qemu-xen)...'
cd tools/qemu-xen
- patch -Np1 -i "${srcdir}/qemu-xen-memfd.patch"
cd ../..
# Misc compile fixes (removed in future versions if not needed anymore).
msg2 'Applying misc compile fixes...'
- patch -Np1 -i "${srcdir}/ocaml-unsafe-string.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-libxc-fix-strncpy-size.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-misc-fix-hypothetical-buffer-overflow-in-xen-lowmemd.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-fix-possible-null-truncation.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-gdbsx-fix-wstringop-truncation-warning.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-blktap2-fix-possible-null-truncation.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-blktap2-fix-hypothetical-buffer-overflow.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-kdd-mute-spurious-gcc-warning.patch"
- patch -Np1 -i "${srcdir}/xen-gcc-8-tools-fix-format-truncation-warnings.patch"
# Compile fix for ipxe package with gcc-8.
cp "${srcdir}/ipxe-git-use-no-pie-on-newer-versions-of-gcc.patch" "${srcdir}/${pkgbase}-${pkgver}/tools/firmware/etherboot/patches"
diff --git a/ocaml-unsafe-string.patch b/ocaml-unsafe-string.patch
deleted file mode 100644
index 2f241132493..00000000000
--- a/ocaml-unsafe-string.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 18c163276f9b1f7f94e17a4f51f37a58b1ee4052 Mon Sep 17 00:00:00 2001
-From: John Thomson <git@johnthomson.fastmail.com.au>
-Date: Thu, 25 Jan 2018 17:06:56 +1000
-Subject: [PATCH] Fix ocaml 4.06.0 build, use unsafe strings
-
----
- tools/ocaml/common.make | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make
-index d5478f6..21ac33c 100644
---- a/tools/ocaml/common.make
-+++ b/tools/ocaml/common.make
-@@ -12,8 +12,8 @@ OCAMLFIND ?= ocamlfind
- CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
-
- OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p')
--OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
--OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F
-+OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F -unsafe-string
-+OCAMLCFLAGS += -g $(OCAMLINCLUDE) -w F -warn-error F -unsafe-string
-
- VERSION := 4.1
-
---
-2.16.0
-
diff --git a/xen-gcc-8-tools-fix-format-truncation-warnings.patch b/xen-gcc-8-tools-fix-format-truncation-warnings.patch
deleted file mode 100644
index 8b72643d146..00000000000
--- a/xen-gcc-8-tools-fix-format-truncation-warnings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
-index f97070c8b0..eacb45d8f6 100644
---- a/tools/ocaml/libs/xc/xenctrl_stubs.c
-+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
-@@ -54,7 +54,7 @@
-
- static void Noreturn failwith_xc(xc_interface *xch)
- {
-- char error_str[1028];
-+ char error_str[1029];
- if (xch) {
- const xc_error *error = xc_get_last_error(xch);
- if (error->code == XC_ERROR_NONE)