Commit b2479338 authored by Barry deFreese's avatar Barry deFreese Committed by Devon Kearns

Imported Debian patch 2008-05-R1-4.1

parent 5a2b62b4
......@@ -101,8 +101,8 @@ $(GPSL): $(GPSLBUILDO)
@if test "$(GPSLBUILD)"x = "x"; then \
echo "Gpsmap cannot be built, check the output of configure"; \
else \
echo $(LD) $(LDFLAGS) -o $(GPSL) $(GPSLO) $(LIBS) `Magick-config --cflags --cppflags --ldflags` `Magick-config --libs` $(THREADL) -lexpat -lgmp; \
$(LD) $(LDFLAGS) -o $(GPSL) $(GPSLO) $(LIBS) `Magick-config --cflags --cppflags --ldflags` `Magick-config --libs` $(THREADL) -lexpat -lgmp; \
echo $(LD) $(LDFLAGS) -o $(GPSL) $(GPSLO) $(LIBS) `pkg-config ImageMagick --cflags ` `pkg-config ImageMagick --libs` $(THREADL) -lexpat -lgmp; \
$(LD) $(LDFLAGS) -o $(GPSL) $(GPSLO) $(LIBS) `pkg-config ImageMagick --cflags ` `pkg-config ImageMagick --libs` $(THREADL) -lexpat -lgmp; \
fi
#$(HOPPER): $(HOPPERO)
......@@ -304,6 +304,7 @@ clean:
@-rm -f *.o
@-rm -f $(PS)
@-rm -f $(DRONE)
@-rm -f $(WRAP)
@-rm -f $(NC)
@-rm -f $(GPSL)
@-rm -f $(WRAP)
......
......@@ -114,7 +114,7 @@ Licensed under the GPL
Kismet has many features useful in different situations for monitoring
wireless networks:
- Ethereal/Tcpdump compatible data logging
- Wireshark/Tcpdump compatible data logging
- Airsnort compatible weak-iv packet logging
- Network IP range detection
- Built-in channel hopping and multicard split channel hopping
......@@ -1621,12 +1621,12 @@ Licensed under the GPL
invalid, but not wholly invalid, sample then Kismet will get confused.
Q: How can I merge multiple capture files into one?
A: Use ``mergecap'' that comes with Ethereal to combine dump files.
A: Use ``mergecap'' that comes with Wireshark to combine dump files.
Q: How can I include all the standard known manufacturers in the manuf
identification?
A: There is a script in the extras/ directory that will convert the
standard OUI list (such as that provided with Ethereal) into the format
standard OUI list (such as that provided with Wireshark) into the format
Kismet uses. This will make Kismet take a LOT more ram and a moderate
increase in CPU to store and search the expanded list. If your hardware
can handle it, by all means, but not recommended for lowpower systems.
......
......@@ -10,7 +10,7 @@ version=2007.09.R1
servername=Kismet
# User to setid to (should be your normal user)
suiduser=your_user_here
#suiduser=your_user_here
# Do we try to put networkmanager to sleep? If you use NM, this is probably
# what you want to do, so that it will leave the interfaces alone while
......@@ -116,7 +116,7 @@ bindaddress=127.0.0.1
maxclients=5
# Do we have a GPS?
gps=true
gps=false
# Host:port that GPSD is running on. This can be localhost OR remote!
gpshost=localhost:2947
# Do we lock the mode? This overrides coordinates of lock "0", which will
......@@ -362,14 +362,14 @@ logdefault=Kismet
# crypt/Pok-Dec-20-01-1
# and so on. The "dump", "crypt", etc, dirs must exist before kismet is run
# in this case.
logtemplate=%n-%d-%i.%l
logtemplate=/var/log/kismet/%n-%d-%i.%l
# Where do we store the pid file of the server?
piddir=/var/run/
# Where state info, etc, is stored. You shouldnt ever need to change this.
# This is a directory.
configdir=%h/.kismet/
configdir=/var/lib/kismet/
# cloaked SSID file. You shouldn't ever need to change this.
ssidmap=ssid_map
......
......@@ -89,17 +89,17 @@ soundplay=/usr/bin/play
# Optional parameters to pass to the player
# soundopts=--volume=.3
# New network found
sound_new=/usr/local/share/kismet/wav/new_network.wav
sound_new=/usr/share/kismet/wav/new_network.wav
# Network traffic sound
sound_traffic=/usr/local/share/kismet/wav/traffic.wav
sound_traffic=/usr/share/kismet/wav/traffic.wav
# Network junk traffic found
sound_junktraffic=/usr/local/share/kismet/wav/junk_traffic.wav
sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
# GPS lock aquired sound
# sound_gpslock=/usr/local/share/kismet/wav/foo.wav
# sound_gpslock=/usr/share/kismet/wav/foo.wav
# GPS lock lost sound
# sound_gpslost=/usr/local/share/kismet/wav/bar.wav
# sound_gpslost=/usr/share/kismet/wav/bar.wav
# Alert sound
sound_alert=/usr/local/share/kismet/wav/alert.wav
sound_alert=/usr/share/kismet/wav/alert.wav
# Does the server have speech? (Again, not to be confused with the GUI's speech)
speech=false
......
......@@ -21,23 +21,23 @@ clientcolumns=decay,type,mac,manuf,data,crypt,ip,signal,quality,noise
# noise on whatever host it's running on.
sound=false
# Path to sound player
soundplay=/usr/local/bin/buzzme
soundplay=/usr/bin/buzzme
# Optional parameters to pass to the player
# soundopts=--volume=.3
# New network found
#sound_new=/usr/local/share/kismet/wav/new_network.wav
#sound_new=/usr/share/kismet/wav/new_network.wav
sound_new=-n
# Network traffic sound
#sound_traffic=/usr/local/share/kismet/wav/traffic.wav
#sound_traffic=/usr/share/kismet/wav/traffic.wav
sound_traffic=-t
# Network junk traffic found
#sound_junktraffic=/usr/local/share/kismet/wav/junk_traffic.wav
#sound_junktraffic=/usr/share/kismet/wav/junk_traffic.wav
# GPS lock aquired sound
# sound_gpslock=/usr/local/share/kismet/wav/foo.wav
# sound_gpslock=/usr/share/kismet/wav/foo.wav
# GPS lock lost sound
# sound_gpslost=/usr/local/share/kismet/wav/bar.wav
# sound_gpslost=/usr/share/kismet/wav/bar.wav
# Alert sound
#sound_alert=/usr/local/share/kismet/wav/alert.wav
#sound_alert=/usr/share/kismet/wav/alert.wav
# Display battery status?
apm=true
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
etc/kismet
usr/bin
var/log/kismet
var/lib/kismet
README
docs/*
scripts
extra
......@@ -3,5 +3,6 @@ Encoding=UTF-8
Version=1.0
Type=Application
Name=Kismet
Exec=/usr/bin/osso-xterm /usr/bin/kismet
Exec=su-to-root kismet
Terminal=true
debian/kismet.desktop usr/share/applications/hildon
\ No newline at end of file
debian/kismet.desktop usr/share/applications
/usr/share/applications/hildon/kismet.desktop /etc/others-menu/0000_kismet.desktop
\ No newline at end of file
/usr/share/applications/kismet.desktop /etc/others-menu/0000_kismet.desktop
?package(kismet):needs="text" \
section="Applications/Network/Monitoring" \
title="Kismet" hints="Monitoring" \
command="/usr/bin/su-to-root -c /usr/bin/kismet"
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment