Hello Matthias, thank you for making us aware of the FTBFS of freelan with gcc7. Upstream provided a patch and I already uploaded the package. Unfortunately, I hadn't realized that I hadn't extended the validity of my key as DM in the official keyring. I've done that now, but seeing that the last update to it was 12 hours ago it might be another four weeks or so before the package comes through.
I've bumped the release once more and uploaded it to https://mentors.debian.net/debian/pool/main/f/freelan/freelan_2.0-4.dsc I attach the debdiff against the latest version in testing/unstable here as well for your inspection. It would be great if you could help out and prevent removal of the package in about two weeks time, well before I expect my updated key to be included in the official keyring. Regards Rolf
diff --git a/debian/changelog b/debian/changelog index 257d999..a08bb26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +freelan (2.0-4) unstable; urgency=medium + + [ Sebastien Vincent ] + * patches: backport 5014a8023b from upstream. Closes: #853406 + fix FTBFS with gcc7 + + [ Rolf Leggewie ] + * control: update to standards version 4.0.0 + - fix typo in manpage + - make the whatis entry for the freelan manpage more meaningful + * copyright: update my copyright to 2017 + + -- Rolf Leggewie <f...@rolf.leggewie.biz> Sun, 06 Aug 2017 17:57:54 +0800 + freelan (2.0-2) unstable; urgency=medium [ Julien Kauffmann ] diff --git a/debian/control b/debian/control index 95b2986..2a1f58c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), libssl-dev, libcurl4-openssl-dev, libboost-system-dev, libboost-thread-dev, libboost-program-options-dev, libboost-filesystem-dev, libboost-iostreams-dev, scons -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://www.freelan.org Vcs-Git: https://github.com/freelan-developers/freelan.git -b debian/unstable Vcs-Browser: https://github.com/freelan-developers/freelan-all/tree/debian/unstable diff --git a/debian/copyright b/debian/copyright index b4c00dc..1d164f9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ License: GPL-3+ Comment: Upstream grants a special exception to link with OpenSSL Files: debian/* -Copyright: 2015-2016 Rolf Leggewie <f...@rolf.leggewe.biz> +Copyright: 2015-2017 Rolf Leggewie <f...@rolf.leggewe.biz> 2012 Julien Kauffmann <julien.kauffm...@freelan.org> License: GPL-3+ diff --git a/debian/freelan.1 b/debian/freelan.1 index c561e76..bbaf7a2 100644 --- a/debian/freelan.1 +++ b/debian/freelan.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1. .TH FREELAN "1" "June 2015" "freelan 2.0.0 (2.0-8-g0545b2d) Sun 21 Jun 2015" "User Commands" .SH NAME -freelan \- manual page for freelan 2.0.0 (2.0-8-g0545b2d) Sun 21 Jun 2015 +freelan \- peer-to-peer VPN .SH DESCRIPTION .SS "Generic options:" .TP @@ -245,7 +245,7 @@ The DNS script. Do not run as a daemon. .TP \fB\-s\fR [ \fB\-\-syslog\fR ] -Alwats log to syslog (useful when running with +Always log to syslog (useful when running with \fB\-\-foreground\fR on OSX with launchd). .HP \fB\-p\fR [ \fB\-\-pid_file\fR ] arg A pid file to use. diff --git a/debian/patches/5014a8023b.patch b/debian/patches/5014a8023b.patch new file mode 100644 index 0000000..3ac53ec --- /dev/null +++ b/debian/patches/5014a8023b.patch @@ -0,0 +1,64 @@ +From 5014a8023b42762052d6417ebbc0cd2adb1fda90 Mon Sep 17 00:00:00 2001 +From: Sebastien Vincent <sebastien.vinc...@cppextrem.com> +Date: Sat, 5 Aug 2017 20:10:55 +0200 +Subject: [PATCH] Fixes compilation with g++-7. + +--- + libs/asiotap/src/posix/posix_tap_adapter.cpp | 2 ++ + libs/netlinkplus/include/netlinkplus/endpoint.hpp | 8 +++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/libs/asiotap/src/posix/posix_tap_adapter.cpp b/libs/asiotap/src/posix/posix_tap_adapter.cpp +index 71377cee..cdd7abf3 100644 +--- a/libs/asiotap/src/posix/posix_tap_adapter.cpp ++++ b/libs/asiotap/src/posix/posix_tap_adapter.cpp +@@ -206,6 +206,7 @@ namespace asiotap + { + result[name] = name; + } ++ break; + } + case tap_adapter_layer::ip: + { +@@ -213,6 +214,7 @@ namespace asiotap + { + result[name] = name; + } ++ break; + } + } + } +diff --git a/libs/netlinkplus/include/netlinkplus/endpoint.hpp b/libs/netlinkplus/include/netlinkplus/endpoint.hpp +index 3503cae3..74fb7e1b 100644 +--- a/libs/netlinkplus/include/netlinkplus/endpoint.hpp ++++ b/libs/netlinkplus/include/netlinkplus/endpoint.hpp +@@ -44,6 +44,8 @@ + + #pragma once + ++#include <cstring> ++ + #include <boost/asio.hpp> + + #include <linux/netlink.h> +@@ -125,17 +127,17 @@ namespace netlinkplus + + friend bool operator==(const netlink_endpoint& lhs, const netlink_endpoint& rhs) + { +- return (lhs.m_sockaddr == rhs.m_sockaddr); ++ return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) == 0); + } + + friend bool operator!=(const netlink_endpoint& lhs, const netlink_endpoint& rhs) + { +- return (lhs.m_sockaddr != rhs.m_sockaddr); ++ return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) != 0); + } + + friend bool operator<(const netlink_endpoint& lhs, const netlink_endpoint& rhs) + { +- return (lhs.m_sockaddr < rhs.m_sockaddr); ++ return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) < 0); + } + + private: diff --git a/debian/patches/series b/debian/patches/series index 51ba687..a1b71cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +5014a8023b.patch openssl.patch 68d18a5a7dd7fad.patch c5bf9ab067.patch
signature.asc
Description: OpenPGP digital signature
