Commit 4b66f68d authored by Martina Ferrari's avatar Martina Ferrari

Incorporate changed from NMUs. Thanks a lot to Andrey Rahmatullin for the...

Incorporate changed from NMUs. Thanks a lot to Andrey Rahmatullin for the fixes and uploads. Closes: 846509.
parent 25bff61b
......@@ -2,9 +2,25 @@ net-tools (1.60+git20151124.452f8e2-1) UNRELEASED; urgency=medium
* New upstream snapshot.
* Re-synced translations.patch.
* Incorporate changed from NMUs. Thanks a lot to Andrey Rahmatullin for the
fixes and uploads. Closes: 846509.
-- Martín Ferrari <tincho@debian.org> Thu, 26 Nov 2015 21:34:48 -0300
net-tools (1.60+git20150829.73cef8a-2.2) unstable; urgency=medium
* Non-maintainer upload.
* Apply an additional fix for the previous FTBFS for some architectures.
-- Andrey Rahmatullin <wrar@debian.org> Thu, 01 Dec 2016 22:49:27 +0500
net-tools (1.60+git20150829.73cef8a-2.1) unstable; urgency=medium
* Non-maintainer upload.
* Fix FTBFS by applying the upstream patch (Closes: #844073).
-- Andrey Rahmatullin <wrar@debian.org> Sun, 20 Nov 2016 15:23:12 +0500
net-tools (1.60+git20150829.73cef8a-2) unstable; urgency=medium
[ Laurent Bigonville ]
......
Desription: iptunnel: fix building w/older linux headers
Origin: upstream, https://sourceforge.net/p/net-tools/code/ci/ea3935bd7c0f36c86c40e5785326698fa3336c6a
Bug-Gentoo: https://bugs.gentoo.org/599542
Applied-Upstream: yes
Last-Update: 2016-12-01
--- a/iptunnel.c
+++ b/iptunnel.c
@@ -29,7 +29,12 @@
#include <arpa/inet.h>
#include <net/if.h>
#include <net/if_arp.h>
+/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers
+ * (pre linux-4.8) did not include all the proper headers leading to missing
+ * structs and types.
+ */
#include <linux/types.h>
+#include <linux/ip.h>
#include <linux/if_tunnel.h>
#include "config.h"
Desription: iptunnel: drop netinet/ip.h include
Origin: upstream, https://sourceforge.net/p/net-tools/code/ci/45d573a89386c934d3ebac499d00c1670437813b/
Applied-Upstream: yes
Last-Update: 2016-11-20
--- a/iptunnel.c
+++ b/iptunnel.c
@@ -26,7 +26,6 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
#include <arpa/inet.h>
#include <net/if.h>
#include <net/if_arp.h>
......@@ -4,3 +4,5 @@ translations.patch
Add_missing_headers.patch
Bug#443075-ifconfig.c-pointtopoint_spelling.patch
Bug#500913-man-en_US-route.8-EXAMPLES-Add-single-route-del.patch
Bug#844073-iptunnel.c-headers.patch
Bug#844073-iptunnel.c-headers-2.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment