commit: 6b906ae69c91c7a4ec841182fcc484e9494aa921 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Dec 10 16:17:04 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Dec 10 16:45:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b906ae6
net-analyzer/snort: bump to v2.9.12 Closes: https://bugs.gentoo.org/550366 Closes: https://bugs.gentoo.org/618822 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> net-analyzer/snort/Manifest | 1 + .../snort/files/snort-2.9.12-snort.pc.patch | 11 + net-analyzer/snort/files/snort.tmpfiles | 1 + net-analyzer/snort/files/snort_at.service | 11 + net-analyzer/snort/metadata.xml | 5 + net-analyzer/snort/snort-2.9.12.ebuild | 258 +++++++++++++++++++++ profiles/arch/powerpc/ppc64/package.use.mask | 4 + 7 files changed, 291 insertions(+) diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index 391e6190d8b..4664a2116c3 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1,3 +1,4 @@ +DIST snort-2.9.12.tar.gz 6456877 BLAKE2B af5584fe01caf9af2f2188e1362bd927a884354ddcb3026af514dddc1264b557691e1644d3c24e85c3b5b5f515dd9fccdd8d38ebc7c28d2f384fb822e27d8bb8 SHA512 6f759b321ca5496abf27c9e4f4fa003cd5167f8c8a160bf5f0b1aee1a93aa8d27de89b84bdf993a0bfb3a93c6315cb2bdbdc3fdb3b09b8d4d1d3c22b69c6783f DIST snort-2.9.4.6.tar.gz 5338762 BLAKE2B d7d663028fcfeffd2f2996a4ebf81aa723b4564a0aa38158f5fef104385866164d8ddd538d920f08e4102da0b055157c8574e42f2e306187eb82283db5ad2c78 SHA512 e35e22cab3b98bbd42ffb4b88c4c4cc9b1c11e35952a9f3f4f684c02c81ca8604b45d16f42b3d0a6c792eeab86a8e319d8ebdd7b1a5215f93ec0e70b6ef53f98 DIST snort-2.9.7.0.tar.gz 6340553 BLAKE2B 97fc2699fd93278edd5b350db498733f60ea9a78fe8f9f755c153380be77b3b97caec3aa7cce633650dd0e5d193deab675855aa68c2efcb04dc6df04b77ccb4c SHA512 f2cbdd2cf2ad15bd4cf3f8658c2a4880ee2069589db89c11aaea637984dde270ef6242c6dd43d5e12f829ed2464388950ee791dbbfa8df796843942c415fbc2f DIST snort-2.9.7.2.tar.gz 6352738 BLAKE2B c2c67395d9a214886ecf033b692f841da58284d0687ee4c219f77850246b1c2e134b874aba6dfd30dcb1f3c71d54a6c4e5dc70e613eb28a59c51f31dc9498b41 SHA512 4732014d0049671b1a81857e25a5ffbc3cbccb698be2b3406f69a45603a6b9f34343469ee14fa513199cf9b890a278cc777b42493850cff6fcb3493bb9b73dce diff --git a/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch b/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch new file mode 100644 index 00000000000..3608a71c692 --- /dev/null +++ b/net-analyzer/snort/files/snort-2.9.12-snort.pc.patch @@ -0,0 +1,11 @@ +--- a/snort.pc.in ++++ b/snort.pc.in +@@ -12,6 +12,5 @@ Name: Snort + Description: Snort dynamic plugins/detection/rules + URL: www.snort.org + Version: @VERSION@ +-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ +-Cflags: @CFLAGS@ @CPPFLAGS@ +- ++Libs: -L${libdir} -lcurl @LIBS@ ++Cflags: -I${includedir} @CPPFLAGS@ diff --git a/net-analyzer/snort/files/snort.tmpfiles b/net-analyzer/snort/files/snort.tmpfiles new file mode 100644 index 00000000000..5772f2fd1ad --- /dev/null +++ b/net-analyzer/snort/files/snort.tmpfiles @@ -0,0 +1 @@ +d /run/snort 0755 snort snort - diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service new file mode 100644 index 00000000000..f764015c219 --- /dev/null +++ b/net-analyzer/snort/files/snort_at.service @@ -0,0 +1,11 @@ +[Unit] +Description=Snort IDS system listening on '%I' + +[Service] +Type=simple +ExecStartPre=/usr/sbin/ip link set up dev %I +ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +Alias=multi-user.target.wants/snort@%i.service diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml index bfd9b69b2e8..4478a084a21 100644 --- a/net-analyzer/snort/metadata.xml +++ b/net-analyzer/snort/metadata.xml @@ -66,6 +66,11 @@ Enable decoding of non-ethernet protocols such as TokenRing, FDDI, IPX, etc. </flag> + <flag name="open-appid"> + Enable OpenAppID, an open, application-focused detection language + and processing module for Snort that enables users to create, share, + and implement application detection. Requires <pkg>dev-lang/luajit</pkg>. + </flag> <flag name="perfprofiling"> Enables support for preprocessor and rule performance profiling using the perfmonitor preprocessor. diff --git a/net-analyzer/snort/snort-2.9.12.ebuild b/net-analyzer/snort/snort-2.9.12.ebuild new file mode 100644 index 00000000000..0a355d73194 --- /dev/null +++ b/net-analyzer/snort/snort-2.9.12.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +inherit autotools user systemd tmpfiles multilib + +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 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="static +gre +ppm +perfprofiling ++non-ether-decoders control-socket file-inspect high-availability +shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen ++threads debug +active-response reload-error-restart open-appid ++react +flexresp3 large-pcap-64bit selinux +libtirpc" + +DEPEND=">=net-libs/libpcap-1.3.0 + >=net-libs/daq-2.0.2 + >=dev-libs/libpcre-8.33 + dev-libs/libdnet + net-libs/libnsl:0= + sys-libs/zlib + !libtirpc? ( sys-libs/glibc[rpc(-)] ) + libtirpc? ( net-libs/libtirpc ) + open-appid? ( dev-lang/luajit:= ) +" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-snort )" + +REQUIRED_USE="!kernel_linux? ( !shared-rep )" + +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 +) + +pkg_setup() { + # pre_inst() is a better place to put this + # but we need it here for the 'fowners' statements in src_install() + enewgroup snort + enewuser snort -1 -1 /dev/null snort + +} + +src_prepare() { + default + + # Multilib fix for the sf_engine + ebegin "Applying multilib fix" + sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ + "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \ + || die "sed for sf_engine failed" + + # Multilib fix for the curent set of dynamic-preprocessors + for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do + sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ + "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \ + || die "sed for $i failed." + done + eend + + mv configure.{in,ac} || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + econf \ + $(use_enable !static shared) \ + $(use_enable static) \ + $(use_enable static so-with-static-lib) \ + $(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 +} + +src_install() { + emake DESTDIR="${D}" install + + 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" "snort@.service" + + 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) + rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die + rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" + + # 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 +} diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask index b6032b13eed..dd7876246d1 100644 --- a/profiles/arch/powerpc/ppc64/package.use.mask +++ b/profiles/arch/powerpc/ppc64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Thomas Deutschmann <whi...@gentoo.org> (10 Dec 2018) +# dev-lang/luajit lacks ppc64 keyword. luajit upstream does not support ppc64 +net-analyzer/snort open-appid + # Andreas Sturmlechner <ast...@gentoo.org> (13 Mar 2018) # missing keyword on media-libs/portmidi media-sound/hydrogen portmidi
