summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorben Günther2021-04-21 19:45:53 +0200
committerThorben Günther2021-04-21 19:45:53 +0200
commit7e19fb6349feebee24d13d8c8143e911f85ee5eb (patch)
tree7f15e718c8da2d34e0535a458cd7edb58fc5d6f8
parent30b21657e3e56c71239f948117e8bf58bc378ac8 (diff)
downloadaur-7e19fb6349feebee24d13d8c8143e911f85ee5eb.tar.gz
upgpkg: soju-git v0.1.0.r0.g706b6e3-1
upstream release
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
-rw-r--r--soju.install10
-rw-r--r--soju.service2
-rw-r--r--soju.tmpfiles1
5 files changed, 23 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5510e243330..7ab1952c80b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = soju-git
pkgdesc = A user-friendly IRC bouncer
- pkgver = r503.c994ce7
+ pkgver = v0.1.0.r0.g706b6e3
pkgrel = 1
url = https://soju.im/
install = soju.install
@@ -9,16 +9,18 @@ pkgbase = soju-git
makedepends = git
makedepends = go
makedepends = scdoc
+ depends = sqlite
provides = soju
conflicts = soju
+ backup = etc/soju/config
source = soju::git+https://git.sr.ht/~emersion/soju
source = soju.sysusers
source = soju.service
source = soju.tmpfiles
sha256sums = SKIP
sha256sums = c050d3f376f43e1cc22e75f445027862df8d09230e18cbb0913ab58ddced78aa
- sha256sums = bdaac5cbbb59a9e8a73fa9956196412315d5fb6ba69abde3a5649cef7028e2f2
- sha256sums = 8ad78b224cf570e09c7f95d2a4e89c83449c9715ceaaecedcc81c56be812ee77
+ sha256sums = d90c047f5f27a06d45840698a0caa9940fc02c75187c04348882f20359655c2b
+ sha256sums = 7d9e772f42765a82be0459bcbded2074f68d450ab09c3627ca3b59978188b61b
pkgname = soju-git
diff --git a/PKGBUILD b/PKGBUILD
index 63fa8b417f85..8425ce4321bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
pkgname=soju-git
_pkgname=soju
-pkgver=r503.c994ce7
+pkgver=v0.1.0.r0.g706b6e3
pkgrel=1
pkgdesc='A user-friendly IRC bouncer'
arch=('x86_64')
url='https://soju.im/'
license=('AGPL3')
+depends=('sqlite')
makedepends=('git' 'go' 'scdoc')
install=$_pkgname.install
provides=('soju')
@@ -19,9 +20,10 @@ source=(
"soju.tmpfiles"
)
sha256sums=('SKIP'
- 'c050d3f376f43e1cc22e75f445027862df8d09230e18cbb0913ab58ddced78aa'
- 'bdaac5cbbb59a9e8a73fa9956196412315d5fb6ba69abde3a5649cef7028e2f2'
- '8ad78b224cf570e09c7f95d2a4e89c83449c9715ceaaecedcc81c56be812ee77')
+ 'c050d3f376f43e1cc22e75f445027862df8d09230e18cbb0913ab58ddced78aa'
+ 'd90c047f5f27a06d45840698a0caa9940fc02c75187c04348882f20359655c2b'
+ '7d9e772f42765a82be0459bcbded2074f68d450ab09c3627ca3b59978188b61b')
+backup=('etc/soju/config')
pkgver() {
cd "$srcdir/$_pkgname"
@@ -52,4 +54,5 @@ package() {
install -Dm644 "$srcdir/$_pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
install -Dm644 "$srcdir/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
install -Dm644 "$srcdir/$_pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf"
+ install -Dm644 "config.in" "$pkgdir/etc/soju/config"
}
diff --git a/soju.install b/soju.install
index 28ad0eb0c41d..6417445bff1c 100644
--- a/soju.install
+++ b/soju.install
@@ -1,5 +1,13 @@
#/bin/bash
post_install() {
- echo '==> Create /var/lib/soju/soju.config ('man soju')'
+ echo '==> Modify /etc/soju/config (man soju)'
+}
+
+post_upgrade() {
+ if [ $(vercmp $2 v0.1.0.r0.g706b6e3-1) -lt 0 ]; then
+ mv /var/lib/soju/soju.config /etc/soju/config
+ echo '==> The config location moved to /etc/soju/config and the settings chaged.'
+ echo '==> Please review your config (man soju)'
+ fi
}
diff --git a/soju.service b/soju.service
index ba900b988867..d8e9e550e667 100644
--- a/soju.service
+++ b/soju.service
@@ -6,7 +6,7 @@ After=network.target
Type=simple
User=soju
Restart=always
-ExecStart=/usr/bin/soju --config /var/lib/soju/soju.config
+ExecStart=/usr/bin/soju --config /etc/soju/config
[Install]
WantedBy=multi-user.target
diff --git a/soju.tmpfiles b/soju.tmpfiles
index 6d38e0c170d9..1e9850e91585 100644
--- a/soju.tmpfiles
+++ b/soju.tmpfiles
@@ -1 +1,2 @@
d /var/lib/soju 0750 soju soju -
+d /var/lib/soju/logs 0750 soju soju -