Fix to build on 2.6.22 kernels, thanks to Kai Lippok for pointing it out

Package-Manager: portage-2.1.2.9

4 files changed, 56 insertions, 13 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index b2b09f214266..0f3e47472419 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.94 2007/07/12 21:13:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.95 2007/07/13 14:51:37 gustavoz Exp $
+
+  13 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/zaptel-1.2.18-2.6.22.diff, zaptel-1.2.18.ebuild:
+  Fix to build on 2.6.22 kernels, thanks to Kai Lippok for pointing it out
 
 *zaptel-1.2.18 (12 Jul 2007)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 1b91286dabb1..6419bb75d7ff 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -45,6 +45,10 @@ AUX zaptel-1.2.16-gentoo.diff 5295 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4
 MD5 27729c0ff28af11c6753094db7c4ac7d files/zaptel-1.2.16-gentoo.diff 5295
 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 files/zaptel-1.2.16-gentoo.diff 5295
 SHA256 f7caa5824fc7ef39149b6a52dd9b4520d4580db20211b0c8995275ae89ff2c31 files/zaptel-1.2.16-gentoo.diff 5295
+AUX zaptel-1.2.18-2.6.22.diff 1172 RMD160 d285a3a76fb9023db10207467c6cdbdb06677574 SHA1 186ce56d54d0c9cc8ac6df1f78472ed3e165fa82 SHA256 e90a922d549d2a10532cd20f053c48beb0510c1465cb40de0a515a1ad7bb7ccd
+MD5 1265fb1f703fed62e42e7dcd2abbb0f0 files/zaptel-1.2.18-2.6.22.diff 1172
+RMD160 d285a3a76fb9023db10207467c6cdbdb06677574 files/zaptel-1.2.18-2.6.22.diff 1172
+SHA256 e90a922d549d2a10532cd20f053c48beb0510c1465cb40de0a515a1ad7bb7ccd files/zaptel-1.2.18-2.6.22.diff 1172
 AUX zaptel-1.2.18-gentoo.diff 5295 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 SHA1 03badeb90d7b97e69878d6fed64d6ce317a09ea5 SHA256 f7caa5824fc7ef39149b6a52dd9b4520d4580db20211b0c8995275ae89ff2c31
 MD5 27729c0ff28af11c6753094db7c4ac7d files/zaptel-1.2.18-gentoo.diff 5295
 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 files/zaptel-1.2.18-gentoo.diff 5295
@@ -115,18 +119,18 @@ EBUILD zaptel-1.2.16.ebuild 9121 RMD160 b2470ddebf0d0a875fec81c76036be783fcdff22
 MD5 30218222a79f53c31caa4551361d99e1 zaptel-1.2.16.ebuild 9121
 RMD160 b2470ddebf0d0a875fec81c76036be783fcdff22 zaptel-1.2.16.ebuild 9121
 SHA256 7b87297ebfa39603effc47c12d2aa90547bc9b7b1831e067fdcc37213054d40a zaptel-1.2.16.ebuild 9121
-EBUILD zaptel-1.2.18.ebuild 9310 RMD160 40e513978be268e76e35353242c0f67aa0237171 SHA1 e50dd63e77e340127eef8f07c263b163e1351023 SHA256 22e7d66f59cc617527a7d4316052368b55527ada10e20db7a5a88532ae3da295
-MD5 a601815569005db28e60b6aa313e7e6c zaptel-1.2.18.ebuild 9310
-RMD160 40e513978be268e76e35353242c0f67aa0237171 zaptel-1.2.18.ebuild 9310
-SHA256 22e7d66f59cc617527a7d4316052368b55527ada10e20db7a5a88532ae3da295 zaptel-1.2.18.ebuild 9310
+EBUILD zaptel-1.2.18.ebuild 9347 RMD160 a88946ebcb9bcc14ab3d9540f59d48356ed3360e SHA1 f4fe77485bec278e4f05069684ca244d2b891597 SHA256 4e85e1ba8aad9e4f354a2395e2eedb4ec5b46f6d45e3d76ed9b07ff80274a1d5
+MD5 de6b3056d123c1c430d01a043dd1e2f7 zaptel-1.2.18.ebuild 9347
+RMD160 a88946ebcb9bcc14ab3d9540f59d48356ed3360e zaptel-1.2.18.ebuild 9347
+SHA256 4e85e1ba8aad9e4f354a2395e2eedb4ec5b46f6d45e3d76ed9b07ff80274a1d5 zaptel-1.2.18.ebuild 9347
 EBUILD zaptel-1.2.9.1-r1.ebuild 8577 RMD160 b487dfe2f52b91b5cd5a75667a2c702bb65397c5 SHA1 b304a51b4e762ca281a54ddac822f3e2deabc4b7 SHA256 36b1e47f352425665c6ed1c77ba9a53374b5bb04e8aaabd8b9483b4c377df8bd
 MD5 3137e2eae66b020b7ac2d239b8d4008b zaptel-1.2.9.1-r1.ebuild 8577
 RMD160 b487dfe2f52b91b5cd5a75667a2c702bb65397c5 zaptel-1.2.9.1-r1.ebuild 8577
 SHA256 36b1e47f352425665c6ed1c77ba9a53374b5bb04e8aaabd8b9483b4c377df8bd zaptel-1.2.9.1-r1.ebuild 8577
-MISC ChangeLog 18472 RMD160 3a1a77a8fe978217b5ca114c3fa66fb0c4880cc5 SHA1 c6297bb12b1b6b49325b130675efae20d87b055c SHA256 794c2160394f4a9e4bbe0e711cc3543bfefc8936419411b3db09a1372325f2c7
-MD5 f8ba6a620eb93f798e58d001628a8dd6 ChangeLog 18472
-RMD160 3a1a77a8fe978217b5ca114c3fa66fb0c4880cc5 ChangeLog 18472
-SHA256 794c2160394f4a9e4bbe0e711cc3543bfefc8936419411b3db09a1372325f2c7 ChangeLog 18472
+MISC ChangeLog 18660 RMD160 bd1544dae3dff39568e199bcab7ef51e8cbe48fa SHA1 a811b0929337c1bd79cef3bfd21b931e282e80e6 SHA256 6b95fd287e879b311746ead4aa5315f0e4345cb47185e9982c586383982c580c
+MD5 73a475c2a7b45fa7055095694f8893f7 ChangeLog 18660
+RMD160 bd1544dae3dff39568e199bcab7ef51e8cbe48fa ChangeLog 18660
+SHA256 6b95fd287e879b311746ead4aa5315f0e4345cb47185e9982c586383982c580c ChangeLog 18660
 MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
 MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
@@ -155,7 +159,7 @@ SHA256 9322dafee7f351be55a54eec5d617e1ee98b3a32aa5cb25546bd9631ac34487f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFGlpliKRy60XGEcJIRAl7kAJ4ud2l0vxgXnOB4h4aauZ2qrQmmWwCeOTha
-YktJSj5FWojyyleJGdRjTUw=
-=SAj3
+iD8DBQFGl5F7KRy60XGEcJIRAn9jAJ9FHEF/TJOFK/ZnRrJ3SVq/kJJkHACdFwNU
+TOt5NCQK9maOyxxMt3XQozA=
+=Ifgw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/zaptel-1.2.18-2.6.22.diff b/net-misc/zaptel/files/zaptel-1.2.18-2.6.22.diff
new file mode 100644
index 000000000000..57ee0c023d73
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.18-2.6.22.diff
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kernel_2.6.22.dpatch by Dermot Bradley <dermot.bradley@sla-networks.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Code changes required for linux 2.6.22.
+
+@DPATCH@
+diff -urN zaptel-1.2.18.SLA/ztd-eth.c zaptel-1.2.18.SLA.new/ztd-eth.c
+--- zaptel-1.2.18.SLA/ztd-eth.c	2007-01-31 19:01:33.000000000 +0000
++++ zaptel-1.2.18.SLA.new/ztd-eth.c	2007-07-03 03:10:50.000000000 +0100
+@@ -92,7 +92,11 @@
+ {
+ 	struct zt_span *span;
+ 	struct ztdeth_header *zh;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++	zh = (struct ztdeth_header *)skb->network_header;
++#else
+ 	zh = (struct ztdeth_header *)skb->nh.raw;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
+ 	span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr);
+ #else
+@@ -171,7 +175,11 @@
+ 
+ 			/* Setup protocol and such */
+ 			skb->protocol = __constant_htons(ETH_P_ZTDETH);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
++			skb->network_header = skb->data;
++#else
+ 			skb->nh.raw = skb->data;
++#endif
+ 			skb->dev = dev;
+ 			if (dev->hard_header)
+ 				dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len);
diff --git a/net-misc/zaptel/zaptel-1.2.18.ebuild b/net-misc/zaptel/zaptel-1.2.18.ebuild
index dc4802f49d77..d65d9574aaba 100644
--- a/net-misc/zaptel/zaptel-1.2.18.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.18.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/zaptel/zaptel-1.2.18.ebuild,v 1.1 2007/07/12 21:13:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.2 2007/07/13 14:51:37 gustavoz Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -169,6 +169,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/${P}-2.6.22.diff
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch