From a5fa315d1d5005f87be7f9b68e6c6f98299659d6 Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 30 Nov 2021 06:56:12 +0000
Subject: [PATCH] upgpkg: soju

---
 soju/PKGBUILD        | 12 ++++++------
 soju/systemd.service |  4 +++-
 soju/sysusers.conf   |  2 +-
 soju/tmpfiles.conf   |  4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/soju/PKGBUILD b/soju/PKGBUILD
index 4fba80f..f77673a 100644
--- a/soju/PKGBUILD
+++ b/soju/PKGBUILD
@@ -17,14 +17,14 @@ source=(
 )
 sha512sums=('9507be35a91fb6fdf96b657f6c5142acba49ee36e4a0de4d060604949f4336db49a79c70038ceebb04354595c5eeb3c7c8f080a458a743335eb7130065775946'
             'SKIP'
-            '8304fb401114d51714841983c5b96b01d63dab3117733ffab2a469aa6f677e128892434accfdd3298df28eb585f2275798eb9c10f6fec715f33e8bcff30b0d7d'
-            'dcd7d35aa61a494cab84c31be57fe3db65a5f1efb06319f9cf3e1f2084dad49f75fdda37b5741faa3a7c1d0a282990ccbc87612895d35aa1773c80487d19019c'
-            'b5be4beda3411ad7e9035430d0fa9b02d71f15890a921f9bacb32216d727db5765b15d99ac804670e9052ecb5968c2494f5c10b88d3421960133f8b7962a77a4')
+            'f1cbf40994dabe6c27288f1d3e5a78ed89a529a834ab178ddd64c093646d85ecc23ecabb5f9a20e99b805f46bb49fe321188b000fb1a3d59a64b77d8fde043c3'
+            '7b4069043d204581b0eda376956f8996365631e83ca78e002d6ea0caec931605bb5e99cf4f42a75b6de958267b982ee8ed7f31046c6b97d8f2442430678f3c07'
+            '378dd64a8c3fa4fd1b28c055bbeb7c46eb05ec79a925d5b138af5d373970e82bafba62ff29269f63e67c67f34fb961570d448a02fa08f7f6cf4e8d844a3c12a0')
 b2sums=('506f7ee78834c21d0909fa093f756760ed9c0d8fa51c62986d4728c6d2e761df7a90684fa0aaa3dabda22a80672da5e72b96196ac95b6779fc581448c4e1143b'
         'SKIP'
-        'aaddf3018723b2dbfd8a54921696bed761a9017adf785167db9a4a329cfad987dfe0063c2d4ce5c7531a7b371b4a8a297200149559523643ce0f0183ed04c96d'
-        '260be525b83bb695c45c3007bbd54f6732cc54af54d56335001db53d962a7a6f9293e7ba1e7e6f86b3d729ab97fd3ce04ebedd4376d53902ec77976fc9c60042'
-        'b9d005ebf14aede222239daa73d91b9af55d7383069ee4525ddd5cf795b8e28eca68d8f707de3a55dee024107bbf4a0727b680c0b8bb229c210be6fa50a762e3')
+        'fe0819958384f58bd04cb7022bd496538a9e70e532256bdbe92832b0e786c003dd2eac6199f2a343764ac50893dda1d85b0977a110aa67489fd7e3a20d4e4bdf'
+        '14e951b98e80d0dddf08aa0c2b03c57a86bda5ea1fd62d332e56edaf42f478ff86e9367699ab83b1ce0b968068e31048573b703bca6f4900cea901ad518a94b7'
+        '9d164e694980e40955b1e8cedf1875214299840a8fce09b20069d594e74265c4335c0693e4bdd7c073c062a1de66cca859657f7581a27baffbfab741f45d0acc')
 validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48')
 
 prepare() {
diff --git a/soju/systemd.service b/soju/systemd.service
index d5c7d8c..a6fdd9b 100644
--- a/soju/systemd.service
+++ b/soju/systemd.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=soju IRC bouncer service
-After=network.target
+After=network-online.target
 
 [Service]
 Type=simple
 User=soju
+Group=soju
 Restart=always
+RestartSec=5
 ExecStart=/usr/bin/soju --config /etc/soju/config
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/soju/sysusers.conf b/soju/sysusers.conf
index 5d62936..74323e6 100644
--- a/soju/sysusers.conf
+++ b/soju/sysusers.conf
@@ -1 +1 @@
-u soju - "soju user" /var/lib/soju
+u soju - "soju daemon user" /var/lib/soju
diff --git a/soju/tmpfiles.conf b/soju/tmpfiles.conf
index 1e9850e..5c435ea 100644
--- a/soju/tmpfiles.conf
+++ b/soju/tmpfiles.conf
@@ -1,2 +1,2 @@
-d /var/lib/soju 0750 soju soju -
-d /var/lib/soju/logs 0750 soju soju -
+d /var/lib/soju 0750 soju soju
+d /var/lib/soju/logs 0750 soju soju