package/libmodsecurity: bump to version 3.0.9
- Drop 0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch, handling of libmaxminddb was fixed upstream in d2b700d - Drop 0004-build-pcre.m4-fix-build-without-pcre.patch, handling of PCRE was fixed upstream in 791964a Signed-off-by: Frank Vanbever <frank.vanbever@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
72edd5633e
commit
a1e0e7276c
@ -1,28 +0,0 @@
|
|||||||
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,29 +0,0 @@
|
|||||||
From af96f4fe916adc7dc6d649a07c10b45c978d31a1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
Date: Wed, 27 Jul 2022 14:17:20 +0200
|
|
||||||
Subject: [PATCH] build/pcre.m4: fix build without pcre
|
|
||||||
|
|
||||||
Don't raise an error if pcre is disabled now that pcre2 is supported
|
|
||||||
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
[Upstream status: not sent (no feedback on
|
|
||||||
https://github.com/SpiderLabs/ModSecurity/pull/2596)]
|
|
||||||
---
|
|
||||||
build/pcre.m4 | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/build/pcre.m4 b/build/pcre.m4
|
|
||||||
index f6c9ae18..3e40f5c9 100644
|
|
||||||
--- a/build/pcre.m4
|
|
||||||
+++ b/build/pcre.m4
|
|
||||||
@@ -99,7 +99,6 @@ AC_SUBST(PCRE_LD_PATH)
|
|
||||||
|
|
||||||
if test -z "${PCRE_VERSION}"; then
|
|
||||||
AC_MSG_NOTICE([*** pcre library not found.])
|
|
||||||
- ifelse([$2], , AC_MSG_ERROR([pcre library is required]), $2)
|
|
||||||
else
|
|
||||||
AC_MSG_NOTICE([using pcre v${PCRE_VERSION}])
|
|
||||||
ifelse([$1], , , $1)
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256
|
# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.9/modsecurity-v3.0.9.tar.gz.sha256
|
||||||
sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz
|
sha256 a5111ecd23e332a1d7c9652dbdb18517a96b21573315cb887a8e86761b95d3d8 modsecurity-v3.0.9.tar.gz
|
||||||
# Localy calculated
|
# Localy calculated
|
||||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBMODSECURITY_VERSION = 3.0.8
|
LIBMODSECURITY_VERSION = 3.0.9
|
||||||
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
|
LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz
|
||||||
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
|
LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION)
|
||||||
LIBMODSECURITY_INSTALL_STAGING = YES
|
LIBMODSECURITY_INSTALL_STAGING = YES
|
||||||
@ -12,7 +12,7 @@ LIBMODSECURITY_LICENSE = Apache-2.0
|
|||||||
LIBMODSECURITY_LICENSE_FILES = LICENSE
|
LIBMODSECURITY_LICENSE_FILES = LICENSE
|
||||||
LIBMODSECURITY_CPE_ID_VENDOR = trustwave
|
LIBMODSECURITY_CPE_ID_VENDOR = trustwave
|
||||||
LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity
|
LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity
|
||||||
# We're patching build/libmaxmind.m4 and build/pcre.m4
|
# We're patching configure.ac
|
||||||
LIBMODSECURITY_AUTORECONF = YES
|
LIBMODSECURITY_AUTORECONF = YES
|
||||||
|
|
||||||
LIBMODSECURITY_DEPENDENCIES = pcre2
|
LIBMODSECURITY_DEPENDENCIES = pcre2
|
||||||
|
Loading…
Reference in New Issue
Block a user