upgpkg: minecraft-server 1.16.2-1

upgpkg: cuberite 1.12.2b14-1
upgpkg: papermc 1.16.1+b135-1
upgpkg: spigot 1.16.2+b120-1

6 files changed, 20 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4784a535032c..8afb0a50d1f4 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.1+b90
+	pkgver = 1.16.1+b135
 	pkgrel = 1
 	url = https://papermc.io/
 	install = papermc.install
@@ -15,21 +15,25 @@ 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.1+b90.jar
+	noextract = papermc.1.16.1+b135.jar
 	backup = etc/conf.d/papermc
-	source = papermc.1.16.1+b90.jar::https://papermc.io/api/v1/paper/1.16.1/90/download
+	source = papermc.1.16.1+b135.jar::https://papermc.io/api/v1/paper/1.16.1/135/download
 	source = papermc-backup.service
 	source = papermc-backup.timer
 	source = papermc.service
 	source = papermc.conf
 	source = papermc.sh
-	source = LICENSE_1.16.1+b90.md::https://raw.githubusercontent.com/PaperMC/Paper/11de41c777/LICENSE.md
-	sha512sums = 6b0c66a0cd0c166372f17f18067a64bb82d3dd297255424ef1d82a92a58f5312a9baa367f900fe548e833c2e1e327de8ee5056b2ad9500cea136674729e014ce
+	source = papermc.tmpfiles
+	source = papermc.sysusers
+	source = LICENSE_1.16.1+b135.md::https://raw.githubusercontent.com/PaperMC/Paper/11de41c777/LICENSE.md
+	sha512sums = b19f9fad7cb758eb4cfd79a29b1f9996656ec988e91a481d65005e062258727e7868c38a2909e6c21877c3dfe5f18e0f0b2ba48bf5c0d03cb884314feb08765a
 	sha512sums = a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895
 	sha512sums = 51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42
 	sha512sums = f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456
 	sha512sums = 70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958
 	sha512sums = c777e62beb213b5203883e13045953daa3d054c59da8ab535d416464366790edfe77fd9517f968d140dfb4c9009f7e8152f693312364ebbdc71cf2148d6a7df4
+	sha512sums = f67da32f350cddb34d2fd1fcb6d6004db13453a3c4cb43d381d6c72c894fc96fca0a970fe3addb9978d73b196dd0b2e18a73637003581446e013bcbb2c716211
+	sha512sums = e3cf85eac89c256e33835eb6ecebbecc93325443c2f32d44603c54cdc789efc95028a55b4fc9c82e8813b233c2eb098134f9ab4849bbf503746ba29a216ea7a5
 	sha512sums = 3edf367c6f16736367159adc9f56742f0fa86abc4dbb115e7f8e2c1060b618f8f292919929aeeca755ddc90c0c39be13733149e2c4a114990536aac2084e1b91
 
 pkgname = papermc
diff --git a/PKGBUILD b/PKGBUILD
index 7ec6e34d98a6..95303ce699e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=papermc
 _pkgver=1.16.1
-_build=90
+_build=135
 _license_commit=11de41c777
 pkgver="${_pkgver}+b${_build}"
 pkgrel=1
@@ -22,14 +22,18 @@ source=("papermc.${pkgver}.jar"::"https://papermc.io/api/v1/paper/${_pkgver}/${_
 	"papermc.service"
 	"papermc.conf"
 	"papermc.sh"
+	"papermc.tmpfiles"
+	"papermc.sysusers"
 	"LICENSE_${pkgver}.md"::"https://raw.githubusercontent.com/PaperMC/Paper/${_license_commit}/LICENSE.md")
 noextract=("papermc.${pkgver}.jar")
-sha512sums=('6b0c66a0cd0c166372f17f18067a64bb82d3dd297255424ef1d82a92a58f5312a9baa367f900fe548e833c2e1e327de8ee5056b2ad9500cea136674729e014ce'
+sha512sums=('b19f9fad7cb758eb4cfd79a29b1f9996656ec988e91a481d65005e062258727e7868c38a2909e6c21877c3dfe5f18e0f0b2ba48bf5c0d03cb884314feb08765a'
             'a4fcc9f28436c0163e9414f2793fcbd4f6ea74772230cdff4a628246eae2a8008688b3dfb94d433f8f0887cd7eea3fe43ce25f9d5812d46e62179ff315b62895'
             '51c5345155e8640d4f1eaef0c8cfb890ae46063f2d4e7a0fe181ad4c8ff7b96fea88b0f9fc74031d589dfd61602f37b440f183ca1859835930fe69d37508cd42'
             'f29c4044d9e3cc5ab137c21f7e62399b36d7e1f777d5558a39f7b4a01de75bdf2de0b8678e424accc03934ca7db9ebb6a22c78c8c4497759287dd55e1c3eb456'
             '70f7d4e42db9ed5efcde412f018d46628ad9c12198787421cc70aa1e51b8e278b436d480568ca21dabaacf33cfbd37c5e607504f2cd25ed65442ba67b9805958'
             'c777e62beb213b5203883e13045953daa3d054c59da8ab535d416464366790edfe77fd9517f968d140dfb4c9009f7e8152f693312364ebbdc71cf2148d6a7df4'
+            'f67da32f350cddb34d2fd1fcb6d6004db13453a3c4cb43d381d6c72c894fc96fca0a970fe3addb9978d73b196dd0b2e18a73637003581446e013bcbb2c716211'
+            'e3cf85eac89c256e33835eb6ecebbecc93325443c2f32d44603c54cdc789efc95028a55b4fc9c82e8813b233c2eb098134f9ab4849bbf503746ba29a216ea7a5'
             '3edf367c6f16736367159adc9f56742f0fa86abc4dbb115e7f8e2c1060b618f8f292919929aeeca755ddc90c0c39be13733149e2c4a114990536aac2084e1b91')
 
 _game="papermc"
@@ -41,6 +45,8 @@ package() {
 	install -Dm644 ${_game}.service           "${pkgdir}/usr/lib/systemd/system/${_game}.service"
 	install -Dm644 ${_game}-backup.service    "${pkgdir}/usr/lib/systemd/system/${_game}-backup.service"
 	install -Dm644 ${_game}-backup.timer      "${pkgdir}/usr/lib/systemd/system/${_game}-backup.timer"
+	install -Dm644 ${_game}.sysusers          "${pkgdir}/usr/lib/sysusers.d/${_game}.conf"
+	install -Dm644 ${_game}.tmpfiles          "${pkgdir}/usr/lib/tmpfiles.d/${_game}.conf"
 	install -Dm644 ${_game}.${pkgver}.jar     "${pkgdir}/${_server_root}/${_game}.${pkgver}.jar"
 	ln -s "${_game}.${pkgver}.jar" "${pkgdir}${_server_root}/${_game}_server.jar"
 
diff --git a/paper.install b/paper.install
deleted file mode 100644
index fb928945f3d0..000000000000
--- a/paper.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    getent group papermc > /dev/null 2>&1 || groupadd papermc
-    getent passwd papermc > /dev/null 2>&1 || useradd -g papermc -d /srv/paper -s /bin/bash papermc
-    chown -R papermc:papermc /srv/paper/
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    if getent passwd papermc >/dev/null 2>&1; then
-        userdel papermc
-    fi
-    if getent group papermc >/dev/null 2>&1; then
-        groupdel papermc
-    fi
-}
\ No newline at end of file
diff --git a/papermc.install b/papermc.install
index f3ebcaaeb95c..e4a957933eeb 100644
--- a/papermc.install
+++ b/papermc.install
@@ -3,33 +3,9 @@ _user="papermc"
 _server_root="/srv/papermc"
 
 post_install() {
-	getent group "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo "Adding ${_user} system group..."
-		groupadd -r ${_user} 1>/dev/null
-	fi
-
-	getent passwd "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo "Adding ${_user} system user..."
-		useradd -r -g ${_user} -d "${_server_root}" ${_user} 1>/dev/null
-	fi
-
-	chown -R ${_user}:${_user} "${_server_root}"
-
 	echo "The world data is stored under ${_server_root} and the server runs as ${_user} user to increase security."
 	echo "Use the ${_game} script under /usr/bin/${_game} to start, stop or backup the server."
 	echo "Adjust the configuration file under /etc/conf.d/${_game} to your liking."
 	echo "For the server to start you have to accept the EULA in ${_server_root}/eula.txt !"
 	echo "The EULA file is generated after the first server start."
 }
-
-post_upgrade() {
-	chown -R ${_user}:${_user} "${_server_root}"
-}
-
-post_remove() {
-	# Notifying the user of kept dirs
-	[[ -d "${_server_root}" ]] && echo "Game saves in ${_server_root} were kept on your system."
-	echo "The ${_user} user was preserved on your system."
-}
diff --git a/papermc.sysusers b/papermc.sysusers
new file mode 100644
index 000000000000..902074205536
--- /dev/null
+++ b/papermc.sysusers
@@ -0,0 +1 @@
+u papermc - "PaperMC Server" /srv/papermc -
diff --git a/papermc.tmpfiles b/papermc.tmpfiles
new file mode 100644
index 000000000000..12fc50c5629f
--- /dev/null
+++ b/papermc.tmpfiles
@@ -0,0 +1,2 @@
+z /srv/papermc 2775 papermc papermc - -
+Z /srv/papermc - papermc papermc - -