Merge pull request #143974 from misuzu/freeswitch-update

freeswitch: 1.10.6 -> 1.10.7

pkgs/development/libraries/libks/default.nix

@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, pkg-config
+, libuuid
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libks";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "signalwire";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1wvl8kzi1fx7pg58r5x1lw4gwkvrkljqajsn72yq6sbsd3iqn8wr";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch";
+      sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a";
+    })
+  ];
+
+  dontUseCmakeBuildDir = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    libuuid
+    openssl
+  ];
+
+  meta = with lib; {
+    description = "Foundational support for signalwire C products";
+    homepage = "https://github.com/signalwire/libks";
+    maintainers = with lib.maintainers; [ misuzu ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}

pkgs/development/libraries/sofia-sip/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sofia-sip";
-  version = "1.13.3";
+  version = "1.13.6";
 
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas=";
+    sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm";
   };
 
   buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;

pkgs/servers/sip/freeswitch/default.nix

@@ -88,12 +88,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "freeswitch";
-  version = "1.10.6";
+  version = "1.10.7";
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2";
+    sha256 = "0npdvidvsi4dhwswdwilff4p3x04qmz7hgs9sdadiy2w83qb6alf";
   };
 
   postPatch = ''
@@ -125,6 +125,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
+  CFLAGS = "-D_ANSI_SOURCE";
+
   hardeningDisable = [ "format" ];
 
   preConfigure = ''

pkgs/servers/sip/freeswitch/modules.nix

@@ -11,6 +11,7 @@
 , postgresql
 , spandsp3
 , sofia_sip
+, libks
 }:
 
 let
@@ -139,7 +140,7 @@ in
     rtmp = mk "endpoints/mod_rtmp" [];
     skinny = mk "endpoints/mod_skinny" [];
     sofia = mk "endpoints/mod_sofia" [ sofia_sip ];
-    verto = mk "endpoints/mod_verto" [];
+    verto = mk "endpoints/mod_verto" [ libks ];
   };
 
   event_handlers = {

pkgs/top-level/all-packages.nix

@@ -17835,6 +17835,8 @@ with pkgs;
 
   libkml = callPackage ../development/libraries/libkml { };
 
+  libks = callPackage ../development/libraries/libks { };
+
   libksba = callPackage ../development/libraries/libksba { };
 
   libksi = callPackage ../development/libraries/libksi { };