Hello community, here is the log from the commit of package net-tools for openSUSE:Factory checked in at 2016-11-04 20:49:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-tools (Old) and /work/SRC/openSUSE:Factory/.net-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "net-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/net-tools/net-tools.changes 2016-05-26 23:52:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.net-tools.new/net-tools.changes 2016-11-04 20:49:15.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 17 07:39:12 UTC 2016 - [email protected] + +- net-tools-1.60-fix-header-conflict.patch: use kernel headers to avoid + conflict with user-space headers + +------------------------------------------------------------------- New: ---- net-tools-1.60-fix-header-conflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.ghoAML/_old 2016-11-04 20:49:17.000000000 +0100 +++ /var/tmp/diff_new_pack.ghoAML/_new 2016-11-04 20:49:17.000000000 +0100 @@ -85,6 +85,7 @@ Patch52: net-tools-1.60-plipconfig-ecode.patch # PATCH-FIX-UPSTREAM net-tools-1.60-hostname-s.patch boo#872264 ticket#14 commit#452f8e Patch53: net-tools-1.60-hostname-s.patch +Patch54: net-tools-1.60-fix-header-conflict.patch %description This package contains essential programs for network administration and @@ -164,6 +165,7 @@ %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 cp %{S:4} . cp %{S:5} ./man/en_US ++++++ net-tools-1.60-fix-header-conflict.patch ++++++ Index: net-tools-1.60/iptunnel.c =================================================================== --- net-tools-1.60.orig/iptunnel.c +++ net-tools-1.60/iptunnel.c @@ -26,7 +26,7 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <netinet/in.h> -#include <netinet/ip.h> +#include <linux/ip.h> #include <arpa/inet.h> #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) #include <net/if.h>
