summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlphaJack2022-01-28 20:47:18 +0100
committerAlphaJack2022-01-28 20:50:29 +0100
commit97bcec35939a8fab21469ccc670f39d27876768a (patch)
tree4ad2fdc2328d9396a7252bf868c8fbf800103ab9
parentf07ce76ec337d58c6b3e966545c66738b3adbee1 (diff)
downloadaur-97bcec35939a8fab21469ccc670f39d27876768a.tar.gz
Updated dendrite to 0.6, added install file to notify about breaking changes
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD44
-rw-r--r--dendrite.install22
-rw-r--r--dendrite.service3
4 files changed, 50 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e141b787e85c..71f052fa827c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,24 @@
pkgbase = dendrite
pkgdesc = A second-generation Matrix homeserver written in Go
- pkgver = 0.5.1
+ pkgver = 0.6
pkgrel = 1
url = https://github.com/matrix-org/dendrite
+ install = dendrite.install
arch = x86_64
arch = i686
arch = armv6h
arch = armv7h
arch = aarch64
license = Apache
- makedepends = go>=1.15
- source = https://github.com/matrix-org/dendrite/archive/v0.5.1/dendrite-v0.5.1.tar.gz
+ makedepends = go>=1.16
+ optdepends = postgresql: recommended database for large instances
+ source = https://github.com/matrix-org/dendrite/archive/v0.6/dendrite-v0.6.tar.gz
source = dendrite.sysusers
source = dendrite.tmpfiles
source = dendrite.service
- sha256sums = 0c69e8031278d0b951e6a35532be939665ba8d8eab2d8eac80d8deed0656cf74
+ sha256sums = 3c7ce45cdb6ec9e03ef2d1514ed0e2d585e387e43bc7dc61d277207a5f4f7e15
sha256sums = aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035
sha256sums = 83fa60ac51eb307aa1c96dbb088aa1ce69a91694b3bbaac210bf37408f33d837
- sha256sums = b0d5da62858969bed01fa6d8154cf43867dba48e86821e51cda8dc6eecba5cc7
+ sha256sums = 8aac18652906202cd2eedbcc5ea68d87a3ece27cfcba13762b66802c046e0e49
pkgname = dendrite
diff --git a/PKGBUILD b/PKGBUILD
index abc4156ec2b0..30cbe4e9cdd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,23 @@
# Maintainer: AlphaJack <alphajack at tuta dot io>
pkgname="dendrite"
-pkgver=0.5.1
+pkgver=0.6
pkgrel=1
pkgdesc="A second-generation Matrix homeserver written in Go"
url="https://github.com/matrix-org/dendrite"
license=("Apache")
arch=("x86_64" "i686" "armv6h" "armv7h" "aarch64")
-makedepends=("go>=1.15")
+makedepends=("go>=1.16")
+optdepends=("postgresql: recommended database for large instances")
source=("$url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
"$pkgname.sysusers"
"$pkgname.tmpfiles"
"$pkgname.service")
-sha256sums=('0c69e8031278d0b951e6a35532be939665ba8d8eab2d8eac80d8deed0656cf74'
+sha256sums=('3c7ce45cdb6ec9e03ef2d1514ed0e2d585e387e43bc7dc61d277207a5f4f7e15'
'aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035'
'83fa60ac51eb307aa1c96dbb088aa1ce69a91694b3bbaac210bf37408f33d837'
- 'b0d5da62858969bed01fa6d8154cf43867dba48e86821e51cda8dc6eecba5cc7')
-
-prepare(){
- cd "$pkgname-$pkgver"
- sed -i "$pkgname-config.yaml" \
- -e "s|# This is the Dendrite configuration file.|# This is an example configuration file for Dendrite.|"
-}
+ '8aac18652906202cd2eedbcc5ea68d87a3ece27cfcba13762b66802c046e0e49')
+install="$pkgname.install"
build(){
cd "$pkgname-$pkgver"
@@ -31,10 +27,10 @@ build(){
export CGO_CXXFLAGS="${CXXFLAGS}"
export CGO_LDFLAGS="${LDFLAGS}"
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
- go build ./cmd/dendrite-monolith-server
- go build ./cmd/generate-config
- go build ./cmd/generate-keys
- go build ./cmd/create-account
+ go build "./cmd/dendrite-monolith-server"
+ go build "./cmd/generate-config"
+ go build "./cmd/generate-keys"
+ go build "./cmd/create-account"
}
check(){
@@ -44,17 +40,17 @@ check(){
export CGO_CXXFLAGS="${CXXFLAGS}"
export CGO_LDFLAGS="${LDFLAGS}"
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
- go test ./cmd/dendrite-monolith-server
+ go test "./cmd/dendrite-monolith-server"
}
package(){
-cd "$pkgname-$pkgver"
-install -D -m 755 "$pkgname-monolith-server" "$pkgdir/usr/bin/$pkgname"
-install -D -m 755 "generate-config" "$pkgdir/usr/bin/$pkgname-generate-config"
-install -D -m 755 "generate-keys" "$pkgdir/usr/bin/$pkgname-generate-keys"
-install -D -m 755 "create-account" "$pkgdir/usr/bin/$pkgname-create-account"
-install -D -m 644 "$pkgname-config.yaml" "$pkgdir/etc/$pkgname/config-sample.yaml"
-install -D -m 644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-install -D -m 644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-install -D -m 644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+ cd "$pkgname-$pkgver"
+ install -D -m 755 "$pkgname-monolith-server" "$pkgdir/usr/bin/$pkgname"
+ install -D -m 755 "generate-config" "$pkgdir/usr/bin/$pkgname-generate-config"
+ install -D -m 755 "generate-keys" "$pkgdir/usr/bin/$pkgname-generate-keys"
+ install -D -m 755 "create-account" "$pkgdir/usr/bin/$pkgname-create-account"
+ install -D -m 644 "$pkgname-config.yaml" "$pkgdir/etc/$pkgname/config-example.yaml"
+ install -D -m 644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ install -D -m 644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+ install -D -m 644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
}
diff --git a/dendrite.install b/dendrite.install
new file mode 100644
index 000000000000..9c36761891ca
--- /dev/null
+++ b/dendrite.install
@@ -0,0 +1,22 @@
+post_upgrade(){
+ # notify about breaking changes
+ # https://wiki.archlinux.org/title/PKGBUILD#install
+ if [ "$1" != "$2" ] && [ "$2" = "0.6-1" ]; then
+ cat <<INFO
+
+Dendrite is now using configuration v2, as it moved from Kafka to NATS Jetstream.
+You are advised to backup your previous configuration located at
+
+ /etc/dendrite/config.yaml
+
+and generate a new one either copying
+
+ /etc/dendrite/config-example.yaml
+
+or by running
+
+ dendrite-generate-config
+
+INFO
+ fi
+}
diff --git a/dendrite.service b/dendrite.service
index 8b0072f88579..797c03aca7f5 100644
--- a/dendrite.service
+++ b/dendrite.service
@@ -1,12 +1,11 @@
[Unit]
Description=Dendrite Matrix Homeserver
-After=network.target
+After=network-online.target
After=postgresql.service
Wants=postgresql.service
[Service]
User=dendrite
-Group=dendrite
ExecStart=/usr/bin/dendrite --config=/etc/dendrite/config.yaml
WorkingDirectory=/var/lib/dendrite/