diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index a88c4564c6b4..4848e30aa98a 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	snort
-DISTVERSION=	3.1.57.0
+DISTVERSION=	3.1.58.0
 PORTEPOCH=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Lightweight network intrusion detection system
 WWW=		https://www.snort.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libdaq.so:net/libdaq \
 		libdnet.so:net/libdnet \
 		libhwloc.so:devel/hwloc2 \
 		libpcap.so:net/libpcap \
 		libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake compiler:c++14-lang cpe iconv localbase luajit pathfix pkgconfig \
 		shebangfix ssl
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	snort3
 GH_PROJECT=	snort3
 
 SHEBANG_FILES=	tools/appid_detector_builder.sh
 
 CMAKE_ARGS+=	-DFLEX_INCLUDE_DIR_HINT:PATH=${PREFIX}/include/flex
 
 CONFLICTS=	snort-2*
 
 OPTIONS_DEFINE=		ADDRESSSANITIZER DEBUG DOCS FLATBUFFERS HYPERSCAN \
 			LARGEPCAP PIE STATICDAQ THREADSANITIZER TSC
 OPTIONS_DEFAULT=	STATICDAQ
 OPTIONS_DEFAULT_amd64=	HYPERSCAN
 OPTIONS_SUB=		yes
 
 ADDRESSSANITIZER_DESC=	Enable address sanitizer
 FLATBUFFERS_DESC=	Enable flatbuffers support
 HYPERSCAN_DESC=		Enable high-performance regular expression lib
 LARGEPCAP_DESC=		Enable support for pcaps larger than 2 GB
 PIE_DESC=		Enable PIE (Broken)
 STATICDAQ_DESC=		Link static DAQ modules
 THREADSANITIZER_DESC=	Enable thread sanitizer
 TSC_DESC=		Use timestamp counter register clock (x86 only)
 
 ADDRESSSANITIZER_CMAKE_BOOL=	ENABLE_ADDRESS_SANITIZER
 DEBUG_CMAKE_BOOL=		ENABLE_COREFILES ENABLE_GDB
 DOCS_CMAKE_BOOL=		MAKE_HTML_DOC MAKE_PDF_DOC MAKE_TEXT_DOC
 FLATBUFFERS_LIB_DEPENDS=	flatc:devel/flatbuffers205 # until https://github.com/snort3/snort3/issues/250 is fixed
 HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
 HYPERSCAN_PLIST_SUB=		HYPERSCAN=""
 HYPERSCAN_PLIST_SUB_OFF=	HYPERSCAN="@comment "
 LARGEPCAP_CMAKE_BOOL=		ENABLE_LARGE_PCAP
 PIE_CMAKE_BOOL=			ENABLE_PIE
 STATICDAQ_CMAKE_BOOL=		ENABLE_STATIC_DAQ
 THREADSANITIZER_CMAKE_BOOL=	ENABLE_THREAD_SANITIZER
 TSC_CMAKE_BOOL=			ENABLE_TSC_CLOCK
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
 BUILD_DEPENDS=	flex>0:textproc/flex
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|_LIBDIR}/pkgconfig|_PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/cmake/create_pkg_config.cmake
 
 .include <bsd.port.mk>
diff --git a/security/snort3/distinfo b/security/snort3/distinfo
index 2528c3b2e948..f7f22d281cca 100644
--- a/security/snort3/distinfo
+++ b/security/snort3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678711780
-SHA256 (snort3-snort3-3.1.57.0_GH0.tar.gz) = cec779dde2fbf7e3d20b721c04b89f6f84ef663bf1afba06535188e7c766721c
-SIZE (snort3-snort3-3.1.57.0_GH0.tar.gz) = 3231068
+TIMESTAMP = 1679680661
+SHA256 (snort3-snort3-3.1.58.0_GH0.tar.gz) = c2b37899db42e2db9a05089abbe0ba48633c6c48496d2c64565500b4f9061d78
+SIZE (snort3-snort3-3.1.58.0_GH0.tar.gz) = 3232406
diff --git a/security/snort3/files/patch-src_control_control.h b/security/snort3/files/patch-src_control_control.h
index da1d6ec6d0cf..96725a313534 100644
--- a/security/snort3/files/patch-src_control_control.h
+++ b/security/snort3/files/patch-src_control_control.h
@@ -1,10 +1,11 @@
 --- src/control/control.h.orig	2021-09-08 19:39:41 UTC
 +++ src/control/control.h
 @@ -26,6 +26,7 @@
  #include <cstdarg>
  #include <queue>
  #include <string>
+ #include <vector>
 +#include <ctime>
  
  #include "main/snort_types.h"