From 4e35f2967f0b30870182817db058ef2d8255bebd Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 29 Jan 2007 23:01:50 +0000 Subject: [PATCH] Add injection useflag and patch thanks to jdettner Package-Manager: portage-2.1.2-r4 --- net-wireless/madwifi-ng/ChangeLog | 8 +++-- net-wireless/madwifi-ng/Manifest | 36 +++++++++---------- .../madwifi-ng/files/madwifi-ng-r1886.patch | 26 ++++++++++++++ .../madwifi-ng/madwifi-ng-0.9.2.1.ebuild | 7 ++-- 4 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog index 2a3d88cadca8..36d3348390be 100644 --- a/net-wireless/madwifi-ng/ChangeLog +++ b/net-wireless/madwifi-ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/madwifi-ng -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.21 2006/12/10 20:52:52 kingtaco Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.22 2007/01/29 23:01:50 genstef Exp $ + + 29 Jan 2007; +files/madwifi-ng-r1886.patch, + madwifi-ng-0.9.2.1.ebuild: + Add injection useflag and patch thanks to jdettner 10 Dec 2006; Mike Doty madwifi-ng-0.9.2.1.ebuild: amd64 stable, bug 157449 diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest index 5fee167c1077..1c3915102127 100644 --- a/net-wireless/madwifi-ng/Manifest +++ b/net-wireless/madwifi-ng/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 SHA1 c4d67684238c51a4632ae9e01caabe9750f705fa SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530 @@ -17,24 +14,32 @@ AUX madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e381761 MD5 7ec7bc646805244f713c1afdb698f211 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e3817612880e86342c699f297680d3 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 +AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe +MD5 e72b6534fc8941fd6c890f2ecbf470e6 files/madwifi-ng-r1886.patch 965 +RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b files/madwifi-ng-r1886.patch 965 +SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe files/madwifi-ng-r1886.patch 965 AUX madwifi-ng-uudecode-gcda-fix.patch 328 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e SHA1 553ce53acb0ae781a83715951857414a36d25e80 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d MD5 a0e4e3918e720015a4416efc14431c47 files/madwifi-ng-uudecode-gcda-fix.patch 328 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-fix.patch 328 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d files/madwifi-ng-uudecode-gcda-fix.patch 328 DIST madwifi-0.9.2.1.tar.bz2 3476892 RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e SHA1 6606291b6facc299203158bfaa1bde09219459db SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843 DIST madwifi-0.9.2.tar.bz2 3476735 RMD160 e24ce96ab7ebcd12e71755c89882a90161a6a15a SHA1 6d6b9d2419e45a940d156b928401b5c688c40844 SHA256 b6edd998fa5e5927f9e42e0470f6f4e0bec1b8a41658eec5595ceea01c787153 -EBUILD madwifi-ng-0.9.2.1.ebuild 3993 RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 SHA1 4e89873b6c12f6b032858107ee19d9ef65028f13 SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c -MD5 04f075160d9d021d7babd15e7ffd7d10 madwifi-ng-0.9.2.1.ebuild 3993 -RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 madwifi-ng-0.9.2.1.ebuild 3993 -SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c madwifi-ng-0.9.2.1.ebuild 3993 +EBUILD madwifi-ng-0.9.2.1.ebuild 4072 RMD160 1c576ea7da3b0c6d5c8cdf5e1583770781adb9b7 SHA1 7a359d76a3301950b97ca888ffdd725e71ee2ae2 SHA256 d6446edbc7105de8b39d12a3fc78a2fa9c9d0548549265726514cfd3928b7795 +MD5 9366ae7e7ac8078cf5624bb0326b66dc madwifi-ng-0.9.2.1.ebuild 4072 +RMD160 1c576ea7da3b0c6d5c8cdf5e1583770781adb9b7 madwifi-ng-0.9.2.1.ebuild 4072 +SHA256 d6446edbc7105de8b39d12a3fc78a2fa9c9d0548549265726514cfd3928b7795 madwifi-ng-0.9.2.1.ebuild 4072 EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a SHA1 3b8378b22791ac5a529e8aca0727ccd79ef790c1 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 MD5 82d58a8bcb92317ce472b3ef6cf4e717 madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a madwifi-ng-0.9.2.ebuild 3979 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 madwifi-ng-0.9.2.ebuild 3979 -MISC ChangeLog 13306 RMD160 d60c77801b988d7896fece86a92f94b56b2ed2b8 SHA1 21531bb1e7bfed0462e5fa96b5b7604ca1be4869 SHA256 ebff08f16b4ab57e4e0259b4cc7c4e7448d4ff2ec8ae2182a94a0277c85b34e3 -MD5 88c46b4757f320107a1bfb8686137f8b ChangeLog 13306 -RMD160 d60c77801b988d7896fece86a92f94b56b2ed2b8 ChangeLog 13306 -SHA256 ebff08f16b4ab57e4e0259b4cc7c4e7448d4ff2ec8ae2182a94a0277c85b34e3 ChangeLog 13306 +MISC ChangeLog 13455 RMD160 5cb47763d6220797846a24d2ddc2eaa31a4d8e7f SHA1 314af20efee21f6af7acb1ea4a4d4a8098d4d872 SHA256 e2785df86bd0f08931cb608b41c8dfcec13928c69286eb29a0e90342f43d72c5 +MD5 fbcedc665bdf22d70a979f6d56b301fa ChangeLog 13455 +RMD160 5cb47763d6220797846a24d2ddc2eaa31a4d8e7f ChangeLog 13455 +SHA256 e2785df86bd0f08931cb608b41c8dfcec13928c69286eb29a0e90342f43d72c5 ChangeLog 13455 +MISC madwifi-ng-0.9.2.1.ebuild.orig 3993 RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 SHA1 4e89873b6c12f6b032858107ee19d9ef65028f13 SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c +MD5 04f075160d9d021d7babd15e7ffd7d10 madwifi-ng-0.9.2.1.ebuild.orig 3993 +RMD160 cd5d91191a322ada3360769e9989fdbfc5fae783 madwifi-ng-0.9.2.1.ebuild.orig 3993 +SHA256 0d783907187b234ca2ec49e45d2349b98ed01d9b76d3ffa33bde6e3bd804e92c madwifi-ng-0.9.2.1.ebuild.orig 3993 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256 @@ -45,12 +50,3 @@ SHA256 21c57d899d4e2d74e3c820476f60b36c356764e54fe6f3be3acc69d663a0eb8d files/di MD5 4759e10919b6002661f86f34d4d1bc7b files/digest-madwifi-ng-0.9.2.1 253 RMD160 2e13cbbae0eb8588a73d66fd4760e0c2dcd3f077 files/digest-madwifi-ng-0.9.2.1 253 SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/digest-madwifi-ng-0.9.2.1 253 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iQCVAwUBRXxzuoBrouQZ9K4FAQJNmgQA9Rr1aTV9CuqDPbbuM669jL/18zqenW7i -Cdy2HpNyG1jgRO3WMPyGl7y3u3+1PrBHiYE2VvfjlzErmcXcNtZi3WSqRu+Ldexd -4MUINOzTDSRX84rf2tsyX+LX6LnE8lB2JSCvtzRrNWvvU3+cfrYZ3/gWGrg5+wDe -0vuP9wQakus= -=4eu1 ------END PGP SIGNATURE----- diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch b/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch new file mode 100644 index 000000000000..1ee11bec1c3f --- /dev/null +++ b/net-wireless/madwifi-ng/files/madwifi-ng-r1886.patch @@ -0,0 +1,26 @@ +allow to inject packets with aircrack-ng + +diff -ur ath/if_ath.c ath/if_ath.c +--- ath/if_ath.c 2007-01-07 21:22:55.312500000 +0100 ++++ ath/if_ath.c 2007-01-07 21:17:09.875000000 +0100 +@@ -2289,6 +2289,7 @@ + ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) + { + struct ath_softc *sc = dev->priv; ++ struct ieee80211com *ic = &sc->sc_ic; + struct ath_hal *ah = sc->sc_ah; + struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb)); + const HAL_RATE_TABLE *rt; +@@ -2305,7 +2306,11 @@ + struct ieee80211_frame *wh; + + wh = (struct ieee80211_frame *) skb->data; +- try0 = ph->try0; ++ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0; ++ /* ++ * The retry value has to be patched to 1 when injecting, ++ * otherwise the sequence number will be overwritten ++ */ + rt = sc->sc_currates; + txrate = dot11_to_ratecode(sc, rt, ph->rate0); + power = ph->power > 60 ? 60 : ph->power; diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild index b2f23366a197..f2304d89034a 100644 --- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild +++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.4 2006/12/10 20:52:52 kingtaco Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.5 2007/01/29 23:01:50 genstef Exp $ inherit linux-mod @@ -16,7 +16,7 @@ LICENSE="as-is SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="amrr onoe" +IUSE="amrr injection onoe" DEPEND="app-arch/sharutils" RDEPEND="!net-wireless/madwifi-old ~net-wireless/madwifi-ng-tools-${PV:0:5}" @@ -76,6 +76,7 @@ src_unpack() { src_compile() { epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch + if use injection; then epatch ${FILESDIR}/madwifi-ng-r1886.patch; fi # epatch ${FILESDIR}/madwifi-association-fix.patch # assists in debugging -- 2.26.2