upgpkg: minecraft-server 1.17-1

More aggressively close the netcat instance in idle_server_daemon as to
not stall on dead connections.

upgpkg: cuberite 1.12.2c0_4e48464-1
upgpkg: cuberite-bin 1.12.2b241-1
upgpkg: papermc 1.16.5+b778-1
upgpkg: spigot 1.17+b128-1

3 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d480ec0ab55a..4d99274c1b17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = minecraft-server
 	pkgdesc = Minecraft server unit files, script, and jar
-	pkgver = 1.16.5
-	pkgrel = 2
+	pkgver = 1.17
+	pkgrel = 1
 	url = https://minecraft.net/
 	arch = any
 	license = custom
-	depends = java-runtime-headless>=8
+	depends = java-runtime-headless>=16
 	depends = screen
 	depends = sudo
 	depends = bash
@@ -15,9 +15,9 @@ pkgbase = minecraft-server
 	optdepends = netcat: required in order to suspend an idle server
 	conflicts = minecraft-server-systemd
 	conflicts = minecraft-canary
-	noextract = minecraft_server.1.16.5.jar
+	noextract = minecraft_server.1.17.jar
 	backup = etc/conf.d/minecraft
-	source = minecraft_server.1.16.5.jar::https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar
+	source = minecraft_server.1.17.jar::https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar
 	source = minecraftd-backup.service
 	source = minecraftd-backup.timer
 	source = minecraftd.service
@@ -25,13 +25,13 @@ pkgbase = minecraft-server
 	source = minecraftd.tmpfiles
 	source = minecraftd.conf
 	source = minecraftd.sh
-	sha512sums = 8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f
+	sha512sums = d8c7658f2fedeb0ce60be24935e5543135200feae53bcaec510fcb86b93a18ac3464527a4d657c886f5ecaca89f1a7701cb03d6656efcb5c19e2156e59feef5a
 	sha512sums = a10e38c0e9a09c25e23e46147a8b8ce4d88a62ee780c1c0b525b9e41a563c4a4ed8e94d851abc3936bc31f3faa916ef005543129a039f66878b8f2c34853b91d
 	sha512sums = 19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418
 	sha512sums = 5203f6331f740ecfcea2a2cc653603ae97419baa89e08512f9d8feb63e4a52978442a69b313eccd9037b676a62ab528e2b533c0fb95a9c7177318279fe0cde79
 	sha512sums = a62c8c04e08dbac0db0aa2eeb505d70f8fd925bd2e427899512ba3ac828d4644e1c43c8d92325c6bc49c8d9ecb40cb5c44bf5957a63980b1e2cf86fdb38a05a7
 	sha512sums = a74f4e31065b6c6f5c830182de05a8c75a6de6eaac7b3dc26479827646ef20ab872509aac88be613048c97d378711c38612ec7ac92d22134acefd40f6e0a99da
 	sha512sums = 30e434ba183527da8047b1ffe403a083f1af34dbd229b5871222e9da0004cdf5d4152eaa4b73215befcb1233d08cc757af32ad6b572f4b6d2a623b6f120aa0d9
-	sha512sums = 1d542dad455594b5fd64bc696785fd8667dc787c3c8f1f8b49121565959c6e1a5158d9087ce6c7bef9a5e282223400f06529fa7c14765fd4bc108ad1fad8f44f
+	sha512sums = 37fef61051416d9313e13c75ace5235f110b2a38207a30743427c5337c18d198ac2732795229a7fb3d81e88fabfecd534aa91cf873767c279acc41459599b913
 
 pkgname = minecraft-server
diff --git a/PKGBUILD b/PKGBUILD
index bf3ff5e5cc57..0197173537e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributer: sowieso <sowieso@dukun.de>
 
 pkgname=minecraft-server
-pkgver=1.16.5
-_nonce=1b557e7b033b583cd9f66746b7a9ab1ec1673ced
-pkgrel=2
+pkgver=1.17
+_nonce=0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e
+pkgrel=1
 pkgdesc="Minecraft server unit files, script, and jar"
 arch=('any')
 url="https://minecraft.net/"
 license=('custom')
-depends=('java-runtime-headless>=8' 'screen' 'sudo' 'bash' 'awk' 'sed')
+depends=('java-runtime-headless>=16' 'screen' 'sudo' 'bash' 'awk' 'sed')
 optdepends=("tar: needed in order to create world backups"
 	"netcat: required in order to suspend an idle server")
 conflicts=('minecraft-server-systemd' 'minecraft-canary')
@@ -25,14 +25,14 @@ source=("minecraft_server.${pkgver}.jar"::"https://launcher.mojang.com/v1/object
 	"minecraftd.conf"
 	"minecraftd.sh")
 noextract=("minecraft_server.${pkgver}.jar")
-sha512sums=('8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f'
+sha512sums=('d8c7658f2fedeb0ce60be24935e5543135200feae53bcaec510fcb86b93a18ac3464527a4d657c886f5ecaca89f1a7701cb03d6656efcb5c19e2156e59feef5a'
             'a10e38c0e9a09c25e23e46147a8b8ce4d88a62ee780c1c0b525b9e41a563c4a4ed8e94d851abc3936bc31f3faa916ef005543129a039f66878b8f2c34853b91d'
             '19ee3646bfbace353b65c0373594edb654de11c9671f29cebad3b31109f29f94ade1d529d9f409b0989c376bef9b451585b22a1e0ac4295fcc92d9565f808418'
             '5203f6331f740ecfcea2a2cc653603ae97419baa89e08512f9d8feb63e4a52978442a69b313eccd9037b676a62ab528e2b533c0fb95a9c7177318279fe0cde79'
             'a62c8c04e08dbac0db0aa2eeb505d70f8fd925bd2e427899512ba3ac828d4644e1c43c8d92325c6bc49c8d9ecb40cb5c44bf5957a63980b1e2cf86fdb38a05a7'
             'a74f4e31065b6c6f5c830182de05a8c75a6de6eaac7b3dc26479827646ef20ab872509aac88be613048c97d378711c38612ec7ac92d22134acefd40f6e0a99da'
             '30e434ba183527da8047b1ffe403a083f1af34dbd229b5871222e9da0004cdf5d4152eaa4b73215befcb1233d08cc757af32ad6b572f4b6d2a623b6f120aa0d9'
-            '1d542dad455594b5fd64bc696785fd8667dc787c3c8f1f8b49121565959c6e1a5158d9087ce6c7bef9a5e282223400f06529fa7c14765fd4bc108ad1fad8f44f')
+            '37fef61051416d9313e13c75ace5235f110b2a38207a30743427c5337c18d198ac2732795229a7fb3d81e88fabfecd534aa91cf873767c279acc41459599b913')
 
 _game="minecraft"
 _server_root="/srv/minecraft"
diff --git a/minecraftd.sh b/minecraftd.sh
index b38fa9aaf538..0dd936ec2110 100755
--- a/minecraftd.sh
+++ b/minecraftd.sh
@@ -140,7 +140,8 @@ idle_server_daemon() {
 					no_player=$(( IDLE_IF_TIME - 300 ))
 					# Game server is down, listen on port ${GAME_PORT} for incoming connections
 					echo -n "Netcat: "
-					${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
+					${NETCAT_CMD} -v -l -p ${GAME_PORT} 2>&1 | (grep -m1 -i "connect" && pkill -P $$ ${NETCAT_CMD}) || true
+					echo "Netcat caught a connection. The server is coming up again..."
 					IDLE_SERVER="false" ${myname} start
 				fi
 			else
@@ -152,7 +153,8 @@ idle_server_daemon() {
 			no_player=$(( IDLE_IF_TIME - 300 ))
 			# Game server is down, listen on port ${GAME_PORT} for incoming connections
 			echo -n "Netcat: "
-			${NETCAT_CMD} -v -l -p ${GAME_PORT} && echo "Netcat caught an connection. The server is coming up again..."
+			${NETCAT_CMD} -v -l -p ${GAME_PORT} 2>&1 | (grep -m1 -i "connect" && pkill -P $$ ${NETCAT_CMD}) || true
+			echo "Netcat caught a connection. The server is coming up again..."
 			IDLE_SERVER="false" ${myname} start
 		fi
 	done