From dee71cdf294bd8462770c00870848bcd4560beee Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 29 Jul 2019 13:15:25 -0700
Subject: [PATCH] Fix libssh changes

This accounts for https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71 (upstream switching from `libssh2` to `libssh` in 4.1+).
---
 4.1-rc/Dockerfile             |  4 ++--
 Dockerfile.template           |  4 ++--
 generate-stackbrew-library.sh |  2 +-
 update.sh                     | 10 ++++++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/4.1-rc/Dockerfile b/4.1-rc/Dockerfile
index 42b24ff..e3b662c 100644
--- a/4.1-rc/Dockerfile
+++ b/4.1-rc/Dockerfile
@@ -47,7 +47,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 \
@@ -110,7 +110,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/Dockerfile.template b/Dockerfile.template
index 8664690..c120f29 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -47,7 +47,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 \
@@ -110,7 +110,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/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index e445b24..962ebe3 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,9 +2,9 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
+	[4.1-rc]='rc'
 	[4.0]='4 latest'
 	[3.1]='3'
-	[2.12]='2'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/update.sh b/update.sh
index 12df6b8..59bcd43 100755
--- a/update.sh
+++ b/update.sh
@@ -35,4 +35,14 @@ for version in "${versions[@]}"; do
 		-e 's!%%QEMU_URL%%!'"$url"'!g' \
 		Dockerfile.template > "$version/Dockerfile"
 	cp -a start-qemu *.patch "$version/"
+
+	case "$rcVersion" in
+		# https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71
+		3.0 | 3.1 | 4.0)
+			sed -ri \
+				-e 's/libssh-dev/libssh2-1-dev/g' \
+				-e 's/--enable-libssh/--enable-libssh2/g' \
+				"$version/Dockerfile"
+			;;
+	esac
 done