* [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31
@ 2019-09-28 12:56 Fabrice Fontaine
2019-09-28 12:56 ` [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5 Fabrice Fontaine
2019-09-28 19:28 ` [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2019-09-28 12:56 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libhtp/libhtp.hash | 2 +-
package/libhtp/libhtp.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash
index be68547be2..cd21641f59 100644
--- a/package/libhtp/libhtp.hash
+++ b/package/libhtp/libhtp.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 7384f8461ad0431e9247c49b37a73929b284f39408d1f11b80949b188069b638 libhtp-0.5.30.tar.gz
+sha256 ce16a3e57c7d1f1e8255a4f698e22ddd33c15fb4e737ab90b04c9a1f07e48780 libhtp-0.5.31.tar.gz
sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE
diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk
index 3f7cecb277..9a3cda6162 100644
--- a/package/libhtp/libhtp.mk
+++ b/package/libhtp/libhtp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBHTP_VERSION = 0.5.30
+LIBHTP_VERSION = 0.5.31
LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION))
LIBHTP_LICENSE = BSD-3-Clause
LIBHTP_LICENSE_FILES = LICENSE
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5
2019-09-28 12:56 [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Fabrice Fontaine
@ 2019-09-28 12:56 ` Fabrice Fontaine
2019-09-28 19:29 ` Thomas Petazzoni
2019-09-28 19:28 ` [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2019-09-28 12:56 UTC (permalink / raw)
To: buildroot
- Drop second patch (already in version)
- Switch from geoip to libmaxminddb, 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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...et-fix-build-on-recent-Linux-kernels.patch | 28 -------------------
package/suricata/suricata.hash | 2 +-
package/suricata/suricata.mk | 20 +++++++------
3 files changed, 13 insertions(+), 37 deletions(-)
delete mode 100644 package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch
diff --git a/package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch b/package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch
deleted file mode 100644
index 6547fd57f5..0000000000
--- a/package/suricata/0002-af-packet-fix-build-on-recent-Linux-kernels.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b37554e0bc3cf383e6547c5c6a69c6f6849c09e3 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-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 <bernd.kuhls@t-online.de>
----
- 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>
diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash
index 44ada0115a..dc52999a9d 100644
--- a/package/suricata/suricata.hash
+++ b/package/suricata/suricata.hash
@@ -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
diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk
index 0491fad6d5..d4ba36ddf4 100644
--- a/package/suricata/suricata.mk
+++ b/package/suricata/suricata.mk
@@ -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,13 +46,6 @@ else
SURICATA_CONF_OPTS += --disable-libmagic
endif
-ifeq ($(BR2_PACKAGE_GEOIP),y)
-SURICATA_DEPENDENCIES += geoip
-SURICATA_CONF_OPTS += --enable-geoip
-else
-SURICATA_CONF_OPTS += --disable-geoip
-endif
-
ifeq ($(BR2_PACKAGE_HIREDIS),y)
SURICATA_DEPENDENCIES += hiredis
SURICATA_CONF_OPTS += --enable-hiredis
@@ -58,6 +53,15 @@ else
SURICATA_CONF_OPTS += --disable-hiredis
endif
+ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
+SURICATA_DEPENDENCIES += libmaxminddb
+SURICATA_CONF_OPTS += \
+ --disable-libgeoip \
+ --enable-geoip
+else
+SURICATA_CONF_OPTS += --disable-geoip
+endif
+
ifeq ($(BR2_PACKAGE_LIBNET),y)
SURICATA_DEPENDENCIES += libnet
SURICATA_CONF_OPTS += --with-libnet-includes=$(STAGING_DIR)/usr/include
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31
2019-09-28 12:56 [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Fabrice Fontaine
2019-09-28 12:56 ` [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5 Fabrice Fontaine
@ 2019-09-28 19:28 ` Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-09-28 19:28 UTC (permalink / raw)
To: buildroot
On Sat, 28 Sep 2019 14:56:34 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/libhtp/libhtp.hash | 2 +-
> package/libhtp/libhtp.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5
2019-09-28 12:56 ` [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5 Fabrice Fontaine
@ 2019-09-28 19:29 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-09-28 19:29 UTC (permalink / raw)
To: buildroot
On Sat, 28 Sep 2019 14:56:35 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> -ifeq ($(BR2_PACKAGE_GEOIP),y)
> -SURICATA_DEPENDENCIES += geoip
> -SURICATA_CONF_OPTS += --enable-geoip
> -else
> -SURICATA_CONF_OPTS += --disable-geoip
> -endif
> -
> ifeq ($(BR2_PACKAGE_HIREDIS),y)
> SURICATA_DEPENDENCIES += hiredis
> SURICATA_CONF_OPTS += --enable-hiredis
> @@ -58,6 +53,15 @@ else
> SURICATA_CONF_OPTS += --disable-hiredis
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y)
> +SURICATA_DEPENDENCIES += libmaxminddb
> +SURICATA_CONF_OPTS += \
> + --disable-libgeoip \
> + --enable-geoip
I'm a bit confused by the semantic of the options here. Why are you
passing --disable-libgeoip in this block ?
> +else
> +SURICATA_CONF_OPTS += --disable-geoip
> +endif
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-28 19:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-28 12:56 [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Fabrice Fontaine
2019-09-28 12:56 ` [Buildroot] [PATCH 2/2] package/suricata: security bump to version 4.1.5 Fabrice Fontaine
2019-09-28 19:29 ` Thomas Petazzoni
2019-09-28 19:28 ` [Buildroot] [PATCH 1/2] package/libhtp: bump to version 0.5.31 Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.