pool/net-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435676 from home:Andreas_Schwab:Factory

Browse Source 
- net-tools-1.60-fix-header-conflict.patch: use kernel headers to avoid
  conflict with user-space headers

OBS-URL: https://build.opensuse.org/request/show/435676
OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-tools?expand=0&rev=50
This commit is contained in:
OBS User mrdocs 2016-10-18 23:02:23 +00:00 committed by Git OBS Bridge
parent 95971535d8
commit 6bf30f5060
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net-tools-1.60-fix-header-conflict.patch Normal file
View File

@ -0,0 +1,13 @@
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>

6
net-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 17 07:39:12 UTC 2016 - schwab@suse.de
- net-tools-1.60-fix-header-conflict.patch: use kernel headers to avoid
conflict with user-space headers
-------------------------------------------------------------------
Tue May 17 11:36:17 UTC 2016 - pwieczorkiewicz@suse.com

2
net-tools.spec
View File

@ -85,6 +85,7 @@ Patch51: net-tools-1.60-plipconfig-manpage.patch
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 @@ cp %{S:3} lib/
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
cp %{S:4} .
cp %{S:5} ./man/en_US