package/kismet: bump to version 2020-09-R3
PATCH v3 1/2 package/kismet: bump to version 2020-09-R3
- Drop all patches (not needed anymore)
- Update help message of Config.in: kismet does not support only WiFi but also Bluetooth, SDR ...
- Remove ncurses dependency
- libnl is now optional
- Drop --with-netlink-version (not available anymore)
- Add protobuf, protobuf-c, sqlite and zlib mandatory dependencies
- kismet_client and kismet_drone have been dropped since version 2019-04-R1
- Select libmicrohttpd for kismet_server
- Add optional libusb and lm-sensors dependencies
- Use --{enable,disable}-{libcap,pcre} options
- Use the new LICENSE file
---
Changes v2 -> v3:
- Bump to version 2020-09-R3
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Move activation of python tools in a dedicated patch
Config.in.legacy | 12 +++ 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 | 51 +++++++------ package/kismet/kismet.hash | 4 +- package/kismet/kismet.mk | 74 ++++++++++--------- 9 files changed, 83 insertions(+), 233 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
Config.in.legacy +12 -0
@@ -146,6 +146,18 @@ endif comment "Legacy options removed in 2020.11" +config BR2_PACKAGE_KISMET_CLIENT + bool "kismet client support was removed" + select BR2_LEGACY + help + Kismet client support was removed since version 2019-04-R1. + +config BR2_PACKAGE_KISMET_DRONE + bool "kismet drone support was removed" + select BR2_LEGACY + help + Kismet drone support was removed since version 2019-04-R1. + config BR2_GCC_VERSION_7_X bool "gcc 7.x support removed" select BR2_LEGACY
package/kismet/0001-ncurses.patch deleted +0 -11
@@ -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
@@ -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 +28 -23
70 lines not on this page · raw message
package/kismet/kismet.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 kismet-2016-07-R1.tar.xz -sha256 92b9eae679d8efbcd7514f7ff1346e4c1d42d272cd10bcb724d1511d35e28cd1 debian/copyright +sha256 6c935a5ee28fe6c5376d6270a2fc484b26a65e63184506724427b2aeff674ab7 kismet-2020-09-R3.tar.xz +sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE
package/kismet/kismet.mk +41 -33
98 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH v3 2/2 package/kismet: add python tools support
--- package/kismet/Config.in | 28 ++++++++++++++++++++++++++++ package/kismet/kismet.mk | 11 ++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-)
package/kismet/Config.in +28 -0
@@ -26,6 +26,34 @@ config BR2_PACKAGE_KISMET if BR2_PACKAGE_KISMET +config BR2_PACKAGE_KISMET_PYTHON_TOOLS + bool "Install python tools" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee + select BR2_PACKAGE_PYTHON_SETUPTOOLS + help + Enable Python and Python-related tools (RTL_433, RTLAMR, + RTLADSB and Freaklabs Zigbee) + +comment "python tools needs python3" + depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + +comment "python tools needs a glibc or musl toolchain w/ dynamic library, gcc >= 4.8" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y
package/kismet/kismet.mk +10 -1
@@ -17,7 +17,7 @@ KISMET_DEPENDENCIES = \ zlib KISMET_LICENSE = GPL-2.0+ KISMET_LICENSE_FILES = LICENSE -KISMET_CONF_OPTS = --disable-debuglibs --disable-python-tools +KISMET_CONF_OPTS = --disable-debuglibs KISMET_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -55,6 +55,15 @@ else KISMET_CONF_OPTS += --disable-pcre endif +ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) +KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_CONF_OPTS += \ + --enable-python-tools \ + --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +else +KISMET_CONF_OPTS += --disable-python-tools +endif + KISMET_INSTALL_TARGET_OPTS += \ DESTDIR=$(TARGET_DIR) \ INSTUSR=$(shell id -u) \
Signature · 1 line
2.28.0
PATCH v3 1/2 package/kismet: bump to version 2020-09-R3
In reply to Fabrice FontaineQuoted 13 lines · On Sun, 4 Oct 2020 17:50:03 +0200 Fabrice Fontaine…
- Drop all patches (not needed anymore)
- Update help message of Config.in: kismet does not support only WiFi but also Bluetooth, SDR ...
- Remove ncurses dependency
- libnl is now optional
- Drop --with-netlink-version (not available anymore)
- Add protobuf, protobuf-c, sqlite and zlib mandatory dependencies
-kismet_clientandkismet_dronehave been dropped since version 2019-04-R1
- Select libmicrohttpd forkismet_server
- Add optional libusb and lm-sensors dependencies
- Use --{enable,disable}-{libcap,pcre} options
- Use the new LICENSE file
Quoted 4 lines
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v2 -> v3:
- Bump to version 2020-09-R3
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com