summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-15 05:51:17 +0000
committerMike Frysinger <vapier@gentoo.org>2007-10-15 05:51:17 +0000
commitcb0a727000dbe8d8c2f3ef6ed6b3d4e09f68ff63 (patch)
tree296e111397664614f0733632424d0f1837afc4f0 /net-misc/iputils
parentstable on ppc64 (diff)
downloadgentoo-2-cb0a727000dbe8d8c2f3ef6ed6b3d4e09f68ff63.tar.gz
gentoo-2-cb0a727000dbe8d8c2f3ef6ed6b3d4e09f68ff63.tar.bz2
gentoo-2-cb0a727000dbe8d8c2f3ef6ed6b3d4e09f68ff63.zip
Fix building with newer kernel headers that lack OPEN_MAX #195861 by Markus Meier.
(Portage version: 2.1.3.13)
Diffstat (limited to 'net-misc/iputils')
-rw-r--r--net-misc/iputils/ChangeLog7
-rw-r--r--net-misc/iputils/files/iputils-20070202-no-open-max.patch16
-rw-r--r--net-misc/iputils/iputils-20070202.ebuild3
3 files changed, 24 insertions, 2 deletions
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index af31067f8f34..a872889e2803 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/iputils
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.54 2007/04/30 20:34:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.55 2007/10/15 05:51:16 vapier Exp $
+
+ 15 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/iputils-20070202-no-open-max.patch, iputils-20070202.ebuild:
+ Fix building with newer kernel headers that lack OPEN_MAX #195861 by Markus
+ Meier.
*iputils-9999 (30 Apr 2007)
diff --git a/net-misc/iputils/files/iputils-20070202-no-open-max.patch b/net-misc/iputils/files/iputils-20070202-no-open-max.patch
new file mode 100644
index 000000000000..5013ba4fdc06
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20070202-no-open-max.patch
@@ -0,0 +1,16 @@
+the OPEN_MAX define has been removed in newer kernel headers so use the
+proper method of getting the value dynamically
+
+http://bugs.gentoo.org/195861
+
+--- a/rdisc.c
++++ b/rdisc.c
+@@ -247,7 +247,7 @@ void do_fork(void)
+ if ((pid=fork()) != 0)
+ exit(0);
+
+- for (t = 0; t < OPEN_MAX; t++)
++ for (t = 0; t < sysconf(_SC_OPEN_MAX); t++)
+ if (t != s)
+ close(t);
+
diff --git a/net-misc/iputils/iputils-20070202.ebuild b/net-misc/iputils/iputils-20070202.ebuild
index 5b439712454d..bf7c87940c12 100644
--- a/net-misc/iputils/iputils-20070202.ebuild
+++ b/net-misc/iputils/iputils-20070202.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20070202.ebuild,v 1.2 2007/06/26 02:32:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20070202.ebuild,v 1.3 2007/10/15 05:51:16 vapier Exp $
inherit flag-o-matic eutils toolchain-funcs
@@ -32,6 +32,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-20070202-makefile.patch
epatch "${FILESDIR}"/${PN}-20060512-kernel-ifaddr.patch
epatch "${FILESDIR}"/${PN}-20060512-linux-headers.patch
+ epatch "${FILESDIR}"/${PN}-20070202-no-open-max.patch #195861
use static && append-ldflags -static
use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile