[Pkg-voip-commits] [bctoolbox] 08/10: Instead of using ENABLE_STRICT=OFF patch upstream

[Johannes Schauer]

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

josch pushed a commit to branch debian/sid
in repository bctoolbox.

commit c8aa49ac72b8ce2713eaab95748c33b0d27ba7e8
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 08:50:55 2017 +0200

    Instead of using ENABLE_STRICT=OFF patch upstream
    
    Ultimately we want to forward this fix to upstream. This has a higher
    chance of happening if we make this workaround a patch instead of a
    configuration option.
---
 debian/patches/deprecated_mbedtls_header | 13 +++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  5 +----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/patches/deprecated_mbedtls_header b/debian/patches/deprecated_mbedtls_header
new file mode 100644
index 0000000..5ec1509
--- /dev/null
+++ b/debian/patches/deprecated_mbedtls_header
@@ -0,0 +1,13 @@
+Do not use the deprecated mbedtls/net.h header.
+
+--- a/src/crypto/mbedtls.c
++++ b/src/crypto/mbedtls.c
+@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include <mbedtls/ssl.h>
+ #include <mbedtls/timing.h>
+ #include <mbedtls/error.h>
+-#include <mbedtls/net.h>
++#include <mbedtls/net_sockets.h>
+ #include <mbedtls/base64.h>
+ 
+ #include <mbedtls/pem.h>
diff --git a/debian/patches/series b/debian/patches/series
index 33ed55d..bba0ced 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kill-rpath.patch
+deprecated_mbedtls_header
diff --git a/debian/rules b/debian/rules
index 9e41bd3..f9124e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # As of version 0.4.0, upstream recommends CMake for configuration.
 # Requires CUnit 3.x by default, which is not available in Debian as of Dec
 # 2016.  Disable tests for now to avoid build configure failures.
-#
-# As of 0.5.1, fails to compile without -DENABLE_STRICT=OFF due to use of
-# deprecated mbedtls header (<mbedtls/net.h>)
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_TESTS_COMPONENT=OFF -DENABLE_STRICT=OFF
+	dh_auto_configure -- -DENABLE_TESTS_COMPONENT=OFF

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