aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2021-03-19 22:58:54 +0100
committerGordian Edenhofer2021-03-19 22:58:54 +0100
commit12fdec6323a58a291eda3674c6d81ee77c9937e6 (patch)
tree0c11e04a414a50d07080fdf873e0fe41ecaa52b5
parent975dcfaa2e5a37649a5d872594162f4d14f3edcf (diff)
downloadaur-12fdec6323a58a291eda3674c6d81ee77c9937e6.tar.gz
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
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD10
-rw-r--r--papermc.conf3
-rwxr-xr-xpapermc.sh2
-rw-r--r--papermc.tmpfiles3
5 files changed, 17 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c47e596889e5..06cb514b75e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = papermc
pkgdesc = Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance
- pkgver = 1.16.5+b470
+ pkgver = 1.16.5+b558
pkgrel = 1
url = https://papermc.io/
install = papermc.install
@@ -15,9 +15,9 @@ pkgbase = papermc
optdepends = tar: needed in order to create world backups
optdepends = netcat: required in order to suspend an idle server
conflicts = papermc-git
- noextract = papermc.1.16.5+b470.jar
+ noextract = papermc.1.16.5+b558.jar
backup = etc/conf.d/papermc
- source = papermc.1.16.5+b470.jar::https://papermc.io/api/v1/paper/1.16.5/470/download
+ source = papermc.1.16.5+b558.jar::https://papermc.io/api/v1/paper/1.16.5/558/download
source = papermc-backup.service
source = papermc-backup.timer
source = papermc.service
@@ -25,14 +25,14 @@ pkgbase = papermc
source = papermc.sh
source = papermc.tmpfiles
source = papermc.sysusers
- source = LICENSE_1.16.5+b470.md::https://raw.githubusercontent.com/PaperMC/Paper/4a7962c/LICENSE.md
- sha512sums = d59eb45880c4f3cfc7e14573f1ad0563d6977d90e8b40e598a5e6101696cc640078aac46fe215722777da5ceee50dbc0a3fe15428aca2087b281563f199efe5b
+ source = LICENSE_1.16.5+b558.md::https://raw.githubusercontent.com/PaperMC/Paper/4a7962c/LICENSE.md
+ sha512sums = 128382cf9dcd0b7871ef2922986adf8074fa3138d56ae9fd4009b22c81f6de47111ad1f6f04f1a380ad0bf96feb8371dbd6617b9b71e2b82689999e6424cca66
sha512sums = a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895
sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42
sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456
- sha512sums = 70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958
- sha512sums = 6462249c6bb29ee0e7278f5c9e5d4e46b9e214f7ebbbcd202717ff639a1bdb455391145bd1cc716e66523bda48cefeb72908a1944c3dec2151186136689cadae
- sha512sums = f67da32f350cddb34d2fd1fcb6d6004db13453a3c4cb43d381d6c72c894fc96fca0a970fe3addb9978d73b196dd0b2e18a73637003581446e013bcbb2c716211
+ sha512sums = fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d
+ sha512sums = 3095ccd94c1918b71ee267dc7d0a429276d732422d660f3162ad5cb16c675cebfc4c12d9acfb7852b4245590b61517bd151b93aac24fddb4ebb3ef23f812d3c5
+ sha512sums = c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5
sha512sums = 115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff
sha512sums = d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5
diff --git a/PKGBUILD b/PKGBUILD
index 9977c82ffe82..5130ce9a9508 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=papermc
_pkgver=1.16.5
-_build=470
+_build=558
_license_commit=4a7962c
pkgver="${_pkgver}+b${_build}"
pkgrel=1
@@ -26,13 +26,13 @@ source=("papermc.${pkgver}.jar"::"https://papermc.io/api/v1/paper/${_pkgver}/${_
"papermc.sysusers"
"LICENSE_${pkgver}.md"::"https://raw.githubusercontent.com/PaperMC/Paper/${_license_commit}/LICENSE.md")
noextract=("papermc.${pkgver}.jar")
-sha512sums=('d59eb45880c4f3cfc7e14573f1ad0563d6977d90e8b40e598a5e6101696cc640078aac46fe215722777da5ceee50dbc0a3fe15428aca2087b281563f199efe5b'
+sha512sums=('128382cf9dcd0b7871ef2922986adf8074fa3138d56ae9fd4009b22c81f6de47111ad1f6f04f1a380ad0bf96feb8371dbd6617b9b71e2b82689999e6424cca66'
'a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895'
'51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42'
'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456'
- '70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958'
- '6462249c6bb29ee0e7278f5c9e5d4e46b9e214f7ebbbcd202717ff639a1bdb455391145bd1cc716e66523bda48cefeb72908a1944c3dec2151186136689cadae'
- 'f67da32f350cddb34d2fd1fcb6d6004db13453a3c4cb43d381d6c72c894fc96fca0a970fe3addb9978d73b196dd0b2e18a73637003581446e013bcbb2c716211'
+ 'fe268d7380f881229100700b1d4f4897904a630aa65b0b06bba08be5d5918f208d497e01fc5306deecd5d93a78cfdb7e9c7f1c3b910b3a414ce9af186a05224d'
+ '3095ccd94c1918b71ee267dc7d0a429276d732422d660f3162ad5cb16c675cebfc4c12d9acfb7852b4245590b61517bd151b93aac24fddb4ebb3ef23f812d3c5'
+ 'c40cba5dfbf5af5d206cd42fa2b43f2321b481f83ab79c9ce4eaa76f204abab48ff2d8b8526a1a3d82636be97f18596d4343b0efc72a7082642e4af8d1b561c5'
'115fe7213d7edd0e3159607a31b28edb6e6b3bd1d454d516973e38c8cf0b803275c2c4e59b29e2260561270d931c71bad134046535e5add309e0a8d055cde0ff'
'd4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5')
diff --git a/papermc.conf b/papermc.conf
index 8c80bb1ca755..87c9299ceba6 100644
--- a/papermc.conf
+++ b/papermc.conf
@@ -13,8 +13,7 @@ SESSION_NAME="papermc"
# 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/papermc.sh b/papermc.sh
index e7c8bbe80919..f62aa2702d95 100755
--- a/papermc.sh
+++ b/papermc.sh
@@ -19,7 +19,7 @@ declare -r game="papermc"
[[ -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/papermc.tmpfiles b/papermc.tmpfiles
index 12fc50c5629f..a8ad726372b3 100644
--- a/papermc.tmpfiles
+++ b/papermc.tmpfiles
@@ -1,2 +1,3 @@
z /srv/papermc 2775 papermc papermc - -
-Z /srv/papermc - papermc papermc - -
+d /srv/papermc/logs 2755 papermc papermc -
+z /srv/papermc/logs - papermc papermc - -