🔼 Update to v0.12.0

2 files changed, 17 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e675186aa871..6cd7c635296d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dendrite
 pkgname=$_pkgname-libvips
-pkgver=0.11.0
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="A second-generation Matrix homeserver written in Go"
 arch=('x86_64' 'aarch64')
@@ -17,10 +17,10 @@ source=("$_pkgname-$pkgver.tar.gz::https://github.com/matrix-org/$_pkgname/archi
         "$_pkgname.sysusers"
         "$_pkgname.tmpfiles"
         "$_pkgname.service")
-sha256sums=('d79ab86c66e6df5a310d28ef59c9207ebeb00ef694f3ec7822f06680c195922f'
+sha256sums=('858a3650d957431da4e78f82d801eba6eb963fbc4e6d1dd0ecce3d5c244b265d'
             'aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035'
             '620b634419e94cb09423d39ecd7edf859bf458e9d72c35be30610b37acc1e8bf'
-            'afcaa66d826a0b56b1cfb165b05c37dc6ec5739b24e21d382edb6c7973e588ff')
+            '7d33160209ed11f0ed6de84b0891becf175887a679eb5a3e01b672884fdf0c1d')
 install="$_pkgname.install"
 
 build() {
@@ -30,20 +30,22 @@ build() {
     export CGO_CXXFLAGS="${CXXFLAGS}"
     export CGO_LDFLAGS="${LDFLAGS}"
     export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-    go build -ldflags='-s -w -linkmode=external' -tags bimg ./cmd/dendrite-monolith-server
-    go build -ldflags='-s -w -linkmode=external' ./cmd/generate-config
-    go build -ldflags='-s -w -linkmode=external' ./cmd/generate-keys
-    go build -ldflags='-s -w -linkmode=external' ./cmd/create-account
+    install -d bin
+    go build -ldflags='-s -w -linkmode=external' -tags bimg -o bin/ ./cmd/...
 }
 
 package() {
     cd "$_pkgname-$pkgver"
-    install -D -m 755 "dendrite-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-sample.monolith.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"
+    install -Dm 644 "$_pkgname-sample.yaml" "$pkgdir/etc/$_pkgname/config-example.yaml"
+    install -Dm 644 "$srcdir/$_pkgname.service"      "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
+    install -Dm 644 "$srcdir/$_pkgname.sysusers"     "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
+    install -Dm 644 "$srcdir/$_pkgname.tmpfiles"     "$pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf"
+    cd bin/
+    for bin in *; do
+        if [[ "$bin" =~ ^$_pkgname-* ]]; then
+            install -Dm 755 "$bin" "$pkgdir/usr/bin/$bin"
+        else
+            install -Dm 755 "$bin" "$pkgdir/usr/bin/$_pkgname-$bin"
+        fi
+    done
 }
diff --git a/dendrite.service b/dendrite.service
index 0e875222e624..4bfed452c4da 100644
--- a/dendrite.service
+++ b/dendrite.service
@@ -9,7 +9,6 @@ Wants=postgresql.service
 User=dendrite
 ExecStart=/usr/bin/dendrite --config=/etc/dendrite/config.yaml
 WorkingDirectory=/var/lib/dendrite/
-LimitNOFILE=524288
 
 [Install]
 WantedBy=multi-user.target