svn commit: r548778 - head/net-im/signal-cli
Mateusz Piotrowski
0mp at FreeBSD.org
Wed Sep 16 11:06:46 UTC 2020
Author: 0mp
Date: Wed Sep 16 11:06:45 2020
New Revision: 548778
URL: https://svnweb.freebsd.org/changeset/ports/548778
Log:
net-im/signal-cli: Update to 0.6.10
Release notes:
- https://github.com/AsamK/signal-cli/releases/tag/v0.6.9
- https://github.com/AsamK/signal-cli/releases/tag/v0.6.10
Port changes:
- Improve the comment about jffi-native to be a bit more clear.
- Set JAVA_HOME for Gradle explicitly. Gradle was not picking up the right
Java version automatically.
- Remove post-patch; it is no longer needed.
- Bump the required Java version to 11+ as documented by the upstream.
Modified:
head/net-im/signal-cli/Makefile
head/net-im/signal-cli/distinfo
head/net-im/signal-cli/pkg-plist
Modified: head/net-im/signal-cli/Makefile
==============================================================================
--- head/net-im/signal-cli/Makefile Wed Sep 16 10:35:43 2020 (r548777)
+++ head/net-im/signal-cli/Makefile Wed Sep 16 11:06:45 2020 (r548778)
@@ -2,13 +2,12 @@
PORTNAME= signal-cli
DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.8
-PORTREVISION= 1
+DISTVERSION= 0.6.10
CATEGORIES= net-im java
MASTER_SITES= https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.9.0/:_jackson_annotations \
https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.9.9/:_jackson_core \
https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.9.9.2/:_jackson_databind \
- https://repo.maven.apache.org/maven2/com/github/hypfvieh/dbus-java/3.2.2/:_dbus_java \
+ https://repo.maven.apache.org/maven2/com/github/hypfvieh/dbus-java/3.2.3/:_dbus_java \
https://repo.maven.apache.org/maven2/com/github/hypfvieh/java-utils/1.0.6/:_java_utils \
https://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.23/:_jffi \
https://repo.maven.apache.org/maven2/com/github/jnr/jnr-a64asm/1.0.0/:_jnr_a64asm \
@@ -18,13 +17,13 @@ MASTER_SITES= https://repo.maven.apache.org/maven2/com
https://repo.maven.apache.org/maven2/com/github/jnr/jnr-posix/3.0.58/:_jnr_posix \
https://repo.maven.apache.org/maven2/com/github/jnr/jnr-unixsocket/0.33/:_jnr_unixsocket \
https://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/:_jnr_x86asm \
- https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.15.3_unofficial_10/:_signal_service_java \
+ https://repo.maven.apache.org/maven2/com/github/turasa/signal-service-java/2.15.3_unofficial_14/:_signal_service_java \
https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.10.0/:_protobuf_javalite \
- https://repo.maven.apache.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.11.0/:_libphonenumber \
+ https://repo.maven.apache.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.6/:_libphonenumber \
https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.6.0/:_okhttp \
https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.6.0/:_okio \
https://repo.maven.apache.org/maven2/net/sourceforge/argparse4j/argparse4j/0.8.1/:_argparse4j \
- https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.65/:_bcprov_jdk15on \
+ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.66/:_bcprov_jdk15on \
https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/:_annotations \
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71/:_kotlin_stdlib_common \
https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/:_kotlin_stdlib \
@@ -47,9 +46,9 @@ DISTFILES= annotations-13.0.jar:_annotations \
asm-commons-7.1.jar:_asm_commons \
asm-tree-7.1.jar:_asm_tree \
asm-util-7.1.jar:_asm_util \
- bcprov-jdk15on-1.65.jar:_bcprov_jdk15on \
+ bcprov-jdk15on-1.66.jar:_bcprov_jdk15on \
curve25519-java-0.5.0.jar:_curve25519_java \
- dbus-java-3.2.2.jar:_dbus_java \
+ dbus-java-3.2.3.jar:_dbus_java \
jackson-annotations-2.9.0.jar:_jackson_annotations \
jackson-core-2.9.9.jar:_jackson_core \
jackson-databind-2.9.9.2.jar:_jackson_databind \
@@ -64,20 +63,21 @@ DISTFILES= annotations-13.0.jar:_annotations \
jnr-x86asm-1.0.2.jar:_jnr_x86asm \
kotlin-stdlib-1.3.71.jar:_kotlin_stdlib \
kotlin-stdlib-common-1.3.71.jar:_kotlin_stdlib_common \
- libphonenumber-8.11.0.jar:_libphonenumber \
+ libphonenumber-8.12.6.jar:_libphonenumber \
okhttp-4.6.0.jar:_okhttp \
okio-2.6.0.jar:_okio \
protobuf-javalite-3.10.0.jar:_protobuf_javalite \
signal-metadata-java-0.1.2.jar:_signal_metadata_java \
signal-protocol-java-2.8.1.jar:_signal_protocol_java \
- signal-service-java-2.15.3_unofficial_10.jar:_signal_service_java \
+ signal-service-java-2.15.3_unofficial_14.jar:_signal_service_java \
slf4j-api-1.7.30.jar:_slf4j_api \
slf4j-nop-1.7.30.jar:_slf4j_nop \
threetenbp-1.3.6.jar:_threetenbp \
zkgroup-java-0.7.0.jar:_zkgroup_java
# jffi-native is not being listed as an explicit dependency by Gradle. As a
-# workaround appended it to DISTFILES separately here as to not remove it by
-# accident when upgrading the port in the future.
+# workaround, append it to DISTFILES. Let's not add it to the main DISTFILES
+# assignment above to avoid removing it by accident when upgrading the port in
+# the future (the DISTFILES assignment above is generated semi-automatically).
DISTFILES+= jffi-1.2.23-native.jar:_jffi
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -94,7 +94,7 @@ USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= AsamK
USE_JAVA= yes
-JAVA_VERSION= 8+
+JAVA_VERSION= 11+
USE_RC_SUBR= signal_cli
NO_ARCH= yes
@@ -113,7 +113,7 @@ DBUS_PLIST_FILES= etc/dbus-1/system.d/org.asamk.Signal
DBUS_RUN_DEPENDS= dbus>0:devel/dbus
_GRADLE_CMD= ${LOCALBASE}/bin/gradle
-_GRADLE_ARGS= --no-daemon --offline --quiet
+_GRADLE_ARGS= -Dorg.gradle.java.home="${JAVA_HOME}" --no-daemon --offline --quiet
_GRADLE_DEPS_DIR= ${WRKDIR}/gradle-deps
_ORIGINAL_BUILD_GRADLE= ${WRKSRC}/original-build.gradle
@@ -127,10 +127,6 @@ post-extract:
-e 's|%%ORIGINAL_BUILD_GRADLE%%|${_ORIGINAL_BUILD_GRADLE}|g' \
${FILESDIR}/build.gradle.in \
> ${WRKSRC}/build.gradle
-
-post-patch:
-# This line may be removed once upstream switches to dbus-java >=3.2.2.
- ${REINPLACE_CMD} 's/dbus-java:3.2.1/dbus-java:3.2.2/' ${_ORIGINAL_BUILD_GRADLE}
do-build:
(cd ${WRKSRC} && \
Modified: head/net-im/signal-cli/distinfo
==============================================================================
--- head/net-im/signal-cli/distinfo Wed Sep 16 10:35:43 2020 (r548777)
+++ head/net-im/signal-cli/distinfo Wed Sep 16 11:06:45 2020 (r548778)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1597136208
+TIMESTAMP = 1600253593
SHA256 (annotations-13.0.jar) = ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478
SIZE (annotations-13.0.jar) = 17536
SHA256 (argparse4j-0.8.1.jar) = 98cb5468cac609f3bc07856f2e34088f50dc114181237c48d20ca69c3265d044
@@ -13,12 +13,12 @@ SHA256 (asm-tree-7.1.jar) = c0e82b220b0a52c71c7ca2a58c
SIZE (asm-tree-7.1.jar) = 50303
SHA256 (asm-util-7.1.jar) = a24485517596ae1003dcf2329c044a2a861e5c25d4476a695ccaacf560c74d1a
SIZE (asm-util-7.1.jar) = 81554
-SHA256 (bcprov-jdk15on-1.65.jar) = e78f96eb59066c94c94fb2d6b5eb80f52feac6f5f9776898634f8addec6e2137
-SIZE (bcprov-jdk15on-1.65.jar) = 4460240
+SHA256 (bcprov-jdk15on-1.66.jar) = 1b861dba1c5445de9b38a1789c211ef28b9d07e26d1fa38bee717e5b51162ffe
+SIZE (bcprov-jdk15on-1.66.jar) = 5884134
SHA256 (curve25519-java-0.5.0.jar) = 0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d
SIZE (curve25519-java-0.5.0.jar) = 124921
-SHA256 (dbus-java-3.2.2.jar) = af3175d9028615311f36d2795ba52e396f3c3fb9e7af3778100fd3b5ccd0a18d
-SIZE (dbus-java-3.2.2.jar) = 285255
+SHA256 (dbus-java-3.2.3.jar) = b8bc0a5b884b01bd59f40675cadaaa33f7a6a93e3879d02ef6891eb0931fc78f
+SIZE (dbus-java-3.2.3.jar) = 285491
SHA256 (jackson-annotations-2.9.0.jar) = 45d32ac61ef8a744b464c54c2b3414be571016dd46bfc2bec226761cf7ae457a
SIZE (jackson-annotations-2.9.0.jar) = 66519
SHA256 (jackson-core-2.9.9.jar) = 3083079be6088db2ed0a0c6ff92204e0aa48fa1de9db5b59c468f35acf882c2c
@@ -47,8 +47,8 @@ SHA256 (kotlin-stdlib-1.3.71.jar) = 5ace22b102a96425e4
SIZE (kotlin-stdlib-1.3.71.jar) = 1379827
SHA256 (kotlin-stdlib-common-1.3.71.jar) = 974f8a9b7bfce3d730a86efe0eab219a72621e8530f91e30c89f400ba98092ec
SIZE (kotlin-stdlib-common-1.3.71.jar) = 179597
-SHA256 (libphonenumber-8.11.0.jar) = 833ec343e55a6910daca392af76f8e09caaab9c4e3f41ded83f4746e7ef389c7
-SIZE (libphonenumber-8.11.0.jar) = 344378
+SHA256 (libphonenumber-8.12.6.jar) = c118abe8954172149c98e727c8630eda4954e048582a9e5007e3479681453e94
+SIZE (libphonenumber-8.12.6.jar) = 349208
SHA256 (okhttp-4.6.0.jar) = 0480d35187423f2fca923c91511a279eb01f27f703afcef40780ae8af460a857
SIZE (okhttp-4.6.0.jar) = 788355
SHA256 (okio-2.6.0.jar) = 4d84ef686277b58eb05691ac19cd3befa3429a27274982ee65ea0f07044bcc00
@@ -59,8 +59,8 @@ SHA256 (signal-metadata-java-0.1.2.jar) = 6aaeb6a33bf3
SIZE (signal-metadata-java-0.1.2.jar) = 63345
SHA256 (signal-protocol-java-2.8.1.jar) = b19db36839ab008fdccefc7f8c005f2ea43dc7c7298a209bc424e6f9b6d5617b
SIZE (signal-protocol-java-2.8.1.jar) = 269033
-SHA256 (signal-service-java-2.15.3_unofficial_10.jar) = cea5aede3bc910135497dd4a99cf844a672f2aafe704bf04da77f434a81c267b
-SIZE (signal-service-java-2.15.3_unofficial_10.jar) = 1337431
+SHA256 (signal-service-java-2.15.3_unofficial_14.jar) = 37b0f71683c82a3dcc0fc65f6104cfb99bc1b9118f6a9b4f156a9ff63e70f5b2
+SIZE (signal-service-java-2.15.3_unofficial_14.jar) = 1500748
SHA256 (slf4j-api-1.7.30.jar) = cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57
SIZE (slf4j-api-1.7.30.jar) = 41472
SHA256 (slf4j-nop-1.7.30.jar) = 2d550dcefaea23d223b72027dbc7cbdb7327676ccefdd9cfe49cf9ea8e9ac8e0
@@ -71,5 +71,5 @@ SHA256 (zkgroup-java-0.7.0.jar) = d0099eedd60d6f7d4df5
SIZE (zkgroup-java-0.7.0.jar) = 316995
SHA256 (jffi-1.2.23-native.jar) = 38cd5c33c4310d173b9345348e3a09528051b8e67f00e8477140c45062034a25
SIZE (jffi-1.2.23-native.jar) = 795222
-SHA256 (AsamK-signal-cli-v0.6.8_GH0.tar.gz) = 43463155418d47f11fcffc3b9231ab3f6296aee35b8c1ae0d7744822a124de37
-SIZE (AsamK-signal-cli-v0.6.8_GH0.tar.gz) = 134436
+SHA256 (AsamK-signal-cli-v0.6.10_GH0.tar.gz) = 9e12eb21228b83d26b2909774cc6decaa69e8ef3ff6b2da720c7718ec72dfbd7
+SIZE (AsamK-signal-cli-v0.6.10_GH0.tar.gz) = 138293
Modified: head/net-im/signal-cli/pkg-plist
==============================================================================
--- head/net-im/signal-cli/pkg-plist Wed Sep 16 10:35:43 2020 (r548777)
+++ head/net-im/signal-cli/pkg-plist Wed Sep 16 11:06:45 2020 (r548778)
@@ -8,15 +8,15 @@ share/man/man1/signal-cli.1.gz
%%DATADIR%%/lib/asm-commons-7.1.jar
%%DATADIR%%/lib/asm-tree-7.1.jar
%%DATADIR%%/lib/asm-util-7.1.jar
-%%DATADIR%%/lib/bcprov-jdk15on-1.65.jar
+%%DATADIR%%/lib/bcprov-jdk15on-1.66.jar
%%DATADIR%%/lib/curve25519-java-0.5.0.jar
-%%DATADIR%%/lib/dbus-java-3.2.2.jar
+%%DATADIR%%/lib/dbus-java-3.2.3.jar
%%DATADIR%%/lib/jackson-annotations-2.9.0.jar
%%DATADIR%%/lib/jackson-core-2.9.9.jar
%%DATADIR%%/lib/jackson-databind-2.9.9.2.jar
%%DATADIR%%/lib/java-utils-1.0.6.jar
-%%DATADIR%%/lib/jffi-1.2.23.jar
%%DATADIR%%/lib/jffi-1.2.23-native.jar
+%%DATADIR%%/lib/jffi-1.2.23.jar
%%DATADIR%%/lib/jnr-a64asm-1.0.0.jar
%%DATADIR%%/lib/jnr-constants-0.9.15.jar
%%DATADIR%%/lib/jnr-enxio-0.28.jar
@@ -26,14 +26,14 @@ share/man/man1/signal-cli.1.gz
%%DATADIR%%/lib/jnr-x86asm-1.0.2.jar
%%DATADIR%%/lib/kotlin-stdlib-1.3.71.jar
%%DATADIR%%/lib/kotlin-stdlib-common-1.3.71.jar
-%%DATADIR%%/lib/libphonenumber-8.11.0.jar
+%%DATADIR%%/lib/libphonenumber-8.12.6.jar
%%DATADIR%%/lib/okhttp-4.6.0.jar
%%DATADIR%%/lib/okio-2.6.0.jar
%%DATADIR%%/lib/protobuf-javalite-3.10.0.jar
-%%DATADIR%%/lib/signal-cli-0.6.8.jar
+%%DATADIR%%/lib/signal-cli-0.6.10.jar
%%DATADIR%%/lib/signal-metadata-java-0.1.2.jar
%%DATADIR%%/lib/signal-protocol-java-2.8.1.jar
-%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_10.jar
+%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_14.jar
%%DATADIR%%/lib/slf4j-api-1.7.30.jar
%%DATADIR%%/lib/slf4j-nop-1.7.30.jar
%%DATADIR%%/lib/threetenbp-1.3.6.jar
More information about the svn-ports-head
mailing list