mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-12 20:16:49 +02:00
bb5f0bf8f3
use intel config from IPFire 3.x branch. arm cfg is not present yet and some patches are missing.
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
diff -Naur net-tools-1.60.org/hostname.c net-tools-1.60/hostname.c
|
|
--- net-tools-1.60.org/hostname.c 2001-04-08 19:04:23.000000000 +0200
|
|
+++ net-tools-1.60/hostname.c 2013-08-26 11:56:50.131844273 +0200
|
|
@@ -42,10 +42,16 @@
|
|
#include "config.h"
|
|
#include "version.h"
|
|
#include "../intl.h"
|
|
+#include <linux/version.h>
|
|
|
|
#if HAVE_AFDECnet
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
|
|
#include <netdnet/dn.h>
|
|
#endif
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
|
|
+#include <linux/dn.h>
|
|
+#endif
|
|
+#endif
|
|
|
|
char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
|
|
|
|
diff -Naur net-tools-1.60.org/lib/tr.c net-tools-1.60/lib/tr.c
|
|
--- net-tools-1.60.org/lib/tr.c 2000-02-20 22:46:45.000000000 +0100
|
|
+++ net-tools-1.60/lib/tr.c 2013-08-26 11:57:33.675175033 +0200
|
|
@@ -20,7 +20,7 @@
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <net/if_arp.h>
|
|
-#include <linux/if_tr.h>
|
|
+#include <netinet/if_tr.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
diff -Naur net-tools-1.60.org/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
|
|
--- net-tools-1.60.org/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
|
|
+++ net-tools-1.60/lib/x25_sr.c 2013-08-26 11:56:50.131844273 +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")) {
|