From 495689d898aca85cf3b272477a639b20ac7314ab Mon Sep 17 00:00:00 2001 From: Gordian Edenhofer Date: Sat, 5 Mar 2016 10:08:55 +0100 Subject: [PATCH] Upgpkg: 1.9-4 Fix wrong netcat invocation. Fix faulty systemd unit files with variables in capital letters. --- .SRCINFO | 8 ++++---- PKGBUILD | 8 ++++---- minecraftd-backup.service | 5 ++--- minecraftd.service | 4 ++-- minecraftd.sh | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 476627a..8b5833b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = minecraft-server pkgdesc = Minecraft server unit files, script, and jar pkgver = 1.9 - pkgrel = 3 + pkgrel = 4 url = http://minecraft.net/ install = minecraft-server.install arch = any @@ -24,10 +24,10 @@ pkgbase = minecraft-server source = minecraftd.conf source = minecraftd.sh md5sums = ff68834eee875bcf367422c67673207c - md5sums = 09e94951d2c2fcf5afab890cdd51dacb + md5sums = b786935d6517d46fe0944377daba32b8 md5sums = fef6fadd0739ae03ff71ba61025be207 - md5sums = 53f7e807bd53f32be2f0c6c06b249f63 + md5sums = afb84ad0316af0aca421b36eaa2bbd90 md5sums = 54438e0c47cc5083e0a4376688b46092 - md5sums = 4f11b1efd6941ea894ca0497824201cf + md5sums = f0916bc22215b5dfabb5566e4850bcb8 pkgname = minecraft-server diff --git a/PKGBUILD b/PKGBUILD index 53b138e..7525dea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=minecraft-server pkgver=1.9 -pkgrel=3 +pkgrel=4 pkgdesc="Minecraft server unit files, script, and jar" arch=('any') url="http://minecraft.net/" @@ -24,11 +24,11 @@ source=("https://s3.amazonaws.com/Minecraft.Download/versions/${pkgver}/minecraf "minecraftd.sh") noextract=("minecraft_server.${pkgver}.jar") md5sums=('ff68834eee875bcf367422c67673207c' - '09e94951d2c2fcf5afab890cdd51dacb' + 'b786935d6517d46fe0944377daba32b8' 'fef6fadd0739ae03ff71ba61025be207' - '53f7e807bd53f32be2f0c6c06b249f63' + 'afb84ad0316af0aca421b36eaa2bbd90' '54438e0c47cc5083e0a4376688b46092' - '4f11b1efd6941ea894ca0497824201cf') + 'f0916bc22215b5dfabb5566e4850bcb8') _game="minecraft" _server_root="/srv/minecraft" diff --git a/minecraftd-backup.service b/minecraftd-backup.service index f5e98c1..830d5ab 100644 --- a/minecraftd-backup.service +++ b/minecraftd-backup.service @@ -4,10 +4,9 @@ After=local-fs.target [Service] Type=forking -EnvironmentFile=/etc/conf.d/minecraft ExecStart=/usr/bin/minecraftd backup -USER=minecraft -GROUP=minecraft +User=minecraft +Group=minecraft [Install] WantedBy=multi-user.target diff --git a/minecraftd.service b/minecraftd.service index bfc5a95..0036d6b 100644 --- a/minecraftd.service +++ b/minecraftd.service @@ -6,8 +6,8 @@ After=local-fs.target network.target Type=forking ExecStart=/usr/bin/minecraftd start ExecStop=/usr/bin/minecraftd stop -USER=minecraft -GROUP=minecraft +User=minecraft +Group=minecraft [Install] WantedBy=multi-user.target diff --git a/minecraftd.sh b/minecraftd.sh index 2366926..62ae31d 100755 --- a/minecraftd.sh +++ b/minecraftd.sh @@ -93,7 +93,7 @@ idle_server_daemon() { else # Game server is down, listen on port ${GAME_PORT} for incoming connections echo "Netcat is listening on port ${GAME_PORT} for incoming connections..." - ${NETCAT_CMD} -v -l ${GAME_PORT} + ${NETCAT_CMD} -v -l -p ${GAME_PORT} echo "Netcat caught an connection. The server is coming up again...." IDLE_SERVER="false" ${myname} start sleep ${CHECK_PLAYER_TIME}