github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3/master' into v3/master

Browse Source
This commit is contained in:
martinhsv 2022-12-07 08:47:38 -08:00 committed by GitHub
commit 0c0e4a25ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -3,6 +3,8 @@ v3.x.y - YYYY-MMM-DD (to be released)
- Support comments in ipMatchFromFile file via '#' token - Support comments in ipMatchFromFile file via '#' token
[Issue #2554 - @tomsommer, @martinhsv] [Issue #2554 - @tomsommer, @martinhsv]
- Use name package name libmaxminddb with pkg-config
[Issue #2595, #2596 - @frankvanbever, @ffontaine, @arnout]
- Fix: FILES_TMP_CONTENT collection key should use part name - Fix: FILES_TMP_CONTENT collection key should use part name
[Issue #2831 - @airween] [Issue #2831 - @airween]
- Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro - Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro

10
build/libmaxmind.m4
View File

@ -60,12 +60,10 @@ else
# Nothing about MaxMind was informed, using the pkg-config to figure things out. # Nothing about MaxMind was informed, using the pkg-config to figure things out.
if test -n "${PKG_CONFIG}"; then if test -n "${PKG_CONFIG}"; then
MAXMIND_PKG_NAME="" MAXMIND_PKG_NAME=""
for x in ${MAXMIND_POSSIBLE_LIB_NAMES}; do if ${PKG_CONFIG} --exists libmaxminddb; then
if ${PKG_CONFIG} --exists ${x}; then MAXMIND_PKG_NAME="libmaxminddb"
MAXMIND_PKG_NAME="$x" break
break fi
fi
done
fi fi
AC_MSG_NOTICE([Nothing about MaxMind was informed during the configure phase. Trying to detect it on the platform...]) AC_MSG_NOTICE([Nothing about MaxMind was informed during the configure phase. Trying to detect it on the platform...])
if test -n "${MAXMIND_PKG_NAME}"; then if test -n "${MAXMIND_PKG_NAME}"; then