]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/net-tools-1.60-kernel_headers-3.patch
firewall: Remove redundant rule.
[people/teissler/ipfire-2.x.git] / src / patches / net-tools-1.60-kernel_headers-3.patch
1 diff -Naur net-tools-1.60.org/hostname.c net-tools-1.60/hostname.c
2 --- net-tools-1.60.org/hostname.c 2001-04-08 19:04:23.000000000 +0200
3 +++ net-tools-1.60/hostname.c 2013-08-26 11:56:50.131844273 +0200
4 @@ -42,10 +42,16 @@
5 #include "config.h"
6 #include "version.h"
7 #include "../intl.h"
8 +#include <linux/version.h>
9
10 #if HAVE_AFDECnet
11 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
12 #include <netdnet/dn.h>
13 #endif
14 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
15 +#include <linux/dn.h>
16 +#endif
17 +#endif
18
19 char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
20
21 diff -Naur net-tools-1.60.org/lib/tr.c net-tools-1.60/lib/tr.c
22 --- net-tools-1.60.org/lib/tr.c 2000-02-20 22:46:45.000000000 +0100
23 +++ net-tools-1.60/lib/tr.c 2013-08-26 11:57:33.675175033 +0200
24 @@ -20,7 +20,7 @@
25 #include <sys/types.h>
26 #include <sys/socket.h>
27 #include <net/if_arp.h>
28 -#include <linux/if_tr.h>
29 +#include <netinet/if_tr.h>
30 #include <stdlib.h>
31 #include <stdio.h>
32 #include <errno.h>
33 diff -Naur net-tools-1.60.org/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
34 --- net-tools-1.60.org/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
35 +++ net-tools-1.60/lib/x25_sr.c 2013-08-26 11:56:50.131844273 +0200
36 @@ -22,6 +22,7 @@
37 #include <sys/socket.h>
38 #include <sys/ioctl.h>
39 #include <linux/x25.h>
40 +#include <linux/version.h>
41 #include <ctype.h>
42 #include <errno.h>
43 #include <netdb.h>
44 @@ -77,7 +78,11 @@
45 rt.sigdigits=sigdigits;
46
47 /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
48 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
49 memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
50 +#else
51 + memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
52 +#endif
53
54 while (*args) {
55 if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {