Re: signal-cli not working anymore (help porting)

Rodrigo Osorio Tue, 12 Dec 2023 14:14:04 -0800

Hi Andrea,

Find attached the quick patch if you wanna build it on your own.
I also put a pre-build package for 14.0 amd64 in my space

https://people.freebsd.org/~rodrigo/signal-cli-0.12.6%2C1-FreeBSD14-amd64.pkg


Feel free to test it.

On 12/12/23 19:20, Rodrigo Osorio wrote:

Hi Andrea,
I did the libsignal-client port upgrade who build on poudriere but hasto be testedCan you git it a try and tell how it works ? I can send you a pach ora pre-build

I mean get not git 😛

package if you let me know your FreeBSD version and arch.

Regards
-- Rodrigo

On 12/12/23 14:29, Andrea Venturoli wrote:
On 12/9/23 12:27, Andrea Venturoli wrote:
Has anyone tried working on updating it?
If so, what are the problems blocking such an update?
Well, no one answered, so I'm giving it a try in my spare time.
I started upgrading net-im/libsignal-client, but I already came to ashowstopper (probably because I know close to nothing about rust :( ).
I've followed the Porters' Handbook on the make makesum/makecargo-crates/make makesum instructions.
However, the port build fails with:
Running`/usr/ports/net-im/libsignal-client/work/target/release/build/boring-sys-0dffa970497cad40/build-script-build`
[boring-sys 2.1.0] cargo:rerun-if-env-changed=BORING_BSSL_PATH
[boring-sys 2.1.0] cargo:warning=fetching boringssl git submodule
[boring-sys 2.1.0] error: pathspec 'deps/boringssl' did not matchany file(s) known to git[boring-sys 2.1.0] thread 'main' panicked at 'failed to fetchsubmodule - consider running `git submodule update --init--recursive deps/boringssl` yourself',/usr/ports/net-im/libsignal-client/work/boring-3809a7e1ca2f60a9495620da514f8432f148cde7/boring-sys/build.rs:447:17
[boring-sys 2.1.0] stack backtrace:
[boring-sys 2.1.0]    0: std::panicking::begin_panic
[boring-sys 2.1.0]    1: build_script_build::main::{{closure}}
[boring-sys 2.1.0]    2: core::result::Result<T,E>::unwrap_or_else
[boring-sys 2.1.0]    3: build_script_build::main
[boring-sys 2.1.0]    4: core::ops::function::FnOnce::call_once
[boring-sys 2.1.0] note: Some details are omitted, run with`RUST_BACKTRACE=full` for a verbose backtrace.
The following warnings were emitted during compilation:

warning: fetching boringssl git submodule
error: failed to run custom build command for `boring-sys v2.1.0(/usr/ports/net-im/libsignal-client/work/boring-3809a7e1ca2f60a9495620da514f8432f148cde7/boring-sys)`note: To improve backtraces for build dependencies, set theCARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG=true environment variableto enable debug information generation.
Caused by:
process didn't exit successfully:`/usr/ports/net-im/libsignal-client/work/target/release/build/boring-sys-0dffa970497cad40/build-script-build`(exit status: 101)
  --- stdout
  cargo:rerun-if-env-changed=BORING_BSSL_PATH
  cargo:warning=fetching boringssl git submodule

  --- stderr
error: pathspec 'deps/boringssl' did not match any file(s) knownto git thread 'main' panicked at 'failed to fetch submodule - considerrunning `git submodule update --init --recursive deps/boringssl`yourself',/usr/ports/net-im/libsignal-client/work/boring-3809a7e1ca2f60a9495620da514f8432f148cde7/boring-sys/build.rs:447:17
  stack backtrace:
     0: std::panicking::begin_panic
     1: build_script_build::main::{{closure}}
     2: core::result::Result<T,E>::unwrap_or_else
     3: build_script_build::main
     4: core::ops::function::FnOnce::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` fora verbose backtrace.
*** Error code 101

Stop.
I guess this is because of the following in Cargo.toml:
# Use our fork of curve25519-dalek for zkgroup support.
curve25519-dalek = { git ='https://github.com/signalapp/curve25519-dalek', tag ='signal-curve25519-4.0.0' }boring = { git = 'https://github.com/signalapp/boring', branch ='libsignal' }
I tried playing with CARGO_USE_GITHUB=yes & Co., but I got up tonothing.
Any hint is appreciated.

 bye & Thanks
    av.

diff --git a/net-im/signal-cli/Makefile b/net-im/signal-cli/Makefile
index a17df448d11e..c6a3915b934c 100644
--- a/net-im/signal-cli/Makefile
+++ b/net-im/signal-cli/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	signal-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.0
-PORTREVISION=	1
+DISTVERSION=	0.12.6
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:jars
@@ -25,7 +24,7 @@ USES=		gmake shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	AsamK
 USE_JAVA=	yes
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
 JAVA_RUN=	jre
 USE_RC_SUBR=	signal_cli
 SHEBANG_FILES=	bin/${PORTNAME}
@@ -53,11 +52,10 @@ DBUS_RUN_DEPENDS=	dbus>0:devel/dbus
 DBUS_PLIST_FILES=	etc/dbus-1/system.d/org.asamk.Signal.conf \
 			share/dbus-1/services/org.asamk.Signal.service
 
-post-extract:
+#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
+#	zip -d ${WRKSRC}/lib/zkgroup-java-*.jar libzkgroup.so #	zip -d ${WRKSRC}/lib/signal-client-java-*.jar libsignal_jni.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
diff --git a/net-im/signal-cli/distinfo b/net-im/signal-cli/distinfo
index 497ae4e788de..95a4bf26824d 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 = 1702329671
+SHA256 (signal-cli-0.12.6.tar.gz) = 61bb1ef97ed0973a3d3e98d8a4b2a9faed7212dcde3e11d8f0d61a65e87816c6
+SIZE (signal-cli-0.12.6.tar.gz) = 47742371
+SHA256 (AsamK-signal-cli-v0.12.6_GH0.tar.gz) = 0a178628783bc5da3d196280814dfdcf98a6c236ee96ce61d73e955e81913d86
+SIZE (AsamK-signal-cli-v0.12.6_GH0.tar.gz) = 406702
diff --git a/net-im/signal-cli/pkg-plist b/net-im/signal-cli/pkg-plist
index 75f5ed8e909b..97f49ade6f7b 100644
--- a/net-im/signal-cli/pkg-plist
+++ b/net-im/signal-cli/pkg-plist
@@ -3,38 +3,33 @@ share/man/man1/signal-cli.1.gz
 %%DATADIR%%/bin/signal-cli
 %%DATADIR%%/lib/annotations-13.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/HikariCP-5.1.0.jar
+%%DATADIR%%/lib/bcprov-jdk18on-1.77.jar
+%%DATADIR%%/lib/core-util-jvm-2.15.3_unofficial_88.jar
+%%DATADIR%%/lib/dbus-java-core-4.3.1.jar
+%%DATADIR%%/lib/dbus-java-transport-native-unixsocket-4.3.1.jar
+%%DATADIR%%/lib/jackson-annotations-2.16.0.jar
+%%DATADIR%%/lib/jackson-core-2.16.0.jar
+%%DATADIR%%/lib/jackson-databind-2.16.0.jar
+%%DATADIR%%/lib/jackson-module-kotlin-2.16.0.jar
+%%DATADIR%%/lib/jsr305-3.0.2.jar
+%%DATADIR%%/lib/jul-to-slf4j-2.0.9.jar
+%%DATADIR%%/lib/kotlin-reflect-1.6.21.jar
+%%DATADIR%%/lib/kotlin-stdlib-1.9.10.jar
+%%DATADIR%%/lib/kotlin-stdlib-common-1.9.10.jar
+%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.9.10.jar
+%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.9.10.jar
+%%DATADIR%%/lib/libphonenumber-8.13.23.jar
+%%DATADIR%%/lib/libsignal-client-0.32.1.jar
+%%DATADIR%%/lib/logback-classic-1.4.11.jar
+%%DATADIR%%/lib/logback-core-1.4.11.jar
+%%DATADIR%%/lib/okhttp-4.11.0.jar
+%%DATADIR%%/lib/okio-jvm-3.6.0.jar
 %%DATADIR%%/lib/reactive-streams-1.0.3.jar
 %%DATADIR%%/lib/rxjava-3.0.13.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_88.jar
+%%DATADIR%%/lib/slf4j-api-2.0.9.jar
+%%DATADIR%%/lib/sqlite-jdbc-3.44.0.0.jar
+%%DATADIR%%/lib/wire-runtime-jvm-4.4.3.jar

Re: signal-cli not working anymore (help porting)

Reply via email to