summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2014-05-03 17:18:41 +0000
committerRick Farina <zerochaos@gentoo.org>2014-05-03 17:18:41 +0000
commitc20291497ab3edb6cca9b59071a633cc80677955 (patch)
tree4374b8beb84118a024b38ede54b2fda63dfce394 /net-wireless
parentUpdate patch. (diff)
downloadgentoo-2-c20291497ab3edb6cca9b59071a633cc80677955.tar.gz
gentoo-2-c20291497ab3edb6cca9b59071a633cc80677955.tar.bz2
gentoo-2-c20291497ab3edb6cca9b59071a633cc80677955.zip
merging in fixes from the pentoo repo so gentoo is the only source of this ebuild
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/mdk/ChangeLog11
-rw-r--r--net-wireless/mdk/files/fix_wids_mdk3_v5.patch21
-rw-r--r--net-wireless/mdk/mdk-3.6-r1.ebuild (renamed from net-wireless/mdk/mdk-3.6.ebuild)20
3 files changed, 40 insertions, 12 deletions
diff --git a/net-wireless/mdk/ChangeLog b/net-wireless/mdk/ChangeLog
index ce1ced9a0245..6d307c89ffa8 100644
--- a/net-wireless/mdk/ChangeLog
+++ b/net-wireless/mdk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-wireless/mdk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/ChangeLog,v 1.3 2013/06/02 19:12:35 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/ChangeLog,v 1.4 2014/05/03 17:18:41 zerochaos Exp $
+
+*mdk-3.6-r1 (03 May 2014)
+
+ 03 May 2014; Rick Farina <zerochaos@gentoo.org> +files/fix_wids_mdk3_v5.patch,
+ +mdk-3.6-r1.ebuild, -mdk-3.6.ebuild:
+ merging in fixes from the pentoo repo so gentoo is the only source of this
+ ebuild
02 Jun 2013; Rick Farina <zerochaos@gentoo.org> metadata.xml:
adding myself as maintainer
diff --git a/net-wireless/mdk/files/fix_wids_mdk3_v5.patch b/net-wireless/mdk/files/fix_wids_mdk3_v5.patch
new file mode 100644
index 000000000000..6013a59b9b1a
--- /dev/null
+++ b/net-wireless/mdk/files/fix_wids_mdk3_v5.patch
@@ -0,0 +1,21 @@
+diff -ur mdk3-v5-orig/mdk3.c mdk3-v5/mdk3.c
+--- mdk3-v5-orig/mdk3.c 2008-11-10 21:45:02.000000000 +0100
++++ mdk3-v5/mdk3.c 2009-01-10 01:47:03.546875000 +0100
+@@ -1092,10 +1092,13 @@
+ {
+ struct clistwidsclient *first = c;
+
+- do {
+- if (!(memcmp(c->mac, mac, mac_len))) return c;
+- c = c->next;
+- } while (c != first);
++ if (c != NULL)
++ {
++ do {
++ if (c->mac != NULL && !(memcmp(c->mac, mac, mac_len))) return c;
++ c = c->next;
++ } while (c != NULL && c != first);
++ }
+
+ return NULL;
+ }
diff --git a/net-wireless/mdk/mdk-3.6.ebuild b/net-wireless/mdk/mdk-3.6-r1.ebuild
index c14144d674e7..3f1dc7389c23 100644
--- a/net-wireless/mdk/mdk-3.6.ebuild
+++ b/net-wireless/mdk/mdk-3.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/mdk-3.6.ebuild,v 1.1 2011/02/22 18:48:52 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/mdk/mdk-3.6-r1.ebuild,v 1.1 2014/05/03 17:18:41 zerochaos Exp $
-EAPI="3"
+EAPI="5"
inherit eutils toolchain-funcs
MY_P="${PN}${PV/./-v}"
@@ -12,26 +12,26 @@ SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-RDEPEND="net-wireless/aircrack-ng"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${PV}-makefile.patch
+ epatch "${FILESDIR}"/fix_wids_mdk3_v5.patch
}
src_compile() {
- emake CC=$(tc-getCC) || die "emake failed"
+ emake CC=$(tc-getCC)
}
src_install() {
- emake DESTDIR="${D}" install || die "Install failed."
+ emake DESTDIR="${ED}" install
insinto /usr/share/${PN}
- doins -r useful_files || die
+ doins -r useful_files
- dohtml docs/* || die
- dodoc AUTHORS CHANGELOG TODO || die
+ dohtml docs/*
+ dodoc AUTHORS CHANGELOG TODO
}