[Pkg-voip-commits] [ring] 11/12: use-debian-gnutls.patch: Don't use buggy GnuTLS feature

[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 f2aad5ab106b4656807cbe6cb532dd47c49ba516
Author: aviau <alexandre at alexandreviau.net>
Date:   Thu Jun 30 22:13:18 2016 +0200

    use-debian-gnutls.patch: Don't use buggy GnuTLS feature
---
 debian/patches/use-debian-gnutls.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/debian/patches/use-debian-gnutls.patch b/debian/patches/use-debian-gnutls.patch
index 7944f84..6b911f9 100644
--- a/debian/patches/use-debian-gnutls.patch
+++ b/debian/patches/use-debian-gnutls.patch
@@ -1,4 +1,6 @@
 Description: Use Debian's GnuTLS
+ This patch should be removed when GnuTLS 3.4.14 is available in Debian
+ so that we can exchange certificates annonymously.
 Author: Alexandre Viau <aviau at debian.org>
 Last-Update: 2016-06-30
 
@@ -13,3 +15,29 @@ Last-Update: 2016-06-30
  PKGS_FOUND += gnutls
  endif
  
+--- a/daemon/contrib/src/nettle/rules.mak
++++ b/daemon/contrib/src/nettle/rules.mak
+@@ -8,9 +8,9 @@
+ # TEMPORARY DISABLED
+ # Force nettle contrib until gnutls major patches are upstream and released
+ # See gnutls rules.mak for more information
+-#ifeq ($(call need_pkg,"nettle >= 3.1"),)
+-#PKGS_FOUND += nettle
+-#endif
++ifeq ($(call need_pkg,"nettle >= 3.1"),)
++PKGS_FOUND += nettle
++endif
+ 
+ $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
+ 	$(call download,$(NETTLE_URL))
+--- a/daemon/src/security/tls_session.h
++++ b/daemon/src/security/tls_session.h
+@@ -137,7 +137,7 @@
+     };
+ 
+     TlsSession(std::shared_ptr<IceTransport> ice, int ice_comp_id, const TlsParams& params,
+-               const TlsSessionCallbacks& cbs, bool anonymous=true);
++               const TlsSessionCallbacks& cbs, bool anonymous=false);
+     ~TlsSession();
+ 
+     // Returns the TLS session type ('server' or 'client')

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