From b3a6d1f99059ff4d00d2c993559b20be48714d55 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 26 Apr 2017 20:25:20 +1000 Subject: [PATCH 1/3] asterisk: patch to remove unresolved symbol warnings --- pkgs/servers/asterisk/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 581dbc3b1f76..e20cbce9c66c 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, +{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, lua, speex, @@ -18,6 +18,10 @@ let # This patch changes the runtime behavior to look for state # directories in /var rather than ${out}/var. ./runtime-vardirs.patch + (fetchpatch { + url = "http://sources.debian.net/data/main/a/asterisk/1:13.14.1~dfsg-1/debian/patches/pjsip_unresolved_symbol.patch"; + sha256 = "0i6a6zplvzbjcvxqlmr87jmrfza7c3qx0rlym2nlmzzp2m7qpnfp"; + }) ]; src = fetchurl { From 718c3e8d97e230bdbcc4143ecaebef03905fc0eb Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 26 Apr 2017 20:31:56 +1000 Subject: [PATCH 2/3] asterisk-stable: 14.2.1 -> 14.4.0 --- pkgs/servers/asterisk/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index e20cbce9c66c..bca7aea94bfd 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -24,6 +24,11 @@ let }) ]; + # Disable MD5 verification for pjsip + postPatch = '' + sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile + ''; + src = fetchurl { url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; inherit sha256; @@ -73,6 +78,11 @@ let sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; }; + pjproject-26 = fetchurl { + url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2; + sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; + }; + mp3-202 = fetchsvn { url = http://svn.digium.com/svn/thirdparty/mp3/trunk; rev = 202; @@ -92,10 +102,10 @@ in }; asterisk-stable = common { - version = "14.2.1"; - sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; + version = "14.4.0"; + sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; }; From 03fde7a34d517993bfbaf12da7e5264a2836a754 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Wed, 26 Apr 2017 20:35:45 +1000 Subject: [PATCH 3/3] asterisk-lts: 13.13.1 -> 13.15.0 --- pkgs/servers/asterisk/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index bca7aea94bfd..e6102c84f134 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -73,11 +73,6 @@ let }; }; - pjproject-255 = fetchurl { - url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2; - sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; - }; - pjproject-26 = fetchurl { url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2; sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; @@ -93,10 +88,10 @@ in { asterisk-lts = common { - version = "13.13.1"; - sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; + version = "13.15.0"; + sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; };