Version bump wrt #225487, add gcc-4.3 patch, bug #217843

(Portage version: 2.2_rc7/cvs/Linux 2.6.25-gentoo-r7 i686)

9 files changed, 60 insertions, 168 deletions

diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 0dccf4c475aa..4f264bf2ecac 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/kismet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.101 2008/03/16 13:54:23 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.102 2008/08/11 16:57:47 armin76 Exp $
+
+*kismet-2008.05.1 (11 Aug 2008)
+
+  11 Aug 2008; Raúl Porcel <armin76@gentoo.org> +files/gcc-4.3.patch,
+  -files/kismet-2006.04.1-conf.d, -files/kismet-2006.04.1-init.d,
+  -files/kismet-2007.01.1b-Makefile.in.patch,
+  -files/kismet-2007.01.1b-conf.d, -files/kismet-2007.01.1b-init.d,
+  +files/kismet.confd, +files/kismet.initd, -kismet-2006.04.1.ebuild,
+  -kismet-2007.01.1b.ebuild, +kismet-2008.05.1.ebuild:
+  Version bump wrt #225487, add gcc-4.3 patch, bug #217843
 
   16 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   kismet-2007.10.1.ebuild:
diff --git a/net-wireless/kismet/files/gcc-4.3.patch b/net-wireless/kismet/files/gcc-4.3.patch
new file mode 100644
index 000000000000..78883a4ebaf2
--- /dev/null
+++ b/net-wireless/kismet/files/gcc-4.3.patch
@@ -0,0 +1,36 @@
+diff -r -u ../kismet-2007-10-R1/kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc
+--- ../kismet-2007-10-R1/kismet_wrapper.cc	2007-10-06 23:50:03.000000000 +0200
++++ kismet-2007-10-R1/kismet_wrapper.cc	2008-03-24 14:23:51.831523343 +0100
+@@ -28,6 +28,8 @@
+ 
+ #include "config.h"
+ 
++#include <cstring>
++
+ /* Blob of globals since sighandler needs them */
+ vector<string> postcli_err;
+ pid_t srvpid = -1, clipid = -1;
+diff -r -u ../kismet-2007-10-R1/ringbuf.cc kismet-2007-10-R1/ringbuf.cc
+--- ../kismet-2007-10-R1/ringbuf.cc	2005-12-11 20:14:39.000000000 +0100
++++ kismet-2007-10-R1/ringbuf.cc	2008-03-24 14:23:51.875510223 +0100
+@@ -18,6 +18,8 @@
+ 
+ #include "ringbuf.h"
+ 
++#include <cstring>
++
+ RingBuffer::RingBuffer(int in_size) {
+     ring_len = in_size;
+     ring_data = new uint8_t[in_size];
+diff -r -u ../kismet-2007-10-R1/util.cc kismet-2007-10-R1/util.cc
+--- ../kismet-2007-10-R1/util.cc	2006-08-28 22:37:29.000000000 +0200
++++ kismet-2007-10-R1/util.cc	2008-03-24 14:23:51.875510223 +0100
+@@ -23,6 +23,8 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++#include <cstring>
++
+ // We need this to make uclibc happy since they don't even have rintf...
+ #ifndef rintf
+ #define rintf(x) (float) rint((double) (x))
diff --git a/net-wireless/kismet/files/kismet-2007.01.1b-Makefile.in.patch b/net-wireless/kismet/files/kismet-2007.01.1b-Makefile.in.patch
deleted file mode 100644
index a865f949d12c..000000000000
--- a/net-wireless/kismet/files/kismet-2007.01.1b-Makefile.in.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: kismet-2007-01-R1b/Makefile.in
-===================================================================
---- kismet-2007-01-R1b.orig/Makefile.in
-+++ kismet-2007-01-R1b/Makefile.in
-@@ -5,7 +5,7 @@ VERSION_MINOR	= 01
- VERSION_TINY	= R1
- 
- INSTGRP ?= "@instgrp@"
--MANGRP ?= "@mangrp@"
-+MANGRP ?= "root"
- INSTUSR ?= "root"
- 
- ZAURUS = @zaurus@
-@@ -128,23 +128,23 @@ checkuiconfig:
- 	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 scripts/kismet $(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
-@@ -159,8 +159,8 @@ commoninstall:
- 	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/files/kismet-2007.01.1b-conf.d b/net-wireless/kismet/files/kismet-2007.01.1b-conf.d
deleted file mode 100644
index d203513c7143..000000000000
--- a/net-wireless/kismet/files/kismet-2007.01.1b-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet.conf
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet_server, see `kismet_server --help`
-KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet-2007.01.1b-init.d b/net-wireless/kismet/files/kismet-2007.01.1b-init.d
deleted file mode 100644
index 7c848f1092e3..000000000000
--- a/net-wireless/kismet/files/kismet-2007.01.1b-init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2007.01.1b-init.d,v 1.1 2007/01/20 13:04:26 phreak Exp $
-
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
-	start-stop-daemon --start --quiet --pidfile /var/run/kismet_server.pid \
-		--background --make-pidfile --exec /usr/bin/kismet_server \
-		-- ${KISMET_SERVER_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping kismet server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
-	eend ${?}
-}
diff --git a/net-wireless/kismet/files/kismet-2006.04.1-conf.d b/net-wireless/kismet/files/kismet.confd
index d203513c7143..d203513c7143 100644
--- a/net-wireless/kismet/files/kismet-2006.04.1-conf.d
+++ b/net-wireless/kismet/files/kismet.confd
diff --git a/net-wireless/kismet/files/kismet-2006.04.1-init.d b/net-wireless/kismet/files/kismet.initd
index 3505444a4f18..e18dd0106e25 100644
--- a/net-wireless/kismet/files/kismet-2006.04.1-init.d
+++ b/net-wireless/kismet/files/kismet.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet-2006.04.1-init.d,v 1.1 2006/04/14 11:33:38 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/files/kismet.initd,v 1.1 2008/08/11 16:57:47 armin76 Exp $
 
 checkconfig() {
 	if [ ! -e /etc/kismet.conf ]; then
diff --git a/net-wireless/kismet/kismet-2006.04.1.ebuild b/net-wireless/kismet/kismet-2006.04.1.ebuild
deleted file mode 100644
index b157bfe985f8..000000000000
--- a/net-wireless/kismet/kismet-2006.04.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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-2006.04.1.ebuild,v 1.9 2007/01/31 18:10:39 phreak Exp $
-
-inherit toolchain-funcs 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="ncurses"
-
-RDEPEND="net-wireless/wireless-tools
-		ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-		>=sys-devel/autoconf-2.58
-		sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-
-	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 config="--disable-gpsmap"
-
-	if ! use ncurses; then
-		config="${config} --disable-curses --disable-panel"
-	fi
-
-	# need to set CC and CXX for FEATURES=confcache, bug #129479
-	CC=$(tc-getCC) CXX=$(tc-getCXX) \
-		econf \
-		${config} --with-linuxheaders="${KV_DIR}" || 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
-}
diff --git a/net-wireless/kismet/kismet-2007.01.1b.ebuild b/net-wireless/kismet/kismet-2008.05.1.ebuild
index 269fe29531d8..cc06c9f5c546 100644
--- a/net-wireless/kismet/kismet-2007.01.1b.ebuild
+++ b/net-wireless/kismet/kismet-2008.05.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2007.01.1b.ebuild,v 1.5 2007/03/17 17:52:02 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2008.05.1.ebuild,v 1.1 2008/08/11 16:57:47 armin76 Exp $
 
 inherit toolchain-funcs linux-info eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ncurses"
 
 DEPEND="${RDEPEND}"
@@ -24,14 +24,16 @@ RDEPEND="net-wireless/wireless-tools
 
 src_unpack() {
 	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+	cd "${S}"
 
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		"${S}"/conf/kismet.conf.in
+		conf/kismet.conf.in
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
 
-	# Remove -s from install options
-	sed -i -e 's| -s||g' "${S}"/Makefile.in
+	epatch "${FILESDIR}"/gcc-4.3.patch
 }
 
 src_compile() {
@@ -54,6 +56,6 @@ src_install () {
 
 	dodoc CHANGELOG README TODO docs/*
 
-	newinitd "${FILESDIR}"/${P}-init.d kismet
-	newconfd "${FILESDIR}"/${P}-conf.d kismet
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
 }