From 6466cf27a8f8719098d9c2db39727979cd9e577e Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 30 Apr 2021 07:54:04 -0700
Subject: [PATCH] Update to 6.0.0

---
 {4.2 => 6.0}/Dockerfile         |  7 +++++--
 {4.2 => 6.0}/Dockerfile.native  |  7 +++++--
 {4.2 => 6.0}/qemu-signals.patch | 10 +++++-----
 {4.2 => 6.0}/start-qemu         |  0
 generate-stackbrew-library.sh   |  5 ++---
 versions.json                   |  8 ++++----
 6 files changed, 21 insertions(+), 16 deletions(-)
 rename {4.2 => 6.0}/Dockerfile (96%)
 rename {4.2 => 6.0}/Dockerfile.native (96%)
 rename {4.2 => 6.0}/qemu-signals.patch (69%)
 rename {4.2 => 6.0}/start-qemu (100%)

diff --git a/4.2/Dockerfile b/6.0/Dockerfile
similarity index 96%
rename from 4.2/Dockerfile
rename to 6.0/Dockerfile
index 28ecdc9..605264b 100644
--- a/4.2/Dockerfile
+++ b/6.0/Dockerfile
@@ -38,8 +38,8 @@ ENV QEMU_KEYS \
 
 # https://www.qemu.org/download/#source
 # https://download.qemu.org/?C=M;O=D
-ENV QEMU_VERSION 4.2.1
-ENV QEMU_URL https://download.qemu.org/qemu-4.2.1.tar.xz
+ENV QEMU_VERSION 6.0.0
+ENV QEMU_URL https://download.qemu.org/qemu-6.0.0.tar.xz
 
 RUN set -eux; \
 	\
@@ -82,6 +82,9 @@ RUN set -eux; \
 		python3 \
 		xfslibs-dev \
 		zlib1g-dev \
+# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
+		ninja-build \
+		python3-setuptools \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
diff --git a/4.2/Dockerfile.native b/6.0/Dockerfile.native
similarity index 96%
rename from 4.2/Dockerfile.native
rename to 6.0/Dockerfile.native
index 308e42e..455f044 100644
--- a/4.2/Dockerfile.native
+++ b/6.0/Dockerfile.native
@@ -40,8 +40,8 @@ ENV QEMU_KEYS \
 
 # https://www.qemu.org/download/#source
 # https://download.qemu.org/?C=M;O=D
-ENV QEMU_VERSION 4.2.1
-ENV QEMU_URL https://download.qemu.org/qemu-4.2.1.tar.xz
+ENV QEMU_VERSION 6.0.0
+ENV QEMU_URL https://download.qemu.org/qemu-6.0.0.tar.xz
 
 RUN set -eux; \
 	\
@@ -84,6 +84,9 @@ RUN set -eux; \
 		python3 \
 		xfslibs-dev \
 		zlib1g-dev \
+# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
+		ninja-build \
+		python3-setuptools \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
diff --git a/4.2/qemu-signals.patch b/6.0/qemu-signals.patch
similarity index 69%
rename from 4.2/qemu-signals.patch
rename to 6.0/qemu-signals.patch
index cbd86f7..ab4ef1f 100644
--- a/4.2/qemu-signals.patch
+++ b/6.0/qemu-signals.patch
@@ -1,11 +1,11 @@
 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
-index 1ad1c04637..9e07fe1dbb 100644
---- a/vl.c
-+++ b/vl.c
-@@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid)
+diff --git a/softmmu/runstate.c b/softmmu/runstate.c
+index ce8977c6a2..392e4c88be 100644
+--- a/softmmu/runstate.c
++++ b/softmmu/runstate.c
+@@ -613,7 +613,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.2/start-qemu b/6.0/start-qemu
similarity index 100%
rename from 4.2/start-qemu
rename to 6.0/start-qemu
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 762b266..201833d 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,9 +2,8 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[5.3-rc]='rc'
-	[5.2]='5 latest'
-	[4.2]='4'
+	[6.0]='6 latest'
+	[5.2]='5'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/versions.json b/versions.json
index 7c87e15..c8e1a7e 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,4 @@
 {
-  "4.2": {
-    "url": "https://download.qemu.org/qemu-4.2.1.tar.xz",
-    "version": "4.2.1"
-  },
   "5.0": {
     "url": "https://download.qemu.org/qemu-5.0.1.tar.xz",
     "version": "5.0.1"
@@ -14,5 +10,9 @@
   "5.2": {
     "url": "https://download.qemu.org/qemu-5.2.0.tar.xz",
     "version": "5.2.0"
+  },
+  "6.0": {
+    "url": "https://download.qemu.org/qemu-6.0.0.tar.xz",
+    "version": "6.0.0"
   }
 }