Fix acx100 issue thanks to Alex Gregory in bug #125651.

Package-Manager: portage-2.0.54

5 files changed, 97 insertions, 5 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index dca6631a3bdb..0d3c6d29349d 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/kismet
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.77 2005/08/17 14:22:21 brix Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.78 2006/03/24 16:16:10 brix Exp $
+
+*kismet-2005.08.1-r1 (24 Mar 2006)
+
+  24 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/kismet-2005.08.1-acx100.patch, +kismet-2005.08.1-r1.ebuild:
+  Fix acx100 issue thanks to Alex Gregory in bug #125651.
 
   17 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   -files/kismet-2005.04.1-conf.d, -files/kismet-2005.04.1-init.d,
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index f970f49b5f6d..ee67f7a3b57d 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,9 @@
-MD5 2432957f297922877997a8bdee4421c5 kismet-2005.08.1.ebuild 1561
-MD5 84aed804f76cca16268b0a2a9cd00175 ChangeLog 12056
-MD5 ffabe8240a5956794f085602c98e8598 metadata.xml 348
+MD5 15010c8007075b172e8b9d6b54f78451 ChangeLog 12274
 MD5 a37073d03154a42c6903c670058b0d0a files/digest-kismet-2005.08.1 69
+MD5 a37073d03154a42c6903c670058b0d0a files/digest-kismet-2005.08.1-r1 69
+MD5 18f99f911134593c2ca023d3950cd833 files/kismet-2005.08.1-acx100.patch 872
 MD5 f4077a584ee7e14cd3c49a5a051a92a1 files/kismet-2005.08.1-conf.d 567
 MD5 7a04c3f78688454bd8b1609ce820c08d files/kismet-2005.08.1-init.d 750
+MD5 7122b80d44f4c6fdf7050d45bb4e2831 kismet-2005.08.1-r1.ebuild 1618
+MD5 2432957f297922877997a8bdee4421c5 kismet-2005.08.1.ebuild 1561
+MD5 ffabe8240a5956794f085602c98e8598 metadata.xml 348
diff --git a/net-wireless/kismet/files/digest-kismet-2005.08.1-r1 b/net-wireless/kismet/files/digest-kismet-2005.08.1-r1
new file mode 100644
index 000000000000..86dedc03e4ae
--- /dev/null
+++ b/net-wireless/kismet/files/digest-kismet-2005.08.1-r1
@@ -0,0 +1 @@
+MD5 17edb7688e04dd28028d5268a77d0ce7 kismet-2005-08-R1.tar.gz 986388
diff --git a/net-wireless/kismet/files/kismet-2005.08.1-acx100.patch b/net-wireless/kismet/files/kismet-2005.08.1-acx100.patch
new file mode 100644
index 000000000000..77bf72215325
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2005.08.1-acx100.patch
@@ -0,0 +1,12 @@
+diff -urp kismet-2005-08-R1/kis_packsources.cc kismet-2005-08-R1-acx100/kis_packsources.cc
+--- kismet-2005-08-R1/kis_packsources.cc	2005-08-16 03:22:51.000000000 +0200
++++ kismet-2005-08-R1-acx100/kis_packsources.cc	2006-03-24 17:06:04.000000000 +0100
+@@ -80,7 +80,7 @@ int RegisterKismetSources(Packetsourcetr
+                                         monitor_orinoco, unmonitor_orinoco,
+                                         chancontrol_orinoco, 1);
+     sourcetracker->RegisterPacketsource("acx100", 1, "IEEE80211b", 6,
+-                                       pcapsource_wextfcs_registrant,
++                                       pcapsource_wext_registrant,
+                                        monitor_acx100, unmonitor_acx100, 
+                                        chancontrol_wext, 1);
+     sourcetracker->RegisterPacketsource("admtek", 1, "IEEE80211b", 6,
diff --git a/net-wireless/kismet/kismet-2005.08.1-r1.ebuild b/net-wireless/kismet/kismet-2005.08.1-r1.ebuild
new file mode 100644
index 000000000000..a21e75f0324f
--- /dev/null
+++ b/net-wireless/kismet/kismet-2005.08.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2005.08.1-r1.ebuild,v 1.1 2006/03/24 16:16:11 brix Exp $
+
+inherit eutils linux-info
+
+MY_P=${P/\./-}
+MY_P=${MY_P/./-R}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="http://www.kismetwireless.net"
+SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gps ncurses"
+
+RDEPEND="net-wireless/wireless-tools
+		ncurses? ( sys-libs/ncurses )
+		gps? ( app-misc/gpsdrive
+				>=dev-libs/expat-1.95.4
+				dev-libs/gmp
+				>=media-gfx/imagemagick-6.0
+				dev-perl/libwww-perl )"
+DEPEND="${RDEPEND}
+		>=sys-devel/autoconf-2.58
+		sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-acx100.patch
+
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		${S}/conf/kismet.conf.in
+}
+
+src_compile() {
+	# the configure script only honors '--disable-foo'
+	local config=""
+
+	if ! use ncurses; then
+		config="${config} --disable-curses --disable-panel"
+	fi
+
+	if ! use gps; then
+		config="${config} --disable-gpsmap"
+	fi
+
+	econf \
+		${config} \
+		--with-linuxheaders=${KV_DIR}/include \
+		|| die "econf failed"
+
+	einfo "You may safely ignore the warning about the missing .depend file"
+	emake dep || die "emake dep failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc CHANGELOG README TODO docs/*
+
+	newinitd ${FILESDIR}/${P}-init.d kismet
+	newconfd ${FILESDIR}/${P}-conf.d kismet
+}