diff --git a/.checkpackageignore b/.checkpackageignore index a4c93db24f..7395389adb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -676,8 +676,7 @@ package/libloki/0002-use-ln-snf.patch lib_patch.Upstream package/libmad/0001-mips-h-constraint-removal.patch lib_patch.Sob lib_patch.Upstream package/libmad/0002-configure-ac-automake-foreign.patch lib_patch.Upstream package/libmng/0001-jpeg-9a.patch lib_patch.Upstream -package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch lib_patch.Upstream -package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch lib_patch.Upstream +package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch lib_patch.Upstream package/libmpeg2/0001-altivec.patch lib_patch.Upstream package/libmpeg2/0002-armv4l.patch lib_patch.Upstream package/libmpeg2/0003-fix-arm-detection.patch lib_patch.Upstream diff --git a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch deleted file mode 100644 index 6853b19ccd..0000000000 --- a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch +++ /dev/null @@ -1,80 +0,0 @@ -From d242b011a8f0d84781bbf7667a44a12646903ca4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -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 -Signed-off-by: Frank Vanbever ---- - configure.ac | 23 ----------------------- - 1 file changed, 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 66d6f4f2..746b1fb4 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 -@@ -224,10 +215,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, - [AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], - -@@ -419,16 +406,6 @@ AC_OUTPUT - - - # Print a fancy summary --echo " " --echo " " --echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM" --echo " " --echo " Mandatory dependencies" --AS_ECHO_N(" + libInjection ....") --echo LIBINJECTION_VERSION --AS_ECHO_N(" + SecLang tests ....") --echo SECLANG_TEST_VERSION -- - echo " " - echo " Optional dependencies" - --- -2.39.2 - diff --git a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch b/package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch similarity index 100% rename from package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch rename to package/libmodsecurity/0001-modsecurity.pc.in-add-lstdc.patch diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index dbe43d18e7..704b5541ad 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,5 +1,5 @@ -# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 -sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.13/modsecurity-v3.0.13.tar.gz.sha256 +sha256 86b4881164a161b822a49df3501e83b254323206906134bdc34a6f3338f4d3f2 modsecurity-v3.0.13.tar.gz # Locally calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index d8c10b98b2..f6a74e13d5 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.12 +LIBMODSECURITY_VERSION = 3.0.13 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES @@ -12,8 +12,6 @@ LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching configure.ac -LIBMODSECURITY_AUTORECONF = YES LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \