summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlphaJack2022-01-29 01:52:54 +0100
committerAlphaJack2022-01-29 01:55:22 +0100
commit81cd3f74f72d431aab7f0ca9def6f6c3e3274b2b (patch)
tree2d42140aeeb8d23bc8c8d0d74a3ded35d65687f6
parent97bcec35939a8fab21469ccc670f39d27876768a (diff)
downloadaur-81cd3f74f72d431aab7f0ca9def6f6c3e3274b2b.tar.gz
Added hotfix for 32 bit architectures, changed configuration folder permission
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD20
-rw-r--r--dendrite.install2
-rw-r--r--dendrite.tmpfiles2
4 files changed, 21 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71f052fa827c..23bf18f3a25c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = dendrite
pkgdesc = A second-generation Matrix homeserver written in Go
pkgver = 0.6
- pkgrel = 1
- url = https://github.com/matrix-org/dendrite
+ pkgrel = 2
+ url = https://matrix.org/docs/projects/server/dendrite
install = dendrite.install
arch = x86_64
arch = i686
@@ -12,13 +12,13 @@ pkgbase = dendrite
license = Apache
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-0.6.tar.gz::https://github.com/matrix-org/dendrite/archive/v0.6/dendrite-v0.6.tar.gz
source = dendrite.sysusers
source = dendrite.tmpfiles
source = dendrite.service
sha256sums = 3c7ce45cdb6ec9e03ef2d1514ed0e2d585e387e43bc7dc61d277207a5f4f7e15
sha256sums = aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035
- sha256sums = 83fa60ac51eb307aa1c96dbb088aa1ce69a91694b3bbaac210bf37408f33d837
+ sha256sums = 8da956f9fcc7c6ea844cea53c823fcfa4376acf04ecd9bceb1a908a85846c90f
sha256sums = 8aac18652906202cd2eedbcc5ea68d87a3ece27cfcba13762b66802c046e0e49
pkgname = dendrite
diff --git a/PKGBUILD b/PKGBUILD
index 30cbe4e9cdd1..2d6f01b1588a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,35 @@
-# Maintainer: Stefan Tatschner <stefan@rumpelsepp.org>
# Maintainer: AlphaJack <alphajack at tuta dot io>
+# Maintainer: Stefan Tatschner <stefan@rumpelsepp.org>
pkgname="dendrite"
pkgver=0.6
-pkgrel=1
+pkgrel=2
pkgdesc="A second-generation Matrix homeserver written in Go"
-url="https://github.com/matrix-org/dendrite"
+url="https://matrix.org/docs/projects/server/dendrite"
license=("Apache")
arch=("x86_64" "i686" "armv6h" "armv7h" "aarch64")
makedepends=("go>=1.16")
optdepends=("postgresql: recommended database for large instances")
-source=("$url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/matrix-org/dendrite/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
"$pkgname.sysusers"
"$pkgname.tmpfiles"
"$pkgname.service")
sha256sums=('3c7ce45cdb6ec9e03ef2d1514ed0e2d585e387e43bc7dc61d277207a5f4f7e15'
'aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035'
- '83fa60ac51eb307aa1c96dbb088aa1ce69a91694b3bbaac210bf37408f33d837'
+ '8da956f9fcc7c6ea844cea53c823fcfa4376acf04ecd9bceb1a908a85846c90f'
'8aac18652906202cd2eedbcc5ea68d87a3ece27cfcba13762b66802c046e0e49')
install="$pkgname.install"
+prepare(){
+ cd "$pkgname-$pkgver"
+ # hotfix for 32 bit, will be implemented in 0.6.1
+ sed -i "go.mod" \
+ -e "s|github.com/Shopify/sarama v1.29.0|github.com/Shopify/sarama v1.31.0|"
+ go mod download "github.com/Shopify/sarama"
+ go get "github.com/Shopify/sarama@v1.31.0"
+ go get "github.com/eapache/go-xerial-snappy@v0.0.0-20180814174437-776d5712da21"
+}
+
build(){
cd "$pkgname-$pkgver"
export CGO_CPPFLAGS="${CPPFLAGS}"
diff --git a/dendrite.install b/dendrite.install
index 9c36761891ca..19f490e19ae7 100644
--- a/dendrite.install
+++ b/dendrite.install
@@ -1,7 +1,7 @@
post_upgrade(){
# notify about breaking changes
# https://wiki.archlinux.org/title/PKGBUILD#install
- if [ "$1" != "$2" ] && [ "$2" = "0.6-1" ]; then
+ if [[ $1 != 0.6* ]] && [[ $2 == 0.6* ]]; then
cat <<INFO
Dendrite is now using configuration v2, as it moved from Kafka to NATS Jetstream.
diff --git a/dendrite.tmpfiles b/dendrite.tmpfiles
index bffef445dcce..c1ada22e671b 100644
--- a/dendrite.tmpfiles
+++ b/dendrite.tmpfiles
@@ -1,3 +1,3 @@
-d /etc/dendrite 0700 dendrite dendrite -
+d /etc/dendrite 0750 root dendrite -
d /var/lib/dendrite 0700 dendrite dendrite -
d /var/log/dendrite 0700 dendrite dendrite -