From 85d79de01c416781394d70facf5913285c457029 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 12 Aug 2020 13:50:52 -0700
Subject: [PATCH] Add 5.1.0 (and remove EOL 4.0)

---
 {4.0 => 5.1}/Dockerfile         | 8 ++++----
 {4.0 => 5.1}/qemu-signals.patch | 6 +++---
 {4.0 => 5.1}/start-qemu         | 0
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename {4.0 => 5.1}/Dockerfile (96%)
 rename {4.0 => 5.1}/qemu-signals.patch (88%)
 rename {4.0 => 5.1}/start-qemu (100%)

diff --git a/4.0/Dockerfile b/5.1/Dockerfile
similarity index 96%
rename from 4.0/Dockerfile
rename to 5.1/Dockerfile
index 9fcfce4..0995611 100644
--- a/4.0/Dockerfile
+++ b/5.1/Dockerfile
@@ -14,8 +14,8 @@ ENV QEMU_KEYS \
 
 # https://www.qemu.org/download/#source
 # https://download.qemu.org/?C=M;O=D
-ENV QEMU_VERSION 4.0.1
-ENV QEMU_URL https://download.qemu.org/qemu-4.0.1.tar.xz
+ENV QEMU_VERSION 5.1.0
+ENV QEMU_URL https://download.qemu.org/qemu-5.1.0.tar.xz
 
 RUN set -eux; \
 	\
@@ -48,7 +48,7 @@ RUN set -eux; \
 		libpixman-1-dev \
 		libpng-dev \
 		libseccomp-dev \
-		libssh2-1-dev \
+		libssh-dev \
 		libusb-1.0-0-dev \
 		libusbredirparser-dev \
 		libxen-dev \
@@ -111,7 +111,7 @@ RUN set -eux; \
 		--enable-kvm \
 		--enable-libiscsi \
 		--enable-libnfs \
-		--enable-libssh2 \
+		--enable-libssh \
 		--enable-libusb \
 		--enable-linux-aio \
 		--enable-linux-user \
diff --git a/4.0/qemu-signals.patch b/5.1/qemu-signals.patch
similarity index 88%
rename from 4.0/qemu-signals.patch
rename to 5.1/qemu-signals.patch
index cbd86f7..4b8c712 100644
--- a/4.0/qemu-signals.patch
+++ b/5.1/qemu-signals.patch
@@ -1,10 +1,10 @@
 Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2
 Origin: https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg03039.html
 
-diff --git a/vl.c b/vl.c
+diff --git a/softmmu/vl.c b/softmmu/vl.c
 index 1ad1c04637..9e07fe1dbb 100644
---- a/vl.c
-+++ b/vl.c
+--- a/softmmu/vl.c
++++ b/softmmu/vl.c
 @@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid)
      /* Cannot call qemu_system_shutdown_request directly because
       * we are in a signal handler.
diff --git a/4.0/start-qemu b/5.1/start-qemu
similarity index 100%
rename from 4.0/start-qemu
rename to 5.1/start-qemu