diff options
| -rw-r--r-- | net-analyzer/suricata/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch | 39 | ||||
| -rw-r--r-- | net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch | 18 | ||||
| -rw-r--r-- | net-analyzer/suricata/suricata-7.0.5.ebuild (renamed from net-analyzer/suricata/suricata-7.0.4.ebuild) | 4 |
4 files changed, 22 insertions, 43 deletions
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index f41fad6e6ffa..fdaacd396d1e 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,2 +1,2 @@ -DIST suricata-7.0.4.tar.gz 23610769 BLAKE2B 6c85ee7134548261a5a766ee3e7c0ce095ef478e9323342f17bb48eb0abc74035a66212c7f7e6ba45bd2efd552d82ad6d218d4b09279877f60526f8f79de9764 SHA512 098364a5f0b2c14bf3a0c8895ec9c94a23edd990468f618fa35181c54405be6db012a6e97981e0024140864342764df97101be73308c835d6fabf6cd98a7ffc3 -DIST suricata-7.0.4.tar.gz.sig 566 BLAKE2B 56a8d3ba556a233b0f27a992c20e2654a44f5205bfd731662e96f1a6cf5e925d00014f2d379458c917527415c5c3020f897528fb35e6681bcbddde670567e6f0 SHA512 f2694f9a6cc4d644bb629ae49deef22517a970a78fa500384b51b3ed9119fdfa4ff4a4524de55d3b02bf16dc36c52419bc0424f65dd02b0b56349c5d2fc00a52 +DIST suricata-7.0.5.tar.gz 23612189 BLAKE2B 9a44e4561edcc8909853b88779aa520a79b684ca9114479a95b2b34f8e34b6a0f5887d4b332dddb9da225335d7642089345e7f245a1ebce68f42f38126eb4b58 SHA512 4eae28a78e1e9595c7f37215e9cccdf417235eadf3c8a9dc4cb531d7dc3fb353c903154ee745df7a44620d299998b84f15d6db95e5f0562744ff7cbaac398d34 +DIST suricata-7.0.5.tar.gz.sig 566 BLAKE2B f1e4885f92d13e3168ae44b2fd2b134e1eee9a71f4d92ee8e60df65af3558f4dfa64919955dc60d597d0ef6c6a92b505ab5974fc2f07cd8dc8b4d889eaa4b4c2 SHA512 5f6c2904441c0cb414990a89a2c5a640da9ef25b572512cb2dbb607c7e469186982299acc98414067f8119c8e7c2d433f1b8cf38d1a3c95235a493311230bfc7 diff --git a/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch b/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch deleted file mode 100644 index 7ebacf76852c..000000000000 --- a/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch +++ /dev/null @@ -1,39 +0,0 @@ -Bug: From b5280929c58559c178415ce199157b5c87171258 Mon Sep 17 00:00:00 2001 -From: Brahmajit Das <brahmajit.xyz@gmail.com> -Date: Tue, 20 Feb 2024 12:05:57 +0530 -Subject: [PATCH 1/1] Fix passing incompatible pointer type with GCC 14 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 14 (and newer compilers like Clang 16) enables --Wincompatible-pointer-types by default, along with some other flags. -Thus resulting in build errors such as - -util-host-info.c: In function ‘SCKernelVersionIsAtLeast’: -util-host-info.c:94:31: error: passing argument 1 of ‘pcre2_substring_list_free_8’ from incompatible pointer type [-Wincompatible-pointer-types] - 94 | pcre2_substring_list_free((PCRE2_SPTR *)list); - | ^~~~~~~~~~~~~~~~~~ - | | - | const PCRE2_UCHAR8 ** {aka const unsigned char **} - -Removing the casting make suricata build with GCC 14. - -First discovered on Gentoo Linux with GCC 14 - -Bug: https://bugs.gentoo.org/925011 -Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> ---- a/src/util-host-info.c -+++ b/src/util-host-info.c -@@ -91,7 +91,7 @@ int SCKernelVersionIsAtLeast(int major, int minor) - err = true; - } - -- pcre2_substring_list_free((PCRE2_SPTR *)list); -+ pcre2_substring_list_free(list); - pcre2_match_data_free(version_regex_match); - pcre2_code_free(version_regex); - --- -2.43.2 - diff --git a/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch new file mode 100644 index 000000000000..302f9bb382f3 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -339,15 +339,6 @@ + [AC_MSG_RESULT(no)]) + CFLAGS="${TMPCFLAGS}" + +- #compile-time best-practices errors for certain libc functions, provides checks of buffer lengths and memory regions +- AC_MSG_CHECKING(for -D_FORTIFY_SOURCE=2) +- TMPCFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=2" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[SECCFLAGS="${SECCFLAGS} -D_FORTIFY_SOURCE=2" +- AC_MSG_RESULT(yes)], +- [AC_MSG_RESULT(no)]) +- CFLAGS="${TMPCFLAGS}" +- + #compile-time warnings about misuse of format strings + AC_MSG_CHECKING(for -Wformat -Wformat-security) + TMPCFLAGS="${CFLAGS}" diff --git a/net-analyzer/suricata/suricata-7.0.4.ebuild b/net-analyzer/suricata/suricata-7.0.5.ebuild index 60817c7c0306..d6d60eada0b0 100644 --- a/net-analyzer/suricata/suricata-7.0.4.ebuild +++ b/net-analyzer/suricata/suricata-7.0.5.ebuild @@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] ') - >=net-libs/libhtp-0.5.47 + >=net-libs/libhtp-0.5.48 net-libs/libpcap sys-apps/file sys-libs/libcap-ng @@ -63,7 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch" "${FILESDIR}/${PN}-6.0.0_default-config.patch" "${FILESDIR}/${PN}-7.0.2_configure-no-sphinx-pdflatex-automagic.patch" - "${FILESDIR}/${PN}-7.0.3_fix-build-with-gcc14.patch" + "${FILESDIR}/${PN}-7.0.5_configure-fortify_source.patch" ) pkg_pretend() { |