upgpkg: minecraft-server 1.16.5-2

Remove highly specific `ParallelGCThreads` argument from default config
for Java based minecraft servers.

Refine tmpfiles.d handling to more specifically target files provided by
the package. Additional files created by executing the server should
already be captured by the umask of the game user running the server.

upgpkg: cuberite 1.12.2b191-1
upgpkg: papermc 1.16.5+b558-1
upgpkg: spigot 1.16.5+b126-1

5 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05213e5e54b8..8f5fb247e812 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = spigot
 	pkgdesc = High performance Minecraft server implementation
-	pkgver = 1.16.5+b124
+	pkgver = 1.16.5+b126
 	pkgrel = 1
 	url = https://www.spigotmc.org/
 	install = spigot.install
@@ -24,7 +24,7 @@ pkgbase = spigot
 	conflicts = craftbukkit
 	conflicts = spigot-patcher
 	backup = etc/conf.d/spigot
-	source = BuildTools-1.16.5+b124.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/124/artifact/target/BuildTools.jar
+	source = BuildTools-1.16.5+b126.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/126/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 = f4898dff44e77495453aafd597c311989fbe812721e82ee52be2b6856b91f933f5b3ec75137b90923231dc2f9f68b84efca507fde4b9a22368f2ea9324323cb8
+	sha512sums = 92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a
 	sha512sums = 03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb
 	sha512sums = 76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c
 	sha512sums = 5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee
 	sha512sums = eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7
-	sha512sums = 69f6b4ec936653ab237e5cf6cbfdd1bc2c408426584f8746aafb3761b9782370c4d5ef4bf4efd23966fde5ac9ba2516acbcc62ea7af8647c79533234354aaca1
-	sha512sums = 33f456fd945bb2cfa6b390ce0ab02753cc6366e39abff80a4f2b7aa3aebe3cd31d148b785cbc2aa159dd8ad9fb03233a09f8693eb031b6b9db8dc03643d2397b
-	sha512sums = 56cd4c1f190a5231891daa96d470b35fe51710732c78834da986920d79b77da7c583d559c93c13b22ba5906bf83543477f90f58f5e045136ba809b44062f345d
+	sha512sums = f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8
+	sha512sums = 2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b
+	sha512sums = 884bde3d6d6cb994850687c5cb806e022bb05740959911912ac9bb8a3cf5d6fda15d5f1139c041b9c8d36d9fae94c97eb01edfb1cb79d568759dc01fcd8dc80b
 
 pkgname = spigot
diff --git a/PKGBUILD b/PKGBUILD
index c855125cd32a..7763acd91be8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=spigot
 _pkgver=1.16.5
-_build=124
+_build=126
 pkgver="${_pkgver}+b${_build}"
 pkgrel=1
 pkgdesc="High performance Minecraft server implementation"
@@ -26,14 +26,14 @@ source=("BuildTools-${_pkgver}+b${_build}.jar::https://hub.spigotmc.org/jenkins/
 	"${pkgname}.tmpfiles"
 	"${pkgname}.conf"
 	"${pkgname}.sh")
-sha512sums=('f4898dff44e77495453aafd597c311989fbe812721e82ee52be2b6856b91f933f5b3ec75137b90923231dc2f9f68b84efca507fde4b9a22368f2ea9324323cb8'
+sha512sums=('92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a'
             '03ba1032b687553831021cfb0bed489e6301d0446c3b4f56d989d203855952911f3b1caaa00596f4731060ddf6684f66c3d674f3c5546b600cbe6585fc8560fb'
             '76c77e47c442b477216e968db2213612579b24add54cf0e0512f808498673500b4d24e59bce70b1e7479d724a9a897ceb154e937b88a476beb11c8776258b36c'
             '5a32439ff4b8fa9db89e9242206cf99109e0b00f29f87711c25342dda522171d999f7e18fb2013437ddf62cfec05b6677601933233aaf42bcb5d67eb7a1469ee'
             'eac1deb53fa9d522af272fa2d9093b98e7d51aa4c0730471e5c575752733500b84a06bc19d1fe83b4c48e41b7f0e11efb23881bfadce4a40d2bfed7cbe5a5bf7'
-            '69f6b4ec936653ab237e5cf6cbfdd1bc2c408426584f8746aafb3761b9782370c4d5ef4bf4efd23966fde5ac9ba2516acbcc62ea7af8647c79533234354aaca1'
-            '33f456fd945bb2cfa6b390ce0ab02753cc6366e39abff80a4f2b7aa3aebe3cd31d148b785cbc2aa159dd8ad9fb03233a09f8693eb031b6b9db8dc03643d2397b'
-            '56cd4c1f190a5231891daa96d470b35fe51710732c78834da986920d79b77da7c583d559c93c13b22ba5906bf83543477f90f58f5e045136ba809b44062f345d')
+            'f3b3005a8ee643cb7d8fa24a3d1141604157efd2147d07aa7f839b070370cbed66ccf3c34317181e9601f2aadb5224002617226c99e36b677c0fc3de0b42d0d8'
+            '2f5d71911c9ee7e7763d3300f335245a531a9e00d23e4d007ce76f4175dd7ecd9d8f0425af86a885797764690db64bfa558b49719f3d9d85a46df89443bcdf7b'
+            '884bde3d6d6cb994850687c5cb806e022bb05740959911912ac9bb8a3cf5d6fda15d5f1139c041b9c8d36d9fae94c97eb01edfb1cb79d568759dc01fcd8dc80b')
 
 _game="spigot"
 _server_root="/srv/craftbukkit"
diff --git a/spigot.conf b/spigot.conf
index 2a85d2f09679..9484bad47bb3 100644
--- a/spigot.conf
+++ b/spigot.conf
@@ -13,8 +13,7 @@ SESSION_NAME="spigot"
 # System parameters for java
 #  -Xms sets the intial heap size (must be a multiple of 1024 and greater than 2MB, no spaces!)
 #  -Xmx sets the maximum heap size (must be a multiple of 1024 and greater than 2MB, no spaces!)
-#  -XX:ParallelGCThreads defines the number of threads the server may use
-SERVER_START_CMD="java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui"
+SERVER_START_CMD="java -Xms512M -Xmx1024M -jar './${MAIN_EXECUTABLE}' nogui"
 
 # System parameters for the actual game server
 # Describes whether a daemon process which stops the server if it is not used by a player
diff --git a/spigot.sh b/spigot.sh
index ecb63321f63b..d9a187b4b797 100755
--- a/spigot.sh
+++ b/spigot.sh
@@ -19,7 +19,7 @@ declare -r game="spigot"
 [[ -n "${SESSION_NAME}" ]] && declare -r SESSION_NAME=${SESSION_NAME} || SESSION_NAME="${game}"
 
 # Command and parameter declaration with which to start the server
-[[ -n "${SERVER_START_CMD}" ]] && declare -r SERVER_START_CMD=${SERVER_START_CMD} || SERVER_START_CMD="java -Xms512M -Xmx1024M -XX:ParallelGCThreads=1 -jar './${MAIN_EXECUTABLE}' nogui"
+[[ -n "${SERVER_START_CMD}" ]] && declare -r SERVER_START_CMD=${SERVER_START_CMD} || SERVER_START_CMD="java -Xms512M -Xmx1024M -jar './${MAIN_EXECUTABLE}' nogui"
 
 # System parameters for the control script
 [[ -n "${IDLE_SERVER}" ]]       && tmp_IDLE_SERVER=${IDLE_SERVER}   || IDLE_SERVER="false"
diff --git a/spigot.tmpfiles b/spigot.tmpfiles
index 732a0bf4fd37..3534d45818c4 100644
--- a/spigot.tmpfiles
+++ b/spigot.tmpfiles
@@ -1,2 +1,5 @@
 z /srv/craftbukkit 2775 craftbukkit craftbukkit - -
-Z /srv/craftbukkit - craftbukkit craftbukkit - -
+d /srv/craftbukkit/logs 2755 craftbukkit craftbukkit -
+z /srv/craftbukkit/logs - craftbukkit craftbukkit - -
+d /srv/craftbukkit/plugins 2755 craftbukkit craftbukkit -
+z /srv/craftbukkit/plugins - craftbukkit craftbukkit - -