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, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f5fb247e812..35184802ecea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = spigot
 	pkgdesc = High performance Minecraft server implementation
-	pkgver = 1.16.5+b126
+	pkgver = 1.17+b128
 	pkgrel = 1
 	url = https://www.spigotmc.org/
 	install = spigot.install
 	arch = any
 	license = LGPL
-	makedepends = java-environment>=8
+	makedepends = java-environment>=16
 	makedepends = git
-	depends = java-runtime-headless>=8
+	depends = java-runtime-headless>=16
 	depends = screen
 	depends = sudo
 	depends = fontconfig
@@ -17,14 +17,14 @@ pkgbase = spigot
 	depends = sed
 	optdepends = tar: needed in order to create world backups
 	optdepends = netcat: required in order to suspend an idle server
-	provides = minecraft-server=1.16.5
-	provides = bukkit=1.16.5
-	provides = craftbukkit=1.16.5
+	provides = minecraft-server=1.17
+	provides = bukkit=1.17
+	provides = craftbukkit=1.17
 	conflicts = bukkit
 	conflicts = craftbukkit
 	conflicts = spigot-patcher
 	backup = etc/conf.d/spigot
-	source = BuildTools-1.16.5+b126.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/126/artifact/target/BuildTools.jar
+	source = BuildTools-1.17+b128.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/128/artifact/target/BuildTools.jar
 	source = spigot-backup.service
 	source = spigot-backup.timer
 	source = spigot.service
@@ -32,13 +32,13 @@ pkgbase = spigot
 	source = spigot.tmpfiles
 	source = spigot.conf
 	source = spigot.sh
-	sha512sums = 92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a
+	sha512sums = 1a68933b4430ca0e4c45f57e3ff6af13fb867b7df776626e038c8cb9a3ffb894b381ba5ed0bd5e35034fb9f2c1a1f65a215733b90f317ebaf87939ba1ee2f30e
 	sha512sums = 03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb
 	sha512sums = 76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c
 	sha512sums = 5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee
 	sha512sums = eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7
 	sha512sums = f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8
 	sha512sums = 2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b
-	sha512sums = 884bde3d6d6cb994850687c5cb806e022bb05740959911912ac9bb8a3cf5d6fda15d5f1139c041b9c8d36d9fae94c97eb01edfb1cb79d568759dc01fcd8dc80b
+	sha512sums = 109e3ce4c78af5bb1ce80dc3259ff239fbf2db5c2415b1002e9b2c29353062f6ed9ecd31956d5f77251e2b5bb537e9bd0b1e7706e4cf3308d49f3eb36046be92
 
 pkgname = spigot
diff --git a/PKGBUILD b/PKGBUILD
index 7763acd91be8..d439374df50b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 # Submitter: Schala Zeal <schalaalexiazeal@gmail.com>
 
 pkgname=spigot
-_pkgver=1.16.5
-_build=126
+_pkgver=1.17
+_build=128
 pkgver="${_pkgver}+b${_build}"
 pkgrel=1
 pkgdesc="High performance Minecraft server implementation"
 arch=('any')
 url="https://www.spigotmc.org/"
 license=("LGPL")
-depends=("java-runtime-headless>=8" 'screen' 'sudo' 'fontconfig' 'bash' 'awk' 'sed')
+depends=("java-runtime-headless>=16" 'screen' 'sudo' 'fontconfig' 'bash' 'awk' 'sed')
 optdepends=("tar: needed in order to create world backups"
 	"netcat: required in order to suspend an idle server")
-makedepends=("java-environment>=8" 'git')
+makedepends=("java-environment>=16" 'git')
 provides=("minecraft-server=${_pkgver%_*}" "bukkit=${_pkgver%_*}" "craftbukkit=${_pkgver%_*}")
 conflicts=("bukkit" "craftbukkit" "spigot-patcher")
 backup=("etc/conf.d/${pkgname}")
@@ -26,14 +26,14 @@ source=("BuildTools-${_pkgver}+b${_build}.jar::https://hub.spigotmc.org/jenkins/
 	"${pkgname}.tmpfiles"
 	"${pkgname}.conf"
 	"${pkgname}.sh")
-sha512sums=('92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a'
+sha512sums=('1a68933b4430ca0e4c45f57e3ff6af13fb867b7df776626e038c8cb9a3ffb894b381ba5ed0bd5e35034fb9f2c1a1f65a215733b90f317ebaf87939ba1ee2f30e'
             '03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb'
             '76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c'
             '5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee'
             'eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7'
             'f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8'
             '2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b'
-            '884bde3d6d6cb994850687c5cb806e022bb05740959911912ac9bb8a3cf5d6fda15d5f1139c041b9c8d36d9fae94c97eb01edfb1cb79d568759dc01fcd8dc80b')
+            '109e3ce4c78af5bb1ce80dc3259ff239fbf2db5c2415b1002e9b2c29353062f6ed9ecd31956d5f77251e2b5bb537e9bd0b1e7706e4cf3308d49f3eb36046be92')
 
 _game="spigot"
 _server_root="/srv/craftbukkit"
diff --git a/spigot.sh b/spigot.sh
index d9a187b4b797..b907580f6e31 100755
--- a/spigot.sh
+++ b/spigot.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