merge of '19d6e36401459c394e778e2c97b17aece67b9345'

     and '4b82308682e75a00741e659b5a0187889f0edb2d'

7 files changed, 276 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e34d15493a..0007994373 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -79,7 +79,7 @@ Recipes:    net-snmp, ebtables, ethtool, arpwatch, lib*-perl
 
 Person:     Joaquim Duran
 Mail:       joaquinduran@adtelecom.es
-Recipes:    fltk
+Recipes:    gtk+, gtkmm
 
 Person:     Justin Patrin
 Mail:       papercrane@reversefold.com
diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb
new file mode 100644
index 0000000000..3093c39955
--- /dev/null
+++ b/packages/aircrack/aircrack-ng_0.7.bb
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
+HOMEPAGE = "http://www.aircrack-ng.org/"
+LICENSE = "GPLv2"
+MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>"
+DEPENDS = ""
+RDEPENDS = ""
+PR="r2"
+
+SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
+
+oe_compile() {
+        oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
+}
+
+do_install() {
+        install -d ${D}/${sbindir}
+	install -d ${D}/${bindir}
+        install -m 0755 airodump-ng       ${D}/${sbindir}
+        install -m 0755 aircrack-ng       ${D}/${bindir}
+        install -m 0755 aireplay-ng       ${D}/${sbindir}
+        install -m 0755 airdecap-ng       ${D}/${bindir}
+        install -m 0755 packetforge-ng    ${D}/${bindir}
+        install -m 0755 airmon-ng         ${D}/${sbindir}
+        install -m 0755 ivstools          ${D}/${bindir}
+	install -m 0755 kstats		  ${D}/${bindir}
+	install -m 0755 airtun-ng	  ${D}/${bindir}
+}
diff --git a/packages/gpe-snes/.mtn2git_empty b/packages/gpe-snes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-snes/.mtn2git_empty
diff --git a/packages/gpe-snes/gpe-snes_0.1.bb b/packages/gpe-snes/gpe-snes_0.1.bb
new file mode 100644
index 0000000000..13944f5a4a
--- /dev/null
+++ b/packages/gpe-snes/gpe-snes_0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "gpe-snes is a gpe frontend for the snes9x SNES emulator"
+SECTION = "games"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "libgpe"
+
+inherit autotools
+
+PR = "r0"
+
+SRC_URI = "http://www.telefonica.net/web2/mteirap/gpe-snes-${PV}.tar.gz"
diff --git a/packages/kismet/files/no-chmod.patch b/packages/kismet/files/no-chmod.patch
new file mode 100644
index 0000000000..b22c513b68
--- /dev/null
+++ b/packages/kismet/files/no-chmod.patch
@@ -0,0 +1,173 @@
+--- kismet-2006-04-R1/Makefile.in.orig	2006-09-14 11:37:20.000000000 +0100
++++ kismet-2006-04-R1/Makefile.in	2006-09-14 11:38:01.000000000 +0100
+@@ -130,52 +130,52 @@
+ 	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 -m 755 $(PS) $(BIN)/$(PS); 
++	install -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 -m 4755 $(PS) $(BIN)/$(PS); 
++	install -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 -m 755 scripts/kismet $(BIN)/kismet
++	install -m 755 $(NC) $(BIN)/$(NC)
++	# install -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 -m 755 $(BUZZER) $(BIN)/buzzme; \
++		echo install -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
++#install -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
++#install -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
+ 	mkdir -p $(MAN)/man1
+-	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
+-	# install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1
+-	# install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1
+-	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
++	install -m 644 man/kismet.1 $(MAN)/man1/kismet.1
++	# install -m 644 man/kismet_monitor.1 $(MAN)/man1/kismet_monitor.1
++	# install -m 644 man/kismet_hopper.1 $(MAN)/man1/kismet_hopper.1
++	install -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
+ 	mkdir -p $(MAN)/man5
+-	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
+-	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
+-	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
++	install -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
++	install -m 644 man/kismet_ui.conf.5 $(MAN)/man5/kismet_ui.conf.5
++	install -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 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; \
+-		echo install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
++		install -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		echo install -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
++		echo install -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
++		install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
++		echo install -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
+ 	fi
+ 
+ 	mkdir -p $(WAV)
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new_network.wav $(WAV)/new_network.wav
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/traffic.wav $(WAV)/traffic.wav
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/ap_manuf $(ETC)/ap_manuf; 
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/client_manuf $(ETC)/client_manuf; 
++	install -m 644 wav/new_network.wav $(WAV)/new_network.wav
++	install -m 644 wav/traffic.wav $(WAV)/traffic.wav
++	install -m 644 wav/junk_traffic.wav $(WAV)/junk_traffic.wav
++	install -m 644 wav/alert.wav $(WAV)/alert.wav
++	install -m 644 conf/ap_manuf $(ETC)/ap_manuf; 
++	install -m 644 conf/client_manuf $(ETC)/client_manuf; 
+ 
+ 	@if test -f $(BIN)/kismet_curses; then \
+ 		echo "Removing old kismet_curses binary.  The panels frontend is now kismet_client."; \
+@@ -188,22 +188,22 @@
+ 	@if test -f $(ETC)/kismet.conf; then \
+ 		$(MAKE) -e checkconfig; \
+     else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++		install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo "Installed config into $(ETC)/kismet.conf."; \
+ 	fi
+ 	@if test -f $(ETC)/kismet_drone.conf; then \
+ 		$(MAKE) -e checkdroneconfig; \
+     else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++		install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
+ 	fi
+ 	@if test -f $(ETC)/kismet_ui.conf; then \
+ 		$(MAKE) -e checkuiconfig; \
+ 	else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++		install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++		echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+ 		echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
+ 	fi
+ 	@echo "Installed kismet into $(BIN)/."
+@@ -221,22 +221,22 @@
+ 	@if test -f $(ETC)/kismet.conf; then \
+ 		$(MAKE) -e checkconfig; \
+     else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++		install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++		echo install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo "Installed config into $(ETC)/kismet.conf."; \
+ 	fi
+ 	@if test -f $(ETC)/kismet_drone.conf; then \
+ 		$(MAKE) -e checkdroneconfig; \
+     else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++		install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++		echo install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; \
+ 	fi
+ 	@if test -f $(ETC)/kismet_ui.conf; then \
+ 		$(MAKE) -e checkuiconfig; \
+ 	else \
+-		install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++		install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++		echo install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+ 		echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
+ 	fi
+ 	@echo "Installed kismet into $(BIN)/."
+@@ -252,11 +252,11 @@
+ forceinstall: $(PS)
+ 	$(MAKE) -e commoninstall
+ 	$(MAKE) -e binuserinstall
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++	install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo "Installed config into $(ETC)/kismet.conf."; 
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++	install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; 
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++	install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+ 		echo "Installed UI config into $(ETC)/kismet_ui.conf."; 
+ 	@echo "Installed kismet into $(BIN)/."
+ 	@echo "If you have not done so already, read the README file and the FAQ file.  Additional"
+@@ -271,11 +271,11 @@
+ suidforceinstall: $(PS)
+ 	$(MAKE) -e commoninstall
+ 	$(MAKE) -e binsuidinstall
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
++	install -m 644 conf/kismet.conf $(ETC)/kismet.conf;  \
+ 		echo "Installed config into $(ETC)/kismet.conf."; 
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
++	install -m 644 conf/kismet_drone.conf $(ETC)/kismet_drone.conf;  \
+ 		echo "Installed drone config into $(ETC)/kismet_drone.conf."; 
+-	install -o $(INSTUSR) -g $(INSTGRP) -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
++	install -m 644 conf/kismet_ui.conf $(ETC)/kismet_ui.conf;  \
+ 		echo "Installed UI config into $(ETC)/kismet_ui.conf."; 
+ 	@echo "Installed kismet into $(BIN)/."
+ 	@echo "If you have not done so already, read the README file and the FAQ file.  Additional"
diff --git a/packages/kismet/kismet_2007-01-R1b.bb b/packages/kismet/kismet_2007-01-R1b.bb
new file mode 100644
index 0000000000..774e71e286
--- /dev/null
+++ b/packages/kismet/kismet_2007-01-R1b.bb
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-2007-01-R1b.tar.gz \
+           file://no-chmod.patch;patch=1"
+
+
+EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
+
+inherit autotools
+
+do_configure() {
+        oe_runconf
+}
+
+do_install_append() {
+	if test -e ${WORKDIR}/kismet.conf; then
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
+	fi
+}
+
+PACKAGES =+ "kismet-sounds"
+FILES_kismet-sounds = "/usr/share/kismet/wav"
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/kismet.conf"
diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb
new file mode 100644
index 0000000000..a4712f3dea
--- /dev/null
+++ b/packages/qpegps/qpegps_0.9.3.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Navigation application for use with GPS adapters"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+
+RRECOMMENDS = "gpsd"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpegps.sourceforge.net/"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
+           file://qpegps.desktop \
+           file://qpegps.png"
+S = "${WORKDIR}/qpegps"
+
+inherit palmtop
+
+QMAKE_PROFILES = "qpegps.pro"
+EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics/qpegps \
+        	   ${D}${palmtopdir}/help/html/qpegps_icons \
+        	   ${D}${palmtopdir}/qpegps/maps \
+        	   ${D}${palmtopdir}/qpegps/icons \
+        	   ${D}${palmtopdir}/qpegps/tracks
+        install -m 0755 qpegps ${D}${palmtopdir}/bin/
+        install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+        install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
+        install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
+        install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+	install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
+}