kismet: update to 2023-07-R1

3 files changed, 14 insertions, 67 deletions

diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 1c1731add..c34a3cd68 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -4,56 +4,33 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		kismet
-PKG_VERSION:=		2013-03-R1b
+PKG_VERSION:=		2023-07-R1
 PKG_RELEASE:=		1
-PKG_HASH:=		636d4d7ef8c67ae6ee8d8e1635f5115700eecb9fa4c208afaee30238db527c2c
+PKG_HASH:=		f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7
 PKG_DESCR:=		wireless network detector, sniffer, and intrusion detection system
 PKG_SECTION:=		net/wifi
-PKG_DEPENDS:=		libpcap libncurses
-PKG_BUILDDEP:=		libpcap ncurses
+PKG_BUILDDEP:=		libpcap ncurses libwebsockets protobuf protobuf-c sqlite
+PKG_DEPENDS:=		libpcap libncurses libwebsockets protobuf protobuf-c libsqlite
 PKG_NEEDS:=		threads
 PKG_URL:=		http://www.kismetwireless.net/
-PKG_SITES:=		http://www.kismetwireless.net/code/
-
-PKG_SUBPKGS:=		KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER
-PKGSD_KISMET_CLIENT:=	kismet client
-PKGSD_KISMET_SERVER:=	kismet server
-PKGSD_KISMET_DRONE:=	kismet drone
+PKG_SITES:=		https://www.kismetwireless.net/code/
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lpthread -ltinfo
-CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet
-
-pre-build:
-	(cd ${WRKBUILD} && ${MAKE} dep);
+CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet \
+			--disable-libusb \
+			--disable-python-tools \
+			--disable-wifi-coconut
 
 kismet-install:
 	${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet ${IDIR_KISMET}/usr/bin/kismet
-
-kismet-client-install:
-	${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_client \
-		${IDIR_KISMET_CLIENT}/usr/bin/
-
-kismet-drone-install:
-	${INSTALL_DIR} ${IDIR_KISMET_DRONE}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_drone \
-		${IDIR_KISMET_DRONE}/usr/bin/
-
-kismet-server-install:
-	${INSTALL_DIR} ${IDIR_KISMET_SERVER}/usr/bin
-	${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet
-	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_server \
-		${IDIR_KISMET_SERVER}/usr/bin/
-	${INSTALL_DATA} ${WRKINST}/etc/kismet/kismet.conf \
-		${IDIR_KISMET_SERVER}/etc/kismet
+	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet \
+		${IDIR_KISMET}/usr/bin/kismet
+	${INSTALL_DIR} ${IDIR_KISMET}/etc/kismet
+	${CP} ${WRKINST}/etc/kismet/kismet*.conf \
+		${IDIR_KISMET}/etc/kismet/
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kismet/patches/patch-configure_in b/package/kismet/patches/patch-configure_in
deleted file mode 100644
index cb7d45cbd..000000000
--- a/package/kismet/patches/patch-configure_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- kismet-2013-03-R1b.orig/configure.in	2013-03-27 15:41:48.000000000 +0100
-+++ kismet-2013-03-R1b/configure.in	2013-12-31 23:14:38.000000000 +0100
-@@ -406,9 +406,6 @@ AC_ARG_ENABLE(client,
- )
- AC_SUBST(wantclient)
- 
--# Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
--
- termcontrol="none";
- 
- if test "$wantclient" = "yes"; then
diff --git a/package/kismet/patches/patch-dumpfile_tuntap_h b/package/kismet/patches/patch-dumpfile_tuntap_h
deleted file mode 100644
index f669446f5..000000000
--- a/package/kismet/patches/patch-dumpfile_tuntap_h
+++ /dev/null
@@ -1,18 +0,0 @@
---- kismet-2013-03-R1b.orig/dumpfile_tuntap.h	2013-03-27 15:41:48.000000000 +0100
-+++ kismet-2013-03-R1b/dumpfile_tuntap.h	2014-01-02 20:53:21.000000000 +0100
-@@ -65,7 +65,15 @@
- #include "dumpfile.h"
- 
- #ifdef SYS_LINUX 
-+#if defined(__GLIBC__)
- #include <linux/if_tun.h>
-+#else
-+#define IFF_TUN         0x0001
-+#define IFF_TAP         0x0002
-+#define IFF_NO_PI       0x1000
-+#define TUNSETNOCSUM  _IOW('T', 200, int)
-+#define TUNSETIFF     _IOW('T', 202, int)
-+#endif
- 
- // Linux IEEE80211 link typ to set
- #define LNX_LINKTYPE_80211		801