[Pkg-voip-commits] [asterisk] 02/05: Build against libsrtp2

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch master
in repository asterisk.

commit b13132ed6ffc83b0fbf6b0209849488e40cecbdc
Author: Bernhard Schmidt <berni at debian.org>
Date:   Fri Oct 6 23:17:17 2017 +0200

    Build against libsrtp2
    
    - Change dependency to libsrtp2-dev
    - Depend on libpjproject-dev 2.7 (built against libsrtp2)
    - Apply upstream patch for libsrtp 2.1.x compatibility
---
 debian/control                     |  4 ++--
 debian/patches/libsrtp-2.1.x.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series              |  2 ++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c7d3f37..ea33588 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends:
  libopenr2-dev [linux-any],
  libopus-dev,
  libopusfile-dev,
- libpjproject-dev,
+ libpjproject-dev (>= 2.7~),
  libpopt-dev,
  libpq-dev,
  libpri-dev,
@@ -58,7 +58,7 @@ Build-Depends:
  libspeexdsp-dev,
  libsqlite0-dev,
  libsqlite3-dev,
- libsrtp-dev,
+ libsrtp2-dev,
  libss7-dev,
  libssl-dev,
  libsystemd-dev [linux-any],
diff --git a/debian/patches/libsrtp-2.1.x.patch b/debian/patches/libsrtp-2.1.x.patch
new file mode 100644
index 0000000..c0097f1
--- /dev/null
+++ b/debian/patches/libsrtp-2.1.x.patch
@@ -0,0 +1,35 @@
+From 13aa1241c32f300fdf809fedcfd3f1974f54a022 Mon Sep 17 00:00:00 2001
+From: Alexander Traud <pabstraud at compuserve.com>
+Date: Wed, 6 Sep 2017 10:15:26 +0200
+Subject: [PATCH] res_srtp: Add support for libsrtp2.1.
+
+Asterisk is able to use libSRTP 2.0.x. However since libSRTP 2.1.x, the macro
+SRTP_AES_ICM got renamed to SRTP_AES_ICM_128. Beside to still compile with
+previous versions of libSRTP, this change allows libSRTP 2.1.x as well.
+
+ASTERISK-27253 #close
+
+Change-Id: I2e6eb3c3bc844fee8a624060a2eb6f182dc70315
+---
+ res/srtp/srtp_compat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h
+index 4ab39f318f..bf42082445 100644
+--- a/res/srtp/srtp_compat.h
++++ b/res/srtp/srtp_compat.h
+@@ -5,7 +5,11 @@
+ 
+ #define crypto_policy_t srtp_crypto_policy_t
+ 
++#if defined(SRTP_AES_ICM_128)
++#define AES_128_ICM SRTP_AES_ICM_128
++#else
+ #define AES_128_ICM SRTP_AES_ICM
++#endif
+ #define HMAC_SHA1 SRTP_HMAC_SHA1
+ 
+ #define err_status_t srtp_err_status_t
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 244b0f3..3c8641a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,5 @@ radcli-detection.patch
 
 pjsip_unresolved_symbol.patch
 build-reproducibly
+
+libsrtp-2.1.x.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git