From 38f1fa10abc12a85253d82d231c4b6c9ef7a07d8 Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 7 Sep 2021 01:19:48 +0000
Subject: [PATCH] upgpkg: drone

* Fix systemd sysusers & service file.
* Fix functionality/licensing.
* Add check() function.
---
 drone/PKGBUILD        | 19 ++++++++++++-------
 drone/systemd.service |  4 +---
 drone/sysusers.conf   |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/drone/PKGBUILD b/drone/PKGBUILD
index e7d1617..fa08dcd 100644
--- a/drone/PKGBUILD
+++ b/drone/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=drone
 pkgver=2.2.0
-pkgrel=1
-pkgdesc="Continuous Delivery platform built on container technology (OSS version)"
+pkgrel=2
+pkgdesc="Continuous Delivery platform built on container technology"
 arch=('x86_64')
 url="https://drone.io"
-license=('Apache')
+license=('custom:Drone-Non-Commercial')
 makedepends=('go' 'git')
 source=(
   "$pkgname-$pkgver.tar.gz::https://github.com/drone/drone/archive/v$pkgver.tar.gz"
@@ -16,9 +16,9 @@ source=(
   'sysusers.conf'
 )
 b2sums=('18da9c94f6c519329547898e3f873cd1bef4bd136d5a37eb26c679eb22b0722443221066b097d7aba50dd8eff6f40019af2fe3dfe71142d4d25b7267a36079ac'
-        'b26d11b697d496378a0cf0d6592309dab5a6af58e0776bc2a168eb3c478cb97134ce3db7ab858d5bf6d89a9e465cc865463963a0693270296f3e81707dbbd6f0'
+        '38cfe24fcc9738a0332626eb0ea0698cdb3aa605f633a8141d0dee8ad4ed06fab1817a096784f2fbdd9be54d088f422c3ecb3b1b202978c000205224436b1bda'
         '9c1bf8e4a382190f2d1bd560ef5c4a9fadad8c38dcd3cf3b79af42f6d0c16de533ba2d5f6cf676003e4ca6b745833e5e100baf4328111cf540ac5f43f67c6145'
-        '65912606d44a45cdcfb449c766313384529b48f30b8f3fa0a79da9cb179639c65af76adcf10005213a2563e90f91eab4f7f5b3250656d2949991ccad58e912f5')
+        '18e5c4ea19348479dc3408bd2546f324f0908acc759c7c79c350006c6c5e6db02cd388a9aa9bd3d4f6b4b1f2efcf6aa7f7e67eac43f8d55566afe341b7ec142e')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -44,8 +44,13 @@ build() {
     -mod=vendor \
     -modcacherw \
     -ldflags "-linkmode external -extldflags \"${LDFLAGS}\"" \
-    -tags "oss nolimit" \
-    -o build ./cmd/...
+    -o build \
+    ./cmd/...
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  go test -v ./...
 }
 
 package() {
diff --git a/drone/systemd.service b/drone/systemd.service
index c04d0c8..f38c51d 100644
--- a/drone/systemd.service
+++ b/drone/systemd.service
@@ -5,10 +5,8 @@ After=syslog.target network.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/drone-server
-RestartSec=2
+RestartSec=5
 Restart=on-failure
-StandardOutput=syslog
-StandardError=syslog
 SyslogIdentifier=drone-server
 
 [Install]
diff --git a/drone/sysusers.conf b/drone/sysusers.conf
index 48276d4..b808abd 100644
--- a/drone/sysusers.conf
+++ b/drone/sysusers.conf
@@ -1 +1 @@
-u drone "Drone system user" /var/lib/drone
+u drone - "Drone system user" /var/lib/drone