]>
Commit | Line | Data |
---|---|---|
a5ee5623 MT |
1 | Submitted By: Jim Gifford (jim at linuxfromscratch dot org) |
2 | Date: 2004-06-24 | |
3 | Initial Package Version: 2.6 | |
4 | Origin: Gentoo and Self | |
5 | Upstream Status: N/A | |
6 | Description: Fixes Compile Issues with the 2.6 Kernel | |
7 | ||
8 | ||
9 | diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c | |
10 | --- net-tools-1.60.orig/hostname.c 2001-04-08 17:04:23.000000000 +0000 | |
11 | +++ net-tools-1.60/hostname.c 2004-06-24 06:17:32.517305695 +0000 | |
12 | @@ -42,10 +42,16 @@ | |
13 | #include "config.h" | |
14 | #include "version.h" | |
15 | #include "../intl.h" | |
16 | +#include <linux/version.h> | |
17 | ||
18 | #if HAVE_AFDECnet | |
19 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) | |
20 | #include <netdnet/dn.h> | |
21 | #endif | |
22 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) | |
23 | +#include <linux/dn.h> | |
24 | +#endif | |
25 | +#endif | |
26 | ||
27 | char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)"; | |
28 | ||
29 | diff -Naur net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c | |
30 | --- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 13:38:10.000000000 +0000 | |
31 | +++ net-tools-1.60/lib/x25_sr.c 2004-06-24 06:15:45.163773724 +0000 | |
32 | @@ -22,6 +22,7 @@ | |
33 | #include <sys/socket.h> | |
34 | #include <sys/ioctl.h> | |
35 | #include <linux/x25.h> | |
36 | +#include <linux/version.h> | |
37 | #include <ctype.h> | |
38 | #include <errno.h> | |
39 | #include <netdb.h> | |
40 | @@ -77,7 +78,11 @@ | |
41 | rt.sigdigits=sigdigits; | |
42 | ||
43 | /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ | |
44 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) | |
45 | memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); | |
46 | +#else | |
47 | + memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); | |
48 | +#endif | |
49 | ||
50 | while (*args) { | |
51 | if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { |