From: Austin English <wizardedit@gentoo.org>
Date: Wed, 4 May 2016 22:36:31 +0000 (-0500)
Subject: et-misc/ipx-utils: build fixes
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d5c548d1ed047462669bc966942edd29d5bbdc45;p=gentoo.git

et-misc/ipx-utils: build fixes

* Install binaries into /sbin (Fixes #582036)
* Add a patch to fix some old gcc warnings

Package-Manager: portage-2.2.26
---

diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
new file mode 100644
index 000000000000..3fc928f00e2d
--- /dev/null
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
@@ -0,0 +1,51 @@
+Binary files ipx-1.1.orig/ipx_configure and ipx-1.1/ipx_configure differ
+diff -ur ipx-1.1.orig/ipx_configure.c ipx-1.1/ipx_configure.c
+--- ipx-1.1.orig/ipx_configure.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_configure.c	2016-05-04 21:21:46.139346843 +0000
+@@ -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>
+Binary files ipx-1.1.orig/ipx_interface and ipx-1.1/ipx_interface differ
+diff -ur ipx-1.1.orig/ipx_interface.c ipx-1.1/ipx_interface.c
+--- ipx-1.1.orig/ipx_interface.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_interface.c	2016-05-04 21:20:27.414995860 +0000
+@@ -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>
+Binary files ipx-1.1.orig/ipx_internal_net and ipx-1.1/ipx_internal_net differ
+diff -ur ipx-1.1.orig/ipx_internal_net.c ipx-1.1/ipx_internal_net.c
+--- ipx-1.1.orig/ipx_internal_net.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_internal_net.c	2016-05-04 21:20:14.814299490 +0000
+@@ -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>
+Binary files ipx-1.1.orig/ipx_route and ipx-1.1/ipx_route differ
+diff -ur ipx-1.1.orig/ipx_route.c ipx-1.1/ipx_route.c
+--- ipx-1.1.orig/ipx_route.c	2016-05-04 21:08:46.606264315 +0000
++++ ipx-1.1/ipx_route.c	2016-05-04 21:20:17.954473064 +0000
+@@ -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>
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
index fbf7d50af696..a835d2be0a59 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
@@ -22,6 +22,7 @@ src_prepare() {
 	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
 	eapply "${FILESDIR}"/${P}-makefile.patch
 	eapply "${FILESDIR}"/${P}-proc.patch #67642
+	eapply "${FILESDIR}"/${P}-gcc-warnings.patch
 
 	default
 }
@@ -31,5 +32,6 @@ src_install() {
 	newconfd "${FILESDIR}"/ipx.confd ipx
 	newinitd "${FILESDIR}"/ipx.init ipx
 
+	into /sbin
 	default
 }