From aa96c34dee760a92b232d6ab844bb6a6e34df6f6 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Sun, 17 Jan 2021 13:10:04 +0000
Subject: [PATCH] Add spigot

---
 games/multimc/APKBUILD       |  4 ++--
 games/spigot-mc/APKBUILD     | 36 ++++++++++++++++++++++++++++++++++++
 games/spigot-mc/spigot.initd | 13 +++++++++++++
 own/uircd/APKBUILD           | 10 ++++++----
 own/uircd/uircd.initd        |  2 +-
 5 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 games/spigot-mc/APKBUILD
 create mode 100644 games/spigot-mc/spigot.initd

diff --git a/games/multimc/APKBUILD b/games/multimc/APKBUILD
index e7e1bf3..36ab69e 100644
--- a/games/multimc/APKBUILD
+++ b/games/multimc/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once."
 url="https://github.com/MultiMC/MultiMC5"
 arch="x86 x86_64" # Officially supported
-license="MIT AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-or-later AND BSD-3-Clause-Clear AND OFL-1.0-RFN AND GPL-2.0 WITH Classpath-exception-2.0 AND Apache-2.0"
-depends="qt5-qtbase qt5-qtx11extras qt5-qtsvg openjdk8-jre"
+license="MIT"
+depends="qt5-qtbase qt5-qtx11extras qt5-qtsvg"
 makedepends="
 	cmake
 	qt5-qtbase-dev
diff --git a/games/spigot-mc/APKBUILD b/games/spigot-mc/APKBUILD
new file mode 100644
index 0000000..de76014
--- /dev/null
+++ b/games/spigot-mc/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+pkgname=spigot
+pkgver=1.16.5
+pkgrel=0
+_buildno=124
+pkgdesc="Spigot server implementation"
+url="https://www.spigotmc.org/wiki/buildtools/#linux"
+arch="noarch"
+license="propietary"
+depends="openjdk8-jre"
+makedepends="git openjdk8 bash" # TODO: Find a way to use packaged maven
+subpackages="$pkgname-openrc"
+source="
+	$pkgname-BuildTools-$_buildno.jar::https://hub.spigotmc.org/jenkins/job/BuildTools/$_buildno/artifact/target/BuildTools.jar
+	spigot.initd
+"
+builddir="$srcdir/"
+options="!check"
+
+build() {
+	/usr/lib/jvm/java-8-openjdk/jre/bin/java -jar "$pkgname-BuildTools-$_buildno.jar" --rev "$pkgver"
+	cat > spigot.sh <<EOF
+#!/bin/sh
+/usr/lib/jvm/java-8-openjdk/jre/bin/java -jar "/usr/lib/spigot/spigot-$pkgver.jar" \$@
+EOF
+}
+
+package() {
+	install -Dm755 "$builddir"/spigot.sh "$pkgdir"/usr/bin/spigot
+	install -Dm755 "$srcdir"/spigot.initd "$pkgdir"/etc/init.d/spigot
+	install -Dm644 "$builddir"/spigot-$pkgver.jar "$pkgdir"/usr/lib/spigot/spigot-$pkgver.jar
+}
+
+sha512sums="f4898dff44e77495453aafd597c311989fbe812721e82ee52be2b6856b91f933f5b3ec75137b90923231dc2f9f68b84efca507fde4b9a22368f2ea9324323cb8  spigot-BuildTools-124.jar
+d9ae3a5c28ba56d5e90ad3bee0fa8745aba85de0849d86b2d5cbd371e5386733e65b535147559e026d847af64b09c04da6d120f18a09d581281422754b3a1f8d  spigot.initd"
diff --git a/games/spigot-mc/spigot.initd b/games/spigot-mc/spigot.initd
new file mode 100644
index 0000000..e83b662
--- /dev/null
+++ b/games/spigot-mc/spigot.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+description="Spigot Minecraft server"
+supervisor=supervise-daemon
+command="/usr/bin/spigot"
+pidfile="/run/${RC_SVCNAME}.pid"
+output_log="/var/log/${RC_SVCNAME}/out.log"
+command_background=true
+
+depend() {
+	want net
+	after net firewall
+}
diff --git a/own/uircd/APKBUILD b/own/uircd/APKBUILD
index 3c74f04..c298cde 100644
--- a/own/uircd/APKBUILD
+++ b/own/uircd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=uircd
-pkgver=2021.01.04
-pkgrel=0
+pkgver=2021.01.09
+pkgrel=2
 pkgdesc="High performance IRC bouncer based on uIRC"
 url="https://git.redxen.eu/caskd/uIRCd"
 arch="all"
@@ -12,6 +12,7 @@ subpackages="$pkgname-openrc"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.redxen.eu/caskd/uIRCd/archive/$pkgver.tar.gz
 	uircd.initd
+	0001-test.patch
 "
 builddir="$srcdir/uircd"
 options="!check" # No test suite
@@ -30,5 +31,6 @@ package() {
 	install -Dm755 "$srcdir"/uircd.initd "$pkgdir"/etc/init.d/uircd
 }
 
-sha512sums="e27d92f3eefc29376ed686779bcd624c37ac36bc1028a78135f1b1c66c8dcc44fb445c711618db93c5972e8246ca0ff5170621de363e3177773db6cb18c1392a  uircd-2021.01.04.tar.gz
-f1cba7ac7f9d73c1c447927b0bdb1e3ca9ec019a376ddf1ef1fd21bfb468bf81674194c9a1c050166704f1eb148832a4a2f44f7e3370f4c323dbf3dbe3543feb  uircd.initd"
+sha512sums="1d44ee30565be0bb80a024d7696a459c2eebc2f9058275520c48c49b8b07fddaa99a20ec956e6906b2ebe35de0ae235cc46693b06fe9b45407b800b1c63a34c6  uircd-2021.01.09.tar.gz
+c6b02b9f324797ff49669624ea8a4db74f4469f3661b3f55ccce98b0b84fed4d6de45dd4954127ad7b8740dbdbba93e2ee3817c43ad327b8518240e37e5c82ed  uircd.initd
+755c8a314aa78faa7d70988049ec8b2136f6fdfa33a995cdcaf4ad661fe537f9995d5c1c45d7b60c451cfc38b8c59c2e2dddf1f623fdbf742499697600b99575  0001-test.patch"
diff --git a/own/uircd/uircd.initd b/own/uircd/uircd.initd
index 8e8938f..b4fbff0 100644
--- a/own/uircd/uircd.initd
+++ b/own/uircd/uircd.initd
@@ -3,7 +3,7 @@
 description="microIRC daemon"
 supervisor=supervise-daemon
 command="/usr/bin/uircd"
-command_args="-V ${uircd_verbosity:-0} -C $uircd_config"
+command_args="${UIRCD_ARGS:--C $uircd_config}"
 pidfile="/run/${RC_SVCNAME}.pid"
 command_background=true