commit: 410cb3ac09ab3d55e96876634c4d58005d9ead89 Author: Hank Leininger <hlein <AT> korelogic <DOT> com> AuthorDate: Sun Jan 18 18:12:40 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 25 06:44:09 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410cb3ac
net-analyzer/snort: fix building w/gcc-15 Also update URL to make pkgcheck scan happy. Closes: https://bugs.gentoo.org/943927 Signed-off-by: Hank Leininger <hlein <AT> korelogic.com> Part-of: https://github.com/gentoo/gentoo/pull/45429 Closes: https://github.com/gentoo/gentoo/pull/45429 Signed-off-by: Sam James <sam <AT> gentoo.org> .../snort/files/snort-2.9.20-gcc-15-fix.patch | 26 +++ net-analyzer/snort/metadata.xml | 2 +- net-analyzer/snort/snort-2.9.20-r1.ebuild | 253 +++++++++++++++++++++ 3 files changed, 280 insertions(+), 1 deletion(-) diff --git a/net-analyzer/snort/files/snort-2.9.20-gcc-15-fix.patch b/net-analyzer/snort/files/snort-2.9.20-gcc-15-fix.patch new file mode 100644 index 000000000000..c17a6d08326c --- /dev/null +++ b/net-analyzer/snort/files/snort-2.9.20-gcc-15-fix.patch @@ -0,0 +1,26 @@ +Adapted from: https://lists.openembedded.org/g/openembedded-devel/topic/meta_oe_patch_2_8_snort/112466576 + +Upstream-Status: Backport [resolved in snort3 https://github.com/snort3/snort3/commit/c3cc27355ac302bd24ee3e9d613166898ec2be64] + +Signed-off-by: Martin Jansa <[email protected]> +--- a/src/dynamic-preprocessors/dcerpc2/spp_dce2.c ++++ b/src/dynamic-preprocessors/dcerpc2/spp_dce2.c +@@ -160,7 +160,7 @@ static void DCE2_ReloadSwapFree(void *); + static void DCE2_AddPortsToPaf(struct _SnortConfig *, DCE2_Config *, tSfPolicyId); + static void DCE2_ScAddPortsToPaf(struct _SnortConfig *, void *); + static uint32_t max(uint32_t a, uint32_t b); +-static uint32_t DCE2_GetReloadSafeMemcap(); ++static uint32_t DCE2_GetReloadSafeMemcap(tSfPolicyUserContextId pConfig); + + static bool dce2_file_cache_is_enabled = false; + static bool dce2_file_cache_was_enabled = false; +--- a/src/preprocessors/HttpInspect/include/file_decomp_PDF.h ++++ b/src/preprocessors/HttpInspect/include/file_decomp_PDF.h +@@ -80,6 +80,6 @@ fd_status_t File_Decomp_Init_PDF( fd_session_p_t SessionPtr ); + + fd_status_t File_Decomp_End_PDF( fd_session_p_t SessionPtr ); + +-fd_status_t File_Decomp_PDF(); ++fd_status_t File_Decomp_PDF( fd_session_p_t SessionPtr ); + + #endif /* FILE_DECOMP_PDF_H */ diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml index 39900f601479..a70ff4f1d934 100644 --- a/net-analyzer/snort/metadata.xml +++ b/net-analyzer/snort/metadata.xml @@ -22,7 +22,7 @@ <email>[email protected]</email> <name>Snort Team</name> </maintainer> - <changelog>http://www.snort.org/snort-downloads</changelog> + <changelog>https://www.snort.org/downloads</changelog> <doc>https://snort.org/documents#OfficialDocumentation</doc> <bugs-to>https://snort.org/community#bugs</bugs-to> </upstream> diff --git a/net-analyzer/snort/snort-2.9.20-r1.ebuild b/net-analyzer/snort/snort-2.9.20-r1.ebuild new file mode 100644 index 000000000000..94493e84e567 --- /dev/null +++ b/net-analyzer/snort/snort-2.9.20-r1.ebuild @@ -0,0 +1,253 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit autotools flag-o-matic lua-single systemd tmpfiles + +DESCRIPTION="The de facto standard for intrusion detection/prevention" +HOMEPAGE="https://www.snort.org"; +SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre +high-availability inline-init-failopen large-pcap-64bit +libtirpc +linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react +reload-error-restart selinux shared-rep side-channel sourcefire +threads" + +DEPEND="acct-user/snort + acct-group/snort + dev-libs/libdnet + >=dev-libs/libpcre-8.33 + net-libs/libnsl:0= + >=net-libs/libpcap-1.3.0 + virtual/zlib:= + !libtirpc? ( sys-libs/glibc[rpc(-)] ) + libtirpc? ( net-libs/libtirpc ) + open-appid? ( ${LUA_DEPS} )" +BDEPEND=">=net-libs/daq-2.0.2" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-snort )" + +REQUIRED_USE="!kernel_linux? ( !shared-rep ) + open-appid? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch" + "${FILESDIR}/${PN}-2.9.8.3-rpc.patch" + "${FILESDIR}/${PN}-2.9.12-snort.pc.patch" + "${FILESDIR}/${PN}-2.9.20-gcc-15-fix.patch" +) + +pkg_setup() { + use open-appid && lua-single_pkg_setup +} + +src_prepare() { + default + + mv configure.{in,ac} || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861239 + # + # Upstream does bug mail. Sent an email. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + econf \ + $(use_enable gre) \ + $(use_enable control-socket) \ + $(use_enable file-inspect) \ + $(use_enable high-availability ha) \ + $(use_enable non-ether-decoders) \ + $(use_enable shared-rep) \ + $(use_enable side-channel) \ + $(use_enable sourcefire) \ + $(use_enable ppm) \ + $(use_enable perfprofiling) \ + $(use_enable linux-smp-stats) \ + $(use_enable inline-init-failopen) \ + $(use_enable open-appid) \ + $(use_enable threads pthread) \ + $(use_enable debug) \ + $(use_enable debug debug-msgs) \ + $(use_enable debug corefiles) \ + $(use_enable !debug dlclose) \ + $(use_enable active-response) \ + $(use_enable reload-error-restart) \ + $(use_enable react) \ + $(use_enable flexresp3) \ + $(use_enable large-pcap-64bit large-pcap) \ + $(use_with libtirpc) \ + --enable-mpls \ + --enable-normalizer \ + --enable-reload \ + --enable-targetbased \ + --disable-build-dynamic-examples \ + --disable-profile \ + --disable-ppm-test \ + --disable-intel-soft-cpm \ + --disable-static-daq \ + --disable-static \ + --disable-so-with-static-lib +} + +src_install() { + default + + keepdir /var/log/snort \ + /etc/snort/rules \ + /etc/snort/so_rules \ + /usr/$(get_libdir)/snort_dynamicrules + + # config.log and build.log are needed by Sourcefire + # to trouble shoot build problems and bug reports so we are + # perserving them incase the user needs upstream support. + dodoc RELEASE.NOTES ChangeLog \ + doc/* \ + tools/u2boat/README.u2boat + + insinto /etc/snort + doins etc/attribute_table.dtd \ + etc/classification.config \ + etc/gen-msg.map \ + etc/reference.config \ + etc/threshold.conf \ + etc/unicode.map + + # We use snort.conf.distrib because the config file is complicated + # and the one shipped with snort can change drastically between versions. + # Users should migrate setting by hand and not with etc-update. + newins etc/snort.conf snort.conf.distrib + + # config.log and build.log are needed by Sourcefire + # to troubleshoot build problems and bug reports so we are + # preserving them incase the user needs upstream support. + if [ -f "${WORKDIR}/${PF}/config.log" ]; then + dodoc "${WORKDIR}/${PF}/config.log" + fi + if [ -f "${T}/build.log" ]; then + dodoc "${T}/build.log" + fi + + insinto /etc/snort/preproc_rules + doins preproc_rules/decoder.rules \ + preproc_rules/preprocessor.rules \ + preproc_rules/sensitive-data.rules + + fowners -R snort:snort \ + /var/log/snort \ + /etc/snort + + newinitd "${FILESDIR}/snort.rc12" snort + newconfd "${FILESDIR}/snort.confd.2" snort + systemd_newunit "${FILESDIR}/snort_at.service" "[email protected]" + + newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf + + # Sourcefire uses Makefiles to install docs causing Bug #297190. + # This removes the unwanted doc directory and rogue Makefiles. + rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" + rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" + + # Remove unneeded .la files (Bug #382863) + find "${ED}" -name '*.la' -type f -delete || die + + # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection + sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct rule location in the config + sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct preprocessor/decoder rule location in the config + sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Enable the preprocessor/decoder rules + sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Just some clean up of trailing /'s in the config + sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Make it clear in the config where these are... + sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Disable all rule files by default. + sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the configured DAQ to afpacket + sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the location of the DAQ modules + sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the DAQ mode to passive + sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set snort to run as snort:snort + sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the default log dir + sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct so_rule location in the config + sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die +} + +pkg_postinst() { + tmpfiles_process snort.conf + + einfo "There have been a number of improvements and new features" + einfo "added to ${P}. Please review the RELEASE.NOTES and" + einfo "ChangLog located in /usr/share/doc/${PF}." + einfo + elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" + elog "users migrate their snort.conf customizations to the latest config" + elog "file released by the VRT. You can find the latest version of the" + elog "Snort config file in /etc/snort/snort.conf.distrib." + elog + elog "!! It is important that you migrate to this new snort.conf file !!" + elog + elog "This version of the ebuild includes an updated init.d file and" + elog "conf.d file that rely on options found in the latest Snort" + elog "config file provided by the VRT." + + if use debug; then + elog "You have the 'debug' USE flag enabled. If this has been done to" + elog "troubleshoot an issue by producing a core dump or a back trace," + elog "then you need to also ensure the FEATURES variable in make.conf" + elog "contains the 'nostrip' option." + fi +}
