File project.diff of Package suricata

--- suricata.changes.orig
+++ suricata.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Tue Jan 25 15:09:22 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Update to version 6.0.4:
+  https://forum.suricata.io/t/suricata-6-0-4-and-5-0-8-released/1942
+- Add luajit build conditional
+- More man pages
+
+-------------------------------------------------------------------
+Mon Nov  9 11:56:06 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Update to version 6.0.0:
+  https://suricata-ids.org/2020/10/08/suricata-6-0-0-released/
+  Upgrade notes:
+  https://suricata.readthedocs.io/en/latest/upgrade.html
+- Add new dependencies, most notably: rust, cargo
+- Change geoip to maxminddb:
+  https://build.opensuse.org/package/view_file/openSUSE:Leap:15.2/GeoIP/README.SUSE
+- Disable prelude support: currently broken
+  https://redmine.openinfosecfoundation.org/issues/4065
+
+-------------------------------------------------------------------
 Tue Apr 28 17:51:33 UTC 2020 - Martin Hauke <mardnh@gmx.de>
 
 - Switch to python3
--- suricata.spec.orig
+++ suricata.spec
@@ -16,13 +16,18 @@
 #
 
 
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} >= 1500
 %ifarch %{ix86} x86_64
 %bcond_without hyperscan
 %endif
 %endif
+%bcond_without luajit
+# prelude support is broken in v6.0:
+# https://redmine.openinfosecfoundation.org/issues/4065
+%bcond_with prelude
+
 Name:           suricata
-Version:        4.1.8
+Version:        6.0.4
 Release:        0
 Summary:        Open Source Next Generation Intrusion Detection and Prevention Engine
 License:        GPL-2.0-only
@@ -32,6 +37,7 @@ Source1:        https://www.openinfosecf
 Source2:        suricata.service
 Source3:        suricata.sysconfig
 Source4:        suricata.logrotate
+BuildRequires:  cargo
 BuildRequires:  coccinelle
 BuildRequires:  file-devel
 BuildRequires:  libnet-devel
@@ -39,20 +45,30 @@ BuildRequires:  libpcap-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3
 BuildRequires:  python3-PyYAML
+BuildRequires:  python3-setuptools
+BuildRequires:  rust
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  pkgconfig(geoip)
+
 BuildRequires:  pkgconfig(hiredis)
 BuildRequires:  pkgconfig(htp)
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libcap-ng)
+BuildRequires:  pkgconfig(libevent)
 BuildRequires:  pkgconfig(liblz4)
 BuildRequires:  pkgconfig(liblzma)
+BuildRequires:  pkgconfig(libmaxminddb)
 BuildRequires:  pkgconfig(libnetfilter_log)
 BuildRequires:  pkgconfig(libnetfilter_queue)
 BuildRequires:  pkgconfig(libnfnetlink)
 BuildRequires:  pkgconfig(libpcre)
+%if %{with prelude}
 BuildRequires:  pkgconfig(libprelude)
+%endif
+%if %{with luajit}
+BuildRequires:  pkgconfig(luajit)
+%else
 BuildRequires:  pkgconfig(lua)
+%endif
 BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(yaml-0.1)
@@ -66,28 +82,44 @@ BuildRequires:  pkgconfig(libhs)
 %endif
 
 %description
-The Suricata Engine is an Open Source Next Generation Intrusion Detection and Prevention Engine. This engine is not intended to just replace or emulate the existing tools in the industry, but will bring new ideas and technologies to the field.
-
-OISF is part of and funded by the Department of Homeland Security's Directorate for Science and Technology HOST program (Homeland Open Security Technology), by the the Navy's Space and Naval Warfare Systems Command (SPAWAR), as well as through the very generous support of the members of the OISF Consortium. More information about the Consortium is available, as well as a list of our current Consortium Members.
+The Suricata Engine is an Open Source Next Generation Intrusion Detection and
+Prevention Engine. This engine is not intended to just replace or emulate the
+existing tools in the industry, but will bring new ideas and technologies to
+the field.
+
+OISF is part of and funded by the Department of Homeland Security's Directorate
+for Science and Technology HOST program (Homeland Open Security Technology), by
+the the Navy's Space and Naval Warfare Systems Command (SPAWAR), as well as
+through the very generous support of the members of the OISF Consortium. More
+information about the Consortium is available, as well as a list of our current
+Consortium Members.
 
 %prep
 %setup -q
 # Fix path in manpage
 sed -i 's|%{_prefix}/local||g' doc/userguide/suricata.1
+sed -i '/^#!\//, 1d' python/suricata/sc/suricatasc.py
 
 %build
 export HAVE_PYTHON=/usr/bin/python3
+
 %configure \
     --enable-gccmarch-native=no \
     --enable-nflog \
     --with-libnetfilter_log-includes=`pkg-config libnetfilter_log --variable=includedir` \
     --enable-nfqueue \
+%if 0%{with prelude}
     --enable-prelude \
+%endif
     --enable-gccprotect \
     --enable-old-barnyard2 \
     --enable-non-bundled-htp \
     --enable-geoip \
+%if %{with luajit}
+    --enable-luajit \
+%else
     --enable-lua \
+%endif
 %if 0%{with hyperscan}
     --enable-hyperscan \
 %endif
@@ -103,6 +135,7 @@ mkdir -p %{buildroot}%{_sbindir}
 cp *.config %{buildroot}%{_sysconfdir}/suricata/
 cp suricata.yaml %{buildroot}%{_sysconfdir}/suricata/
 cp -R rules %{buildroot}%{_sysconfdir}/suricata/
+rm %{buildroot}%{_includedir}/suricata-plugin.h
 rm -rf %{buildroot}/%{_datadir}/doc/suricata
 rm -rf %{buildroot}%{python3_sitelib}/suricata/__pycache__
 install -Dpm 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
@@ -137,6 +170,10 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 %{_datadir}/suricata*
 %dir %{_localstatedir}/log/suricata
 %{_mandir}/man1/suricata.1%{?ext_man}
+%{_mandir}/man1/suricatasc.1%{?ext_man}
+%{_mandir}/man1/suricatactl.1%{?ext_man}
+%{_mandir}/man1/suricatactl-filestore.1%{?ext_man}
+
 %dir %{_localstatedir}/lib/suricata
 %{_unitdir}/%{name}.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}