diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-12-04 12:43:03 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-12-04 12:43:03 +0000 |
| commit | 2edb46f1328d99fdccdd51b1d876098fb39da61b (patch) | |
| tree | 5603e70200d157a53fd67eab0cdeb9a613478ed1 /net-misc/dhcpcd | |
| parent | Stable on sparc wrt #156420 (diff) | |
| download | gentoo-2-2edb46f1328d99fdccdd51b1d876098fb39da61b.tar.gz gentoo-2-2edb46f1328d99fdccdd51b1d876098fb39da61b.tar.bz2 gentoo-2-2edb46f1328d99fdccdd51b1d876098fb39da61b.zip | |
Fix the patch so we only include linux/if_addr.h for 2.6.19+ kernels.
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'net-misc/dhcpcd')
| -rw-r--r-- | net-misc/dhcpcd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index dd2331ae83d9..db71f12e235a 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/dhcpcd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.117 2006/12/04 10:06:04 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.118 2006/12/04 12:43:02 uberlord Exp $ + + 04 Dec 2006; Roy Marples <uberlord@gentoo.org> + files/dhcpcd-3.0.2-if_addr.patch: + Fix the patch so we only include linux/if_addr.h for 2.6.19+ kernels. 04 Dec 2006; Roy Marples <uberlord@gentoo.org> +files/dhcpcd-3.0.2-if_addr.patch, dhcpcd-3.0.2.ebuild: diff --git a/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch b/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch index bb9e041aec32..81013f4b0ba2 100644 --- a/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch +++ b/net-misc/dhcpcd/files/dhcpcd-3.0.2-if_addr.patch @@ -1,12 +1,25 @@ Index: interface.c =================================================================== ---- interface.c (revision 91) +--- interface.c (revision 92) +++ interface.c (working copy) -@@ -30,6 +30,7 @@ +@@ -30,6 +30,10 @@ #ifdef __linux__ #include <asm/types.h> /* Needed for 2.4 kernels */ #include <features.h> ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,19) +#include <linux/if_addr.h> ++#endif #include <linux/netlink.h> #include <linux/rtnetlink.h> #include <netinet/ether.h> +Index: ChangeLog +=================================================================== +--- ChangeLog (revision 92) ++++ ChangeLog (working copy) +@@ -1,3 +1,5 @@ ++Include linux/if_addr.h for 2.6.19+ kernels, thanks to AlexExtreme. ++ + dhcpcd-3.0.2 + Linux systems without glibc-2.3 don't have getifaddrs, so we define our own. + Changed the default timeout to 20 seconds, allowing hme Sparc drivers to work. |