package/suricata: security bump to version 4.1.5
PATCH v5 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 v4 -> v5 (after review of Thomas Petazzoni):
- Change ifeq order so that libmaxminddb is really preferred over geoip
Changes v3 -> v4 (after review of Thomas Petazzoni):
- Add comment about --disable-libgeoip (retrieved from:
https://github.com/OISF/suricata/commit/c55226b7126079d78e4bf5c6fc290242001954a6)
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 | 18 ++++++++++-- 3 files changed, 16 insertions(+), 32 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 +15 -3
@@ -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 \
@@ -44,9 +46,19 @@ else SURICATA_CONF_OPTS += --disable-libmagic endif -ifeq ($(BR2_PACKAGE_GEOIP),y) +# --disable-libgeoip disables libgeoip when --enable-geoip is requested. +# This allows libmaxminddb to be picked up instead of libgeoip when both are +# installed on the system. +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +SURICATA_DEPENDENCIES += libmaxminddb +SURICATA_CONF_OPTS += \ + --disable-libgeoip \ + --enable-geoip +else ifeq ($(BR2_PACKAGE_GEOIP),y) SURICATA_DEPENDENCIES += geoip -SURICATA_CONF_OPTS += --enable-geoip +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --enable-libgeoip else SURICATA_CONF_OPTS += --disable-geoip endif
Signature · 1 line
2.23.0
PATCH v5 1/1 package/suricata: security bump to version 4.1.5
Quoted 10 lines · Fabrice Fontaine
- 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
Quoted 4 lines
Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v4 -> v5 (after review of Thomas Petazzoni):
- Change ifeq order so that libmaxminddb is really preferred over geoip
I hope it's finally OK now because I committed it to master, thanks :-)
[snip]
+# --disable-libgeoip disables libgeoip when --enable-geoip is requested.
package/suricata/suricata.mk else · line 56
Quoted 7 lines
package/suricata/suricata.mk +7
-0+# This allows libmaxminddb to be picked up instead of libgeoip when both are +# installed on the system. +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +SURICATA_DEPENDENCIES += libmaxminddb +SURICATA_CONF_OPTS += \ + --disable-libgeoip \ + --enable-geoip
I've swapped those two so they're in the same order as the equivalents below. I
think that that's more important than alphabetical ordering. Anyway, it makes more sense to ignore the disable/enable bit when sorting.
Regards,
Arnout
Quoted 10 lines
package/suricata/suricata.mk +4
-1+else ifeq ($(BR2_PACKAGE_GEOIP),y) SURICATA_DEPENDENCIES += geoip -SURICATA_CONF_OPTS += --enable-geoip +SURICATA_CONF_OPTS += \ + --enable-geoip \ + --enable-libgeoip else SURICATA_CONF_OPTS += --disable-geoip endif
PATCH v5 1/1 package/suricata: security bump to version 4.1.5
In reply to Fabrice FontaineQuoted 19 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- 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-releasedSigned-off-by Fabrice Fontaine <[email protected]>---
Changes v4 -> v5 (after review of Thomas Petazzoni):
- Change ifeq order so that libmaxminddb is really preferred over geoipChanges v3 -> v4 (after review of Thomas Petazzoni):
- Add comment about --disable-libgeoip (retrieved from:
Quoted 7 lines
https://github.com/OISF/suricata/commit/c55226b7126079d78e4bf5c6fc290242001954a6)Changes v2 -> v3:
- Fix typo: "else if" -> "else ifeq"Changes v1 -> v2 (after review of Thomas Petazzoni):
- Fix geoip/maxminddb handling
Committed to 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard