diff options
author | 2007-08-29 19:06:08 +0000 | |
---|---|---|
committer | 2007-08-29 19:06:08 +0000 | |
commit | fb3e3b52265f03516dbcb6ee647c80bc7bd29ab9 (patch) | |
tree | 8565192f5316d64765fa962e7ec7e8fc43c56dd9 /net-misc | |
parent | CONFIG_CHECK fix, NET_RADIO -> WIRELESS_EXT (diff) | |
download | historical-fb3e3b52265f03516dbcb6ee647c80bc7bd29ab9.tar.gz historical-fb3e3b52265f03516dbcb6ee647c80bc7bd29ab9.tar.bz2 historical-fb3e3b52265f03516dbcb6ee647c80bc7bd29ab9.zip |
Fix 2.6.22 kernel thanks to Jernej Kos <kostko@unimatrix-one.org> in bug 189718
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/arpstar/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/arpstar/Manifest | 20 | ||||
-rw-r--r-- | net-misc/arpstar/arpstar-0.5.5-r1.ebuild | 5 | ||||
-rw-r--r-- | net-misc/arpstar/files/2.6.22.patch | 61 |
4 files changed, 83 insertions, 11 deletions
diff --git a/net-misc/arpstar/ChangeLog b/net-misc/arpstar/ChangeLog index d49554bbb509..259ddf34f1d3 100644 --- a/net-misc/arpstar/ChangeLog +++ b/net-misc/arpstar/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/arpstar # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/ChangeLog,v 1.9 2007/05/12 02:05:52 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/ChangeLog,v 1.10 2007/08/29 19:06:08 genstef Exp $ + +*arpstar-0.5.5-r1.ebuild (29 Aug 2007) + + 29 Aug 2007; Stefan Schweizer <genstef@gentoo.org> +files/2.6.22.patch, + arpstar-0.5.5-r1.ebuild: + Fix 2.6.22 kernel thanks to Jernej Kos <kostko@unimatrix-one.org> in bug 189718 12 May 2007; Daniel Drake <dsd@gentoo.org> metadata.xml: Move from kernel to kernel-misc herd diff --git a/net-misc/arpstar/Manifest b/net-misc/arpstar/Manifest index 610a7fa396c6..db53b10242e3 100644 --- a/net-misc/arpstar/Manifest +++ b/net-misc/arpstar/Manifest @@ -1,16 +1,20 @@ +AUX 2.6.22.patch 1650 RMD160 0d4be41d209d8f5a8004030d6443ebc119f5f148 SHA1 5ed4bf8d93c0c69c2bd1ad70818ef05b71f0a2fd SHA256 0a39ea2705c22af46cda09b36770e26b3f28a44a53ca9ed3e79f81919d702447 +MD5 1a6cfe58ce043704b5952e799cbbfc55 files/2.6.22.patch 1650 +RMD160 0d4be41d209d8f5a8004030d6443ebc119f5f148 files/2.6.22.patch 1650 +SHA256 0a39ea2705c22af46cda09b36770e26b3f28a44a53ca9ed3e79f81919d702447 files/2.6.22.patch 1650 AUX arpstar-0.5.5-2.6.16.patch 1116 RMD160 0f2144abb36ed6905ea7d54cc3ccda57f7196f39 SHA1 f35799af8ec795801923a364d7bdedf93e2a77aa SHA256 a8ddf7f247accd770682957a11c757bf41af8abafcf1bebdca63be161ff77c83 MD5 74c7a42e35d9869a37b1d716786bb15b files/arpstar-0.5.5-2.6.16.patch 1116 RMD160 0f2144abb36ed6905ea7d54cc3ccda57f7196f39 files/arpstar-0.5.5-2.6.16.patch 1116 SHA256 a8ddf7f247accd770682957a11c757bf41af8abafcf1bebdca63be161ff77c83 files/arpstar-0.5.5-2.6.16.patch 1116 DIST arpstar-0.5.5.tar.gz 6928 RMD160 a59550e6e79ee9ce74e0027ab0a264f789223625 SHA1 0e526793c977135e24af5a6f9a29b3f45398a8de SHA256 85ec75d3f7f18d78d086bcf83572ee1b3121f91337eea4193bc96bb3039033d3 -EBUILD arpstar-0.5.5-r1.ebuild 780 RMD160 b1a5d1c41759e3fe8fac120af3ca89b6073c2fe4 SHA1 179474fcc08f667b7ac87b3a5c869c70a030c19a SHA256 33df8ec0e6a6360bbe7cc9c2a54bb41d830e24eb9b4faa1c7689d4435e8104f8 -MD5 2e7f77031733e2edac7d5e659a94b10c arpstar-0.5.5-r1.ebuild 780 -RMD160 b1a5d1c41759e3fe8fac120af3ca89b6073c2fe4 arpstar-0.5.5-r1.ebuild 780 -SHA256 33df8ec0e6a6360bbe7cc9c2a54bb41d830e24eb9b4faa1c7689d4435e8104f8 arpstar-0.5.5-r1.ebuild 780 -MISC ChangeLog 1694 RMD160 0e454eaba3e369b124b93739a00ecc8e78691e53 SHA1 3fef1e6cb32cbda589cea9c56137b7c1f0bac156 SHA256 fef4e0fe48c2a90d0d926d84fa5af96a9baf5d5a3bca662b661f28876efa42a3 -MD5 03853181f9318ef8df67fc97f8463519 ChangeLog 1694 -RMD160 0e454eaba3e369b124b93739a00ecc8e78691e53 ChangeLog 1694 -SHA256 fef4e0fe48c2a90d0d926d84fa5af96a9baf5d5a3bca662b661f28876efa42a3 ChangeLog 1694 +EBUILD arpstar-0.5.5-r1.ebuild 792 RMD160 7edbdd5b693f391a39722e093e662b8e1274a0b2 SHA1 392dbb35e3aa7e0e59a81d4f540dc98e55c42cc6 SHA256 007a74046f4555589c59f6db71510d417b6bb39953bc9e3618d9f07b9e48f8f1 +MD5 5d9432a29985de21424062e2ac07f128 arpstar-0.5.5-r1.ebuild 792 +RMD160 7edbdd5b693f391a39722e093e662b8e1274a0b2 arpstar-0.5.5-r1.ebuild 792 +SHA256 007a74046f4555589c59f6db71510d417b6bb39953bc9e3618d9f07b9e48f8f1 arpstar-0.5.5-r1.ebuild 792 +MISC ChangeLog 1923 RMD160 b84f325916fa971668c344912f28f11101c6612f SHA1 0830e34e279f4b3589b318566949c0ee6ffcd721 SHA256 409886348ede2578ccda20e52f3da06d7676d8dd7d0ca955eee0e9df263926f8 +MD5 c3a58fdcb4cabfdb7fd3c76221af34c4 ChangeLog 1923 +RMD160 b84f325916fa971668c344912f28f11101c6612f ChangeLog 1923 +SHA256 409886348ede2578ccda20e52f3da06d7676d8dd7d0ca955eee0e9df263926f8 ChangeLog 1923 MISC metadata.xml 165 RMD160 40791643aa14e1a3f6dd5fe8d77d67c7d8efd6a4 SHA1 3a82c6bd5272ecf891fbafcb8ece28ef7797bab6 SHA256 84bb5da4595ddab016f37d15403a3760c283dd044dd1c42277fdd1ef581c641b MD5 882b95faa6dd6af134dd6b0528ac1f58 metadata.xml 165 RMD160 40791643aa14e1a3f6dd5fe8d77d67c7d8efd6a4 metadata.xml 165 diff --git a/net-misc/arpstar/arpstar-0.5.5-r1.ebuild b/net-misc/arpstar/arpstar-0.5.5-r1.ebuild index cd4ae97334a4..2af967c0b9ea 100644 --- a/net-misc/arpstar/arpstar-0.5.5-r1.ebuild +++ b/net-misc/arpstar/arpstar-0.5.5-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-misc/arpstar/arpstar-0.5.5-r1.ebuild,v 1.4 2007/02/25 09:21:37 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/arpstar-0.5.5-r1.ebuild,v 1.5 2007/08/29 19:06:08 genstef Exp $ inherit eutils linux-mod @@ -25,7 +25,8 @@ pkg_setup() { src_unpack() { unpack ${A} - epatch "${FILESDIR}"/${P}-2.6.16.patch || die "epatch failed" + epatch "${FILESDIR}"/${P}-2.6.16.patch + epatch "${FILESDIR}"/2.6.22.patch } src_install() { diff --git a/net-misc/arpstar/files/2.6.22.patch b/net-misc/arpstar/files/2.6.22.patch new file mode 100644 index 000000000000..4565e95a97aa --- /dev/null +++ b/net-misc/arpstar/files/2.6.22.patch @@ -0,0 +1,61 @@ +--- arpstar.c.orig 2007-08-21 16:07:16.000000000 +0200 ++++ arpstar.c 2007-08-21 16:10:06.000000000 +0200 +@@ -113,7 +113,7 @@ + struct in_ifaddr * ifa; + + dev=(*skb)->dev; +- arp = (*skb)->nh.arph; ++ arp = arp_hdr(*skb); + arp_ptr= (unsigned char *)(arp+1); + sha = arp_ptr; + arp_ptr += dev->addr_len; +@@ -132,7 +132,7 @@ + goto out; + if(arpop==1) /*received ARP request*/ + { +- e2dst=(unsigned char *)(*skb)->mac.raw; ++ e2dst=skb_mac_header(*skb); + /*check if it's for us and send reply if it is*/ + ifa=indev->ifa_list; + while(ifa!=NULL) +@@ -239,7 +239,7 @@ + unsigned int status=NF_DROP; + + dev=(*skb)->dev; +- arp = (*skb)->nh.arph; ++ arp = arp_hdr(*skb); + arp_ptr= (unsigned char *)(arp+1); + sha = arp_ptr; + arp_ptr += dev->addr_len; +@@ -267,9 +267,9 @@ + { + u8 prot=1; + u32 ip; +- if((*skb)->h.ipiph->protocol==prot) /*looking for icmp*/ ++ if(ip_hdr(*skb)->protocol==prot) /*looking for icmp*/ + { +- ip=(*skb)->h.ipiph->saddr; ++ ip=ip_hdr(*skb)->saddr; + if(!check_ip(&ip,WAICMP)) + add_ip(&ip,WAICMP); + } +@@ -527,7 +527,7 @@ + + if(skb->len>=42||skb->len==28) /*28 is for wireless drivers that cut off ethernet header even though it's still accessible*/ + { +- arp = skb->nh.arph; ++ arp = arp_hdr(skb); + arp_ptr= (unsigned char *)(arp+1); + arpsrc = arp_ptr; + arp_ptr += dev->addr_len; +@@ -535,8 +535,8 @@ + arp_ptr += 4; + arpdst = arp_ptr; + arp_ptr += dev->addr_len; +- e2dst=(unsigned char *)skb->mac.raw; +- e2src=(unsigned char *)skb->mac.raw+ADDRLEN; ++ e2dst=skb_mac_header(skb); ++ e2src=skb_mac_header(skb)+ADDRLEN; + ifa=indev->ifa_list; + while(ifa!=NULL) + { |