- up to 2021-05-R1

diff --git a/config.patch b/config.patch
index a45e418d4b88d41137483a954a1589aa8fda998f..9f1fcb5729b33ed4960b75759dc1c9a870afeaca 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,40 +1,11 @@
---- kismet-2010-07-R1/conf/kismet_drone.conf~  2008-12-11 00:12:27.000000000 +0200
-+++ kismet-2010-07-R1/conf/kismet_drone.conf   2011-01-13 20:03:48.696974538 +0200
-@@ -16,7 +16,7 @@
- droneringlen=65535
+--- kismet-2021-05-R1/conf/kismet_logging.conf~        2021-05-20 00:58:52.000000000 +0200
++++ kismet-2021-05-R1/conf/kismet_logging.conf 2021-05-23 13:45:39.393458522 +0200
+@@ -14,7 +14,7 @@
+ # in, but the logs can be automatically stored in other directories as well.
+ # The directory must exist before Kismet is started - Kismet will /not/ create
+ # the directory list itself.
+-log_prefix=./
++log_prefix=/var/log/kismet
  
- # Do we have a GPS?
--gps=true
-+gps=false
- # Do we use a locally serial attached GPS, or use a gpsd server?
- # (Pick only one)
- gpstype=gpsd
---- kismet-2016-07-R1/conf/kismet.conf.in~     2016-07-02 20:06:10.000000000 +0200
-+++ kismet-2016-07-R1/conf/kismet.conf.in      2017-01-17 10:59:15.329493490 +0100
-@@ -11,7 +11,7 @@
- # servername=Kismet Server
  
- # Prefix of where we log (as used in the logtemplate later)
--# logprefix=/some/path/to/logs
-+logprefix=@localstatedir@/log/kismet
- 
- # Do we process the contents of data frames?  If this is enabled, data
- # frames will be truncated to the headers only immediately after frame type
-@@ -122,13 +122,13 @@
- # OUI file, expected format 00:11:22<tab>manufname
- # IEEE OUI file used to look up manufacturer info.  We default to the
- # wireshark one since most people have that.
--ouifile=/etc/manuf
--ouifile=/usr/share/wireshark/wireshark/manuf
-+#ouifile=/etc/manuf
-+#ouifile=/usr/share/wireshark/wireshark/manuf
- ouifile=/usr/share/wireshark/manuf
--ouifile=/Applications/Wireshark.app/Contents/Resources/share/wireshark/manuf
-+#ouifile=/Applications/Wireshark.app/Contents/Resources/share/wireshark/manuf
- 
- # Do we have a GPS?
--gps=true
-+gps=false
- # Do we use a locally serial attached GPS, or use a gpsd server, or
- # use a fixed virtual gps?
- # (Pick only one)
+ # Logging is enabled by type; plugins may add additional types.  The log types can be

diff --git a/kismet.spec b/kismet.spec
index 3e9ea555fc25d51ece6492281062df77731f5706..a2e23963838c3e1d9187efabdc31bc5f05535495 100644 (file)
--- a/kismet.spec
+++ b/kismet.spec
@@ -5,12 +5,12 @@
 Summary:       Wireless network sniffer
 Summary(pl.UTF-8):     Sniffer sieci bezprzewodowych
 Name:          kismet
-Version:       2016_07_R1
-Release:       4
+Version:       2021_05_R1
+Release:       0.1
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.kismetwireless.net/code/%{name}-%{tarver}.tar.xz
-# Source0-md5: 7fa6e86c5078a0e7d91fc9bf954c5107
+# Source0-md5: df4cc90d5183b7fd45846a33bf598339
 Patch0:                config.patch
 URL:           http://www.kismetwireless.net/
 BuildRequires: autoconf
@@ -20,6 +20,7 @@ BuildRequires:        gmp-devel
 BuildRequires: libcap-devel
 BuildRequires: libnl-devel
 BuildRequires: libpcap-devel >= 2:0.9.4-1
+BuildRequires: libwebsockets-devel >= 3.1.0
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-ext-devel
 BuildRequires: openssl-devel
@@ -31,7 +32,7 @@ Suggests:     %{name}-server
 %requires_eq   libpcap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                plugins plugin-alertsyslog plugin-btscan plugin-spectools plugin-syslog
+%define                plugins plugin-alertsyslog plugin-dashboard
 
 %description
 Kismet is a 802.11b wireless network sniffer. It is capable of
@@ -79,7 +80,8 @@ cp -f /usr/share/automake/config.* .
 %{__autoconf}
 %configure
 
-%{__make}
+# -j1 due to OOM
+%{__make} -j1
 
 for plugin in %plugins; do
        %{__make} -C $plugin \
@@ -95,12 +97,10 @@ for dir in . %plugins; do
                KIS_SRC_DIR=$PWD \
                INSTUSR=%(id -un) \
                INSTGRP=%(id -gn) \
+               SUIDGROUP=%(id -gn) \
                MANGRP=%(id -gn)
 done
 
-# do what binsuidinstall would do
-install -p kismet_capture $RPM_BUILD_ROOT%{_bindir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,28 +114,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc docs/* CHANGELOG README README.plugin-*
+%doc CHANGELOG README.md README.plugin-alertsyslog README.plugin-dashboard
 %attr(755,root,root) %{_bindir}/kismet
-%attr(755,root,root) %{_bindir}/kismet_client
 %{_datadir}/%{name}
-%{_mandir}/man1/kismet.1*
-%{_mandir}/man1/kismet_drone.1*
-%dir %{_libdir}/kismet_client
-%attr(755,root,root) %{_libdir}/kismet_client/btscan_ui.so
-%attr(755,root,root) %{_libdir}/kismet_client/spectools_ui.so
 
 %files server
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kismet.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kismet_drone.conf
-%attr(4750,root,kismet) %{_bindir}/kismet_capture
-%attr(755,root,root) %{_bindir}/kismet_drone
 %attr(755,root,root) %{_bindir}/kismet_server
-%{_mandir}/man5/kismet.conf.5*
-%{_mandir}/man5/kismet_drone.conf.5*
 %dir %{_libdir}/kismet
-%attr(755,root,root) %{_libdir}/kismet/kismet-syslog.so
-%attr(755,root,root) %{_libdir}/kismet/alertsyslog.so
-%attr(755,root,root) %{_libdir}/kismet/btscan.so
-%attr(755,root,root) %{_libdir}/kismet/spectool_net.so
+#%attr(755,root,root) %{_libdir}/kismet/alertsyslog.so
+#%attr(755,root,root) %{_libdir}/kismet/spectool_net.so
 %dir %attr(770,root,kismet) /var/log/%{name}