Update to version 0.2.2 + minor improvements

Remove pessimistic max versions. Adapt config.yaml to match the paths of
the signald package. Fix formatting.

3 files changed, 35 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7bea6ce24f9..bddc8747ee09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,36 @@
 pkgbase = mautrix-signal
 	pkgdesc = A Matrix-Signal puppeting bridge
-	pkgver = 0.2.1
+	pkgver = 0.2.2
 	pkgrel = 1
 	url = https://github.com/tulir/mautrix-signal
 	install = mautrix-signal.install
 	arch = any
 	license = AGPLv3
 	makedepends = python-setuptools
-	depends = python-aiohttp>=3
-	depends = python-asyncpg>=0.20
-	depends = python-attrs>=19.1
-	depends = python-commonmark>=0.8
+	depends = python-aiohttp
+	depends = python-asyncpg
+	depends = python-attrs
+	depends = python-commonmark
 	depends = python-mautrix
-	depends = python-magic>=0.4
-	depends = python-ruamel-yaml>=0.15.35
-	depends = signald>=0.15
-	depends = python-yarl>=1
-	optdepends = python-phonenumbers>=8
+	depends = python-magic
+	depends = python-ruamel-yaml
+	depends = python-yarl
+	depends = signald>=0.16
+	optdepends = python-aiosqlite: Support for SQLite-Database
+	optdepends = python-olm>=3: end-to-bridge encryption support
+	optdepends = python-phonenumbers: Formatted phone numbers
 	optdepends = python-pillow>=4: webp conversion and qr code login
 	optdepends = python-prometheus_client>=0.6: metrics upload
 	optdepends = python-pycryptodome>=3
-	optdepends = python-olm>=3: end-to-bridge encryption support
 	optdepends = python-qrcode>=6: qr code login
 	optdepends = python-signalstickers-client>=3
 	optdepends = python-unpaddedbase64: end-to-bridge encryption support
 	backup = etc/mautrix-signal/config.yaml
-	source = https://github.com/tulir/mautrix-signal/archive/refs/tags/v0.2.1.tar.gz
+	source = https://github.com/tulir/mautrix-signal/archive/refs/tags/v0.2.2.tar.gz
 	source = mautrix-signal.service
 	source = mautrix-signal.sysusers
 	source = mautrix-signal.tmpfiles
-	sha256sums = 68ea168db3d7a99b52f84a9d1d6f96bf914e31a5787b6d4d97923974156a09c4
+	sha256sums = c409699ae833db52e436a136fddc6d9af1e51e2d631998b0541649147739d38f
 	sha256sums = 87a479c5216fa79dbe20ff776f67f5ab70ad0f9705da4b274cc662003545c4be
 	sha256sums = 3203dcff48579a2420eff4289a03ea1b3a9f47031c39f514e8c9a2d119625725
 	sha256sums = 5badc8727dfbf4531f93e86ae475c64753952ee60090a043be22b9dd9a124ca5
diff --git a/PKGBUILD b/PKGBUILD
index 521e8ea3a7ea..b87de89093bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,37 @@
 # Maintainer: Frédéric Tobias Christ <dev+mautrix-signal@ntr.li> <ftchrist:matrix.org>
 pkgname='mautrix-signal'
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="A Matrix-Signal puppeting bridge"
 arch=('any')
 url="https://github.com/tulir/mautrix-signal"
 license=('AGPLv3')
-depends=('python-aiohttp>=3' 'python-asyncpg>=0.20' 'python-attrs>=19.1' 'python-commonmark>=0.8' 'python-mautrix' 'python-magic>=0.4' 'python-ruamel-yaml>=0.15.35' 'signald>=0.15' 'python-yarl>=1' )
+depends=(
+'python-aiohttp'
+'python-asyncpg'
+'python-attrs'
+'python-commonmark'
+'python-mautrix'
+'python-magic'
+'python-ruamel-yaml'
+'python-yarl' 
+'signald>=0.16' )
 makedepends=('python-setuptools')
 #checkdepends
 optdepends=(
-'python-phonenumbers>=8'
+'python-aiosqlite: Support for SQLite-Database '
+'python-olm>=3: end-to-bridge encryption support'
+'python-phonenumbers: Formatted phone numbers'
 'python-pillow>=4: webp conversion and qr code login'
 'python-prometheus_client>=0.6: metrics upload'
 'python-pycryptodome>=3'
-'python-olm>=3: end-to-bridge encryption support'
 'python-qrcode>=6: qr code login'
 'python-signalstickers-client>=3'
 'python-unpaddedbase64: end-to-bridge encryption support')
 backup=("etc/${pkgname}/config.yaml")
 install="${pkgname}.install"
 source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}.sysusers" "${pkgname}.tmpfiles")
-sha256sums=('68ea168db3d7a99b52f84a9d1d6f96bf914e31a5787b6d4d97923974156a09c4'
+sha256sums=('c409699ae833db52e436a136fddc6d9af1e51e2d631998b0541649147739d38f'
             '87a479c5216fa79dbe20ff776f67f5ab70ad0f9705da4b274cc662003545c4be'
             '3203dcff48579a2420eff4289a03ea1b3a9f47031c39f514e8c9a2d119625725'
             '5badc8727dfbf4531f93e86ae475c64753952ee60090a043be22b9dd9a124ca5')
@@ -30,6 +40,10 @@ prepare() {
     mv "${srcdir}/signal-${pkgver}" "${srcdir}/${pkgname}-${pkgver}"
     cd "${srcdir}/${pkgname}-${pkgver}"
     touch registration.yaml
+    
+    # Adapt signald paths for convenience
+    sed -i "s|~/.config/signald/avatars|/var/lib/signald/avatars|g" mautrix_signal/example-config.yaml
+    sed -i "s|~/.config/signald/data|/var/lib/signald/data|g" mautrix_signal/example-config.yaml
 }
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/mautrix-signal.install b/mautrix-signal.install
index b02abf78a6ae..85667d80b47f 100644
--- a/mautrix-signal.install
+++ b/mautrix-signal.install
@@ -5,13 +5,10 @@ post_install() {
 		##################################
 		See: https://docs.mau.fi/bridges/python/setup/index.html?bridge=signal
 		## config.yaml
-		Make sure to set 
-		- avatar_dir: /var/lib/signald/avatars
-        - data_dir: /var/lib/signald/data
 		After editing /etc/mautrix-signal/config.yaml, generate a registration file using:
 		# python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml -g
-		Add the path to the registration file ("/etc/mautrix-signal/registration.yaml" by default) to your Synapse's homeserver.yaml under app_service_config_files. Restart Synapse to apply changes.
+		Add the path to the registration file ("/etc/mautrix-signal/registration.yaml" by default, requires permission for synapse user) to your Synapse's homeserver under app_service_config_files. Restart Synapse to apply changes.
 		If you encounter an error like "cannot write tmp file, start the bridge once manually as root and check the file permissions on the config files afterwards:
-		# sudo -u mautrix-signal python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
+		# sudo python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
 	EOF
 }