summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-10-19 11:40:06 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-10-19 11:40:06 +0000
commit0596af1f9f937b880ea3b4ad9acd5b1b6818dd86 (patch)
tree8e0041456ca6eb9d069868a932c5fe51da647d64 /sys-apps/net-tools/files
parentchangelog:P (diff)
downloadhistorical-0596af1f9f937b880ea3b4ad9acd5b1b6818dd86.tar.gz
historical-0596af1f9f937b880ea3b4ad9acd5b1b6818dd86.tar.bz2
historical-0596af1f9f937b880ea3b4ad9acd5b1b6818dd86.zip
Added a patch to get net-tools to go on 2.6 headers: Bug #31240.
Diffstat (limited to 'sys-apps/net-tools/files')
-rw-r--r--sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch b/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch
new file mode 100644
index 000000000000..92ce90128458
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-1.60-2.6-compilefix.patch
@@ -0,0 +1,23 @@
+diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
+--- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
++++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200
+@@ -22,6 +22,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/x25.h>
++#include <linux/version.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <netdb.h>
+@@ -77,7 +78,11 @@
+ rt.sigdigits=sigdigits;
+
+ /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
++#else
++ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
++#endif
+
+ while (*args) {
+ if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {