[Pkg-voip-commits] [ring] 09/12: Use Debian's GnuTLS

[Alexandre Viau]

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

aviau pushed a commit to branch master
in repository ring.

commit 04c9277513911c8a59ec294638f7737f144a088d
Author: aviau <alexandre at alexandreviau.net>
Date:   Thu Jun 30 21:23:39 2016 +0200

    Use Debian's GnuTLS
---
 debian/changelog                       |  3 ++-
 debian/patches/series                  |  1 +
 debian/patches/use-debian-gnutls.patch | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2318e00..49a029e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ ring (20160630.2.b3d131f~dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
   * Remove .sum-iax.
-  * d/copyright: reflect changes in msgpack
+  * d/copyright: reflect changes in msgpack.
+  * Add patch to use Debian's GnuTLS.
 
  -- Alexandre Viau <aviau at debian.org>  Thu, 30 Jun 2016 19:09:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 42f61dd..ac2d5c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+use-debian-gnutls.patch
 jsoncpp-rename.patch
 check-for-gsm.patch
diff --git a/debian/patches/use-debian-gnutls.patch b/debian/patches/use-debian-gnutls.patch
new file mode 100644
index 0000000..7944f84
--- /dev/null
+++ b/debian/patches/use-debian-gnutls.patch
@@ -0,0 +1,15 @@
+Description: Use Debian's GnuTLS
+Author: Alexandre Viau <aviau at debian.org>
+Last-Update: 2016-06-30
+
+--- a/daemon/contrib/src/gnutls/rules.mak
++++ b/daemon/contrib/src/gnutls/rules.mak
+@@ -6,7 +6,7 @@
+ PKGS += gnutls
+ # We need at least the 3.4.10, but DTLS handshake re-ordered packet fix is only available since 3.4.14
+ # So we patch the 3.4.10 until official release of 3.4.14
+-ifeq ($(call need_pkg,"gnutls >= 3.4.14"),)
++ifeq ($(call need_pkg,"gnutls"),)
+ PKGS_FOUND += gnutls
+ endif
+ 

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