package/suricata: security bump to version 4.1.5
PATCH v3 1/1 package/suricata: security bump to version 4.1.5
- Drop second patch (already in version)
- Add libmaxminddb dependency and use --disable-libgeoip to prefer maxminddb over geoip, see:
https://github.com/OISF/suricata/commit/d29072647fa479eb748357a5a75f1ac4206a2cff
https://github.com/OISF/suricata/commit/c55226b7126079d78e4bf5c6fc290242001954a6
- Disable sphinx-build (to avoid a build failure)
- This release fixes a number of issues found in the 4.1 branch. Some of the issues are security issues, so upgrading is highly recommended. See https://suricata-ids.org/2019/09/24/suricata-4-1-5-released
---
Changes v2 -> v3:
- Fix typo: "else if" -> "else ifeq"
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Fix geoip/maxminddb handling
...et-fix-build-on-recent-Linux-kernels.patch | 28 ------------------- package/suricata/suricata.hash | 2 +- package/suricata/suricata.mk | 13 +++++++-- 3 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch
package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From b37554e0bc3cf383e6547c5c6a69c6f6849c09e3 Mon Sep 17 00:00:00 2001 -From: Eric Leblond <[email protected]> -Date: Wed, 17 Jul 2019 12:35:12 +0200 -Subject: [PATCH] af-packet: fix build on recent Linux kernels - -Downloaded from upstream commit -https://github.com/OISF/suricata/commit/b37554e0bc3cf383e6547c5c6a69c6f6849c09e3 - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - src/source-af-packet.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/source-af-packet.c b/src/source-af-packet.c -index 2c65ccbcf5..e117d36e5c 100644 ---- a/src/source-af-packet.c -+++ b/src/source-af-packet.c -@@ -65,6 +65,10 @@ - #include <sys/ioctl.h> - #endif - -+#if HAVE_LINUX_SOCKIOS_H -+#include <linux/sockios.h> -+#endif -+ - #ifdef HAVE_PACKET_EBPF - #include "util-ebpf.h" - #include <bpf/libbpf.h>
package/suricata/suricata.hash +1 -1
@@ -1,5 +1,5 @@ # Locally computed: -sha256 6cda6c80b753ce36483c6be535358b971f3890b9aa27a58c2d2f7e89dd6c6aa0 suricata-4.1.3.tar.gz +sha256 cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b suricata-4.1.5.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/suricata/suricata.mk +11 -2
@@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 4.1.3 +SURICATA_VERSION = 4.1.5 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE
@@ -24,6 +24,8 @@ SURICATA_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LZMA),lzma) \ pcre +SURICATA_CONF_ENV = ac_cv_path_HAVE_SPHINXBUILD=no + SURICATA_CONF_OPTS = \ --disable-gccprotect \ --disable-pie \
@@ -46,7 +48,14 @@ endif ifeq ($(BR2_PACKAGE_GEOIP),y) SURICATA_DEPENDENCIES += geoip -SURICATA_CONF_OPTS += --enable-geoip +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --enable-libgeoip +else ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +SURICATA_DEPENDENCIES += libmaxminddb +SURICATA_CONF_OPTS += \ + --disable-libgeoip \ + --enable-geoip else SURICATA_CONF_OPTS += --disable-geoip endif
Signature · 1 line
2.23.0
PATCH v3 1/1 package/suricata: security bump to version 4.1.5
Hello Fabrice,
Quoted 3 lines · On Sun, 29 Sep 2019 10:38:57 +0200 Fabrice Fontaine…
- Drop second patch (already in version)
- Add libmaxminddb dependency and use --disable-libgeoip to prefer maxminddb over geoip, see:
That's not what your code does: your code prefers geoip over maxmindb.
package/suricata/suricata.mk endif · line 53
Quoted 6 lines
ifeq ($(BR2_PACKAGE_GEOIP),y)
SURICATA_DEPENDENCIES+= geoippackage/suricata/suricata.mk +3
-1-SURICATA_CONF_OPTS += --enable-geoip +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --enable-libgeoip
Indeed, if both geoip and libmaxminddb are enabled, it will be this first part of the condition that will be used.
package/suricata/suricata.mk endif · line 59
Quoted 6 lines
package/suricata/suricata.mk +5
-0+else ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +SURICATA_DEPENDENCIES += libmaxminddb +SURICATA_CONF_OPTS += \ + --disable-libgeoip \ + --enable-geoip else
I am still confused by the semantic of those geoip/libgeoip options. Could you add a comment above this sequence of ifeq/else ifeq/endif, to clarify what is going on ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com