[oe-commits] org.oe.oz354x kismet: added 2006-04-R1 from .dev - reused patch from older version to get it buildable (throw() problem)
hrw commit
openembedded-commits at lists.openembedded.org
Fri Sep 29 15:33:46 UTC 2006
kismet: added 2006-04-R1 from .dev - reused patch from older version to get it buildable (throw() problem)
Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 8d41afc996184bb6f5a6b0e9d09307ffb1872001
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8d41afc996184bb6f5a6b0e9d09307ffb1872001
Files:
1
packages/kismet/kismet-2006-04-R1
packages/kismet/kismet-2006-04-R1/glibc3.3.2-getopt-throw.diff
packages/kismet/kismet-2006-04-R1/no-chmod.patch
packages/kismet/kismet_2006-04-R1.bb
Diffs:
#
# mt diff -rbfa714dc346bf107cc28575397267ad76b0534e3 -r8d41afc996184bb6f5a6b0e9d09307ffb1872001
#
#
#
# add_dir "packages/kismet/kismet-2006-04-R1"
#
# add_file "packages/kismet/kismet-2006-04-R1/glibc3.3.2-getopt-throw.diff"
# content [4292d835e8f5b1eb3c5d707a8bcc8922fc39ecdd]
#
# add_file "packages/kismet/kismet-2006-04-R1/no-chmod.patch"
# content [c7e6b415646a01fe700e0a4eb7a9dbd766b8f191]
#
# add_file "packages/kismet/kismet_2006-04-R1.bb"
# content [73fb9ea0b65a641da225381d2d195165281de3db]
#
============================================================
--- packages/kismet/kismet-2006-04-R1/glibc3.3.2-getopt-throw.diff 4292d835e8f5b1eb3c5d707a8bcc8922fc39ecdd
+++ packages/kismet/kismet-2006-04-R1/glibc3.3.2-getopt-throw.diff 4292d835e8f5b1eb3c5d707a8bcc8922fc39ecdd
@@ -0,0 +1,36 @@
+--- getopt.h.o 2004-10-10 19:48:48.409249432 +0200
++++ getopt.h 2004-10-10 19:51:42.610766776 +0200
+@@ -20,6 +20,14 @@
+
+ #include "config.h"
+
++#ifndef __THROW
++# if defined __cplusplus && __GNUC_PREREQ (2,8)
++# define __THROW throw ()
++# else
++# define __THROW
++# endif
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -103,15 +111,15 @@
+ /* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+-extern int getopt (int argc, char *const *argv, const char *shortopts);
++extern int getopt (int argc, char *const *argv, const char *shortopts) __THROW;
+ #else /* not __GNU_LIBRARY__ */
+ /* extern int getopt (); */
+ #endif /* not __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+- const struct option *longopts, int *longind);
++ const struct option *longopts, int *longind) __THROW;
+ extern int getopt_long_only (int argc, char *const *argv,
+ const char *shortopts,
+- const struct option *longopts, int *longind);
++ const struct option *longopts, int *longind) __THROW;
+
+ /* Internal only. Users should not call this directly. */
+ extern int _getopt_internal (int argc, char *const *argv,
============================================================
--- packages/kismet/kismet-2006-04-R1/no-chmod.patch c7e6b415646a01fe700e0a4eb7a9dbd766b8f191
+++ packages/kismet/kismet-2006-04-R1/no-chmod.patch c7e6b415646a01fe700e0a4eb7a9dbd766b8f191
@@ -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"
============================================================
--- packages/kismet/kismet_2006-04-R1.bb 73fb9ea0b65a641da225381d2d195165281de3db
+++ packages/kismet/kismet_2006-04-R1.bb 73fb9ea0b65a641da225381d2d195165281de3db
@@ -0,0 +1,30 @@
+SECTION = "console/network"
+DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+HOMEPAGE = "http://www.kismetwireless.net/"
+MAINTAINER = "Graeme Gregory <dp at xora.org.uk>"
+LICENSE = "GPLv2"
+DEPENDS = "expat gmp"
+
+SRC_URI = "http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz \
+ file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0 \
+ 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"
More information about the Openembedded-commits
mailing list