94b6fbd582
Build with libmaxminddb is broken since bump to version 3.0.5 in commit464d0be380because of785958f9b5So revert this commit until upstream answer to comment to https://github.com/SpiderLabs/ModSecurity/issues/2131 Reverting this commit requires autoreconfiguring, which itself causes lots of warnings as configure.ac queries git to know the version of various parts of libmodsecurity. However, it turns out that those versions are only used to be displayed in the output of the configure script, which is quite useless. The only one that is referenced elsewhere is LIBINJECTION_VERSION, but it's in fact a different thing: it is defined by others/libinjection/src/libinjection_sqli.c. The only variable that was AC_SUBST() and therefore visible elsewhere was MSC_GIT_VERSION, but it is not used anywhere in the code base, except in the configure script itself. Note that one patch is 0001 and the other 0003, because there was already a 0002 patch. Fixes: - http://autobuild.buildroot.org/results/4c639fd967faa06f8ae362bacd38f3409c47267c Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
29 lines
905 B
Diff
29 lines
905 B
Diff
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
|
|
|