diff --git a/testing/mautrix-slack/APKBUILD b/testing/mautrix-slack/APKBUILD index 28eb0611c05..ff3df61ae53 100644 --- a/testing/mautrix-slack/APKBUILD +++ b/testing/mautrix-slack/APKBUILD @@ -1,22 +1,21 @@ # Contributor: Matthias Ahouansou +# Contributor: fossdd # Maintainer: Matthias Ahouansou pkgname=mautrix-slack -pkgver=0_git20240710 -_gitrev=a9c4b6c9b2d3125a86e6501aabc473cdf0bb22cf +pkgver=0.1.0 pkgrel=0 pkgdesc="Matrix-Slack puppeting bridge" url="https://go.mau.fi/mautrix-slack/" arch="all" license="AGPL-3.0-or-later" makedepends="go olm-dev sqlite-dev" -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.post-upgrade" subpackages="$pkgname-openrc $pkgname-doc" -source="$pkgname-$_gitrev.tar.gz::https://github.com/mautrix/slack/archive/$_gitrev.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/mautrix/slack/archive/v$pkgver.tar.gz mautrix-slack.initd mautrix-slack.confd - default-log-dir.patch " -builddir="$srcdir/slack-$_gitrev" +builddir="$srcdir/slack-$pkgver" options="net" export GOFLAGS="$GOFLAGS -tags=libsqlite3" @@ -27,7 +26,13 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { export CGO_CFLAGS="$CFLAGS" export CGO_LDFLAGS="$LDFLAGS" - go build + + go build \ + -ldflags "-X main.Tag=$pkgver -X 'main.BuildTime=$(date -d @"$SOURCE_DATE_EPOCH" '+%b %_d %Y, %H:%M:%S')'" \ + ./cmd/mautrix-slack + + ./mautrix-slack -e + sed -i 's|./logs/bridge.log|/var/log/mautrix-slack/mautrix-slack.log|g' config.yaml } check() { @@ -37,7 +42,7 @@ check() { package() { install -Dm755 mautrix-slack \ -t "$pkgdir"/usr/bin/ - install -Dm644 example-config.yaml \ + install -Dm644 config.yaml \ -t "$pkgdir"/etc/mautrix-slack/ install -Dm755 "$srcdir"/mautrix-slack.initd \ @@ -49,8 +54,7 @@ package() { } sha512sums=" -7b4e5705b66e0ec4689e49f6c363355d6735465a95ad3c87176c911074d657f60e56167c1ba1a5edc33dfb2921e07d74c477b64686979ad159e0657251dc482e mautrix-slack-a9c4b6c9b2d3125a86e6501aabc473cdf0bb22cf.tar.gz +b117f7c8a222c5d0688f31d3dc40848212053392a6c401dcb952d58c7b96a4f85dd3a1a6275b3c3480e8b53017a4be715fa5818763b8ae38ab6487c9ae22043d mautrix-slack-0.1.0.tar.gz d27fbc6c7ebe9d42eb8226e035649239e6a3e9fbdea21fd9930666da68be375df577fdf9fd6989152e3bee76c924cf77119c57056aff6def84408c4548e8c42a mautrix-slack.initd cda8cd828fa1e4e4c302adc79a51d9af99fb428a81639691afefad6b575f6d2ac75730ea2cc455be514fe65a9836bdeb530a86b553c34a47e4a56796ce843fe1 mautrix-slack.confd -9444fec2555b1a4a1a4db2f0d08179fdd7a9d725e0a7414cea35591dbaea642978ce2020b6889f54c40f69627b167eaa1a796abcaf216ade5a6457584c38f8dc default-log-dir.patch " diff --git a/testing/mautrix-slack/default-log-dir.patch b/testing/mautrix-slack/default-log-dir.patch deleted file mode 100644 index 82c8818bb36..00000000000 --- a/testing/mautrix-slack/default-log-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: No, Alpine specific -Reason: We don't want to log into $PWD/logs by default but -into /var/log/mautrix-slack. -diff --git a/example-config.yaml b/example-config.yaml -index a636e58..9674a1c 100644 ---- a/example-config.yaml -+++ b/example-config.yaml -@@ -288,7 +288,7 @@ logging: - format: pretty-colored - - type: file - format: json -- filename: ./logs/mautrix-slack.log -+ filename: /var/log/mautrix-slack/mautrix-slack.log - max_size: 100 - max_backups: 10 - compress: true - diff --git a/testing/mautrix-slack/mautrix-slack.post-upgrade b/testing/mautrix-slack/mautrix-slack.post-upgrade new file mode 100644 index 00000000000..35e4c0969a4 --- /dev/null +++ b/testing/mautrix-slack/mautrix-slack.post-upgrade @@ -0,0 +1,17 @@ +#!/bin/sh + +ver_old=$2 + +if [ "$(apk version -t "$ver_old" '0.1.0-r0')" = '<' ]; then + cat >&2 <<-EOF + * + * mautrix-slack was ported over to the new Megabridge framework, + * which requires a new config format. + * + * Migration of the old format is not possible. A example config has + * been added to /etc/mautrix-slack/config.yaml + * + EOF +fi + +exit 0