small cleanup removing unneeded files from kismet-newcore

This commit is contained in:
Zero_Chaos 2009-02-25 03:25:14 +00:00
parent fb2158050a
commit 1bed76483e
4 changed files with 0 additions and 130 deletions

View file

@ -1,36 +0,0 @@
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))

View file

@ -1,55 +0,0 @@
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; \

View file

@ -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=""

View file

@ -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.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 ${?}
}