X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=net%2Fkismet%2FMakefile;h=048b3f72cf1b8221554796764292b034d1c681a2;hb=23c11105f000fb6409910c6c8b2b5cc2403ca904;hp=53cd8caf260ddb8e08c469d26d00a64359e8bb85;hpb=5360edce8f45be94248e74df88c9c3c4206bf3ce;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 53cd8caf26..048b3f72cf 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -9,30 +9,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kismet
-PKG_VERSION:=2006-04-R1
+PKG_VERSION:=2007-10-R1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
-PKG_MD5SUM:=8ec2de513f2911df1b7edfcba5ad1c26
-PKG_CAT:=zcat
+PKG_MD5SUM:=2100c667e69db0cde35fa2d06c8516e2
 
-PKG_BUILDDEP:=libpcap libncurses uclibcxx
+PKG_BUILD_DEPENDS:=libnotimpl libpcap libncurses uclibcxx
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kismet-client
+define Package/kismet/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=Kismet client
-  DEPENDS:=+libncurses +uclibcxx
-  DESCRIPTION:=Kismet client.\\\
-    An 802.11 layer2 wireless network detector, sniffer, and intrusion \\\
-    detection system.\\\
-    \\\
-    This package contains the kismet text interface client.
+  TITLE:=Kismet
+  DEPENDS:= +uclibcxx
   URL:=http://www.kismetwireless.net/
+  SUBMENU:=wireless
+endef
+
+define Package/kismet/Default/description
+ An 802.11 layer2 wireless network detector, sniffer, and intrusion 
+ detection system.
+endef
+
+define Package/kismet-client
+$(call Package/kismet/Default)
+  TITLE+= client
+  DEPENDS+= +libncurses
 endef
 
 define Package/kismet-client/conffiles
@@ -42,34 +47,30 @@ define Package/kismet-client/conffiles
 /etc/kismet/kismet_ui.conf
 endef
 
+define Package/kismet-client/description
+$(call Package/kismet/Default/description)
+ This package contains the kismet text interface client.
+endef
+
 define Package/kismet-drone
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcap +uclibcxx
-  TITLE:=Kismet drone
-  DESCRIPTION:=Kismet drone.\\\
-    An 802.11 layer2 wireless network detector, sniffer, and intrusion \\\
-    detection system.\\\
-    \\\
-    This package contains the kismet remote sniffing.and monitoring drone.
-  URL:=http://www.kismetwireless.net/
+$(call Package/kismet/Default)
+  DEPENDS+= +libpcap
+  TITLE+= drone
 endef
 
 define Package/kismet-drone/conffiles
 /etc/kismet/kismet_drone.conf
 endef
 
+define Package/kismet-drone/description
+$(call Package/kismet/Default/description)
+ This package contains the kismet remote sniffing.and monitoring drone.
+endef
+
 define Package/kismet-server
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpcap +uclibcxx
-  TITLE:=Kismet server
-  DESCRIPTION:=Kismet server.\\\
-    An 802.11 layer2 wireless network detector, sniffer, and intrusion \\\
-    detection system.\\\
-    \\\
-    This package contains the kismet server.
-  URL:=http://www.kismetwireless.net/
+$(call Package/kismet/Default)
+  DEPENDS+= +libpcap +dbus
+  TITLE+= server
 endef
 
 define Package/kismet-server/conffiles
@@ -78,44 +79,26 @@ define Package/kismet-server/conffiles
 /etc/kismet/kismet.conf
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)"  \
-		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 -lgcc" \
-		./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-setuid \
-			--disable-wsp100 \
-			--disable-gpsmap \
-	);
+define Package/kismet-server/description
+$(call Package/kismet/Default/description)
+ This package contains the kismet server.
 endef
 
+CONFIGURE_ARGS += \
+	--enable-syspcap=yes \
+	--disable-setuid \
+	--disable-wsp100 \
+	--disable-gpsmap \
+
+CONFIGURE_VARS += \
+	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
+	LDFLAGS="$$$$LDFLAGS" \
+	LIBS="-nodefaultlibs -luClibc++ -lm -lnotimpl" \
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LIBS="-luClibc++ -lc -lm -lgcc" \
+		LD="\$$$$(CC)" \
 		all
 endef