Fix compilation error when build against linux-headers-2.6.17-r2 (#160381)

Package-Manager: portage-2.1.2.2

diff --git a/net-dialup/linux-atm/ChangeLog b/net-dialup/linux-atm/ChangeLog
index cfb6d9e4258228eb3e56db8b2a61b1b2dd091f17..bab24ab54bda79f422122d7f787e6650edb90529 100644 (file)
--- a/net-dialup/linux-atm/ChangeLog
+++ b/net-dialup/linux-atm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/linux-atm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.20 2007/01/03 16:58:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.21 2007/04/13 22:31:53 mrness Exp $
+
+  13 Apr 2007; Alin Năstac <mrness@gentoo.org> +files/2.4.1-linux-if.patch,
+  linux-atm-2.4.1-r1.ebuild:
+  Fix compilation error when build against linux-headers-2.6.17-r2 (#160381).
 
   03 Jan 2007; Mike Frysinger <vapier@gentoo.org> linux-atm-2.4.1-r1.ebuild:
   Fix building with sanitized linux-headers #159823 by Emanuele Tamponi.

diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 452505db7e513e802dd05ee8f232bdeba5fe176d..9d47ec562f65bfbf4cbcd3061d225b04861f42da 100644 (file)
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -9,19 +9,23 @@ AUX 2.4.1-gcc4.patch 3394 RMD160 2af6a796d209279b645fb654b1f0a237d78d470c SHA1 0
 MD5 30ac2602fbe634b8719307df79b1f4cb files/2.4.1-gcc4.patch 3394
 RMD160 2af6a796d209279b645fb654b1f0a237d78d470c files/2.4.1-gcc4.patch 3394
 SHA256 b28b101c2746bc6cdc62dadb55a3c65ca2389ad46f3382e310fe83043b5d2814 files/2.4.1-gcc4.patch 3394
+AUX 2.4.1-linux-if.patch 459 RMD160 734f6085fed3fbfde0623d47ba1635e590ea0db5 SHA1 d2828d341fa9c78c8e2a2ed53e74dc0c0bcc1660 SHA256 21fdc2f6a6f75945f9c188c4cace21dc21f5ee8b74ab3514de5252d8faa7c434
+MD5 b420df39e39da7883aa872ac3d7e0eee files/2.4.1-linux-if.patch 459
+RMD160 734f6085fed3fbfde0623d47ba1635e590ea0db5 files/2.4.1-linux-if.patch 459
+SHA256 21fdc2f6a6f75945f9c188c4cace21dc21f5ee8b74ab3514de5252d8faa7c434 files/2.4.1-linux-if.patch 459
 AUX 2.4.1-stdlib.patch 1216 RMD160 9fba5d8ec55fa5831198cb91ca704b474f259ad3 SHA1 f4f5e3d8dd5091229c251434acacbb1a1a9709ca SHA256 36e41ced942e04b6ff174a51bc26a230112c7dc493f1cadb2f9a25e47ea6a17a
 MD5 d7dd6d910e147168b4d1204e618f5a79 files/2.4.1-stdlib.patch 1216
 RMD160 9fba5d8ec55fa5831198cb91ca704b474f259ad3 files/2.4.1-stdlib.patch 1216
 SHA256 36e41ced942e04b6ff174a51bc26a230112c7dc493f1cadb2f9a25e47ea6a17a files/2.4.1-stdlib.patch 1216
 DIST linux-atm-2.4.1.tar.gz 711714 RMD160 bee14d7dd0b703d8e17bb6b9a7366408d4509b48 SHA1 244a52e1119c990e87c7918ba3ae67575625e563 SHA256 a812816ee1742bf3bf8977a391b369a7351f54a1917dc90b27e666679dd1742a
-EBUILD linux-atm-2.4.1-r1.ebuild 1261 RMD160 34952f5b8a09aff7ccffc874875fbb4a4cc562ad SHA1 4ef54f634f8de139d20360754a843c6215bbfdb6 SHA256 9baf3d13a251ad11683359ea5d20b6752fef59ed53dcd71e1c104a6bafc67b2d
-MD5 45eeb7cdcbaf27eeb64dfc8921c3a2a1 linux-atm-2.4.1-r1.ebuild 1261
-RMD160 34952f5b8a09aff7ccffc874875fbb4a4cc562ad linux-atm-2.4.1-r1.ebuild 1261
-SHA256 9baf3d13a251ad11683359ea5d20b6752fef59ed53dcd71e1c104a6bafc67b2d linux-atm-2.4.1-r1.ebuild 1261
-MISC ChangeLog 2531 RMD160 8c8df7a32fc6ea94fdd4996ecc4a386e029893dd SHA1 5c67605cc67458fe02cf233573b715fa5cc10846 SHA256 95924cec50fd4e8b191f87dd467a7e020f9483cdba17b3b0dd875ead25e2d123
-MD5 5af7508441f03de99ca127d50b809bac ChangeLog 2531
-RMD160 8c8df7a32fc6ea94fdd4996ecc4a386e029893dd ChangeLog 2531
-SHA256 95924cec50fd4e8b191f87dd467a7e020f9483cdba17b3b0dd875ead25e2d123 ChangeLog 2531
+EBUILD linux-atm-2.4.1-r1.ebuild 1305 RMD160 de3e8b33b40a4ee99ec836e59d80e8b62ebbb3e5 SHA1 c3d455b305585af8817a5e0b2613a33fb9604c1d SHA256 4ec916f62d17cc2db0e401bef1930d32cb7f25808b5efd4719fdf4f75d747ed5
+MD5 260f4002f1787f0cca89894a32b66fe7 linux-atm-2.4.1-r1.ebuild 1305
+RMD160 de3e8b33b40a4ee99ec836e59d80e8b62ebbb3e5 linux-atm-2.4.1-r1.ebuild 1305
+SHA256 4ec916f62d17cc2db0e401bef1930d32cb7f25808b5efd4719fdf4f75d747ed5 linux-atm-2.4.1-r1.ebuild 1305
+MISC ChangeLog 2716 RMD160 ab1d0c4ab2c2dab012c8e5fda88fdcc4102977f4 SHA1 e28d464882a483e51694c0d100a71f4cabd6be70 SHA256 da1a2cbd1fc1d8fcc5bcb84e6d8d54889f68191e6d98eedf7951022e799975e6
+MD5 ff4b49b0af97e7820901bd0d1ec9d7f4 ChangeLog 2716
+RMD160 ab1d0c4ab2c2dab012c8e5fda88fdcc4102977f4 ChangeLog 2716
+SHA256 da1a2cbd1fc1d8fcc5bcb84e6d8d54889f68191e6d98eedf7951022e799975e6 ChangeLog 2716
 MISC metadata.xml 221 RMD160 0d4170fa2da5d71ad91305834619992920225f35 SHA1 cca29f168616ccb67147f7e447f466d62e4670bb SHA256 8a2d028dbf3e99f156adfb113f4a8bb8bba39472e338c58da3f018f939a50e23
 MD5 aca8fbd1d23180a4c3434d1ca7f812e1 metadata.xml 221
 RMD160 0d4170fa2da5d71ad91305834619992920225f35 metadata.xml 221
@@ -30,9 +34,9 @@ MD5 d25c4d5839204e320387bf5c69986a3d files/digest-linux-atm-2.4.1-r1 247
 RMD160 772aa7628394a519dd1312c193ae4a95bcaf454e files/digest-linux-atm-2.4.1-r1 247
 SHA256 6aee0fc958a00736bafe8dae55bb330427815b0d9fc866eb56fca24b94701e15 files/digest-linux-atm-2.4.1-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFm+D58bi6rjpTunYRAvt+AKCBRuzlmLyl2InXQ3GxrXwBWY/ilQCeIL4w
-G0K/QySyFXpBIZDBsQrCMko=
-=+izC
+iD8DBQFGIATkJnxX6mF440QRAja4AKDJt+S90BHbcL3+tye4CcDkgHzUNQCgqEY2
+ZK/m3uyG0EHWhDibjFMRKFE=
+=tPGz
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/linux-atm/files/2.4.1-linux-if.patch b/net-dialup/linux-atm/files/2.4.1-linux-if.patch
new file mode 100644 (file)
index 0000000..fcc2f8a
--- /dev/null
+++ b/net-dialup/linux-atm/files/2.4.1-linux-if.patch
@@ -0,0 +1,12 @@
+diff -Nru linux-atm-2.4.1.orig/src/arpd/io.c linux-atm-2.4.1/src/arpd/io.c
+--- linux-atm-2.4.1.orig/src/arpd/io.c 2007-04-13 23:50:25.000000000 +0300
++++ linux-atm-2.4.1/src/arpd/io.c      2007-04-13 23:30:28.000000000 +0300
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <netinet/in.h>
+ #include <atm.h>
+ #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */

diff --git a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild b/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild
index 87ca83c84b5e4405ff910fc375426e625e3e3953..34d9a93b6eefce9c5056a0b37e83cec5d788a362 100644 (file)
--- a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.4.1-r1.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-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.15 2007/01/03 16:58:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.16 2007/04/13 22:31:53 mrness Exp $
 
 inherit eutils libtool
 
@@ -29,6 +29,8 @@ src_unpack() {
        # Fedora patch: include stdlib.h for strtol prototype in sigd/cfg_y.y
        epatch "${FILESDIR}"/${PV}-stdlib.patch
 
+       epatch "${FILESDIR}"/${PV}-linux-if.patch
+
        sed -i '/#define _LINUX_NETDEVICE_H/d' src/arpd/*.c || die
        sed -i 's:cp hosts.atm /etc:cp hosts.atm ${DESTDIR}/etc:' src/config/Makefile.in || die "sed operation on Makefile failed"