<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1baa7b85892ce0684edbbb1fbac1b63353714417">https://github.com/macports/macports-ports/commit/1baa7b85892ce0684edbbb1fbac1b63353714417</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1baa7b8 snort: Add interface variants, remove unused/deprecated mysql variants
</span>1baa7b8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1baa7b85892ce0684edbbb1fbac1b63353714417
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue May 7 10:16:33 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> snort: Add interface variants, remove unused/deprecated mysql variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Add variants if_en0, if_en1, […] for the snort launch daemon
</span><span style='display:block; white-space:pre;color:#404040;'> * Snort no longer supports SQL variants, remove these unused dependencies
</span>---
net/snort/Portfile | 151 ++++++++++++++++++-----------------------------------
1 file changed, 51 insertions(+), 100 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/snort/Portfile b/net/snort/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9253ad..6704496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,13 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name snort
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Open Source Network Intrusion Detection System
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name snort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Open Source Network Intrusion Detection System
</span> long_description \
Snort is an open source network intrusion detection system, capable \
of performing real-time traffic analysis and packet logging on IP \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,47 +16,67 @@ long_description \
</span> searching/matching and can be used to detect a variety of attacks \
and probes, such as buffer overflows, stealth port scans, CGI \
attacks, SMB probes, OS fingerprinting attempts, and much more.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.snort.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}downloads/snort/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.snort.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}downloads/snort/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fd6e48daa14622209871ddeecb0edcb7457ceddb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 31447393d15286b848810dd78ab2cb3ad231fcd1f1663f959587690eeea75413 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6553425
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd6e48daa14622209871ddeecb0edcb7457ceddb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31447393d15286b848810dd78ab2cb3ad231fcd1f1663f959587690eeea75413 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6553425
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:daq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:luajit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nghttp2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles patch-src-strlcatu.h.diff patch-src-strlcpyu.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:daq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:luajit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nghttp2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span>
add_users snort group=snort home=${prefix}/var/snort shell=/sbin/nologin realname=Snort\ user
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# snort interface, defined outside variants below so that `port lint` succeeds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set interface en0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# provide snort interface as port variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant if_en0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts if_en1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Snort launch daemon interface en0" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set interface en0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant if_en1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts if_en0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Snort launch daemon interface en1" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set interface en1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset if_en0] && ![variant_isset if_en1] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +if_en0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set if en1
</span> startupitem.create yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable ${prefix}/bin/${name} -i ${if} -c ${prefix}/etc/snort/snort.conf -l ${prefix}/var/log/snort -u snort -g snort --pid-path ${prefix}/var/run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.pidfile "${prefix}/var/run/snort_${if}.pid"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/bin/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -u snort -g snort \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -l ${prefix}/var/log/snort \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pid-path ${prefix}/var/run \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -i ${interface} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -c ${prefix}/etc/snort/snort.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.pidfile "${prefix}/var/run/snort_${interface}.pid"
</span> #startupitem.start "${prefix}/share/${name}/snort.sh"
#startupitem.stop "/bin/kill \$(cat ${prefix}/var/run/snort_*.pid)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.asroot yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.asroot yes
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copy the Snort database schemas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -d -m 755 ${destroot}${prefix}/share/${name}/schemas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xinstall -m 755 {*}[glob ${worksrcpath}/schemas/create*] ${destroot}${prefix}/share/${name}/schemas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copy Snort's etc/ files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy Snort's etc/ files
</span> xinstall -d -m 755 ${destroot}${prefix}/etc/${name}
xinstall {*}[glob ${worksrcpath}/etc/*.map] ${destroot}${prefix}/etc/${name}
xinstall {*}[glob ${worksrcpath}/etc/*.conf*] ${destroot}${prefix}/etc/${name}
xinstall -d -m 755 ${destroot}${prefix}/share/examples/${name}
file rename ${destroot}${prefix}/etc/${name}/snort.conf ${destroot}${prefix}/share/examples/${name}/snort.conf.dist
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix snort.conf.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix snort.conf.dist
</span> reinplace "s|dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/|dynamicpreprocessor directory ${prefix}/lib/snort_dynamicpreprocessor/|g" ${destroot}${prefix}/share/examples/${name}/snort.conf.dist
reinplace "s|dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so|dynamicengine ${prefix}/lib/snort_dynamicengine/libsf_engine.dylib|g" ${destroot}${prefix}/share/examples/${name}/snort.conf.dist
reinplace "s|dynamicdetection directory /usr/local/lib/snort_dynamicrule/|dynamicdetection directory ${prefix}/lib/snort_dynamicrule/|g" ${destroot}${prefix}/share/examples/${name}/snort.conf.dist
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +127,7 @@ Oinkmaster is the recommended way with regular updates.
</span> Change at least your HOME_NET in snort.conf and Validate your config with
$ snort -T -c ${prefix}/etc/snort/snort.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-By default ${prefix}/share/${name}/snort.sh is configured to listen only on ${if} interface.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+By default ${prefix}/share/${name}/snort.sh is configured to listen only on ${interface} interface.
</span> If you want to listen multiple interface, you need to start one snort instance per interface (or bond them)
$ grep 'Snort rules read' /var/log/system.log
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,75 +149,6 @@ http://labs.snort.org/iplists/
</span>
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +mysql57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql55 mysql56 mysql57mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.1 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql51/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql51/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/mysql51/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/mysql51/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql56 mysql57 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.5 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql55/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/mysql55/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/mysql55/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql55 mysql57 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.6 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql56/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/mysql56/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/mysql56/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql55 mysql56 mariadb percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MySQL 5.7 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql57/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql57/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/mysql57/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/mysql57/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mariadb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql55 mysql56 mysql57 percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable MariaDB (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mariadb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mariadb/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/mariadb/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/mariadb/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant percona \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts mysql51 mysql55 mysql56 mysql57 mariadb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Enable Percona (MySQL) support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:percona
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/percona/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mysql-libraries=${prefix}/lib/percona/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS=-L${prefix}/lib/percona/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${homepage}downloads
livecheck.regex >${name}-(\[0-9.\]+)${extract.suffix}<
</pre><pre style='margin:0'>
</pre>