Date: Sun, 17 Oct 2021 09:19:13 GMT From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4df137cb79d6 - main - net-im/signald: Update to 0.15.0 Message-ID: <202110170919.19H9JDx9047511@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4df137cb79d691b866686360de2fa8e69719d079 commit 4df137cb79d691b866686360de2fa8e69719d079 Author: Michael Gmelin <grembo@FreeBSD.org> AuthorDate: 2021-10-17 09:14:00 +0000 Commit: Michael Gmelin <grembo@FreeBSD.org> CommitDate: 2021-10-17 09:18:07 +0000 net-im/signald: Update to 0.15.0 --- net-im/signald/Makefile | 32 ++++++++++++------ net-im/signald/distinfo | 38 ++++++++++++++-------- net-im/signald/files/patch-build.gradle | 30 ++++++++++------- ...in_java_io_finn_signald_db_RecipientsTable.java | 19 +++++++++++ net-im/signald/pkg-plist | 14 +++++--- 5 files changed, 94 insertions(+), 39 deletions(-) diff --git a/net-im/signald/Makefile b/net-im/signald/Makefile index eaab9be889f3..2c8f603d2cbf 100644 --- a/net-im/signald/Makefile +++ b/net-im/signald/Makefile @@ -1,16 +1,21 @@ PORTNAME= signald -DISTVERSION= 0.14.1 +DISTVERSION= 0.15.0 CATEGORIES= net-im java MASTER_SITES= https://plugins.gradle.org/m2/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/:buildconfig \ https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.0/:jackann \ https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.9.9/:jackcore \ https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.9.9.2/:jackdbind \ - https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.15.3_unofficial_24/:sservice \ + https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.15.3_unofficial_27/:sservice \ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.10.0/:protobuf \ https://repo.maven.apache.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.17/:libphone \ + https://repo.maven.apache.org/maven2/io/prometheus/simpleclient/0.11.0/:simpleclient \ + https://repo.maven.apache.org/maven2/io/prometheus/simpleclient_hotspot/0.11.0/:simpleclient_hotspot \ + https://repo.maven.apache.org/maven2/io/prometheus/simpleclient_httpserver/0.11.0/:simpleclient_httpserver \ + https://repo.maven.apache.org/maven2/io/reactivex/rxjava3/rxjava/3.1.2/:rxjava \ https://repo.maven.apache.org/maven2/com/kohlschutter/junixsocket/junixsocket-common/2.3.2/:jcommon \ https://repo.maven.apache.org/maven2/com/kohlschutter/junixsocket/junixsocket-native-common/2.3.2/:jncommon \ - https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.6.0/:okhttp \ + https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.1/:okhttp \ + https://repo.maven.apache.org/maven2/com/squareup/okhttp3/logging-interceptor/4.9.1/:okhttp_interceptor \ https://repo.maven.apache.org/maven2/com/squareup/okio/2.6.0/:okjvm \ https://repo.maven.apache.org/maven2/info/picocli/picocli/4.5.2/:picocli \ https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.14.0/:log4j_api \ @@ -20,11 +25,12 @@ MASTER_SITES= https://plugins.gradle.org/m2/gradle/plugin/de/fuerstenau/BuildCon https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/:jetann \ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71/:jetkotstdcommon \ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/:jetkotstd \ - https://repo.maven.apache.org/maven2/org/signal/zkgroup-java/0.7.0/:zkgroup \ + https://repo.maven.apache.org/maven2/org/reactivestreams/reactive-streams/1.0.3/:reactivestreams \ + https://repo.maven.apache.org/maven2/org/signal/zkgroup-java/0.7.3/:zkgroup \ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.8.0-beta4/:slf4japi \ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-nop/1.8.0-beta4/:slf4jnop \ https://repo.maven.apache.org/maven2/org/threeten/threetenbp/1.3.6/:threeten \ - https://repo.maven.apache.org/maven2/org/whispersystems/signal-client-java/0.8.1/:sclient + https://repo.maven.apache.org/maven2/org/whispersystems/signal-client-java/0.9.6/:sclient DISTFILES= BuildConfigPlugin-1.1.8.jar:buildconfig \ annotations-13.0.jar:jetann \ bcprov-jdk15on-1.66.jar:bcprov \ @@ -37,18 +43,24 @@ DISTFILES= BuildConfigPlugin-1.1.8.jar:buildconfig \ kotlin-stdlib-1.3.71.jar:jetkotstd \ kotlin-stdlib-common-1.3.71.jar:jetkotstdcommon \ libphonenumber-8.12.17.jar:libphone \ + logging-interceptor-4.9.1.jar:okhttp_interceptor \ log4j-api-2.14.0.jar:log4j_api \ log4j-core-2.14.0.jar:log4j_core \ - okhttp-4.6.0.jar:okhttp \ + okhttp-4.9.1.jar:okhttp \ okio-2.6.0.jar:okjvm \ picocli-4.5.2.jar:picocli \ protobuf-javalite-3.10.0.jar:protobuf \ - signal-client-java-0.8.1.jar:sclient \ - signal-service-java-2.15.3_unofficial_24.jar:sservice \ + reactive-streams-1.0.3.jar:reactivestreams \ + rxjava-3.1.2.jar:rxjava \ + signal-client-java-0.9.6.jar:sclient \ + signal-service-java-2.15.3_unofficial_27.jar:sservice \ + simpleclient-0.11.0.jar:simpleclient \ + simpleclient_hotspot-0.11.0.jar:simpleclient_hotspot \ + simpleclient_httpserver-0.11.0.jar:simpleclient_httpserver \ slf4j-api-1.8.0-beta4.jar:slf4japi \ slf4j-nop-1.8.0-beta4.jar:slf4jnop \ threetenbp-1.3.6.jar:threeten \ - zkgroup-java-0.7.0.jar:zkgroup + zkgroup-java-0.7.3.jar:zkgroup MAINTAINER= grembo@FreeBSD.org COMMENT= Daemon to facilitate communication via Signal Private Messenger @@ -67,7 +79,7 @@ LIB_DEPENDS= libsignal_jni.so:net-im/libsignal-client \ USES= gmake shebangfix USE_GITLAB= yes GL_ACCOUNT= signald -GL_COMMIT= 227706969ee084c4e06b424bdf0a95a43bdeb051 +GL_COMMIT= 65cf5e8a1cf2b81fd1f5c3936e0164d53c5a9b29 USE_JAVA= yes JAVA_VERSION= 11+ diff --git a/net-im/signald/distinfo b/net-im/signald/distinfo index 0e1a9ae045a1..ae3ff7f9ddd2 100644 --- a/net-im/signald/distinfo +++ b/net-im/signald/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1630166976 +TIMESTAMP = 1634427903 +SHA256 (BuildConfigPlugin-1.1.8.jar) = 99b5256936af67431a8a92902f253f525837ac3639a5ff05ed2225febaa710af +SIZE (BuildConfigPlugin-1.1.8.jar) = 52133 SHA256 (annotations-13.0.jar) = ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 SIZE (annotations-13.0.jar) = 17536 SHA256 (bcprov-jdk15on-1.66.jar) = 1b861dba1c5445de9b38a1789c211ef28b9d07e26d1fa38bee717e5b51162ffe SIZE (bcprov-jdk15on-1.66.jar) = 5884134 SHA256 (flyway-core-7.5.3.jar) = d0283d9481ae39cc77d210a5bb176a5c103da292898bfd3a9acb25da059e97d8 SIZE (flyway-core-7.5.3.jar) = 679850 -SHA256 (BuildConfigPlugin-1.1.8.jar) = 99b5256936af67431a8a92902f253f525837ac3639a5ff05ed2225febaa710af -SIZE (BuildConfigPlugin-1.1.8.jar) = 52133 SHA256 (jackson-annotations-2.9.0.jar) = 45d32ac61ef8a744b464c54c2b3414be571016dd46bfc2bec226761cf7ae457a SIZE (jackson-annotations-2.9.0.jar) = 66519 SHA256 (jackson-core-2.9.9.jar) = 3083079be6088db2ed0a0c6ff92204e0aa48fa1de9db5b59c468f35acf882c2c @@ -23,29 +23,41 @@ SHA256 (kotlin-stdlib-common-1.3.71.jar) = 974f8a9b7bfce3d730a86efe0eab219a72621 SIZE (kotlin-stdlib-common-1.3.71.jar) = 179597 SHA256 (libphonenumber-8.12.17.jar) = 729483057ef874b01537da8395d67e23b419d504f8ff29ddf5f69da21bf816ac SIZE (libphonenumber-8.12.17.jar) = 350448 +SHA256 (logging-interceptor-4.9.1.jar) = 08ae52d4e7ab4dde8f94970bbeb1545b51934d4b3f0802f6e816b0522902fa9d +SIZE (logging-interceptor-4.9.1.jar) = 15680 SHA256 (log4j-api-2.14.0.jar) = 9791ac85aa3cdad633e512192766f84995eddf4db188cc42facec52a0dae15e8 SIZE (log4j-api-2.14.0.jar) = 301418 SHA256 (log4j-core-2.14.0.jar) = f04ee9c0ac417471d9127b5880b96c3147249f20674a8dbb88e9949d855382a8 SIZE (log4j-core-2.14.0.jar) = 1762731 -SHA256 (okhttp-4.6.0.jar) = 0480d35187423f2fca923c91511a279eb01f27f703afcef40780ae8af460a857 -SIZE (okhttp-4.6.0.jar) = 788355 +SHA256 (okhttp-4.9.1.jar) = 6afdd8f35f4eb60df965c290fa3acf29443fa986545113d0729b8461f6571f8f +SIZE (okhttp-4.9.1.jar) = 791390 SHA256 (okio-2.6.0.jar) = 4d84ef686277b58eb05691ac19cd3befa3429a27274982ee65ea0f07044bcc00 SIZE (okio-2.6.0.jar) = 243330 SHA256 (picocli-4.5.2.jar) = b4395e9a67932616efd2245d984bf5fcd453c2c5049558c3ce959ac2af4d3fac SIZE (picocli-4.5.2.jar) = 390247 SHA256 (protobuf-javalite-3.10.0.jar) = 215a94dbe100130295906b531bb72a26965c7ac8fcd9a75bf8054a8ac2abf4b4 SIZE (protobuf-javalite-3.10.0.jar) = 690955 -SHA256 (signal-client-java-0.8.1.jar) = 6bcf9ab3a77be20b43086fd802d9ade3940f36ed7b99bac2a79b9bcaf0a7808b -SIZE (signal-client-java-0.8.1.jar) = 1076260 -SHA256 (signal-service-java-2.15.3_unofficial_24.jar) = 3817f4b526bca8cc800a738f6b0eb073d502eece0693c82f22f87b9ac5f9e8ae -SIZE (signal-service-java-2.15.3_unofficial_24.jar) = 1735667 +SHA256 (reactive-streams-1.0.3.jar) = 1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865 +SIZE (reactive-streams-1.0.3.jar) = 11369 +SHA256 (rxjava-3.1.2.jar) = 8d784075bec0b7c55042c109a4de8923b3b6d2ebd2e00912d518f07240f9c23a +SIZE (rxjava-3.1.2.jar) = 2654933 +SHA256 (signal-client-java-0.9.6.jar) = f64aeb071eae2e1e2413902da6554c03e22f66d7a59ffdd79f3beeb0248ea054 +SIZE (signal-client-java-0.9.6.jar) = 4002591 +SHA256 (signal-service-java-2.15.3_unofficial_27.jar) = 01ff7cb5c1874d9a09ba1a7b9a44c01ed206d1f2d368d1ef05c4140a0ec5968e +SIZE (signal-service-java-2.15.3_unofficial_27.jar) = 1781909 +SHA256 (simpleclient-0.11.0.jar) = dee025612a2bec65bb813eaf6830221ded9d44733d5c90855dbdcdf559f209eb +SIZE (simpleclient-0.11.0.jar) = 82198 +SHA256 (simpleclient_hotspot-0.11.0.jar) = 96a349c370007786c611257bce66930a4ab749146d360098069b9a50d478b4fd +SIZE (simpleclient_hotspot-0.11.0.jar) = 22116 +SHA256 (simpleclient_httpserver-0.11.0.jar) = de2c12b90c586425b6fcb9b9a716973b2e328b421a314230f16a3060eeaeb31a +SIZE (simpleclient_httpserver-0.11.0.jar) = 10621 SHA256 (slf4j-api-1.8.0-beta4.jar) = 602b712329c84b4a83c40464f4fdfd0fe4238c53ef397139a867064739dbf4e0 SIZE (slf4j-api-1.8.0-beta4.jar) = 44213 SHA256 (slf4j-nop-1.8.0-beta4.jar) = c833140c2c210678d4aea0d689696ae0b0bdbdc69d36b565ddf357bacacce052 SIZE (slf4j-nop-1.8.0-beta4.jar) = 5860 SHA256 (threetenbp-1.3.6.jar) = f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7 SIZE (threetenbp-1.3.6.jar) = 514875 -SHA256 (zkgroup-java-0.7.0.jar) = d0099eedd60d6f7d4df5b288175e5d585228ed8897789926bdab69bf8c05659f -SIZE (zkgroup-java-0.7.0.jar) = 316995 -SHA256 (signald-signald-227706969ee084c4e06b424bdf0a95a43bdeb051_GL0.tar.gz) = 7f64ade2fdf60339b5505f9e3c210d271c982fe7a541bfd11360d26c4dd7038f -SIZE (signald-signald-227706969ee084c4e06b424bdf0a95a43bdeb051_GL0.tar.gz) = 232775 +SHA256 (zkgroup-java-0.7.3.jar) = 6d45d1bce568a87089bc6a1d9a2daa4587a7f04d168069abfa50616ca2bae524 +SIZE (zkgroup-java-0.7.3.jar) = 321682 +SHA256 (signald-signald-65cf5e8a1cf2b81fd1f5c3936e0164d53c5a9b29_GL0.tar.gz) = d9b807aa6097141779ec30f47c217783812a375d2f435c85b097da1bd996092c +SIZE (signald-signald-65cf5e8a1cf2b81fd1f5c3936e0164d53c5a9b29_GL0.tar.gz) = 257854 diff --git a/net-im/signald/files/patch-build.gradle b/net-im/signald/files/patch-build.gradle index 19d07c526d55..8f87d2577a12 100644 --- a/net-im/signald/files/patch-build.gradle +++ b/net-im/signald/files/patch-build.gradle @@ -1,6 +1,6 @@ ---- build.gradle.orig 2021-07-20 19:35:21 UTC +--- build.gradle.orig 2021-10-02 23:08:05 UTC +++ build.gradle -@@ -20,10 +20,13 @@ +@@ -20,10 +20,13 @@ import org.gradle.nativeplatform.platform.internal.Ope import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.xml.sax.SAXParseException @@ -16,7 +16,7 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'idea' -@@ -86,10 +86,18 @@ String getTarget() { +@@ -86,10 +89,18 @@ static String getTarget() { return target } @@ -38,12 +38,12 @@ } sourceSets { -@@ -109,17 +117,31 @@ configurations { +@@ -109,21 +120,37 @@ configurations { } dependencies { -- implementation 'com.github.turasa:signal-service-java-' + getTarget() + ':2.15.3_unofficial_24' -+ implementation 'com.github.turasa:signal-service-java:2.15.3_unofficial_24' +- implementation 'com.github.turasa:signal-service-java-' + getTarget() + ':2.15.3_unofficial_27' ++ implementation 'com.github.turasa:signal-service-java:2.15.3_unofficial_27' implementation 'org.bouncycastle:bcprov-jdk15on:1.66' implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.3.2' implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.3.2' @@ -57,18 +57,24 @@ + implementation 'com.fasterxml.jackson.core:jackson-core:2.9.9' + implementation 'com.fasterxml.jackson.annotations:jackson-annotations:2.9.0' + implementation 'com.fasterxml.jackson.databind:jackson-databind:2.9.9.2' -+ implementation 'org.whispersystems.libsignal.signal-client-java:signal-client-java:0.8.1' -+ implementation 'org.signal.zkgroup:zkgroup-java:0.7.0' ++ implementation 'org.whispersystems.libsignal.signal-client-java:signal-client-java:0.9.6' ++ implementation 'org.signal.zkgroup:zkgroup-java:0.7.3' implementation 'org.flywaydb:flyway-core:7.5.3' implementation 'com.google.protobuf:protobuf-javalite:3.10.0' -+ implementation 'okhttp3:okhttp:4.6.0' + implementation 'io.prometheus:simpleclient:0.11.0' + implementation 'io.prometheus:simpleclient_hotspot:0.11.0' + implementation 'io.prometheus:simpleclient_httpserver:0.11.0' ++ implementation 'io.reactivex.rxjava3:rxjava:3.1.2' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' ++ implementation 'okhttp3:okhttp:4.9.1' + implementation 'okio:okio:2.6.0' + implementation 'org.jetbrains.annotations:annotations:13.0' + implementation 'org.jetbrains.kotlin.kotlin-stdlib:kotlin-stdlib:1.3.71' + implementation 'org.jetbrains.kotlin.kotlin-stdlib-common:kotlin-stdlib-common:1.3.71' ++ implementation 'org.reactivestreams:reactive-streams:1.0.3' + implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.17' + implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.17' + implementation 'org.threeten.threetenbp:threetenbp:1.3.6' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' - } + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0' diff --git a/net-im/signald/files/patch-src_main_java_io_finn_signald_db_RecipientsTable.java b/net-im/signald/files/patch-src_main_java_io_finn_signald_db_RecipientsTable.java new file mode 100644 index 000000000000..016d5bb4aa71 --- /dev/null +++ b/net-im/signald/files/patch-src_main_java_io_finn_signald_db_RecipientsTable.java @@ -0,0 +1,19 @@ +--- src/main/java/io/finn/signald/db/RecipientsTable.java.orig 2021-10-17 08:41:09 UTC ++++ src/main/java/io/finn/signald/db/RecipientsTable.java +@@ -144,6 +144,16 @@ public class RecipientsTable { + + if (storedUUID == null) { + storedUUID = getRegisteredUser(e164); ++ if (rowid < 0 && storedUUID != null && queryUUID == null) { ++ statement.setString(1, storedUUID.toString()); ++ statement.setString(2, null); ++ rows = statement.executeQuery(); ++ if (rows.next()) { ++ rowid = rows.getInt(ROW_ID); ++ update(E164, e164, rowid); ++ } ++ } ++ + if (rowid > 0) { + update(UUID, storedUUID.toString(), rowid); + } else { diff --git a/net-im/signald/pkg-plist b/net-im/signald/pkg-plist index 4de9134f36f1..d2711504310c 100644 --- a/net-im/signald/pkg-plist +++ b/net-im/signald/pkg-plist @@ -13,15 +13,21 @@ man/man7/signald.7.gz %%DATADIR%%/lib/libphonenumber-8.12.17.jar %%DATADIR%%/lib/log4j-api-2.14.0.jar %%DATADIR%%/lib/log4j-core-2.14.0.jar -%%DATADIR%%/lib/okhttp-4.6.0.jar +%%DATADIR%%/lib/logging-interceptor-4.9.1.jar +%%DATADIR%%/lib/okhttp-4.9.1.jar %%DATADIR%%/lib/okio-2.6.0.jar %%DATADIR%%/lib/picocli-4.5.2.jar %%DATADIR%%/lib/protobuf-javalite-3.10.0.jar -%%DATADIR%%/lib/signal-client-java-0.8.1.jar -%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_24.jar +%%DATADIR%%/lib/reactive-streams-1.0.3.jar +%%DATADIR%%/lib/rxjava-3.1.2.jar +%%DATADIR%%/lib/signal-client-java-0.9.6.jar +%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_27.jar %%DATADIR%%/lib/signald.jar +%%DATADIR%%/lib/simpleclient-0.11.0.jar +%%DATADIR%%/lib/simpleclient_hotspot-0.11.0.jar +%%DATADIR%%/lib/simpleclient_httpserver-0.11.0.jar %%DATADIR%%/lib/slf4j-api-1.8.0-beta4.jar %%DATADIR%%/lib/slf4j-nop-1.8.0-beta4.jar %%DATADIR%%/lib/sqlitejdbc-native.jar %%DATADIR%%/lib/threetenbp-1.3.6.jar -%%DATADIR%%/lib/zkgroup-java-0.7.0.jar +%%DATADIR%%/lib/zkgroup-java-0.7.3.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110170919.19H9JDx9047511>