v.20.09.1

3 files changed, 26 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f4d404ea028..e804185ebcc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mscs
 	pkgdesc = Powerful command-line control for UNIX and Linux powered Minecraft servers
-	pkgver = 19.05.01.r0.ga4b7379
+	pkgver = 20.09.01
 	pkgrel = 1
 	url = https://github.com/MinecraftServerControl/mscs
 	install = mscs.install
@@ -11,18 +11,18 @@ pkgbase = mscs
 	depends = screen
 	depends = perl-json
 	depends = perl-lwp-protocol-https
-	depends = jre8-openjdk
+	depends = java-runtime
 	depends = rdiff-backup
 	depends = rsync
 	depends = socat
 	optdepends = python: Overviewer mapping tool
 	optdepends = iptables: Recommended firewall
-	source = mscs::git+https://github.com/MinecraftServerControl/mscs.git
+	source = mscs-v.20.09.01.tar.gz::https://github.com/MinecraftServerControl/mscs/archive/refs/tags/v.20.09.01.tar.gz
 	source = mscs.install
 	source = mscs.patch
-	md5sums = SKIP
+	md5sums = c6570eea198f62cdaf178bd6baa5855b
 	md5sums = 197c788a097a5c2d087935c69db67fa1
-	md5sums = 815626b124df3779188ebb56427c7976
+	md5sums = 8e275fb7b81308361f44cc1d2ca7e7bb
 
 pkgname = mscs
 
diff --git a/PKGBUILD b/PKGBUILD
index 4c207fe3fa3d..9e87a6eeb48d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,13 @@
-# Maintainer: Leonardo Eugenio <lelgenio@disroot.org>
+# Ex-Maintainer: Leonardo Eugenio <lelgenio@disroot.org>
+# Mantainer: Darvin Delgado <dnmodder at gmail dot com>
 pkgname=mscs
-pkgver=19.05.01.r0.ga4b7379
+pkgver=20.09.01
 pkgrel=1
 pkgdesc="Powerful command-line control for UNIX and Linux powered Minecraft servers"
 arch=('any')
 url="https://github.com/MinecraftServerControl/mscs"
 license=('BSD')
-depends=(
-    screen
-    perl-json
-    perl-lwp-protocol-https 
-    jre8-openjdk
-    rdiff-backup
-    rsync
-    socat)
+depends=('screen' 'perl-json' 'perl-lwp-protocol-https' 'java-runtime' 'rdiff-backup' 'rsync' 'socat')
 makedepends=(make git)
 optdepends=(
     'python: Overviewer mapping tool'
@@ -21,23 +15,19 @@ optdepends=(
 )
 install=mscs.install
 source=(
-    "$pkgname::git+$url.git"
+    "${pkgname}-v.${pkgver}.tar.gz::${url}/archive/refs/tags/v.${pkgver}.tar.gz"
     "mscs.install"
     "mscs.patch")
-md5sums=('SKIP'
+md5sums=('c6570eea198f62cdaf178bd6baa5855b'
          '197c788a097a5c2d087935c69db67fa1'
-         '815626b124df3779188ebb56427c7976')
-pkgver(){
-    cd $pkgname
-    git describe --long --tags | sed 's/^v.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+         '8e275fb7b81308361f44cc1d2ca7e7bb')
 
 prepare() {
-	cd "$srcdir/$pkgname"
-	patch -p1 -i "$srcdir/mscs.patch"
+	cd "${srcdir}/${pkgname}-v.${pkgver}"
+	patch -p1 -i "${srcdir}/mscs.patch"
 }
 
 package() {
-    cd $srcdir/$pkgname
-    make DESTDIR="$pkgdir/" install
+    cd "${srcdir}/${pkgname}-v.${pkgver}"
+    make DESTDIR="${pkgdir}/" install
 }
diff --git a/mscs.patch b/mscs.patch
index 41e591500345..4493e5a2d7dc 100644
--- a/mscs.patch
+++ b/mscs.patch
@@ -1,7 +1,7 @@
 diff -u -r -a mscs.orig/Makefile mscs.new/Makefile
---- mscs.orig/Makefile	2019-06-20 17:38:19.418922318 -0300
-+++ mscs.new/Makefile	2019-06-20 18:24:57.362084707 -0300
-@@ -1,42 +1,12 @@
+--- mscs.orig/Makefile	2020-10-12 13:11:46.000000000 -0400
++++ mscs.new/Makefile	2021-07-02 11:13:41.265602506 -0400
+@@ -1,44 +1,12 @@
 -MSCS_USER := minecraft
 -MSCS_HOME := /opt/mscs
 -
@@ -13,16 +13,18 @@ diff -u -r -a mscs.orig/Makefile mscs.new/Makefile
 -
 -UPDATE_D := $(wildcard update.d/*)
 -
--.PHONY: install update clean
+-.PHONY: install adduser update clean
 -
--install: update
--	useradd --system --user-group --create-home -K UMASK=0022 --home $(MSCS_HOME) $(MSCS_USER)
+-install: adduser update
 -	if which systemctl; then \
 -		systemctl -f enable mscs.service; \
 -	else \
 -		ln -s $(MSCS) $(MSCS_INIT_D); \
 -		update-rc.d mscs defaults; \
 -	fi
+-	
+-adduser:
+-	useradd --system --user-group --create-home -K UMASK=0022 --home $(MSCS_HOME) $(MSCS_USER)
 -
 -update:
 -	install -m 0755 msctl $(MSCTL)
@@ -57,8 +59,8 @@ diff -u -r -a mscs.orig/Makefile mscs.new/Makefile
 +	install -D -m 0644 mscs.service $(MSCS_SERVICE)
 +	install -D -m 0644 LICENSE $(MSCS_LICENSE)
 diff -u -r -a mscs.orig/mscs mscs.new/mscs
---- mscs.orig/mscs	2019-06-20 17:38:19.418922318 -0300
-+++ mscs.new/mscs	2019-06-20 18:24:06.225421165 -0300
+--- mscs.orig/mscs	2020-10-12 13:11:46.000000000 -0400
++++ mscs.new/mscs	2021-07-02 11:14:00.479137361 -0400
 @@ -16,7 +16,7 @@
  PROG=$(basename $0)