mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 12:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/signal-cli: upgrade to 0.10.5

Browse Source
This commit is contained in:
Simon Frankenberger 2022-04-19 08:17:04 +00:00 committed by alice
parent a147c74be4
commit 9ab7cb747d
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testing/signal-cli/APKBUILD
View File

@ -2,7 +2,7 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Siva Mahadevan <me@svmhdvn.name>
pkgname=signal-cli
pkgver=0.10.4.1
pkgver=0.10.5
pkgrel=0
pkgdesc="commandline interface for libsignal-service-java"
url="https://github.com/AsamK/signal-cli"
@ -13,7 +13,8 @@ arch="x86_64 ppc64le"
license="GPL-3.0-or-later"
depends="java-libsignal-client"
makedepends="openjdk17-jdk"
source="$pkgname-$pkgver.tar.gz::https://github.com/AsamK/signal-cli/archive/v$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/AsamK/signal-cli/archive/v$pkgver.tar.gz
FixServiceConfigWrongExceptionCatched.patch"
build() {
./gradlew installDist
@ -34,11 +35,12 @@ package() {
install -dm755 "$pkgdir/usr/bin"
ln -s "$installhome/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
rm -v "$pkgdir/$installhome/lib"/signal-client-java-*.jar
ln -sv /usr/share/java/libsignal-client/signal-client-java.jar "$pkgdir/$installhome/lib/signal-client-java.jar"
sed -i -e 's/signal-client-java-[0-9.]\+\.jar/signal-client-java.jar/g' "$pkgdir/$installhome/bin/$pkgname"
rm -v "$pkgdir/$installhome/lib"/libsignal-client-*.jar
ln -sv /usr/share/java/libsignal-client/libsignal-client.jar "$pkgdir/$installhome/lib/signal-client-java.jar"
sed -i -e 's/libsignal-client-[0-9.]\+\.jar/signal-client-java.jar/g' "$pkgdir/$installhome/bin/$pkgname"
}
sha512sums="
8575b4e2b3d6149e5499820735c7af59669cd57de60af15ecd6eb5b83a16b8f6c1222abab5fbef0fe7262ac6b68623359beb8d57e2f9923d82fa543bee900550 signal-cli-0.10.4.1.tar.gz
fe6b5a2f333920a7d30f781fb6ce8f8286785e893f650aa198c23d2b2bd4b65dd90fa7273405ae82c62cba010d5e2156b2a8cf2fed909dad5da280769e424203 signal-cli-0.10.5.tar.gz
5b0dc066f789e74405c5203bd5fb7e5c3231ab14dcc2c068e8a6dfa36d7db3349d8c46a2fe91a4675bda814a683adcbad218a4972d7b9c4767a73a8223d138e2 FixServiceConfigWrongExceptionCatched.patch
"

20
testing/signal-cli/FixServiceConfigWrongExceptionCatched.patch Normal file
View File

@ -0,0 +1,20 @@
--- old/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ new/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -48,14 +48,13 @@
public static boolean isSignalClientAvailable() {
try {
- try {
- org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
- } catch (IllegalArgumentException ignored) {
- }
+ org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
return true;
} catch (UnsatisfiedLinkError e) {
logger.warn("Failed to call libsignal-client: {}", e.getMessage());
return false;
+ } catch (Exception e) {
+ return true;
}
}