jami-*: 20211005.2.251ac7d -> 20211104.2.e80361d

5 files changed, 26 insertions, 23 deletions

diff --git a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches
index 2e106289a9628..5b9579f8f94e8 100644
--- a/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches
+++ b/pkgs/applications/networking/instant-messengers/jami/config/pjsip_patches
@@ -1,20 +1 @@
-0001-rfc6544.patch
-0002-rfc2466.patch
-0003-add-tcp-keep-alive.patch
-0004-multiple_listeners.patch
-0005-fix_ebusy_turn.patch
-0006-ignore_ipv6_on_transport_check.patch
-0007-upnp-srflx-nat-assisted-cand.patch
-0008-fix_ioqueue_ipv6_sendto.patch
 0009-add-config-site.patch
-0010-fix-tcp-death-detection.patch
-0011-fix-turn-shutdown-crash.patch
-0012-ignore-down-interfaces.patch
-0013-ignore-addresses-for-RFC7335.patch
-0014-fix-socket-leak.patch
-0015-fix-socktype-and-duplicate-checking.patch
-0016-use-larger-Ta-interval.patch
-0017-auto-register-thread.patch
-0018-fix-ioqueue-lock-acquire.patch
-0019-resort-check-list-after-adding-prflx.patch
-0020-avoid-immediate-nominating-triggered-check.patch
diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
index 2fe6d7191e74e..a324d061aa73e 100644
--- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix
@@ -3,6 +3,7 @@
 , jami-meta
 , stdenv
 , lib
+, fetchFromGitHub
 , autoreconfHook
 , pkg-config
 , perl # for pod2man
@@ -57,9 +58,15 @@ let
 
   pjsip-jami = pjsip.overrideAttrs (old:
     let
+      src-args = import ./pjproject-src.nix;
+      version = lib.concatStrings (lib.lists.take 7 (lib.stringToCharacters src-args.rev));
       patch-src = src + "/daemon/contrib/src/pjproject/";
     in
     {
+      inherit version;
+
+      src = fetchFromGitHub src-args;
+
       patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
     });
 
@@ -68,7 +75,8 @@ let
     enablePushNotifications = true;
   };
 
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   pname = "jami-daemon";
   inherit src version;
   sourceRoot = "source/daemon";
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index ee9762a8f0328..e3bf7054949d0 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -8,11 +8,11 @@
 }:
 
 rec {
-  version = "20211005.2.251ac7d";
+  version = "20211104.2.e80361d";
 
   src = fetchzip {
     url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
-    sha256 = "12ppbwhnk5zajb73szd04sz80bp17q577bkb9j8p45apvq201db3";
+    sha256 = "1l48svppshh8mg7y1dymnh0rgwswy4qwdyl7qlg25mmh4y1li21f";
 
     stripRoot = false;
     extraPostFetch = ''
diff --git a/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix
new file mode 100644
index 0000000000000..1681769248711
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/jami/pjproject-src.nix
@@ -0,0 +1,6 @@
+{
+  owner = "savoirfairelinux";
+  repo = "pjproject";
+  rev = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a";
+  sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y=";
+}
diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh
index 22233a81bf8d8..10d9bb885c35d 100755
--- a/pkgs/applications/networking/instant-messengers/jami/update.sh
+++ b/pkgs/applications/networking/instant-messengers/jami/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts
+#!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch
 
 set -e
 
@@ -40,3 +40,11 @@ echo "${ffmpeg_args_x86}" > "$config_dir/ffmpeg_args_x86"
 pjsip_patches=$(sed -n '/UNPACK/,/HAVE_ANDROID/p' ${src}/daemon/contrib/src/pjproject/rules.mak | sed -n -E 's/.*pjproject\/(00.*patch).*/\1/p')
 echo -e "Patches for pjsip:\n${pjsip_patches}\n"
 echo "${pjsip_patches}" > "$config_dir/pjsip_patches"
+
+# Update pjsip version
+pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)
+nix-prefetch fetchFromGitHub \
+  --owner savoirfairelinux \
+  --repo pjproject \
+  --rev ${pjsip_version} \
+  --output nix > "${jami_dir}/pjproject-src.nix"