Update buildroot to 2021.02.4 (#1522)
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
@@ -1,31 +0,0 @@
|
||||
From 0832208360aab69fbaec76225db67801840a33fe Mon Sep 17 00:00:00 2001
|
||||
From: Frank Vanbever <frank.vanbever@essensium.com>
|
||||
Date: Fri, 10 Jan 2020 11:14:43 +0100
|
||||
Subject: [PATCH] Fail when CANONICAL_HOST cannot be determined
|
||||
|
||||
When the CANONICAL_HOST is unknown the configure script exits
|
||||
with exit code 0 even though no makefile was produced.
|
||||
|
||||
Upstream: https://github.com/SpiderLabs/ModSecurity/pull/2235
|
||||
|
||||
Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 95e48843..5e6971f4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -193,7 +193,7 @@ case $host in
|
||||
;;
|
||||
*)
|
||||
echo "Unknown CANONICAL_HOST $host"
|
||||
- exit
|
||||
+ exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 1 Aug 2021 23:21:35 +0200
|
||||
Subject: [PATCH] configure.ac: drop usage of git at configure time
|
||||
|
||||
The usage of git is only to print some messages at configure time,
|
||||
which is not very useful, and causes a significant number of warning
|
||||
when regenerating the configure script.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
configure.ac | 23 -----------------------
|
||||
1 file changed, 23 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 20163e1e..14e5892a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
# Get the hash of the last commit, to be used if it is not an
|
||||
# official release.
|
||||
-AC_DEFUN([MSC_GIT_HASH], m4_esyscmd_s(git log -1 --format="%h" --abbrev-commit))
|
||||
AC_DEFUN([MSC_MAJOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MAJOR " | awk {'print $3'} | sed 's/\"//g'))
|
||||
AC_DEFUN([MSC_MINOR], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_MINOR " | awk {'print $3'} | sed 's/\"//g'))
|
||||
AC_DEFUN([MSC_PATCHLEVEL], m4_esyscmd_s(cat headers/modsecurity/modsecurity.h | grep "define MODSECURITY_PATCHLEVEL " | awk {'print $3'} | sed 's/\"//g'))
|
||||
@@ -25,9 +24,6 @@ m4_define([msc_version],
|
||||
m4_define([msc_version_with_patchlevel],
|
||||
[msc_version_major.msc_version_minor.msc_version_patchlevel])
|
||||
|
||||
-m4_define([msc_version_git],
|
||||
- [m4_esyscmd_s(git describe)])
|
||||
-
|
||||
m4_define([msc_version_info],
|
||||
[msc_version_c_plus_a:msc_version_patchlevel:msc_version_minor])
|
||||
|
||||
@@ -73,11 +69,6 @@ AC_MSG_ERROR([\
|
||||
|
||||
])
|
||||
fi
|
||||
-# Libinjection version
|
||||
-AC_DEFUN([LIBINJECTION_VERSION], m4_esyscmd_s(cd "others/libinjection" && git describe && cd ../..))
|
||||
-
|
||||
-# SecLang test version
|
||||
-AC_DEFUN([SECLANG_TEST_VERSION], m4_esyscmd_s(cd "test/test-cases/secrules-language-tests" && git log -1 --format="%h" --abbrev-commit && cd ../../..))
|
||||
|
||||
|
||||
# Check for yajl
|
||||
@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL])
|
||||
MSC_VERSION=msc_version
|
||||
AC_SUBST([MSC_VERSION])
|
||||
|
||||
-MSC_GIT_VERSION=msc_version_git
|
||||
-AC_SUBST([MSC_GIT_VERSION])
|
||||
-
|
||||
-
|
||||
AC_ARG_ENABLE(debug-logs,
|
||||
[AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
|
||||
|
||||
@@ -412,16 +399,6 @@ AC_OUTPUT
|
||||
|
||||
|
||||
# Print a fancy summary
|
||||
-echo " "
|
||||
-echo " "
|
||||
-echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM"
|
||||
-echo " "
|
||||
-echo " Mandatory dependencies"
|
||||
-echo -n " + libInjection ...."
|
||||
-echo LIBINJECTION_VERSION
|
||||
-echo -n " + SecLang tests ...."
|
||||
-echo SECLANG_TEST_VERSION
|
||||
-
|
||||
echo " "
|
||||
echo " Optional dependencies"
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 1a84881b280eb08852d5495c57e44351a40d3f91 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 26 Jul 2021 00:24:57 +0200
|
||||
Subject: [PATCH] modsecurity.pc.in: add -lstdc++
|
||||
|
||||
Add -lstdc++ to Libs.Private to avoid the following static build failure
|
||||
with nginx:
|
||||
|
||||
/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libmodsecurity.a(libmodsecurity_la-transaction.o): in function `std::basic_streambuf<char, std::char_traits<char> >::sbumpc() [clone .isra.0]':
|
||||
transaction.cc:(.text+0x40): undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dispose()'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/e5a9eb8448980f1c5cafe97180b7d1f48ddf02ca
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
modsecurity.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modsecurity.pc.in b/modsecurity.pc.in
|
||||
index 96cdf5ca..7c895ddc 100644
|
||||
--- a/modsecurity.pc.in
|
||||
+++ b/modsecurity.pc.in
|
||||
@@ -8,4 +8,4 @@ Description: ModSecurity API
|
||||
Version: @MSC_VERSION_WITH_PATCHLEVEL@
|
||||
Cflags: -I@includedir@
|
||||
Libs: -L@libdir@ -lmodsecurity
|
||||
-Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@
|
||||
+Libs.private: @CURL_LDADD@ @GEOIP_LDADD@ @MAXMIND_LDADD@ @GLOBAL_LDADD@ @LIBXML2_LDADD@ @LMDB_LDADD@ @LUA_LDADD@ @PCRE_LDADD@ @SSDEEP_LDADD@ @YAJL_LDADD@ -lstdc++
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 13c505e30474c919ed9ae552e459769c456da21e Mon Sep 17 00:00:00 2001
|
||||
From: Frank Vanbever <frank.vanbever@essensium.com>
|
||||
Date: Fri, 10 Jan 2020 11:24:43 +0100
|
||||
Subject: [PATCH] test for uClinux in configure script
|
||||
|
||||
Upstream: https://github.com/SpiderLabs/ModSecurity/pull/2235
|
||||
|
||||
Signed-off-by: Frank Vanbever <frank.vanbever@essensium.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5e6971f4..51d38071 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -156,7 +156,7 @@ case $host in
|
||||
AC_DEFINE([MACOSX], [1], [Define if the operating system is Macintosh OSX])
|
||||
PLATFORM="MacOSX"
|
||||
;;
|
||||
- *-*-linux*)
|
||||
+ *-*-linux* | *-*uclinux*)
|
||||
echo "Checking platform... Identified as Linux"
|
||||
AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX])
|
||||
PLATFORM="Linux"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 6737dc133cb4811a000c02b4e0a92b72f0b220ee Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 16 Jul 2021 19:12:51 +0200
|
||||
Subject: [PATCH] Revert "Fix maxminddb link on FreeBSD"
|
||||
|
||||
This reverts commit 785958f9b5089b918c7d054cbcc2fe4a3c7b3788.
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
build/libmaxmind.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4
|
||||
index 656fc250..02820b5a 100644
|
||||
--- a/build/libmaxmind.m4
|
||||
+++ b/build/libmaxmind.m4
|
||||
@@ -10,7 +10,7 @@ dnl MAXMIND_VERSION
|
||||
AC_DEFUN([PROG_MAXMIND], [
|
||||
|
||||
# Possible names for the maxmind library/package (pkg-config)
|
||||
-MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind"
|
||||
+MAXMIND_POSSIBLE_LIB_NAMES="libmaxminddb maxminddb maxmind"
|
||||
|
||||
# Possible extensions for the library
|
||||
MAXMIND_POSSIBLE_EXTENSIONS="so la sl dll dylib"
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
config BR2_PACKAGE_LIBMODSECURITY
|
||||
bool "libmodsecurity"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_PCRE
|
||||
help
|
||||
@@ -16,6 +15,5 @@ config BR2_PACKAGE_LIBMODSECURITY
|
||||
|
||||
https://github.com/SpiderLabs/ModSecurity
|
||||
|
||||
comment "libmodsecurity needs a toolchain w/ C++, dynamic library, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
comment "libmodsecurity needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.4/modsecurity-v3.0.4.tar.gz.sha256
|
||||
sha256 b4231177dd80b4e076b228e57d498670113b69d445bab86db25f65346c24db22 modsecurity-v3.0.4.tar.gz
|
||||
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.5/modsecurity-v3.0.5.tar.gz.sha256
|
||||
sha256 751bf95a7a8d39c440d0c26ec1f73961550ca2eb2ac9e2e7a56dce2dd7b959e9 modsecurity-v3.0.5.tar.gz
|
||||
# Localy calculated
|
||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBMODSECURITY_VERSION = 3.0.4
|
||||
LIBMODSECURITY_VERSION = 3.0.5
|
||||
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
|
||||
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
|
||||
LIBMODSECURITY_INSTALL_STAGING = YES
|
||||
@@ -12,11 +12,8 @@ LIBMODSECURITY_LICENSE = Apache-2.0
|
||||
LIBMODSECURITY_LICENSE_FILES = LICENSE
|
||||
LIBMODSECURITY_CPE_ID_VENDOR = trustwave
|
||||
LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity
|
||||
# 0002-test-for-uClinux-in-configure-script.patch
|
||||
# We're patching build/libmaxmind.m4
|
||||
LIBMODSECURITY_AUTORECONF = YES
|
||||
# libinjection uses AC_CHECK_FILE, not available in cross-compile
|
||||
LIBMODSECURITY_CONF_ENV = \
|
||||
ac_cv_file_others_libinjection_src_libinjection_html5_c=yes
|
||||
|
||||
LIBMODSECURITY_DEPENDENCIES = pcre
|
||||
LIBMODSECURITY_CONF_OPTS = \
|
||||
|
||||
Reference in New Issue
Block a user