diff options
author | 2008-06-23 18:58:01 -0400 | |
---|---|---|
committer | 2008-06-23 18:58:01 -0400 | |
commit | a162ca9b80d79bed31f2f340502648d07db18ae9 (patch) | |
tree | f48736c5cd30401b397b9b9be2388b3984a17feb /net-wireless | |
parent | Mask scribus 9999* (diff) | |
download | dberkholz-a162ca9b80d79bed31f2f340502648d07db18ae9.tar.gz dberkholz-a162ca9b80d79bed31f2f340502648d07db18ae9.tar.bz2 dberkholz-a162ca9b80d79bed31f2f340502648d07db18ae9.zip |
kismet: Add patch for gcc 4.3.
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/kismet/Manifest | 6 | ||||
-rw-r--r-- | net-wireless/kismet/files/kismet-2007.10.1-Makefile.in.patch | 55 | ||||
-rw-r--r-- | net-wireless/kismet/files/kismet-2007.10.1-conf.d | 12 | ||||
-rw-r--r-- | net-wireless/kismet/files/kismet-2007.10.1-gcc-4.3.patch | 33 | ||||
-rw-r--r-- | net-wireless/kismet/files/kismet-2007.10.1-init.d | 27 | ||||
-rw-r--r-- | net-wireless/kismet/kismet-2007.10.1.ebuild | 60 |
6 files changed, 193 insertions, 0 deletions
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest new file mode 100644 index 0000000..092eb2b --- /dev/null +++ b/net-wireless/kismet/Manifest @@ -0,0 +1,6 @@ +AUX kismet-2007.10.1-Makefile.in.patch 2716 RMD160 abccd73749e80afe299ef46ed7ce39f132d8805c SHA1 4bbe30845e190e01dc495573f7bcedbd8da9c089 SHA256 d74c9b7c558beff78908e3d720d2b1783c101e12c2b719315b5ac3abb2c8808a +AUX kismet-2007.10.1-conf.d 403 RMD160 cf6cad4dc844ccf9c807edfb5adec2351c0cd249 SHA1 50ce39c8989ddf214f72b3ac14f2a989d6121d15 SHA256 d2f5bb606e4dac45c8de27843ab460b9dac02e83979e52e1b8b3ca3af841adeb +AUX kismet-2007.10.1-gcc-4.3.patch 1260 RMD160 6cc9d924f0071600a91991c46266046de6652a3a SHA1 ff8ed0df16f56d32391265eef2a665c7aa8edff4 SHA256 fda2b4590ed9e47f88e6cdd82442e7466cd0d77c8efe93ca81e8d2735ec4b915 +AUX kismet-2007.10.1-init.d 749 RMD160 c9dfda5e93ae8fa59679194241dd9508830dc617 SHA1 b3efd2d802aa34eee278fa8b4933e3eec8c33308 SHA256 1dd3fd3fee724490908abe072577ab159c2371820561872f8af0e30ea2f83054 +DIST kismet-2007-10-R1.tar.gz 646452 RMD160 7cb62a3fd964c9ee7e4ec6bef050558c806ab495 SHA1 a1c682797ad6842b53f9e0f038254aa8326e0fb4 SHA256 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9 +EBUILD kismet-2007.10.1.ebuild 1460 RMD160 deb233ffcc3aa2e8bea66428b71e8bed46a3c554 SHA1 f8fece742311c1e71bbe6a2b5574b009864cd0e6 SHA256 9e48b782f6457bdd56526c147f3a503ac6b41b8f85d76fde0ccbdaed6ee8277b 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 0000000..bcea97e --- /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/files/kismet-2007.10.1-conf.d b/net-wireless/kismet/files/kismet-2007.10.1-conf.d new file mode 100644 index 0000000..d203513 --- /dev/null +++ b/net-wireless/kismet/files/kismet-2007.10.1-conf.d @@ -0,0 +1,12 @@ +# /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.10.1-gcc-4.3.patch b/net-wireless/kismet/files/kismet-2007.10.1-gcc-4.3.patch new file mode 100644 index 0000000..7fcb90c --- /dev/null +++ b/net-wireless/kismet/files/kismet-2007.10.1-gcc-4.3.patch @@ -0,0 +1,33 @@ +diff -x .ccache -x Makefile -x 'config.*' -ur kismet-2007-10-R1.orig/kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc +--- kismet-2007-10-R1.orig/kismet_wrapper.cc 2008-06-23 18:49:13.000000000 -0400 ++++ kismet-2007-10-R1/kismet_wrapper.cc 2008-06-23 18:51:46.000000000 -0400 +@@ -20,6 +20,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string> ++#include <cstring> + #include <vector> + #include <errno.h> + #include <sys/wait.h> +diff -x .ccache -x Makefile -x 'config.*' -ur kismet-2007-10-R1.orig/ringbuf.cc kismet-2007-10-R1/ringbuf.cc +--- kismet-2007-10-R1.orig/ringbuf.cc 2008-06-23 18:49:13.000000000 -0400 ++++ kismet-2007-10-R1/ringbuf.cc 2008-06-23 18:50:59.000000000 -0400 +@@ -17,6 +17,7 @@ + */ + + #include "ringbuf.h" ++#include <cstring> + + RingBuffer::RingBuffer(int in_size) { + ring_len = in_size; +diff -x .ccache -x Makefile -x 'config.*' -ur kismet-2007-10-R1.orig/util.cc kismet-2007-10-R1/util.cc +--- kismet-2007-10-R1.orig/util.cc 2008-06-23 18:49:13.000000000 -0400 ++++ kismet-2007-10-R1/util.cc 2008-06-23 18:50:39.000000000 -0400 +@@ -22,6 +22,7 @@ + #include <sys/types.h> + #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 diff --git a/net-wireless/kismet/files/kismet-2007.10.1-init.d b/net-wireless/kismet/files/kismet-2007.10.1-init.d new file mode 100644 index 0000000..55bdbf7 --- /dev/null +++ b/net-wireless/kismet/files/kismet-2007.10.1-init.d @@ -0,0 +1,27 @@ +#!/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.10.1-init.d,v 1.1 2007/11/25 07:24:37 cla 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/kismet-2007.10.1.ebuild b/net-wireless/kismet/kismet-2007.10.1.ebuild new file mode 100644 index 0000000..625b676 --- /dev/null +++ b/net-wireless/kismet/kismet-2007.10.1.ebuild @@ -0,0 +1,60 @@ +# 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.10.1.ebuild,v 1.4 2008/03/16 13:54:23 coldwind 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 + epatch "${FILESDIR}"/${P}-gcc-4.3.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 +} |