From 47b4ceac8239751683e4ac1e794100bfb4b47f52 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 7 May 2023 00:58:25 -0400 Subject: [PATCH] snort3: update to 3.1.61.0 Upstream bump Removed upstreamed patch: 900-fix_build_for_archs_contain_plus.patch[1] 1. https://github.com/snort3/snort3/commit/4de62ca9b9bfea4049ebe373a07076284b121bfe Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- net/snort3/Makefile | 4 ++-- .../900-fix_build_for_archs_contain_plus.patch | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 net/snort3/patches/900-fix_build_for_archs_contain_plus.patch diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 8252bad5ca..a3f17cf703 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.60.0 +PKG_VERSION:=3.1.61.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=295bbeea93ead7835379d9c9332b1f82f9ecdd3741aeed267caf85bb887126a1 +PKG_HASH:=207963ece2eddd3c85ad90c9e2dabe33dc67eaa485ba9576e2b244f7ac45fc5d PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only diff --git a/net/snort3/patches/900-fix_build_for_archs_contain_plus.patch b/net/snort3/patches/900-fix_build_for_archs_contain_plus.patch deleted file mode 100644 index 163a7a069c..0000000000 --- a/net/snort3/patches/900-fix_build_for_archs_contain_plus.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/cmake/FindFlexLexer.cmake -+++ b/cmake/FindFlexLexer.cmake -@@ -16,11 +16,11 @@ macro(FLEX NAME LEXER_IN LEXER_OUT) - COMPILE_FLAGS ${FLEX_FLAGS} - ) - -- # we use '+' as a separator for 'sed' to avoid conflicts with '/' in paths from LEXER_OUT -+ # we use '|' as a separator for 'sed' to avoid conflicts with '/' in paths from LEXER_OUT - add_custom_command( - OUTPUT ${LEXER_OUT} - COMMAND sed -e -- "s+void yyFlexLexer::LexerError+yynoreturn void yyFlexLexer::LexerError+;s+${LEXER_OUT}.tmp+${LEXER_OUT}+" -+ "s|void yyFlexLexer::LexerError|yynoreturn void yyFlexLexer::LexerError|;s|${LEXER_OUT}.tmp|${LEXER_OUT}|" - ${FLEX_${NAME}_OUTPUTS} > ${LEXER_OUT} - DEPENDS ${FLEX_${NAME}_OUTPUTS} - VERBATIM -- 2.30.2