git: 75cdbe28f7fd - main - net-im/gurk-rs: update to 0.6.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Sun, 16 Mar 2025 10:20:26 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=75cdbe28f7fd17d23ada5b730a39afe7aa3cc7e1

commit 75cdbe28f7fd17d23ada5b730a39afe7aa3cc7e1
Author:     Herbert J. Skuhra <herbert@gojira.at>
AuthorDate: 2025-02-27 11:26:30 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-03-16 10:19:26 +0000

    net-im/gurk-rs: update to 0.6.1
    
     - unbundle openssl-src
     - now depends on databases/sqlcipher
    
    Changelog: https://github.com/boxdot/gurk-rs/releases/tag/v0.6.1
    
    PR:             284248
---
 net-im/gurk-rs/Makefile               |  6 +++---
 net-im/gurk-rs/Makefile.crates        |  7 +++----
 net-im/gurk-rs/distinfo               | 16 +++++++---------
 net-im/gurk-rs/files/patch-Cargo.toml | 11 ++++++++++-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/net-im/gurk-rs/Makefile b/net-im/gurk-rs/Makefile
index e44450af7d38..19a915afcee1 100644
--- a/net-im/gurk-rs/Makefile
+++ b/net-im/gurk-rs/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gurk-rs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
-PORTREVISION=	2
+DISTVERSION=	0.6.1
 CATEGORIES=	net-im
 
 MAINTAINER=	bsd@orsolic.org
@@ -13,8 +12,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE-AGPL-3.0
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		protoc:devel/protobuf
+LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher
 
-USES=		cargo perl5
+USES=		cargo perl5 ssl
 USE_PERL5=	build
 
 USE_GITHUB=	yes
diff --git a/net-im/gurk-rs/Makefile.crates b/net-im/gurk-rs/Makefile.crates
index 5e7c9c8bce95..cdd142f42089 100644
--- a/net-im/gurk-rs/Makefile.crates
+++ b/net-im/gurk-rs/Makefile.crates
@@ -285,7 +285,6 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		oorandom-11.1.4 \
 		opaque-debug-0.3.1 \
 		opener-0.7.2 \
-		openssl-src-300.4.1+3.4.0 \
 		openssl-sys-0.9.104 \
 		option-ext-0.2.0 \
 		ordered-stream-0.2.0 \
@@ -573,7 +572,7 @@ CARGO_CRATES=	addr2line-0.24.2 \
 		zvariant-4.2.0 \
 		zvariant_derive-4.2.0 \
 		zvariant_utils-2.1.0 \
-		libsignal-service@git+https://github.com/whisperfish/libsignal-service-rs?rev=268e0c47e0924597b6379e6f1b5df58abd46d5ca\#268e0c47e0924597b6379e6f1b5df58abd46d5ca \
 		curve25519-dalek,curve25519-dalek-derive@git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3\#7c6d34756355a3566a704da84dce7b1c039a6572 \
-		presage,presage-store-cipher,presage-store-sled@git+https://github.com/whisperfish/presage?rev=8b9af8ee4758c73550024bea8c715a893e9e4e47\#8b9af8ee4758c73550024bea8c715a893e9e4e47 \
-		libsignal-core,libsignal-protocol,poksho,signal-crypto,zkcredential,zkgroup@git+https://github.com/signalapp/libsignal?tag=v0.56.1\#e46841ea2c1ad03bc5113eba267ac1543689d031
+		presage,presage-store-cipher,presage-store-sled@git+https://github.com/whisperfish/presage?rev=35c2c98ba782fb212ad6cd3356fd4807e5d5a8eb\#35c2c98ba782fb212ad6cd3356fd4807e5d5a8eb \
+		libsignal-core,libsignal-protocol,poksho,signal-crypto,zkcredential,zkgroup@git+https://github.com/signalapp/libsignal?tag=v0.56.1\#e46841ea2c1ad03bc5113eba267ac1543689d031 \
+		libsignal-service@git+https://github.com/whisperfish/libsignal-service-rs?rev=19c0c78da7a7479954634580a5e5081e7a8f2897\#19c0c78da7a7479954634580a5e5081e7a8f2897
diff --git a/net-im/gurk-rs/distinfo b/net-im/gurk-rs/distinfo
index 6307af9fc271..4400055a9007 100644
--- a/net-im/gurk-rs/distinfo
+++ b/net-im/gurk-rs/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1736672954
+TIMESTAMP = 1737491554
 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1
 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015
 SHA256 (rust/crates/adler2-2.0.0.crate) = 512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627
@@ -573,8 +573,6 @@ SHA256 (rust/crates/opaque-debug-0.3.1.crate) = c08d65885ee38876c4f86fa503fb49d7
 SIZE (rust/crates/opaque-debug-0.3.1.crate) = 7066
 SHA256 (rust/crates/opener-0.7.2.crate) = d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681
 SIZE (rust/crates/opener-0.7.2.crate) = 19229
-SHA256 (rust/crates/openssl-src-300.4.1+3.4.0.crate) = faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c
-SIZE (rust/crates/openssl-src-300.4.1+3.4.0.crate) = 9945831
 SHA256 (rust/crates/openssl-sys-0.9.104.crate) = 45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741
 SIZE (rust/crates/openssl-sys-0.9.104.crate) = 72287
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
@@ -1149,13 +1147,13 @@ SHA256 (rust/crates/zvariant_derive-4.2.0.crate) = 73e2ba546bda683a90652bac4a279
 SIZE (rust/crates/zvariant_derive-4.2.0.crate) = 11057
 SHA256 (rust/crates/zvariant_utils-2.1.0.crate) = c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340
 SIZE (rust/crates/zvariant_utils-2.1.0.crate) = 7043
-SHA256 (whisperfish-libsignal-service-rs-268e0c47e0924597b6379e6f1b5df58abd46d5ca_GH0.tar.gz) = e7fe26250e2a16271520535aa12c97a942bfa0b26c61dae1a865b321d0761b4d
-SIZE (whisperfish-libsignal-service-rs-268e0c47e0924597b6379e6f1b5df58abd46d5ca_GH0.tar.gz) = 98916
 SHA256 (signalapp-curve25519-dalek-signal-curve25519-4.1.3_GH0.tar.gz) = 8dd338dd7d558b7882310e8dc76ceca41ef448afd0532be208d4ff0f2924f334
 SIZE (signalapp-curve25519-dalek-signal-curve25519-4.1.3_GH0.tar.gz) = 808022
-SHA256 (whisperfish-presage-8b9af8ee4758c73550024bea8c715a893e9e4e47_GH0.tar.gz) = 062c55f7d1bd48a921af164e49cedf23990f359ac671c838aa297e046b4d6a50
-SIZE (whisperfish-presage-8b9af8ee4758c73550024bea8c715a893e9e4e47_GH0.tar.gz) = 68156
+SHA256 (whisperfish-presage-35c2c98ba782fb212ad6cd3356fd4807e5d5a8eb_GH0.tar.gz) = 304bb1ad86889f7198ba9e2f0862f0c86a0e357ed0deec86307a02bfa7773a50
+SIZE (whisperfish-presage-35c2c98ba782fb212ad6cd3356fd4807e5d5a8eb_GH0.tar.gz) = 68308
 SHA256 (signalapp-libsignal-v0.56.1_GH0.tar.gz) = 765b32f463669e4590d253ee82d524805ba42b156af1d058b30e1dc38607f039
 SIZE (signalapp-libsignal-v0.56.1_GH0.tar.gz) = 1656542
-SHA256 (boxdot-gurk-rs-v0.6.0_GH0.tar.gz) = 63302a65e4f832797911651f688e1f056f049da99b8d396d114f002629d03f2d
-SIZE (boxdot-gurk-rs-v0.6.0_GH0.tar.gz) = 294623
+SHA256 (whisperfish-libsignal-service-rs-19c0c78da7a7479954634580a5e5081e7a8f2897_GH0.tar.gz) = bf27c9a94d28deeeada77605c60a5fbc61a64c447e8850367e0b8df6af4e8330
+SIZE (whisperfish-libsignal-service-rs-19c0c78da7a7479954634580a5e5081e7a8f2897_GH0.tar.gz) = 98961
+SHA256 (boxdot-gurk-rs-v0.6.1_GH0.tar.gz) = c6e972ae1c40ebc0cc245dd88b3dbbfb0e8afe5bc2cfcb7c7318790a1cc7038f
+SIZE (boxdot-gurk-rs-v0.6.1_GH0.tar.gz) = 294295
diff --git a/net-im/gurk-rs/files/patch-Cargo.toml b/net-im/gurk-rs/files/patch-Cargo.toml
index 57240c1f606c..76a976519263 100644
--- a/net-im/gurk-rs/files/patch-Cargo.toml
+++ b/net-im/gurk-rs/files/patch-Cargo.toml
@@ -1,5 +1,14 @@
---- Cargo.toml.orig	2024-12-24 15:23:09 UTC
+--- Cargo.toml.orig	2025-01-16 17:39:02 UTC
 +++ Cargo.toml
+@@ -50,7 +50,7 @@ libsqlite3-sys = { version = "0.30.1", features = [
+ image = { version = "0.25.5", default-features = false, features = ["png"] }
+ itertools = "0.13.0"
+ libsqlite3-sys = { version = "0.30.1", features = [
+-    "bundled-sqlcipher-vendored-openssl",
++    "sqlcipher",
+ ] }
+ log-panics = "2.1.0"
+ mime_guess = "2.0.5"
 @@ -121,4 +121,4 @@ harness = false
  [patch.crates-io]
  # signal-protocol uses a fork of this library via the patch mechanism of cargo.