diff options
Diffstat (limited to 'net-im/signald/files')
| -rw-r--r-- | net-im/signald/files/patch-build.gradle | 82 | ||||
| -rw-r--r-- | net-im/signald/files/patch-src_main_java_io_finn_signald_db_RecipientsTable.java | 19 | ||||
| -rw-r--r-- | net-im/signald/files/signald.7.in | 142 | ||||
| -rw-r--r-- | net-im/signald/files/signald.in | 71 |
4 files changed, 0 insertions, 314 deletions
diff --git a/net-im/signald/files/patch-build.gradle b/net-im/signald/files/patch-build.gradle deleted file mode 100644 index 480b26a8de87..000000000000 --- a/net-im/signald/files/patch-build.gradle +++ /dev/null @@ -1,82 +0,0 @@ ---- build.gradle.orig 2021-10-02 23:08:05 UTC -+++ build.gradle -@@ -20,10 +20,13 @@ import org.gradle.nativeplatform.platform.internal.Ope - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.xml.sax.SAXParseException - --plugins { -- id 'de.fuerstenau.buildconfig' version '1.1.8' -+buildscript { -+ dependencies { -+ classpath files ("../jars/BuildConfigPlugin-1.1.8.jar") -+ } - } - -+apply plugin: 'de.fuerstenau.buildconfig' - apply plugin: 'java' - apply plugin: 'application' - apply plugin: 'idea' -@@ -86,10 +89,18 @@ static String getTarget() { - return target - } - -+ - repositories { -- maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -- maven {url "https://plugins.gradle.org/m2/"} -- mavenCentral() -+ ivy { -+ url "../jars" -+ metadataSources { -+ artifact() -+ } -+ patternLayout { -+ artifact "[artifact]-[revision](-[classifier]).[ext]" -+ artifact "[artifact].[ext]" -+ } -+ } - } - - sourceSets { -@@ -109,21 +120,37 @@ configurations { - } - - dependencies { -- 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' -- implementation 'org.apache.logging.log4j:log4j-api:2.14.0' -- implementation 'org.apache.logging.log4j:log4j-core:2.14.0' -+ implementation 'org.apache.logging.log4j:log4j-api:2.17.0' -+ implementation 'org.apache.logging.log4j:log4j-core:2.17.0' - implementation 'org.slf4j:slf4j-nop:1.8.0-beta4' -+ implementation 'org.slf4j:slf4j-api:1.8.0-beta4' - implementation 'info.picocli:picocli:4.5.2' -- implementation 'org.xerial:sqlite-jdbc:3.34.0' -+ implementation files('sqlitejdbc-native.jar') -+ 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.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 '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.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 deleted file mode 100644 index 016d5bb4aa71..000000000000 --- a/net-im/signald/files/patch-src_main_java_io_finn_signald_db_RecipientsTable.java +++ /dev/null @@ -1,19 +0,0 @@ ---- 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/files/signald.7.in b/net-im/signald/files/signald.7.in deleted file mode 100644 index fe7607c23ab0..000000000000 --- a/net-im/signald/files/signald.7.in +++ /dev/null @@ -1,142 +0,0 @@ -.\" -.\" Copyright (c) 2021 Michael Gmelin -.\" -.\" All rights reserved. -.\" -.\" 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 DEVELOPERS ``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 DEVELOPERS 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. -.\" -.Dd August 28, 2021 -.Dt SIGNALD 7 -.Os -.Sh NAME -.Nm %%PKGBASE%% -.Nd Daemon to facilitate communication via Signal Private Messenger -.Sh SYNOPSIS -.Nm pkg install %%PKGBASE%% -.Sh DESCRIPTION -.Em Signald -is an unofficial utility for interacting with Signal. -It is a Java based daemon that is running in the background and is -communicated to over a socket. -.Pp -This man page documents how the -.Fx -port is installed and how to get started. -It assumes that the %%PKGBASE%% package was already installed, -e.g., from the -.Fx -package repo as described in -.Sx SYNOPSIS . -.Sh GETTING STARTED -To enable and start the service, run as root -.Bd -literal -offset indent -service %%PKGBASE%% enable -service %%PKGBASE%% start -.Ed -.Pp -Check log output: -.Bd -literal -offset indent -cat /var/log/%%PKGBASE%%/%%PKGBASE%%.log -.Ed -.Pp -Install signaldctl, a command line tool that allows interacting with -the service: -.Bd -literal -offset indent -pkg install go -go install gitlab.com/signald/signald-go/cmd/signaldctl@latest -.Ed -.Sh LINKING A DEVICE -To link an existing device (phone), first enter -.Bd -literal -offset indent -~/go/bin/signaldctl account link -.Ed -.Pp -then do "Select Linked Devices -> Link New Device" -in the Signal smartphone app's menu and scan the QR code shown -on your terminal. -.Sh REGISTERING A DEVICE -.Em WARNING : -This disconnects other devices using the same MSISDN. -.Bl -bullet -compact -.It -Open your web browser and enable developer mode -.It -Go to -.Lk https://signalcaptchas.org/registration/generate.html -.It -Solve the captcha -.It -Depending on your browser you are redirected to a URL starting -with "signalcaptcha://" or it can be seen in the web developer -console - everything after "//" is the captcha. -.El -.Pp -Register your device using the captcha copied above: -.Bd -literal -offset indent -~/go/bin/signaldctl account register [msisdn] --captcha [captcha] -.Ed -.Pp -.Em msisdn -is your full mobile phone number with country code, e.g., +123456789. -.Pp -You will receive a text message containing a verification code on the -MSISDN specified in the registration call above. -Use this verification code -.Bd -literal -offset indent -~/go/bin/signaldctl account verify [msisdn] [code] -.Ed -.Pp -to complete the registration. -.Sh SENDING A MESSAGE -Use this command to send a message -.Bd -literal -offset indent -~/go/bin/signaldctl message send -a [msisdn_from] [msisdn_to] [msg] -.Ed -.Pp -You can also send a message to yourself when using a linked device, -which will show up in "Note to Self", but not cause a notification, -e.g., -.Bd -literal -offset indent -~/go/bin/signaldctl message send -a +123456789 +123456789 "Beep beep" -.Ed -.Sh FILES -.Bl -tag -width ".Pa /var/run/signald/signald.sock" -compact -.It Pa /var/db/signald -Signald database. -.It Pa /var/log/signald/signald.log -Signald log output. -.It Pa /var/run/signald/signald.sock -Socket to communicate with signald, -.Em world writable . -.El -.Sh SEE ALSO -.Xr ports 7 , -.Xr daemon 8 , -.Xr service 8 -.Pp -.Rs -.%B "Signald project website" -.%U https://signald.org -.Re -.Sh AUTHORS -.An -nosplit -This manual page was written by -.An Michael Gmelin Aq Mt grembo@FreeBSD.org . diff --git a/net-im/signald/files/signald.in b/net-im/signald/files/signald.in deleted file mode 100644 index 308a645d696d..000000000000 --- a/net-im/signald/files/signald.in +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh - - -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2021 Michael Gmelin <grembo@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. - -# PROVIDE: signald -# REQUIRE: DAEMON LOGIN NETWORKING - -. /etc/rc.subr - -name='signald' -rcvar='signald_enable' - -# User-facing settings and their default values. - -: ${signald_enable:="NO"} -: ${signald_user:="signal-cli"} -: ${signald_group:="signal-cli"} -: ${signald_data_dir:="/var/db/signald"} -: ${signald_env:="JAVA_HOME=%%JAVA_HOME%%"} - -pidfile="/var/run/${name}/${name}.pid" -procname="%%JAVA_HOME%%/bin/java" - -_daemon_args="-p ${pidfile} -o /var/log/${name}/${name}.log" -_signald="%%DATADIR%%/bin/${name}" -_signald_args="-d ${signald_data_dir}" -command="/usr/sbin/daemon" -command_args="${_daemon_args} ${_signald} ${_signald_args}" - -start_precmd="signald_prestart" - -signald_prestart() { - if ! install -d -o "${signald_user}" -g "${signald_group}" -m 700 \ - "${signald_data_dir}"; then - err 1 "Failed to create data directory \"${signald_data_dir}\"" - fi - if ! install -d -o "${signald_user}" -g "${signald_group}" -m 755 \ - "/var/run/${name}"; then - err 1 "Failed to create run directory \"/var/run/${name}\"" - fi - if ! install -d -o "${signald_user}" -g "${signald_group}" -m 755 \ - "/var/log/${name}"; then - err 1 "Failed to create log directory \"/var/log/${name}\"" - fi -} - -load_rc_config "$name" -run_rc_command "$@" |