X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0ba0ace5d1e8673c7519fdd76bb719333ca4ef5b..586042df85d9eb774183e4fad67a11bf18ff303b:/openwrt/package/kismet/Makefile

diff --git a/openwrt/package/kismet/Makefile b/openwrt/package/kismet/Makefile
index e1ee6c27c..366fddddb 100644
--- a/openwrt/package/kismet/Makefile
+++ b/openwrt/package/kismet/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kismet
-PKG_VERSION:=2005-04-R1
-PKG_RELEASE:=3
-PKG_MD5SUM:=19b4f192eb11a418ed3f6bf65c1226af
+PKG_VERSION:=2005-08-R1
+PKG_RELEASE:=1
+PKG_MD5SUM:=17edb7688e04dd28028d5268a77d0ce7
 
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -25,44 +25,46 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)"  \
-		CXXFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include  -fno-builtin -nostdinc++ -nodefaultlibs"  \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++"  \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(LINUX_DIR)/include" \
+		LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="-luClibc++ -lc -lm" \
 		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc/kismet \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-		  --enable-syspcap=yes \
-		  --disable-wsp100 \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc/kismet \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-syspcap=yes \
+			--disable-setuid \
+			--disable-wsp100 \
+			--disable-gpsmap \
 	);
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		LIBS="-L$(STAGING_DIR)/lib -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm" \
-		CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" 
+		LIBS="-luClibc++ -lc -lm" \
+		all
 	touch $@
 
 $(IPKG_KISMET):
 	install -d -m0755 $(IDIR_KISMET)/usr/bin/
-	cp -fpR $(PKG_BUILD_DIR)/scripts/kismet $(IDIR_KISMET)/usr/bin/
+	install -m0755 $(PKG_BUILD_DIR)/scripts/kismet $(IDIR_KISMET)/usr/bin/kismet
 	$(IPKG_BUILD) $(IDIR_KISMET) $(PACKAGE_DIR)
 
 $(IPKG_KISMET_CLIENT):
@@ -71,16 +73,16 @@ $(IPKG_KISMET_CLIENT):
 	install -m0644 ./files/client_manuf $(IDIR_KISMET_CLIENT)/etc/kismet/
 	install -m0644 ./files/kismet.conf $(IDIR_KISMET_CLIENT)/etc/kismet/
 	install -m0644 ./files/kismet_ui.conf $(IDIR_KISMET_CLIENT)/etc/kismet/
-	install -d -m0755 $(IDIR_KISMET_CLIENT)/usr/sbin
-	cp -fpR $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/sbin/
+	install -d -m0755 $(IDIR_KISMET_CLIENT)/usr/bin
+	cp -fpR $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/bin/
 	$(RSTRIP) $(IDIR_KISMET_CLIENT)
 	$(IPKG_BUILD) $(IDIR_KISMET_CLIENT) $(PACKAGE_DIR)
 
 $(IPKG_KISMET_DRONE):
 	install -d -m0755 $(IDIR_KISMET_DRONE)/etc/kismet/
 	install -m0644 ./files/kismet_drone.conf $(IDIR_KISMET_DRONE)/etc/kismet/
-	install -d -m0755 $(IDIR_KISMET_DRONE)/usr/sbin
-	cp -fpR $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/sbin/
+	install -d -m0755 $(IDIR_KISMET_DRONE)/usr/bin
+	cp -fpR $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/bin/
 	$(RSTRIP) $(IDIR_KISMET_DRONE)
 	$(IPKG_BUILD) $(IDIR_KISMET_DRONE) $(PACKAGE_DIR)
 
@@ -89,11 +91,11 @@ $(IPKG_KISMET_SERVER):
 	install -m0644 ./files/ap_manuf $(IDIR_KISMET_SERVER)/etc/kismet/
 	install -m0644 ./files/client_manuf $(IDIR_KISMET_SERVER)/etc/kismet/
 	install -m0644 ./files/kismet.conf $(IDIR_KISMET_SERVER)/etc/kismet/
-	mkdir -p $(IDIR_KISMET_SERVER)/usr/sbin
-	cp -fpR  $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/sbin/
+	mkdir -p $(IDIR_KISMET_SERVER)/usr/bin
+	cp -fpR  $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/bin/
 	$(RSTRIP) $(IDIR_KISMET_SERVER)
 	$(IPKG_BUILD) $(IDIR_KISMET_SERVER) $(PACKAGE_DIR)
 
 mostlyclean:
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
+#	$(MAKE) -C $(PKG_BUILD_DIR) clean
 	rm -f $(PKG_BUILD_DIR)/.built