4 files changed, 116 insertions, 11 deletions
diff --git a/packages/kismet/kismet-newcore_svn.bb b/packages/kismet/kismet-newcore_svn.bb
new file mode 100644
index 0000000000..fd1eadfeb7
--- /dev/null
+++ b/packages/kismet/kismet-newcore_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http"
+
+EXTRA_OECONF = "--disable-gpsmap --enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+S = "${WORKDIR}/kismet-newcore"
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+PACKAGES =+ "${PN}-sounds"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+
diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb
index 5c10300573..a908ac4637 100644
--- a/packages/kismet/kismet_2007-01-R1b.bb
+++ b/packages/kismet/kismet_2007-01-R1b.bb
@@ -1,19 +1,19 @@
-SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
 LICENSE = "GPLv2"
-DEPENDS = "expat gmp"
-
-SRC_URI = "http://www.kismetwireless.net/code/kismet-2007-01-R1b.tar.gz \
-           file://no-chmod.patch;patch=1"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
+PR = "r2"
 
+SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
 
-EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include --disable-gpsmap"
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
 
 inherit autotools
 
-do_configure() {
-        oe_runconf
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
 }
 
 do_install_append() {
@@ -22,7 +22,13 @@ do_install_append() {
 	fi
 }
 
-PACKAGES =+ "kismet-sounds"
-FILES_kismet-sounds = "/usr/share/kismet/wav"
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
 
-CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb
new file mode 100644
index 0000000000..1c78d468d7
--- /dev/null
+++ b/packages/kismet/kismet_2007-10-R1.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
+PR = "r1"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
+
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+
diff --git a/packages/kismet/kismet_svn.bb b/packages/kismet/kismet_svn.bb
new file mode 100644
index 0000000000..10723dd42a
--- /dev/null
+++ b/packages/kismet/kismet_svn.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
+PV = "2007-10-R1+svnr${SRCREV}"
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
+SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http"
+
+EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \
+                --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+S = "${WORKDIR}/trunk"
+
+fakeroot do_install() {
+     oe_runmake "DESTDIR=${D}" suidinstall
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "${PN}-sounds ${PN}-gpsmap"
+
+FILES_${PN}-sounds = "${datadir}/kismet/wav"
+RDEPENDS_${PN}-sounds = "sox"
+
+FILES_${PN}-gpsmap = "${bindir}/gpsmap*"
+RDEPENDS_${PN}-gpsmap = "gpsd"
+
+CONFFILES_${PN} = "${sysconfdir}/kismet.conf ${sysconfdir}/kismet_ui.conf ${sysconfdir}/kismet_drone.conf"
+