From 4bbd2706564a3363c1fc593a97c236698dc1fcdf Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 14 Mar 2024 15:14:45 -0400 Subject: [PATCH 1/6] snort3: update to 3.1.82.0 Changelog: https://github.com/snort3/snort3/releases/tag/3.1.82.0 Removed patches/010-gcc13.patch ,,_ -*> Snort++ <*- o" )~ Version 3.1.82.0 '''' By Martin Roesch & The Snort Team http://snort.org/contact#team Copyright (C) 2014-2024 Cisco and/or its affiliates. All rights reserved. Copyright (C) 1998-2013 Sourcefire, Inc., et al. Using DAQ version 3.0.14 Using LuaJIT version 2.1.0-beta3 Using OpenSSL 3.0.13 30 Jan 2024 Using libpcap version 1.10.4 (with TPACKET_V3) Using PCRE version 8.45 2021-06-15 Using ZLIB version 1.3.1 Using Hyperscan version 5.4.2 2024-03-06 Using LZMA version 5.4.6 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia (cherry picked from commit fdebb16619b84831c2624f8fd8b9b38d732bc6df) --- net/snort3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 7582a16251..0404e4cefa 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.81.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.1.82.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=d4093b0bfde013b3ad246cbc87bbd6c0cc09dfb9b4978b1a76b4ab27abf6d03a +PKG_HASH:=64304315e1c172b80cb9fef8c27fa457357329ecf02ee27a6604a79fd6cfa10f PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only From 5596fa277fd4d197f8bde816c62de4fbacefd140 Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 11 Apr 2024 14:10:31 -0400 Subject: [PATCH 2/6] snort3: remove symbol @HAS_LUAJIT_ARCH Remove symbol introduced in master to allow building. Closes #23861 Signed-off-by: John Audia --- net/snort3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 0404e4cefa..2ac2e9d0cc 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -29,7 +29,7 @@ define Package/snort3 +(TARGET_x86||TARGET_x86_64):hyperscan-runtime \ +(TARGET_x86||TARGET_x86_64):gperftools-runtime \ +libstdcpp +libdaq3 +libdnet +libopenssl +libpcap +libpcre +libpthread \ - +libuuid +zlib +libhwloc +libtirpc @HAS_LUAJIT_ARCH +luajit +libatomic \ + +libuuid +zlib +libhwloc +libtirpc +luajit +libatomic \ +kmod-nft-queue +liblzma +ucode +ucode-mod-fs +ucode-mod-uci TITLE:=Lightweight Network Intrusion Detection System URL:=http://www.snort.org/ From 19c641a266e8e95c9217ff67a1888e68e83fb91d Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 28 Jun 2023 12:30:13 -0400 Subject: [PATCH 3/6] libdaq3: update to 3.0.11 Upstream bump Signed-off-by: John Audia (cherry picked from commit 9f2d3c5bf855773d5e5756652b640e2c0565d1a9) --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index a97eb77552..59caff9511 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.11 +PKG_VERSION:=3.0.12 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=c9b691e113960cc19c4df6e93eacbdb45c96491da9c81471f3e419b91c04579a +PKG_HASH:=dedfdb88de151d61009bdb365322853687b1add4adec248952d2a93b70f584af PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From 4acf815ddf6f77f28c24ef9c99c91a96e093d38d Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 8 Nov 2023 16:09:27 -0500 Subject: [PATCH 4/6] libdaq3: update to 3.0.13 Upstream bump Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia (cherry picked from commit 4c05ae5f6c4e64f404fa435a63e94de381504f42) --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 59caff9511..f5f91d8d2a 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.12 +PKG_VERSION:=3.0.13 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=dedfdb88de151d61009bdb365322853687b1add4adec248952d2a93b70f584af +PKG_HASH:=3a48b934bc45a1fe44b3887185d33a76a042c1d10aa177e3e7c417d83da67213 PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From e1f0df9517492c359126e84cb00def344765105e Mon Sep 17 00:00:00 2001 From: John Audia Date: Thu, 18 Jan 2024 14:13:43 -0500 Subject: [PATCH 5/6] libdaq3: update to 3.0.14 Update to latest version. Changelog: https://github.com/snort3/libdaq/releases/tag/v3.0.14 Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia (cherry picked from commit 651b7e1f92f0733c1d128a7fe3869def9f065954) --- libs/libdaq3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index f5f91d8d2a..b0d1205013 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.13 +PKG_VERSION:=3.0.14 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3a48b934bc45a1fe44b3887185d33a76a042c1d10aa177e3e7c417d83da67213 +PKG_HASH:=521364d69f8b764281ce39924d2e4c4c43348c7679768c41246adea9c7a31cc3 PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf From f7251c4f826656b8e8a569c130a40aa513ad3780 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Jan 2024 21:13:59 +0100 Subject: [PATCH 6/6] libs/libdaq3: assign PKG_LICENSE_FILES Signed-off-by: Fabrice Fontaine (cherry picked from commit b2c548975de4ab3d917c78d5d405a9993965b8ad) --- libs/libdaq3/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index b0d1205013..65ade02577 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -14,6 +14,7 @@ PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING LICENSE PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)?