main/qemu: upgrade to 2.11.0

6 files changed, 8 insertions, 121 deletions

diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch b/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
index a013809ee2..c3a918775a 100644
--- a/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
+++ b/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
@@ -12,8 +12,8 @@
  
      if (*pcreg > (uintptr_t)safe_syscall_start
          && *pcreg < (uintptr_t)safe_syscall_end) {
---- a/user-exec.c
-+++ a/user-exec.c
+--- a/accel/tcg/user-exec.c
++++ a/accel/tcg/user-exec.c
 @@ -228,6 +228,7 @@
   */
  #ifdef linux
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index ce94b896dc..be194eb25b 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=2.10.1
-pkgrel=3
+pkgver=2.11.0
+pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
@@ -134,9 +134,6 @@ source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
 	ignore-signals-33-and-64-to-allow-golang-emulation.patch
 	0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 	fix-sockios-header.patch
-	fix-test-crypto-tls-x509-helpers-dont-use-sha1.patch
-	fix-test-io-channel-tls-handshake-completion.patch
-	fix-test-io-channel-tls-temp-directory.patch
 	test-crypto-ivgen-skip-essiv.patch
 	12-12-Fix-configure-for-s390-qemu-on-alpine.patch
 
@@ -341,7 +338,7 @@ guest() {
 		"$subpkgdir"/etc/conf.d/$pkgname-guest-agent
 }
 
-sha512sums="1a4a6ebf700ec6851c83cc2a71eaea8d95f14c685d094eaaa86c740eb9401e49a79074b72385f58681ca7646771a99bb6bbd9bebb39162f7220626d37ed0654f  qemu-2.10.1.tar.bz2
+sha512sums="3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004  qemu-2.11.0.tar.bz2
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
 ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
 1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56  0001-linux-user-fix-build-with-musl-on-aarch64.patch
@@ -350,11 +347,8 @@ ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606
 4b1e26ba4d53f9f762cbd5cea8ef6f8062d827ae3ae07bc36c5b0c0be4e94fc1856ad2477e8e791b074b8a25d51ed6d0ddd75e605e54600e5dd0799143793ce4  xattr_size_max.patch
 b6ed02aaf95a9bb30a5f107d35371207967edca058f3ca11348b0b629ea7a9c4baa618db68a3df72199eea6d86d14ced74a5a229d17604cc3f0adedcfeae7a73  ncurses.patch
 fd178f2913639a0c33199b3880cb17536961f2b3ff171c12b27f4be6bca032d6b88fd16302d09c692bb34883346babef5c44407a6804b20a39a465bb2bc85136  ignore-signals-33-and-64-to-allow-golang-emulation.patch
-a750e5e3d768cd41f704ca376a0ee460b83c0337f00cef0e8bced342d55b37fb9075f0a9ff805533b97f1e4dd02bf76c96ec202643df501784e85b985cdaf24e  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
-f0f99dc4f7fb475e3fab0262c0bc2c0dd8f17d77fe096c295fa1fc3e911ce07e1592f49c6ead7489246fecdd3a3f39f89ce05704af7f3fd384ce4f626f3c4601  fix-sockios-header.patch
-f4c6f9b1b1b22eecddb63e801a7e6070766868a63cc441647dbd571c86f29ba74d0fbd67f6016c85873d01ce537eed558eca05b92872ac70b4e9e0f17123ba2a  fix-test-crypto-tls-x509-helpers-dont-use-sha1.patch
-f405d985a359069a310b03a714e6223dbe85c94442b03ba35d7e1fe5da02c02c6ad1ce52d3705a6f9fccb79c2494085298d93b3cb159bacaa3b3bf3597c25202  fix-test-io-channel-tls-handshake-completion.patch
-2233b45389467b4386253e113c9b08ff0d6ad55f06361f4c6f9f49f2528895847e12c1a6e7f66efa356d49b384b61945d970325a0008e4a8715ef48b9d84b7fd  fix-test-io-channel-tls-temp-directory.patch
+d8933df9484158c2b4888254e62117d78f8ed7c18527b249419f39c2b2ab1afa148010884b40661f8965f1ef3105580fceffdfddbb2c9221dc1c62066722ba65  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
+39590476a4ebd7c1e79a4f0451b24c75b1817a2a83abaa1f71bb60b225d772152f0af8f3e51ff65645e378c536ffa6ff551dade52884d03a14b7c6a19c5c97d4  fix-sockios-header.patch
 8b8db136f78bd26b5da171effa9e11016ec2bc3e2fc8107228b5543b47aa370978ed883794aa4f917f334e284a5b49e82070e1da2d31d49301195b6713a48eff  test-crypto-ivgen-skip-essiv.patch
 272272efbf380a6c070c267864c96aa6747c446394b650c9e40633f905e3b6240faa12202e38e9dede5fce02df3fc1bf5b0d6c7ce96826488e752ce339588117  12-12-Fix-configure-for-s390-qemu-on-alpine.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
diff --git a/main/qemu/fix-sockios-header.patch b/main/qemu/fix-sockios-header.patch
index e74b7190d4..1f3cd767c1 100644
--- a/main/qemu/fix-sockios-header.patch
+++ b/main/qemu/fix-sockios-header.patch
@@ -7,6 +7,7 @@ index 43d0562..afa0ac4 100644
  #include <linux/icmpv6.h>
  #include <linux/errqueue.h>
 +#include <linux/sockios.h>
+ #include <linux/random.h>
  #include "qemu-common.h"
  #ifdef CONFIG_TIMERFD
  #include <sys/timerfd.h>
diff --git a/main/qemu/fix-test-crypto-tls-x509-helpers-dont-use-sha1.patch b/main/qemu/fix-test-crypto-tls-x509-helpers-dont-use-sha1.patch
deleted file mode 100644
index 6c56d7fbd3..0000000000
--- a/main/qemu/fix-test-crypto-tls-x509-helpers-dont-use-sha1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 23c1595b0297e6ca8f37559af6f0b8533aa1fd99 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 29 Aug 2017 17:03:30 +0100
-Subject: [PATCH] crypto: fix test cert generation to not use SHA1 algorithm
-
-GNUTLS 3.6.0 marked SHA1 as untrusted for certificates.
-Unfortunately the gnutls_x509_crt_sign() method we are
-using to create certificates in the test suite is fixed
-to always use SHA1. We must switch to a different method
-and explicitly ask for SHA256.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-Patch-Source: https://src.fedoraproject.org/rpms/qemu/blob/master/f/1016-crypto-fix-test-cert-generation-to-not-use-SHA1-algo.patch
----
- tests/crypto-tls-x509-helpers.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helpers.c
-index 64073d3bd3..173d4e28fb 100644
---- a/tests/crypto-tls-x509-helpers.c
-+++ b/tests/crypto-tls-x509-helpers.c
-@@ -406,7 +406,8 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req,
-      * If no 'ca' is set then we are self signing
-      * the cert. This is done for the root CA certs
-      */
--    err = gnutls_x509_crt_sign(crt, ca ? ca : crt, privkey);
-+    err = gnutls_x509_crt_sign2(crt, ca ? ca : crt, privkey,
-+                                GNUTLS_DIG_SHA256, 0);
-     if (err < 0) {
-         g_critical("Failed to sign certificate %s",
-                    gnutls_strerror(err));
--- 
-2.13.5
-
diff --git a/main/qemu/fix-test-io-channel-tls-handshake-completion.patch b/main/qemu/fix-test-io-channel-tls-handshake-completion.patch
deleted file mode 100644
index 552e17769b..0000000000
--- a/main/qemu/fix-test-io-channel-tls-handshake-completion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 689ed13e73bdb5a5ca3366524475e3065fae854a Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 29 Aug 2017 17:04:52 +0100
-Subject: [PATCH] io: fix check for handshake completion in TLS test
-
-The TLS I/O channel test had mistakenly used && instead
-of || when checking for handshake completion. As a
-result it could terminate the handshake process before
-it had actually completed. This was harmless before but
-changes in GNUTLS 3.6.0 exposed this bug and caused the
-test suite to fail.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-Patch-Source: https://src.fedoraproject.org/rpms/qemu/blob/master/f/1017-io-fix-check-for-handshake-completion-in-TLS-test.patch
----
- tests/test-io-channel-tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
-index ff96877323..a210d01ba5 100644
---- a/tests/test-io-channel-tls.c
-+++ b/tests/test-io-channel-tls.c
-@@ -218,7 +218,7 @@ static void test_io_channel_tls(const void *opaque)
-     mainloop = g_main_context_default();
-     do {
-         g_main_context_iteration(mainloop, TRUE);
--    } while (!clientHandshake.finished &&
-+    } while (!clientHandshake.finished ||
-              !serverHandshake.finished);
- 
-     g_assert(clientHandshake.failed == data->expectClientFail);
--- 
-2.13.5
-
diff --git a/main/qemu/fix-test-io-channel-tls-temp-directory.patch b/main/qemu/fix-test-io-channel-tls-temp-directory.patch
deleted file mode 100644
index 283f85a70f..0000000000
--- a/main/qemu/fix-test-io-channel-tls-temp-directory.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d4adf9675801cd90e66ecfcd6a54ca1abc5a6698 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Fri, 21 Jul 2017 12:47:39 +0100
-Subject: [PATCH] io: fix temp directory used by test-io-channel-tls test
-
-The test-io-channel-tls test was mistakenly using two of the
-same directories as test-crypto-tlssession. This causes a
-sporadic failure when using make -j$BIGNUM.
-
-Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-Patch-Source: https://src.fedoraproject.org/rpms/qemu/blob/master/f/1018-io-fix-temp-directory-used-by-test-io-channel-tls-te.patch
----
- tests/test-io-channel-tls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
-index 8eaa208e1b..ff96877323 100644
---- a/tests/test-io-channel-tls.c
-+++ b/tests/test-io-channel-tls.c
-@@ -127,8 +127,8 @@ static void test_io_channel_tls(const void *opaque)
-     /* We'll use this for our fake client-server connection */
-     g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
- 
--#define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/"
--#define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/"
-+#define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/"
-+#define SERVER_CERT_DIR "tests/test-io-channel-tls-server/"
-     mkdir(CLIENT_CERT_DIR, 0700);
-     mkdir(SERVER_CERT_DIR, 0700);
- 
--- 
-2.13.5
-