diff options
Diffstat (limited to 'net-im/signal-cli')
| -rw-r--r-- | net-im/signal-cli/Makefile | 20 | ||||
| -rw-r--r-- | net-im/signal-cli/distinfo | 10 | ||||
| -rw-r--r-- | net-im/signal-cli/files/signal_cli.in | 51 | ||||
| -rw-r--r-- | net-im/signal-cli/pkg-plist | 62 |
4 files changed, 57 insertions, 86 deletions
diff --git a/net-im/signal-cli/Makefile b/net-im/signal-cli/Makefile index 142a5e8d4c86..e5f82183f6df 100644 --- a/net-im/signal-cli/Makefile +++ b/net-im/signal-cli/Makefile @@ -1,13 +1,12 @@ PORTNAME= signal-cli DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 -PORTREVISION= 1 +DISTVERSION= 0.13.20 PORTEPOCH= 1 CATEGORIES= net-im java MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:jars DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:jars -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jaap.aarts1@gmail.com COMMENT= Command-line and D-Bus interface for Signal and libsignal-service-java WWW= https://github.com/AsamK/signal-cli @@ -16,15 +15,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE EXTRACT_DEPENDS= zip:archivers/zip BUILD_DEPENDS= asciidoc>0:textproc/asciidoc -LIB_DEPENDS= libsignal_jni.so:net-im/libsignal-client \ - libzkgroup.so:net-im/zkgroup -RUN_DEPENDS= libsignal-client>=0.9.0:net-im/libsignal-client +LIB_DEPENDS= libsignal_jni.so:net-im/libsignal TEST_DEPENDS= qrencode:graphics/libqrencode USES= gmake java shebangfix USE_GITHUB= yes GH_ACCOUNT= AsamK -JAVA_VERSION= 11+ +JAVA_VERSION= 21+ USE_RC_SUBR= signal_cli SHEBANG_FILES= bin/${PORTNAME} SHEBANG_LANG= sh @@ -52,10 +49,9 @@ DBUS_PLIST_FILES= etc/dbus-1/system.d/org.asamk.Signal.conf \ share/dbus-1/services/org.asamk.Signal.service post-extract: -# Delete bundled libraries from the JARs. Otherwise, they are going to conflict -# with the libraries installed by net-im/zkgroup and net-im/libsignal-client. - zip -d ${WRKSRC}/lib/zkgroup-java-*.jar libzkgroup.so - zip -d ${WRKSRC}/lib/signal-client-java-*.jar libsignal_jni.so +# Delete bundled library from the JARs. Otherwise, they are going to conflict +# with the library installed by net-im/libsignal. + zip -d ${WRKSRC}/lib/libsignal-client-*.jar libsignal_jni_amd64.so do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/bin @@ -86,7 +82,7 @@ pre-test: do-test: ${SETENV} ${TEST_ENV} ${STAGEDIR}${DATADIR}/bin/signal-cli \ link --name "${PORTNAME} test $$(date)" | \ - xargs -n 1 qrencode -t ANSI256 + ${XARGS} -n 1 qrencode -t ANSI256 ${SETENV} ${TEST_ENV} ${STAGEDIR}${DATADIR}/bin/signal-cli \ send --message "${PORTNAME} test $$(date)" \ "${_TEST_SIGNAL_CLI_USERNAME}" diff --git a/net-im/signal-cli/distinfo b/net-im/signal-cli/distinfo index 497ae4e788de..4d8a6454a814 100644 --- a/net-im/signal-cli/distinfo +++ b/net-im/signal-cli/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1633414747 -SHA256 (signal-cli-0.9.0.tar.gz) = c24f2493e3c6d27c36384ee671c1a33f8df9484cad4ad472d6e9f183a12a3fff -SIZE (signal-cli-0.9.0.tar.gz) = 22700633 -SHA256 (AsamK-signal-cli-v0.9.0_GH0.tar.gz) = d2d4d8e98da81162df4debd1c0c47d6fddc61a1b53b4ce48e7be8487155e1c03 -SIZE (AsamK-signal-cli-v0.9.0_GH0.tar.gz) = 241098 +TIMESTAMP = 1760450722 +SHA256 (signal-cli-0.13.20.tar.gz) = 305811d9cf978738313ba8efededf4ad37fb6d155ae60c67cd538b9de997618f +SIZE (signal-cli-0.13.20.tar.gz) = 89762349 +SHA256 (AsamK-signal-cli-v0.13.20_GH0.tar.gz) = 7dd652c793f03b3231a01122b6438992b65656a640127f60eb48c0e908805448 +SIZE (AsamK-signal-cli-v0.13.20_GH0.tar.gz) = 447245 diff --git a/net-im/signal-cli/files/signal_cli.in b/net-im/signal-cli/files/signal_cli.in index cab51212c20e..2cd4da199c4d 100644 --- a/net-im/signal-cli/files/signal_cli.in +++ b/net-im/signal-cli/files/signal_cli.in @@ -1,42 +1,17 @@ -#! /bin/sh - - -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2020 Mateusz Piotrowski <0mp@FreeBSD.org> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. +#!/bin/sh # PROVIDE: signal_cli # REQUIRE: DAEMON LOGIN NETWORKING dbus . /etc/rc.subr -name='signal_cli' -rcvar='signal_cli_enable' +name=signal_cli +rcvar=signal_cli_enable # User-facing settings and their default values. -: "${signal_cli_enable:=NO}" -: "${signal_cli_phone_number}" # No default value. Kept here for consistency. -: "${signal_cli_config_dir:="/var/lib/signal-cli"}" +: ${signal_cli_enable:=NO} +: ${signal_cli_phone_number} # No default value. Kept here for consistency. +: ${signal_cli_config_dir:=/var/lib/signal-cli} pidfile="/var/run/signal_cli.pid" procname="%%JAVA_HOME%%/bin/java" @@ -53,28 +28,32 @@ extra_commands="runcli" start_precmd="signal_cli_prestart" runcli_cmd="signal_cli_runcli" -signal_cli_create_config_dir() { +signal_cli_create_config_dir() +{ if ! install -d -o signal-cli -g signal-cli -m 700 "${signal_cli_config_dir}"; then err 1 "Failed to create a config directory at \"${signal_cli_create_config_dir}\"" fi } -signal_cli_prestart() { +signal_cli_prestart() +{ if [ -z "${signal_cli_phone_number}" ]; then err 1 "Phone number not provided; please set signal_cli_phone_number" fi signal_cli_create_config_dir } -signal_cli_preconfigure() { +signal_cli_preconfigure() +{ signal_cli_create_config_dir } # The "runcli" command can be used to run any signal-cli command (for example # "link -n DEVICENAME") from the environment of the service. -signal_cli_runcli() { +signal_cli_runcli() +{ chroot -u signal-cli / ${_signal_cli} "$@" } -load_rc_config "$name" +load_rc_config ${name} run_rc_command "$@" diff --git a/net-im/signal-cli/pkg-plist b/net-im/signal-cli/pkg-plist index 75f5ed8e909b..07ccef46c840 100644 --- a/net-im/signal-cli/pkg-plist +++ b/net-im/signal-cli/pkg-plist @@ -1,40 +1,36 @@ bin/signal-cli share/man/man1/signal-cli.1.gz %%DATADIR%%/bin/signal-cli -%%DATADIR%%/lib/annotations-13.0.jar +%%DATADIR%%/lib/HikariCP-7.0.2.jar +%%DATADIR%%/lib/annotations-23.0.0.jar %%DATADIR%%/lib/argparse4j-0.9.0.jar -%%DATADIR%%/lib/asm-9.0.jar -%%DATADIR%%/lib/asm-analysis-9.0.jar -%%DATADIR%%/lib/asm-commons-9.0.jar -%%DATADIR%%/lib/asm-tree-9.0.jar -%%DATADIR%%/lib/asm-util-9.0.jar -%%DATADIR%%/lib/bcprov-jdk15on-1.69.jar -%%DATADIR%%/lib/dbus-java-3.3.0.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/jffi-1.3.1-native.jar -%%DATADIR%%/lib/jffi-1.3.1.jar -%%DATADIR%%/lib/jnr-a64asm-1.0.0.jar -%%DATADIR%%/lib/jnr-constants-0.10.1.jar -%%DATADIR%%/lib/jnr-enxio-0.32.3.jar -%%DATADIR%%/lib/jnr-ffi-2.2.1.jar -%%DATADIR%%/lib/jnr-posix-3.1.4.jar -%%DATADIR%%/lib/jnr-unixsocket-0.38.5.jar -%%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/lib.jar -%%DATADIR%%/lib/libphonenumber-8.12.17.jar -%%DATADIR%%/lib/okhttp-4.6.0.jar -%%DATADIR%%/lib/okio-jvm-2.6.0.jar -%%DATADIR%%/lib/protobuf-javalite-3.10.0.jar +%%DATADIR%%/lib/bcprov-jdk18on-1.81.jar +%%DATADIR%%/lib/core-util-jvm-2.15.3_unofficial_130.jar +%%DATADIR%%/lib/dbus-java-core-5.0.0.jar +%%DATADIR%%/lib/dbus-java-transport-native-unixsocket-5.0.0.jar +%%DATADIR%%/lib/jackson-annotations-2.20.jar +%%DATADIR%%/lib/jackson-core-2.20.0.jar +%%DATADIR%%/lib/jackson-databind-2.20.0.jar +%%DATADIR%%/lib/jackson-module-kotlin-2.20.0.jar +%%DATADIR%%/lib/jsr305-3.0.2.jar +%%DATADIR%%/lib/jul-to-slf4j-2.0.17.jar +%%DATADIR%%/lib/kotlin-reflect-2.1.0.jar +%%DATADIR%%/lib/kotlin-stdlib-2.1.21.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk7-2.1.0.jar +%%DATADIR%%/lib/kotlin-stdlib-jdk8-2.1.0.jar +%%DATADIR%%/lib/kotlinx-coroutines-core-jvm-1.10.2.jar +%%DATADIR%%/lib/libphonenumber-8.13.50.jar +%%DATADIR%%/lib/libsignal-cli-%%VERSION%%.jar +%%DATADIR%%/lib/libsignal-client-0.81.0.jar +%%DATADIR%%/lib/logback-classic-1.5.18.jar +%%DATADIR%%/lib/logback-core-1.5.18.jar +%%DATADIR%%/lib/okhttp-jvm-5.0.0-alpha.16.jar +%%DATADIR%%/lib/okio-jvm-3.13.0.jar %%DATADIR%%/lib/reactive-streams-1.0.3.jar %%DATADIR%%/lib/rxjava-3.0.13.jar +%%DATADIR%%/lib/rxkotlin-3.0.1.jar %%DATADIR%%/lib/signal-cli-%%VERSION%%.jar -%%DATADIR%%/lib/signal-client-java-%%VERSION%%.jar -%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_27.jar -%%DATADIR%%/lib/slf4j-api-1.7.30.jar -%%DATADIR%%/lib/slf4j-simple-1.7.30.jar -%%DATADIR%%/lib/threetenbp-1.3.6.jar -%%DATADIR%%/lib/zkgroup-java-0.7.0.jar +%%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_130.jar +%%DATADIR%%/lib/slf4j-api-2.0.17.jar +%%DATADIR%%/lib/sqlite-jdbc-3.50.3.0.jar +%%DATADIR%%/lib/wire-runtime-jvm-4.4.3.jar |