aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCeleste <20312-Celeste@users.gitlab.alpinelinux.org>2023-09-26 14:01:56 +0000
committerPatrycja Rosa <alpine@ptrcnull.me>2023-10-14 20:04:52 +0000
commitb9c00417f77626799b396b877258ece20cec9c3e (patch)
tree2ba5ff2405da34d8f17f4a59952d761466f00487
parent15329c289290a57a70b2d95c76b1c5acab7183c5 (diff)
testing/jami-daemon: upgrade to 4.0.0_git20230925
also, rebuild against opendht 3.0.0
-rw-r--r--testing/jami-daemon/APKBUILD35
-rw-r--r--testing/jami-daemon/dhtnet-unpack-dir.patch11
-rw-r--r--testing/jami-daemon/fmt-10.patch15
3 files changed, 33 insertions, 28 deletions
diff --git a/testing/jami-daemon/APKBUILD b/testing/jami-daemon/APKBUILD
index ced0fb2fa35..a8cf9c6e892 100644
--- a/testing/jami-daemon/APKBUILD
+++ b/testing/jami-daemon/APKBUILD
@@ -1,10 +1,11 @@
# Contributor: Anjandev Momi <anjan@momi.ca>
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=jami-daemon
-pkgver=4.0.0_git20230616
-pkgrel=2
-_gitrev=417447a167c52512e8c81250cc08bb5b24c6b667
-_pjprojectver=e4b83585a0bdf1523e808a4fc1946ec82ac733d0
+pkgver=4.0.0_git20230925
+pkgrel=0
+_gitrev=f19b0fad9b99181e9a5e5a892ae354d940db2bb2
+_pjprojectver=1489db073be280629e41d387c1c2561f20b0bfb3
+_dhtnetver=4796de15ed32b41949489c328bc250d17c431c80
pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (daemon component)"
url="https://jami.net"
arch="all !ppc64le !s390x !riscv64" # no webrtc-audio-processing
@@ -12,6 +13,7 @@ license="GPL-3.0-or-later"
makedepends="
alsa-lib-dev
asio-dev
+ cmake
eudev-dev
fmt-dev
ffmpeg-dev
@@ -35,16 +37,21 @@ makedepends="
"
subpackages="$pkgname-dev"
source="$pkgname-$_gitrev.tar.gz::https://git.jami.net/savoirfairelinux/jami-daemon/-/archive/$_gitrev/jami-daemon-$_gitrev.tar.gz
- pjproject-$_pjprojectver.tar.gz::https://github.com/savoirfairelinux/pjproject/archive/$_pjprojectver/pjproject-$_pjprojectver.tar.gz
- fmt-10.patch
+ pjproject-$_pjprojectver.tar.gz.noauto::https://github.com/savoirfairelinux/pjproject/archive/$_pjprojectver/pjproject-$_pjprojectver.tar.gz
+ dhtnet-$_dhtnetver.tar.gz.noauto::https://git.jami.net/savoirfairelinux/dhtnet/-/archive/$_dhtnetver/dhtnet-$_dhtnetver.tar.gz
+ dhtnet-unpack-dir.patch
"
builddir="$srcdir/$pkgname-$_gitrev"
options="!check" # https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/649
prepare() {
default_prepare
- cp ../pjproject-$_pjprojectver.tar.gz contrib/tarballs
- mkdir contrib/native
+
+ cp -v ../pjproject-$_pjprojectver.tar.gz.noauto \
+ contrib/tarballs/pjproject-$_pjprojectver.tar.gz
+ cp -v ../dhtnet-$_dhtnetver.tar.gz.noauto \
+ contrib/tarballs/dhtnet-$_dhtnetver.tar.gz
+ mkdir -v contrib/native
}
build() {
@@ -52,8 +59,9 @@ build() {
../bootstrap \
--disable-downloads \
--disable-all \
- --enable-pjproject
- make DEPS_pjproject=
+ --enable-pjproject \
+ --enable-dhtnet
+ make DEPS_pjproject= DEPS_dhtnet=pjproject
cd "$builddir"
abuild-meson \
@@ -71,7 +79,8 @@ package() {
}
sha512sums="
-73e73a182771c420a94f22c99882576bdd19ec6d5a74ac29b4f7bc19aa126ad6cc9dee9026e97b27c9566ff589f4f28cd65ad382aab41f8bf6cc4c33b2d43fba jami-daemon-417447a167c52512e8c81250cc08bb5b24c6b667.tar.gz
-617f3a5cd38423a429b17553bb73ad467694ce3e899a788aaf20d0540f6a6904c06a2fc35bf9e0d1c9ab07ba821ca0e1d6d2b002e473bfa9850ff6f8b96447c0 pjproject-e4b83585a0bdf1523e808a4fc1946ec82ac733d0.tar.gz
-4bfefd6d0f1f08fb34849bf8dbce75f1d7fa42bf8f32ee81b8cc45f3c297eb69f4abdcc5420eaca7d03d2410e5347651d4664c007e2f06b8b403b8626a283993 fmt-10.patch
+0d8591013d1e26c436de593d1ee974bf334acdb70ac2e7e2fab3d1e426bb52b7a2b3c8de21603c5945dd2f7829caf781982c95dcc5efa7fe225aa6ba49f64fbb jami-daemon-f19b0fad9b99181e9a5e5a892ae354d940db2bb2.tar.gz
+4a7cf995827f3d450627f32dbba463593e7ee9e268e6050c12622cae9c5ee8b6f7aadd1897e218b5665f467d89d40608681e56017d3cf817b69ad7348070afc7 pjproject-1489db073be280629e41d387c1c2561f20b0bfb3.tar.gz.noauto
+c940ea273c25a38ca1d2b63077dddfeed7740405d5c16ac8f8db0a14e3fdf838a69f4c09bd68ef98b72fe04d1a3feb3f61fed2d34fb8e073c492211c121b8fae dhtnet-4796de15ed32b41949489c328bc250d17c431c80.tar.gz.noauto
+812b720831d35fffbaef1bb64cdc085bc72fb0f92f6e8ebe06ff3f1a20cf5a07cdd9dbc6dd00694cc880e7f905dfdc0fa956127b4bcb3ee78c4e08b763d2d807 dhtnet-unpack-dir.patch
"
diff --git a/testing/jami-daemon/dhtnet-unpack-dir.patch b/testing/jami-daemon/dhtnet-unpack-dir.patch
new file mode 100644
index 00000000000..33ee641c5e8
--- /dev/null
+++ b/testing/jami-daemon/dhtnet-unpack-dir.patch
@@ -0,0 +1,11 @@
+--- a/contrib/src/dhtnet/rules.mak
++++ b/contrib/src/dhtnet/rules.mak
+@@ -30,7 +30,7 @@
+
+ dhtnet: dhtnet-$(DHTNET_VERSION).tar.gz
+ mkdir -p $(UNPACK_DIR)
+- $(UNPACK) -C $(UNPACK_DIR)
++ $(UNPACK) -C $(UNPACK_DIR)/../
+ $(APPLY) $(SRC)/dhtnet/libjami-testable.patch
+ $(MOVE)
+
diff --git a/testing/jami-daemon/fmt-10.patch b/testing/jami-daemon/fmt-10.patch
deleted file mode 100644
index 1be193cad3f..00000000000
--- a/testing/jami-daemon/fmt-10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://gitlab.archlinux.org/archlinux/packaging/packages/jami-daemon/-/raw/main/fmt-10.patch
-
-diff --git a/src/connectivity/security/tls_session.cpp b/src/connectivity/security/tls_session.cpp
-index bf3182736..fc13c5652 100644
---- a/src/connectivity/security/tls_session.cpp
-+++ b/src/connectivity/security/tls_session.cpp
-@@ -1216,7 +1216,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
- return state; // handshake
-
- } else if (cred != GNUTLS_CRD_CERTIFICATE) {
-- JAMI_ERROR("[TLS] spurious session credential ({})", cred);
-+ JAMI_ERROR("[TLS] spurious session credential ({})", static_cast<int>(cred));
- return TlsSessionState::SHUTDOWN;
- }
-