From 192273ffaef7a52deeab4d9fbc69ca799bd667ba Mon Sep 17 00:00:00 2001
From: Dmitry Podgorny <pasis.ua@gmail.com>
Date: Fri, 29 May 2020 23:41:57 +0300
Subject: [PATCH] Apply patches from Gentoo project

---
 Makefile           | 17 ++++-------------
 ipx_configure.c    |  1 +
 ipx_interface.c    |  6 ++++--
 ipx_internal_net.c |  2 +-
 ipx_route.c        |  2 +-
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 0b1d6a3..5c40bae 100644
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,8 @@ clean:
 install: $(UTILS)
 	for i in $(UTILS); \
 	do \
-		install --strip $$i /sbin; \
-		install $$i.8 /usr/man/man8; \
+		install $$i ${DESTDIR}/sbin; \
+		install $$i.8 ${DESTDIR}/usr/share/man/man8; \
 	done
-	install init.ipx /etc/rc.d/init.d/ipx
-	install -m 0644 config.ipx /etc/sysconfig/ipx
-	rm -f /etc/rc.d/rc2.d/S15ipx
-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx
-	rm -f /etc/rc.d/rc3.d/S15ipx
-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx
-	rm -f /etc/rc.d/rc5.d/S15ipx
-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx
-	rm -f /etc/rc.d/rc6.d/K55ipx
-	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx
-
+#	install init.ipx /etc/rc.d/init.d/ipx
+#	install -m 0644 config.ipx /etc/sysconfig/ipx
diff --git a/ipx_configure.c b/ipx_configure.c
index fd3e458..670bc78 100644
--- a/ipx_configure.c
+++ b/ipx_configure.c
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <getopt.h>
+#include <stdlib.h>
 #include <strings.h>
 #include <netipx/ipx.h>
 #include <sys/types.h>
diff --git a/ipx_interface.c b/ipx_interface.c
index b9d0ad0..59185b7 100644
--- a/ipx_interface.c
+++ b/ipx_interface.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <strings.h>
+#include <string.h>
 #include <netinet/in.h>
 #include <netipx/ipx.h>
 #include <linux/if.h>
@@ -191,7 +191,9 @@ ipx_delall_interface(int argc, char **argv)
 		exit(-1);
 	}
 
-	fp = fopen("/proc/net/ipx_interface", "r");
+	fp = fopen("/proc/net/ipx/interface", "r");
+	if (fp == NULL)
+		fp = fopen("/proc/net/ipx_interface", "r");
 	if (fp == NULL) {
 		fprintf(stderr, 
 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
diff --git a/ipx_internal_net.c b/ipx_internal_net.c
index f6f995b..9acef55 100644
--- a/ipx_internal_net.c
+++ b/ipx_internal_net.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <strings.h>
+#include <string.h>
 #include <netinet/in.h>
 #include <netipx/ipx.h>
 #include <linux/if.h>
diff --git a/ipx_route.c b/ipx_route.c
index df083bc..f7277f3 100644
--- a/ipx_route.c
+++ b/ipx_route.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <strings.h>
+#include <string.h>
 #include <netinet/in.h>
 #include <netipx/ipx.h>
 #include <sys/types.h>