[Pkg-voip-commits] [ring] 01/01: remove deprecated use-debian-gnutls.patch

[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 121e7f34a067b79f847c313d0cec0f38d57d3850
Author: aviau <alexandre at alexandreviau.net>
Date:   Tue Jul 12 17:43:00 2016 -0400

    remove deprecated use-debian-gnutls.patch
---
 debian/changelog                       |  4 +++-
 debian/control                         |  2 +-
 debian/patches/use-debian-gnutls.patch | 43 ----------------------------------
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4245d4..d1a566b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ring (20160630.3.52c5ef6~dfsg1-2) UNRELEASED; urgency=medium
 
-  * d/watch: gpl.savoirfairelinux.net -> dl.ring.cx
+  * d/watch: gpl.savoirfairelinux.net -> dl.ring.cx.
+  * remove deprecated use-debian-gnutls.patch.
+  * depend on libgnutls28-dev (>= 3.4.14).
 
  -- Alexandre Viau <aviau at debian.org>  Fri, 01 Jul 2016 19:06:06 +0200
 
diff --git a/debian/control b/debian/control
index babf4ec..28452de 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                libdbus-1-dev,
                libdbus-c++-dev,
                libupnp-dev,
-               libgnutls28-dev,
+               libgnutls28-dev (>= 3.4.14),
                libebook1.2-dev,
                libclutter-gtk-1.0-dev,
                libclutter-1.0-dev,
diff --git a/debian/patches/use-debian-gnutls.patch b/debian/patches/use-debian-gnutls.patch
deleted file mode 100644
index 6b911f9..0000000
--- a/debian/patches/use-debian-gnutls.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-
---- 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
- 
---- 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