Fix the patch so we only include linux/if_addr.h for 2.6.19+ kernels.

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index dd2331ae83d9f5825fba047ab8b2e85d85af82fd..db71f12e235a6e64b12b8c28b524845b96713e40 100644 (file)
--- 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/Manifest b/net-misc/dhcpcd/Manifest
index 6175efcacb7e7d9314445973206e292365fe560d..850ff85a23d6bbe5880b8144073e37ef60e3f68c 100644 (file)
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -18,10 +18,10 @@ AUX dhcpcd-2.0.8-no_resolve_hostname.patch 469 RMD160 14216b14dcf5499842d0a837ce
 MD5 56afc76092c3c2ecb7abe181cd6e09a2 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
 RMD160 14216b14dcf5499842d0a837ce03b8f9c80dd9c5 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
 SHA256 adaa5323811e44a334de429bfe8361b0c1c39666b18fdc9d6e35dc22d9098e61 files/dhcpcd-2.0.8-no_resolve_hostname.patch 469
-AUX dhcpcd-3.0.2-if_addr.patch 375 RMD160 fef43d57a715a6dfda55971ecdfeb10af3f1e019 SHA1 744f8711b958ad244335ca1c4791ac8430f349e8 SHA256 1783c1a5ba932424b15ad78b910cadf758b381f8fa35cf2229ead0d393fa3069
-MD5 89e7d0eb06760348702a05ec79d95889 files/dhcpcd-3.0.2-if_addr.patch 375
-RMD160 fef43d57a715a6dfda55971ecdfeb10af3f1e019 files/dhcpcd-3.0.2-if_addr.patch 375
-SHA256 1783c1a5ba932424b15ad78b910cadf758b381f8fa35cf2229ead0d393fa3069 files/dhcpcd-3.0.2-if_addr.patch 375
+AUX dhcpcd-3.0.2-if_addr.patch 864 RMD160 40cc2d0eeaa83e91e6febcd63a58522b8cc95fa8 SHA1 09523f498bc4c2c658f8aa7737ae6839805d522d SHA256 b79a23a24e64ef6a5060745eba50c007ced5d8079496c12f67b8093a8985605c
+MD5 cb71d5a4fdeb77cad3341a69b1c8e40c files/dhcpcd-3.0.2-if_addr.patch 864
+RMD160 40cc2d0eeaa83e91e6febcd63a58522b8cc95fa8 files/dhcpcd-3.0.2-if_addr.patch 864
+SHA256 b79a23a24e64ef6a5060745eba50c007ced5d8079496c12f67b8093a8985605c files/dhcpcd-3.0.2-if_addr.patch 864
 DIST dhcpcd-2.0.0.tar.bz2 122497 RMD160 0b5b766fad5e1c1f2a82d5ed850b4569ada04854 SHA1 83f5905ed73953d995d1dc0eca318003f4ea95e0 SHA256 f8c79e6a72a2b34ab05a5370fda582ea1ceb436924c911a09a8c69850b4cd673
 DIST dhcpcd-2.0.3.tar.bz2 123176 RMD160 f66d1017b193c409dde624618cdfcd95d0b34429 SHA1 dec7254ce08114f1ced5e3c37bf528f33bf1ea96 SHA256 9dd7358f1f7e6a72ba218860abd9f44535cacf6084f34dbb8da15963a62ddcc4
 DIST dhcpcd-2.0.5.tar.bz2 124838 RMD160 205632ea754c51d39827cfbdb9839368a4f17a78 SHA1 f2480d142dfce4128b13d434497ad933f4c337d1 SHA256 0b3acf8306f5ad1fb036703c9ede302c416d9f118950903306c647357113a411
@@ -57,10 +57,10 @@ EBUILD dhcpcd-3.0.2.ebuild 976 RMD160 4040f5e8a4d031da5e043dc275a2af24858c5343 S
 MD5 815139a48229a13c03d73022206b67cb dhcpcd-3.0.2.ebuild 976
 RMD160 4040f5e8a4d031da5e043dc275a2af24858c5343 dhcpcd-3.0.2.ebuild 976
 SHA256 fd28db0c76056134cd31f0fc3eaa8be50e29da1e9eef0824ccb2cb4501d0a192 dhcpcd-3.0.2.ebuild 976
-MISC ChangeLog 17547 RMD160 acc03a7d74833707775967d3b28a2a5fe113128c SHA1 a151f67b58d08807c298902f2bd96dc972b77121 SHA256 64069c5dc76c1253c2f882d58da57881ec39c9e99a40fc32e5c914200c2f4667
-MD5 1b3b84ea024cbe0f0cc040861ef60da8 ChangeLog 17547
-RMD160 acc03a7d74833707775967d3b28a2a5fe113128c ChangeLog 17547
-SHA256 64069c5dc76c1253c2f882d58da57881ec39c9e99a40fc32e5c914200c2f4667 ChangeLog 17547
+MISC ChangeLog 17705 RMD160 8c563cc52a125ba176527022b48c1c159baffe15 SHA1 d01ab233d464a37c1fe0297d108a7d67211c1c5d SHA256 2d420e3c03c41a2ec04a5c9de2a0361084697cdd3dafac99cbd4547fa9ca7a76
+MD5 e8e95393754a801885841ca31cd14dda ChangeLog 17705
+RMD160 8c563cc52a125ba176527022b48c1c159baffe15 ChangeLog 17705
+SHA256 2d420e3c03c41a2ec04a5c9de2a0361084697cdd3dafac99cbd4547fa9ca7a76 ChangeLog 17705
 MISC metadata.xml 387 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b SHA1 0c5e906b77e4bdcb49309098599d1af03fd984b2 SHA256 1a92884e5ea54c2b54b068a428431fb720e9456a62b0a2506700c80c43e94c18
 MD5 d162dd0282805d591f68cfc5d4e36901 metadata.xml 387
 RMD160 c53e701a27189b08ae150e174d24e94813f22d9b metadata.xml 387

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 bb9e041aec3224ffd1bb59975038a34fedce63e0..81013f4b0ba28a4cd13bfcde5f59341695cdae84 100644 (file)
--- 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.