Skip to contentSkip to conversation

package/kismet: bump version to 2020-09-R2

PATCH New Francois Gervais 3 participants 5 messages Sep 18, 2020 – Sep 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/kismet: bump version to 2020-09-R2

---
 package/kismet/0001-ncurses.patch             | 11 ----
 package/kismet/0002-nobsd.patch               | 44 ----------------
 .../0003-fix-curses-libs-ordering.patch       | 44 ----------------
 .../kismet/0004-no-include-host-paths.patch   | 25 ---------
 ...don-t-include-linux-if_tun.h-kernel-.patch | 51 -------------------
 package/kismet/Config.in                      | 13 ++---
 package/kismet/kismet.hash                    |  2 +-
 package/kismet/kismet.mk                      | 30 +++++++----
 8 files changed, 28 insertions(+), 192 deletions(-)
 delete mode 100644 package/kismet/0001-ncurses.patch
 delete mode 100644 package/kismet/0002-nobsd.patch
 delete mode 100644 package/kismet/0003-fix-curses-libs-ordering.patch
 delete mode 100644 package/kismet/0004-no-include-host-paths.patch
 delete mode 100644 package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch
package/kismet/0001-ncurses.patch deleted +0 -11
deleted file mode 100644
index af8fba52b7..0000000000
@@ -1,11 +0,0 @@
---- kismet-2009-06-R1/configure	2009-06-12 04:26:32.000000000 +0100
-+++ kismet-2009-06-R1.mod/configure	2009-08-05 11:27:43.000000000 +0100
-@@ -6981,7 +6981,7 @@
- 
- 
- # Add additional cflags since some distros bury panel.h
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
- 
- termcontrol="none";
- 
package/kismet/0002-nobsd.patch deleted +0 -44

44 lines not on this page · raw message

package/kismet/0003-fix-curses-libs-ordering.patch deleted +0 -44

44 lines not on this page · raw message

package/kismet/0004-no-include-host-paths.patch deleted +0 -25
deleted file mode 100644
index 6819bf425e..0000000000
@@ -1,25 +0,0 @@
-configure: do not hard-code host paths
-
-configure hard-codes include dirs to contain /usr/include/ncurses.
-Needless to say this does not work well for cross-compilation.
-
-Remove that directory from the include search dirs.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-Cc: Vicente Olivert Riera <[email protected]>
-[bernd.kuhls at t-online.de: update for 2016-07-R1]
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in
---- kismet-Kismet-2014-02-R1.orig/configure.ac	2014-02-19 05:37:43.000000000 +0100
-+++ kismet-Kismet-2014-02-R1/configure.ac	2014-12-26 16:46:55.770692349 +0100
-@@ -406,9 +406,6 @@
- )
- 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
package/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch deleted +0 -51

51 lines not on this page · raw message

package/kismet/Config.in +7 -6
index ab91c0e6fb..9e51356e79 100644
@@ -12,6 +12,10 @@ config BR2_PACKAGE_KISMET
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNL
+	select BR2_PACKAGE_LIBMICROHTTPD
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_PROTOBUF
+	select BR2_PACKAGE_PROTOBUF_C
 	help
 	  Kismet - 802.11 layer2 wireless network detector, sniffer,
 	  and intrusion detection system.
@@ -29,14 +33,11 @@ config BR2_PACKAGE_KISMET
 
 if BR2_PACKAGE_KISMET
 
-config BR2_PACKAGE_KISMET_CLIENT
-	bool "Install client"
-
-config BR2_PACKAGE_KISMET_DRONE
-	bool "Install drone"
-
 config BR2_PACKAGE_KISMET_SERVER
 	bool "Install server"
 	default y
 
+config BR2_PACKAGE_KISMET_REMOTE_CAPTURE
+	bool "Install remote capture"
+
 endif
package/kismet/kismet.hash +1 -1
index 30780b1cc3..676f4304b1 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237  kismet-2016-07-R1.tar.xz
+sha256  ef737fb4801c1d258e575893627625612ac043161a5660d1b30b14879f36ded8  kismet-2020-09-R2.tar.xz
 sha256  92b9eae679d8efbcd7514f7ff1346e4c1d42d272cd10bcb724d1511d35e28cd1  debian/copyright
package/kismet/kismet.mk +20 -10
index d3946d65f3..6b88958791 100644
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-KISMET_VERSION = 2016-07-R1
+KISMET_VERSION = 2020-09-R2
 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz
 KISMET_SITE = http://www.kismetwireless.net/code
-KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
+KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl libmicrohttpd sqlite \
+					  protobuf protobuf-c
 KISMET_CONF_OPTS += --with-netlink-version=3
 KISMET_LICENSE = GPL-2.0+
 KISMET_LICENSE_FILES = debian/copyright
@@ -31,18 +32,26 @@ ifeq ($(BR2_PACKAGE_PCRE),y)
 KISMET_DEPENDENCIES += pcre
 endif
 
-ifeq ($(BR2_PACKAGE_KISMET_CLIENT),y)
-KISMET_TARGET_BINARIES += kismet_client
-endif
-
 ifeq ($(BR2_PACKAGE_KISMET_SERVER),y)
-KISMET_TARGET_BINARIES += kismet_server
+KISMET_TARGET_BINARIES += kismet
 KISMET_TARGET_CONFIGS += kismet.conf
+KISMET_TARGET_CONFIGS += kismet_80211.conf
+KISMET_TARGET_CONFIGS += kismet_alerts.conf
+KISMET_TARGET_CONFIGS += kismet_filter.conf
+KISMET_TARGET_CONFIGS += kismet_httpd.conf
+KISMET_TARGET_CONFIGS += kismet_logging.conf
+KISMET_TARGET_CONFIGS += kismet_memory.conf
+KISMET_TARGET_CONFIGS += kismet_uav.conf
+define KISMET_INSTALL_TARGET_HTTP_DATA
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/kismet/httpd
+    cp -r $(KISMET_DIR)/http_data/* $(TARGET_DIR)/usr/share/kismet/httpd
+endef
 endif
 
-ifeq ($(BR2_PACKAGE_KISMET_DRONE),y)
-KISMET_TARGET_BINARIES += kismet_drone
-KISMET_TARGET_CONFIGS += kismet_drone.conf
+ifeq ($(BR2_PACKAGE_KISMET_REMOTE_CAPTURE),y)
+KISMET_TARGET_BINARIES += kismet_cap_pcapfile
+KISMET_TARGET_BINARIES += capture_linux_wifi/kismet_cap_linux_wifi
+KISMET_TARGET_BINARIES += capture_linux_bluetooth/kismet_cap_linux_bluetooth
 endif
 
 ifdef KISMET_TARGET_BINARIES
@@ -60,6 +69,7 @@ endif
 define KISMET_INSTALL_TARGET_CMDS
 	$(KISMET_INSTALL_TARGET_BINARIES)
 	$(KISMET_INSTALL_TARGET_CONFIGS)
+	$(KISMET_INSTALL_TARGET_HTTP_DATA)
 endef
 
 $(eval $(autotools-package))
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/kismet: bump version to 2020-09-R2

Hello Fran?ois,

Quoted 1 line · On Fri, 18 Sep 2020 13:59:53 -0400 Francois Gervais via buildroot…

Thanks for this patch! It turns out that today, Fabrice Fontaine has also sent a patch also bumping the kismet package.

However, your changes are quite radically different. Could you synchronize, compare your changes, and propose a common solution ?

Fabrice: in your patch, it would at least be nice to split the addition of python tools support into a separate patch, i.e the first patch should have an unconditional --disable-python-tools, with the second patch adding the option to enable python tools.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/kismet: bump version to 2020-09-R2

From what I can see, Fabrice seems to have the better patch. I'll give it a try on monday, see if it works on my end and report here.

From: Thomas Petazzoni <[email protected]>
Sent: September 19, 2020 8:21 AM
To: Gervais, Francois <[email protected]>
Cc: buildroot at buildroot.org <[email protected]>; Fabrice Fontaine <[email protected]>
Subject: Re: [Buildroot] [PATCH 1/1] package/kismet: bump version to 2020-09-R2
?
Hello Fran?ois,

Quoted 1 line · On Fri, 18 Sep 2020 13:59:53 -0400 Francois Gervais via buildroot…

Thanks for this patch! It turns out that today, Fabrice Fontaine has also sent a patch also bumping the kismet package.

However, your changes are quite radically different. Could you synchronize, compare your changes, and propose a common solution ?

Fabrice: in your patch, it would at least be nice to split the addition of python tools support into a separate patch, i.e the first patch should have an unconditional --disable-python-tools, with the second patch adding the option to enable python tools.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://urldefense.com/v3/__https://bootlin.com__;!!Po4YltK3bPMkYw!j8Wm5n3iF1ibtKcxFpnIhX9UjwZJR2ivXQEarg2LQPSGTqBIcLGOFvW9fOgPqZWMbDNynRU$ 
#3 lore raw

PATCH 1/1 package/kismet: bump version to 2020-09-R2

Hello,

Quoted 2 lines · Francois

From what I can see, Fabrice seems to have the better patch. I'll give it a try on monday, see if it works on my end and report here.

Well, your patch did contain a number of other changes that Fabrice's version did not, so it would be good to compare them, and pick the best of both :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/kismet: bump version to 2020-09-R2

I'm flattered that my patch could complement a patch from one of the top contributors but I must say, I fail to see what.

I tried Fabrice's patch, first it works. So that's out of the way.

It also adds obsolete parameters to the Config.in.legacy which I forgot.

Like me it can install just the capture tools or the whole thing. His config layout is better though as on my side you could disable everything so kismet would get built but nothing would get installed which is kinda weird. In his case when you select kismet you'll get the capture tools, then you get the option to install the server or not.

In my patch I would just build everything and do a partial install. In his case he actually uses a config option to disable building things that won't get installed. Obviously better.

He also changes the installation so when you install the capture tools only they are setuid so you don't have to run them as root. To me setuid seems unsecure but kismet has a clear message stating that this is actually more secure so nothing to say here.

I cannot comment on the python tools though as my target doesn't have python so I didn't try them.

Did I miss something?

From: Thomas Petazzoni <[email protected]>
Sent: September 19, 2020 3:59 PM
To: Gervais, Francois <[email protected]>
Cc: buildroot at buildroot.org <[email protected]>; Fabrice Fontaine <[email protected]>
Subject: Re: [Buildroot] [PATCH 1/1] package/kismet: bump version to 2020-09-R2
?
Hello,

Quoted 2 lines · Francois

From what I can see, Fabrice seems to have the better patch. I'll give it a try on monday, see if it works on my end and report here.

Well, your patch did contain a number of other changes that Fabrice's version did not, so it would be good to compare them, and pick the best of both :-)

Thomas

Signature · 2 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering