From 65154822bec2767bf748086c8c6f436be15ff420 Mon Sep 17 00:00:00 2001
From: Gordian Edenhofer <gordian.edenhofer@gmail.com>
Date: Sat, 1 Jul 2017 18:22:26 +0200
Subject: [PATCH] upgpkg: minecraft-server 1.12-3

Circumvent a permission bug related to running GNU screen as a different
user.

upgpkg: spigot 1.12-2
---
 .SRCINFO      | 4 ++--
 PKGBUILD      | 4 ++--
 minecraftd.sh | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5b97799..a0954a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = minecraft-server
 	pkgdesc = Minecraft server unit files, script, and jar
 	pkgver = 1.12
-	pkgrel = 2
+	pkgrel = 3
 	url = https://minecraft.net/
 	install = minecraft-server.install
 	arch = any
@@ -29,6 +29,6 @@ pkgbase = minecraft-server
 	sha512sums = 19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418
 	sha512sums = b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28
 	sha512sums = 73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67
-	sha512sums = b7509e3e6df7764d78d9515b35ace80bfedd478c5beeeb37e1cd191155d8b0efd9c5c97eea89d6f4eb0a469bbcb781d73999283975f8d834db25063e3d6af257
+	sha512sums = d92a1c0babd25a1811e643222bcb0f96b65b936a132bfe5ba308397abc81369e819dbb6f29293ee23088d70a2e439edcd974f0a60676fa019a57b20be68e587f
 
 pkgname = minecraft-server
diff --git a/PKGBUILD b/PKGBUILD
index 8dde5ed..803cad4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=minecraft-server
 pkgver=1.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Minecraft server unit files, script, and jar"
 arch=('any')
 url="https://minecraft.net/"
@@ -27,7 +27,7 @@ sha512sums=('b96aff9b718373c587ada412513aa3c8111c88ff1424a9ec9f80a934e781a4371bf
             '19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418'
             'b0124c8cd90a4f9901a9105c0ee51eb3e7db944d106cf30fd91b29794178e650d3a21c3be3c8e0cb454b2cef6f27541c44e7a5e77a1d50f89b9152363de51d28'
             '73132ec613e05c8ed7ebe4eda2395f1ea0733ffe94ba7e203e06246d5852139bbfb7a9073b2b01891282339a2f85676699cd889cde79d6317066e27fd65b1d67'
-            'b7509e3e6df7764d78d9515b35ace80bfedd478c5beeeb37e1cd191155d8b0efd9c5c97eea89d6f4eb0a469bbcb781d73999283975f8d834db25063e3d6af257')
+            'd92a1c0babd25a1811e643222bcb0f96b65b936a132bfe5ba308397abc81369e819dbb6f29293ee23088d70a2e439edcd974f0a60676fa019a57b20be68e587f')
 
 _game="minecraft"
 _server_root="/srv/minecraft"
diff --git a/minecraftd.sh b/minecraftd.sh
index 9761504..6a4203b 100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -407,7 +407,9 @@ server_command() {
 # Enter the screen game session
 server_console() {
 	if ${SUDO_CMD} screen -S "${SESSION_NAME}" -Q select . > /dev/null; then
-		${SUDO_CMD} screen -S "${SESSION_NAME}" -rx
+		# Circumvent a permission bug related to running GNU screen as a different user,
+		# see e.g. https://serverfault.com/questions/116775/sudo-as-different-user-and-running-screen
+		${SUDO_CMD} script -q -c "screen -S \"${SESSION_NAME}\" -rx" /dev/null
 	else
 		echo "There is no ${SESSION_NAME} session to connect to."
 	fi