Version bump, fix bug #195077; thanks for Jukka Ruohonen for patch

Package-Manager: portage-2.1.3.19

5 files changed, 144 insertions, 8 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 98da5f584946..002346c7c6aa 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.96 2007/11/04 10:36:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.97 2007/11/25 07:15:52 cla Exp $
+
+*kismet-2007.10.1 (25 Nov 2007)
+
+  25 Nov 2007; Dawid Węgliński <cla@gentoo.org>
+  +files/kismet-2007.10.1-Makefile.in.patch, +kismet-2007.10.1.ebuild:
+  Version bump, fixing bug #195077; thanks to Jukka Ruohonen <drear@iki.fi>
+  for patch
 
   04 Nov 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing myself as the maintainer.
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index ed0f499e1fcd..8c99cfbac02c 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -21,8 +21,13 @@ AUX kismet-2007.01.1b-init.d 753 RMD160 423c56cbb12400a60ee4fd93abc67438bc1173d9
 MD5 9adb2ccee4ff64673b03833f452d60e3 files/kismet-2007.01.1b-init.d 753
 RMD160 423c56cbb12400a60ee4fd93abc67438bc1173d9 files/kismet-2007.01.1b-init.d 753
 SHA256 dcf19082c780198d8f146dd6039b5ccc0da3908ba3e3288a8cff4bc101e0c665 files/kismet-2007.01.1b-init.d 753
+AUX kismet-2007.10.1-Makefile.in.patch 2716 RMD160 abccd73749e80afe299ef46ed7ce39f132d8805c SHA1 4bbe30845e190e01dc495573f7bcedbd8da9c089 SHA256 d74c9b7c558beff78908e3d720d2b1783c101e12c2b719315b5ac3abb2c8808a
+MD5 fbd4c14cb5b3eff965f48f1bbd52aa10 files/kismet-2007.10.1-Makefile.in.patch 2716
+RMD160 abccd73749e80afe299ef46ed7ce39f132d8805c files/kismet-2007.10.1-Makefile.in.patch 2716
+SHA256 d74c9b7c558beff78908e3d720d2b1783c101e12c2b719315b5ac3abb2c8808a files/kismet-2007.10.1-Makefile.in.patch 2716
 DIST kismet-2006-04-R1.tar.gz 1005068 RMD160 b709256198820d5ac650ce40dea637716427a8b7 SHA1 e48ce08e96328bfdac98152df6b5759c27ed9169 SHA256 eb8a1c688b07adede53c362355e639d8ac29d30536d69eaee97235d14e6d7e76
 DIST kismet-2007-01-R1b.tar.gz 625585 RMD160 1f066bd2669e571ffe62789b82a28bbdece2a479 SHA1 d09256e744ec0ca924f80863feaba8e548d4b4bf SHA256 1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
+DIST kismet-2007-10-R1.tar.gz 646452 RMD160 7cb62a3fd964c9ee7e4ec6bef050558c806ab495 SHA1 a1c682797ad6842b53f9e0f038254aa8326e0fb4 SHA256 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
 EBUILD kismet-2006.04.1.ebuild 1562 RMD160 651726148a91794277b8601543248bedbb60f2e8 SHA1 ba608c3caf88c0eda510a6ccca3c0f0c35a8511c SHA256 e5f2cf92cc2a659520034990b0a02e9538276274eb058179d77d34df37d9fe84
 MD5 414fbae24fc1d4ebb7d0e05108837b43 kismet-2006.04.1.ebuild 1562
 RMD160 651726148a91794277b8601543248bedbb60f2e8 kismet-2006.04.1.ebuild 1562
@@ -31,10 +36,14 @@ EBUILD kismet-2007.01.1b.ebuild 1419 RMD160 ed208d7a96554f2e8dcac22886973ddafcd1
 MD5 2c7b0da754af78e6c86d88057c42a5a5 kismet-2007.01.1b.ebuild 1419
 RMD160 ed208d7a96554f2e8dcac22886973ddafcd1dd8a kismet-2007.01.1b.ebuild 1419
 SHA256 ff4e50b22b58924f0beab7d568a36b9cfa1fe7aa9577f0511f341dd05e8cd667 kismet-2007.01.1b.ebuild 1419
-MISC ChangeLog 14914 RMD160 d5ccfd83f4bb6d82c1251ab0f6e987be5484f759 SHA1 4c658ed71ebc1cde943113c5a854bc104e34ca69 SHA256 bc319a402563f07fe0691bec955b59b084729b32f992bdc085e95a02ae9cb2fb
-MD5 cae05026959cb9cbc16b2a11a2fed282 ChangeLog 14914
-RMD160 d5ccfd83f4bb6d82c1251ab0f6e987be5484f759 ChangeLog 14914
-SHA256 bc319a402563f07fe0691bec955b59b084729b32f992bdc085e95a02ae9cb2fb ChangeLog 14914
+EBUILD kismet-2007.10.1.ebuild 1417 RMD160 f0d11adcbb07561c36fc86c1bba58ea63ea5a79a SHA1 52b8d9c549052eb4e9a63d059c41efac6c898bb6 SHA256 6bc890c3a9b633824a0d3fd8df96379fa51190848243ce6bc0e86417356399e1
+MD5 1627e84d01a115e72f95770c5d5d2461 kismet-2007.10.1.ebuild 1417
+RMD160 f0d11adcbb07561c36fc86c1bba58ea63ea5a79a kismet-2007.10.1.ebuild 1417
+SHA256 6bc890c3a9b633824a0d3fd8df96379fa51190848243ce6bc0e86417356399e1 kismet-2007.10.1.ebuild 1417
+MISC ChangeLog 15154 RMD160 2d393bdfc4358e65950058876c79d3d5dd543bb7 SHA1 f629113041f46806406633b6af912de0e8818286 SHA256 fca953522e1587a90a3a294fece372c1675414acb1ee75c29f09c85f3ed1c536
+MD5 eafaeb9a928b1cb8cc7c1c566c567478 ChangeLog 15154
+RMD160 2d393bdfc4358e65950058876c79d3d5dd543bb7 ChangeLog 15154
+SHA256 fca953522e1587a90a3a294fece372c1675414acb1ee75c29f09c85f3ed1c536 ChangeLog 15154
 MISC metadata.xml 255 RMD160 d8ea1a1533bac4af62dafa3f646b4e7801790bc9 SHA1 e301c8a1cb21da3cfd7bb963ae2d41ad4e2f5ef1 SHA256 65c782e3ec68721e86132d35e0c58561f4507ba2e42821d6f2f96decb3db79ef
 MD5 f60585112c721d573adc42f5e8ce55ce metadata.xml 255
 RMD160 d8ea1a1533bac4af62dafa3f646b4e7801790bc9 metadata.xml 255
@@ -45,10 +54,13 @@ SHA256 00e2a0182c5116c3b37b085c9bc59ad7f1a74ff367f7800369359703d2571a38 files/di
 MD5 8958c8bf0077d3867102688207126077 files/digest-kismet-2007.01.1b 256
 RMD160 25925bc8fafbeae0cfa8cb8ec5180c8ff581aaf4 files/digest-kismet-2007.01.1b 256
 SHA256 43faf272b7440e686011340d87099dba0069cc246e760e023223714a1526e2ed files/digest-kismet-2007.01.1b 256
+MD5 14f3ccb03c453839b9b004327044de89 files/digest-kismet-2007.10.1 253
+RMD160 619f60568148f42c9680969bc81ba95106980944 files/digest-kismet-2007.10.1 253
+SHA256 3c0ef9f7346d913b3ebfa6152507048d0741c4fba2030cfcc45e65c6741c4aa1 files/digest-kismet-2007.10.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHLaEHyuNVb5qfaOYRAp5nAKDKdC6Mgqr8JOcQh6MIc2wePq1k6wCghJ+a
-vQ6ZZk6EgbwQpK4qTXpdBSA=
-=Ukqu
+iD8DBQFHSSEuUPEOwClectkRAi9oAJoD3MJmLTfwDfQvwNBG0TmhT4w8UgCfYJf8
+S/ssvEFf+tAVG12fArGzxVQ=
+=F0xk
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kismet/files/digest-kismet-2007.10.1 b/net-wireless/kismet/files/digest-kismet-2007.10.1
new file mode 100644
index 000000000000..9d55b201ea3b
--- /dev/null
+++ b/net-wireless/kismet/files/digest-kismet-2007.10.1
@@ -0,0 +1,3 @@
+MD5 2100c667e69db0cde35fa2d06c8516e2 kismet-2007-10-R1.tar.gz 646452
+RMD160 7cb62a3fd964c9ee7e4ec6bef050558c806ab495 kismet-2007-10-R1.tar.gz 646452
+SHA256 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9 kismet-2007-10-R1.tar.gz 646452
diff --git a/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch b/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch
new file mode 100644
index 000000000000..bcea97e03db8
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch
@@ -0,0 +1,55 @@
+diff -ur kismet-2007-10-R1/Makefile.in kismet-2007-10-R1.new/Makefile.in
+--- kismet-2007-10-R1/Makefile.in	2007-10-06 23:53:38.000000000 +0300
++++ kismet-2007-10-R1.new/Makefile.in	2007-11-15 09:45:04.000000000 +0200
+@@ -5,7 +5,7 @@
+ VERSION_TINY	= R1
+ 
+ INSTGRP ?= "@instgrp@"
+-MANGRP ?= "@mangrp@"
++MANGRP ?= "root"
+ INSTUSR ?= "root"
+ 
+ ZAURUS = @zaurus@
+@@ -138,23 +138,23 @@
+ 	fi
+ 
+ binuserinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
+ 
+ binsuidinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
+ 	
+ commoninstall:
+ 	mkdir -p $(ETC)
+ 	mkdir -p $(BIN)
+ 
+ 	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
+-	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
++	# install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
+ 	@if test "$(ZAURUS)" = "yes"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
+ 	fi
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
+@@ -169,8 +169,8 @@
+ 	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+ 
+ 	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
+ 		install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
diff --git a/net-wireless/kismet/kismet-2007.10.1.ebuild b/net-wireless/kismet/kismet-2007.10.1.ebuild
new file mode 100644
index 000000000000..b1bb962e59bc
--- /dev/null
+++ b/net-wireless/kismet/kismet-2007.10.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2007.10.1.ebuild,v 1.1 2007/11/25 07:15:52 cla Exp $
+
+inherit toolchain-funcs linux-info eutils
+
+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="ncurses"
+
+DEPEND="${RDEPEND}"
+RDEPEND="net-wireless/wireless-tools
+	net-libs/libpcap
+	ncurses? ( sys-libs/ncurses )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		"${S}"/conf/kismet.conf.in
+
+	# Remove -s from install options
+	sed -i -e 's| -s||g' "${S}"/Makefile.in
+}
+
+src_compile() {
+	# the configure script only honors '--disable-foo'
+	local myconf="--disable-gpsmap"
+
+	if ! use ncurses; then
+		myconf="${myconf} --disable-curses --disable-panel"
+	fi
+
+	econf ${myconf} \
+		--with-linuxheaders="${KV_DIR}" || die "econf failed"
+
+	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
+}