From 10792e6729863c5d1d9b9fa41a18cd58574c861f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Tue, 7 Dec 2021 23:38:07 +0100 Subject: [PATCH] Remove soju-srht Going back to normal soju. Single sign-on is not worth the extra maintenance hassle. --- soju-srht/.SRCINFO | 25 ------------------- soju-srht/PKGBUILD | 53 ----------------------------------------- soju-srht/soju.install | 5 ---- soju-srht/soju.service | 14 ----------- soju-srht/soju.sysusers | 1 - soju-srht/soju.tmpfiles | 2 -- 6 files changed, 100 deletions(-) delete mode 100644 soju-srht/.SRCINFO delete mode 100644 soju-srht/PKGBUILD delete mode 100644 soju-srht/soju.install delete mode 100644 soju-srht/soju.service delete mode 100644 soju-srht/soju.sysusers delete mode 100644 soju-srht/soju.tmpfiles diff --git a/soju-srht/.SRCINFO b/soju-srht/.SRCINFO deleted file mode 100644 index 572de4a..0000000 --- a/soju-srht/.SRCINFO +++ /dev/null @@ -1,25 +0,0 @@ -pkgbase = soju - pkgdesc = A user-friendly IRC bouncer - pkgver = 0.2.2 - pkgrel = 1 - url = https://soju.im/ - install = soju.install - arch = x86_64 - license = AGPL3 - makedepends = go - makedepends = scdoc - depends = sqlite - backup = etc/soju/config - source = https://git.sr.ht/~emersion/soju/refs/download/v0.2.2/soju-0.2.2.tar.gz - source = https://git.sr.ht/~emersion/soju/refs/download/v0.2.2/soju-0.2.2.tar.gz.sig - source = soju.sysusers - source = soju.service - source = soju.tmpfiles - validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 - sha256sums = d55c5c6e7dac5855280e6d19ed54e65445f847ed9a620b0aee58d0e398c3107a - sha256sums = SKIP - sha256sums = c050d3f376f43e1cc22e75f445027862df8d09230e18cbb0913ab58ddced78aa - sha256sums = d90c047f5f27a06d45840698a0caa9940fc02c75187c04348882f20359655c2b - sha256sums = 7d9e772f42765a82be0459bcbded2074f68d450ab09c3627ca3b59978188b61b - -pkgname = soju diff --git a/soju-srht/PKGBUILD b/soju-srht/PKGBUILD deleted file mode 100644 index 5511d2f..0000000 --- a/soju-srht/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Thorben Günther - -pkgname=soju-srht -_pkgname=soju -pkgver=0.2.2 -pkgrel=4 -pkgdesc='A user-friendly IRC bouncer (with srht support)' -arch=('x86_64') -url='https://soju.im/' -license=('AGPL3') -makedepends=('go' 'scdoc') -optdepends=( - "sqlite: SQLite support" - "postgresql: PostgreSQL support" -) -install=$_pkgname.install -provides=('soju') -conflicts=('soju') -_githash="2e11806bbacb6c88cf37a0df14b87b0bbd56459d" -source=( - "$pkgname-$pkgver.tar.gz::https://git.sr.ht/~emersion/soju/archive/$_githash.tar.gz" - "soju.sysusers" - "soju.service" - "soju.tmpfiles" -) -sha256sums=('1648cff2718631ab233e02b0301671ce290bea9af57cd5808307f7c5e7d39b0a' - 'c050d3f376f43e1cc22e75f445027862df8d09230e18cbb0913ab58ddced78aa' - 'ab7527fa06a97795b3301cef12cf8f3927398eb0eb55b6e1819eff251a4f538d' - '7d9e772f42765a82be0459bcbded2074f68d450ab09c3627ca3b59978188b61b') -backup=('etc/soju/config') -validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48') - -build() { - cd "$srcdir/$_pkgname-$_githash" - export CGO_LDFLAGS="${LDFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - - go build ./cmd/soju - go build ./cmd/sojuctl - - scdoc doc/soju.1 -} - -package() { - cd "$srcdir/$_pkgname-$_githash" - make PREFIX=/usr DESTDIR=$pkgdir install - 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" -} diff --git a/soju-srht/soju.install b/soju-srht/soju.install deleted file mode 100644 index 938d4ac..0000000 --- a/soju-srht/soju.install +++ /dev/null @@ -1,5 +0,0 @@ -#/bin/bash - -post_install() { - echo '==> Modify /etc/soju/config (man soju)' -} diff --git a/soju-srht/soju.service b/soju-srht/soju.service deleted file mode 100644 index 6d67999..0000000 --- a/soju-srht/soju.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=soju IRC bouncer service -After=network.target - -[Service] -Type=simple -User=soju -Restart=always -ExecStart=/usr/bin/soju --config /etc/soju/config -ExecReload=/bin/kill -HUP $MAINPID -Environment=SRHT_ENDPOINT=https://meta.xenrox.net - -[Install] -WantedBy=multi-user.target diff --git a/soju-srht/soju.sysusers b/soju-srht/soju.sysusers deleted file mode 100644 index 5d62936..0000000 --- a/soju-srht/soju.sysusers +++ /dev/null @@ -1 +0,0 @@ -u soju - "soju user" /var/lib/soju diff --git a/soju-srht/soju.tmpfiles b/soju-srht/soju.tmpfiles deleted file mode 100644 index 1e9850e..0000000 --- a/soju-srht/soju.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /var/lib/soju 0750 soju soju - -d /var/lib/soju/logs 0750 soju soju - -- 2.44.0