pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/snort Upgraded to version 2.9.9.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c003fbc2a8e
branches: trunk
changeset: 363780:3c003fbc2a8e
user: nils <nils%pkgsrc.org@localhost>
date: Thu Jun 15 18:27:50 2017 +0000
description:
Upgraded to version 2.9.9.0.
This is a HUGE bump, so look at the changelog on the Snort website !
For example, Snort does not natively handle MySQL anymore.
As for the pkgsrc changes :
- updated deps (net/daq) ;
- updated config files ;
- updated MASTER_SITE ;
- some substitution to handle pkgsrc paths ;
- updated compile options.
diffstat:
net/snort/MESSAGE | 16 +++----
net/snort/Makefile | 95 ++++++++++++++++++++++++--------------------
net/snort/PLIST | 98 ++++++++++++++++++++++++++++++++++++---------
net/snort/distinfo | 18 ++------
net/snort/options.mk | 22 +---------
net/snort/patches/patch-aa | 33 ---------------
net/snort/patches/patch-ab | 22 ----------
net/snort/patches/patch-ac | 13 ------
net/snort/patches/patch-ad | 13 ------
net/snort/patches/patch-ae | 48 ----------------------
net/snort/patches/patch-af | 14 ------
net/snort/patches/patch-ah | 13 ------
12 files changed, 142 insertions(+), 263 deletions(-)
diffs (truncated from 619 to 300 lines):
diff -r 9c2d634a218e -r 3c003fbc2a8e net/snort/MESSAGE
--- a/net/snort/MESSAGE Thu Jun 15 18:17:05 2017 +0000
+++ b/net/snort/MESSAGE Thu Jun 15 18:27:50 2017 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/09/14 12:46:52 adrianp Exp $
+$NetBSD: MESSAGE,v 1.6 2017/06/15 18:27:50 nils Exp $
To use snort, you will need to perform the following steps:
@@ -13,13 +13,11 @@
/etc/rc.d/snort start
As of snort v2.4.0 rules are no longer distributed with the main
-distribution. You can either install the net/snort-rules package
-which contains the GPL "Community Rules" or download your appropriate
-rules from:
-
- http://www.snort.org/pub-bin/downloads.cgi
-
-or:
- http://www.bleedingsnort.com
+distribution.
+You can :
+- install the net/snort-rules package which contains
+ the GPL "Community Rules"
+- install the net/pulledpork package which downloads and updates rules
+- manually download rules from https://snort.org/downloads/#rule-downloads
===========================================================================
diff -r 9c2d634a218e -r 3c003fbc2a8e net/snort/Makefile
--- a/net/snort/Makefile Thu Jun 15 18:17:05 2017 +0000
+++ b/net/snort/Makefile Thu Jun 15 18:27:50 2017 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:21 agc Exp $
+# $NetBSD: Makefile,v 1.56 2017/06/15 18:27:50 nils Exp $
#
-DISTNAME= snort-2.8.5.1
-PKGREVISION= 9
+DISTNAME= snort-2.9.9.0
CATEGORIES= net security
-MASTER_SITES= http://www.snort.org/dl/
-MASTER_SITES+= http://www.snort.org/dl/current/
-MASTER_SITES+= http://www.snort.org/dl/old/
+MASTER_SITES= https://www.snort.org/downloads/archive/snort/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.snort.org/
COMMENT= The Open Source Network Intrusion Detection System
+LICENSE= gnu-gpl-v2
-LICENSE= gnu-gpl-v2
+DEPENDS+= daq>=2.0.0:../../net/daq
CONFLICTS+= snort-mysql-[0-9]*
CONFLICTS+= snort-pgsql-[0-9]*
@@ -30,58 +28,66 @@
PKG_GROUPS= ${SNORT_GROUP}
PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}
PKG_GROUPS_VARS+= SNORT_GROUP
-PKG_USERS_VARS+= SNORT_USER
-FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
+PKG_USERS_VARS= SNORT_USER
+FILES_SUBST+= SNORT_USER=${SNORT_USER} SNORT_GROUP=${SNORT_GROUP}
BUILD_DEFS+= VARBASE
MAKE_JOBS_SAFE= NO
OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
DOC_FILES= BUGS INSTALL NEWS PROBLEMS README TODO USAGE WISHLIST
+OWN_DIRS= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/rules
+OWN_DIRS+= ${PKG_SYSCONFDIR}/so_rules ${PKG_SYSCONFDIR}/preproc_rules
+OWN_DIRS+= ${PREFIX}/lib ${PREFIX}/lib/snort_dynamicrules
+INSTALLATION_DIRS+= ${EGDIR}/rules
+AUTO_MKDIRS= yes
-CONF_FILES= ${EGDIR}/snort.conf.default \
+CONF_FILES= ${EGDIR}/attribute_table.dtd \
+ ${PKG_SYSCONFDIR}/attribute_table.dtd
+CONF_FILES+= ${EGDIR}/classification.config \
+ ${PKG_SYSCONFDIR}/classification.config
+CONF_FILES+= ${EGDIR}/file_magic.conf \
+ ${PKG_SYSCONFDIR}/file_magic.conf
+CONF_FILES+= ${EGDIR}/gen-msg.map \
+ ${PKG_SYSCONFDIR}/gen-msg.map
+CONF_FILES+= ${EGDIR}/reference.config \
+ ${PKG_SYSCONFDIR}/reference.config
+CONF_FILES+= ${EGDIR}/snort.conf.default \
${PKG_SYSCONFDIR}/snort.conf
CONF_FILES+= ${EGDIR}/threshold.conf \
${PKG_SYSCONFDIR}/threshold.conf
-CONF_FILES+= ${EGDIR}/classification.config \
- ${PKG_SYSCONFDIR}/classification.config
-CONF_FILES+= ${EGDIR}/reference.config \
- ${PKG_SYSCONFDIR}/reference.config
-CONF_FILES+= ${EGDIR}/gen-msg.map \
- ${PKG_SYSCONFDIR}/gen-msg.map
CONF_FILES+= ${EGDIR}/generators \
${PKG_SYSCONFDIR}/generators
-CONF_FILES+= ${EGDIR}/sid-msg.map \
- ${PKG_SYSCONFDIR}/sid-msg.map
CONF_FILES+= ${EGDIR}/unicode.map \
${PKG_SYSCONFDIR}/unicode.map
+CONF_FILES+= ${EGDIR}/rules/black_list.rules \
+ ${PKG_SYSCONFDIR}/rules/black_list.rules
+CONF_FILES+= ${EGDIR}/rules/white_list.rules \
+ ${PKG_SYSCONFDIR}/rules/white_list.rules
SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= etc/snort.conf src/snort.c
-SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.paths+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|g"
+SUBST_SED.paths+= -e "s|../rules|rules|g"
+SUBST_SED.paths+= -e "s|../so_rules|so_rules|g"
+SUBST_SED.paths+= -e "s|../preproc_rules|preproc_rules|g"
SUBST_MESSAGE.paths= Fixing paths.
SUBST_CLASSES+= installp
SUBST_STAGE.installp= post-extract
-SUBST_FILES.installp= src/dynamic-preprocessors/ssl/Makefile.in
-SUBST_SED.installp= -e "s|@INSTALL@|${INSTALL} -c|g"
-SUBST_MESSAGE.installp= Fixing INSTALL options.
-
-SUBST_CLASSES+= install
-SUBST_STAGE.install= post-configure
-SUBST_FILES.install= src/dynamic-preprocessors/ftptelnet/Makefile
-SUBST_FILES.install+= src/dynamic-preprocessors/smtp/Makefile
-SUBST_FILES.install+= src/dynamic-preprocessors/ssh/Makefile
-SUBST_FILES.install+= src/dynamic-preprocessors/dcerpc/Makefile
-SUBST_FILES.install+= src/dynamic-preprocessors/dns/Makefile
-SUBST_SED.install= -e "s|-o root -g wheel||g"
-SUBST_MESSAGE.install= Fixing install scripts.
+SUBST_FILES.installp= src/dynamic-preprocessors/Makefile.in
+SUBST_SED.installp= -e "s|exec_prefix)|exec_prefix)/share/snort|g"
+SUBST_MESSAGE.installp= Fixing preprocessors install path.
.include "options.mk"
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --disable-static-daq
+CONFIGURE_ARGS+= --enable-sourcefire
+CONFIGURE_ARGS+= --with-daq-includes=${BUILDLINK_PREFIX.daq}/include
+CONFIGURE_ARGS+= --with-daq-libraries=${BUILDLINK_PREFIX.daq}/lib
CONFIGURE_ARGS+= --with-libpcap-includes=${BUILDLINK_PREFIX.libpcap}/include
CONFIGURE_ARGS+= --with-libpcap-libraries=${BUILDLINK_PREFIX.libpcap}/lib
+CONFIGURE_ARGS+= --disable-so_with_static_lib
pre-build:
${CP} ${WRKSRC}/etc/snort.conf ${WRKSRC}/etc/snort.conf.default
@@ -92,21 +98,24 @@
${INSTALL_DATA} ${WRKSRC}/etc/*.config \
${WRKSRC}/etc/*.map \
${WRKSRC}/etc/threshold.conf \
+ ${WRKSRC}/etc/attribute_table.dtd \
+ ${WRKSRC}/etc/file_magic.conf \
${WRKSRC}/etc/snort.conf.default ${DESTDIR}${EGDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/generators ${DESTDIR}${EGDIR}
-. for i in ${DOC_FILES}
- ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/snort/
-. endfor
+.for i in ${DOC_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/snort/
+.endfor
- ${INSTALL_DATA} ${WRKSRC}/doc/README.* ${DESTDIR}${PREFIX}/share/doc/snort/
- ${INSTALL_DATA} ${WRKSRC}/doc/*.tex ${DESTDIR}${PREFIX}/share/doc/snort/
- ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DESTDIR}${PREFIX}/share/doc/snort/
+ ${INSTALL_DATA} ${WRKSRC}/doc/README.* \
+ ${WRKSRC}/doc/*.tex \
+ ${WRKSRC}/doc/*.pdf ${DESTDIR}${PREFIX}/share/doc/snort/
+ ${INSTALL_DATA} ${FILESDIR}/black_list.rules \
+ ${FILESDIR}/white_list.rules ${DESTDIR}${EGDIR}/rules/
${INSTALL_MAN} ${WRKSRC}/snort.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/schemas/create_* \
- ${DESTDIR}${PREFIX}/share/doc/snort/schemas
-
+.include "../../net/daq/buildlink3.mk"
+.include "../../net/libdnet/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c2d634a218e -r 3c003fbc2a8e net/snort/PLIST
--- a/net/snort/PLIST Thu Jun 15 18:17:05 2017 +0000
+++ b/net/snort/PLIST Thu Jun 15 18:27:50 2017 +0000
@@ -1,102 +1,158 @@
-@comment $NetBSD: PLIST,v 1.32 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.33 2017/06/15 18:27:50 nils Exp $
bin/snort
+bin/u2boat
+bin/u2spewfoo
lib/pkgconfig/snort.pc
lib/snort_dynamicengine/libsf_engine.la
-lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.la
lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
-lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.la
+lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
+lib/snort_dynamicpreprocessor/libsf_gtp_preproc.la
+lib/snort_dynamicpreprocessor/libsf_imap_preproc.la
+lib/snort_dynamicpreprocessor/libsf_modbus_preproc.la
+lib/snort_dynamicpreprocessor/libsf_pop_preproc.la
+lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
+lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
+lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
-lib/snort_dynamicrules/lib_sfdynamic_example_rule.la
man/man8/snort.8
share/doc/snort/AUTHORS
share/doc/snort/BUGS
share/doc/snort/CREDITS
share/doc/snort/INSTALL
share/doc/snort/NEWS
+share/doc/snort/OpenDetectorDeveloperGuide.pdf
share/doc/snort/PROBLEMS
share/doc/snort/README
-share/doc/snort/README.ARUBA
-share/doc/snort/README.FLEXRESP
-share/doc/snort/README.FLEXRESP2
-share/doc/snort/README.INLINE
+share/doc/snort/README.GTP
share/doc/snort/README.PLUGINS
share/doc/snort/README.PerfProfiling
share/doc/snort/README.SMTP
share/doc/snort/README.UNSOCK
share/doc/snort/README.WIN32
+share/doc/snort/README.active
share/doc/snort/README.alert_order
+share/doc/snort/README.appid
share/doc/snort/README.asn1
+share/doc/snort/README.counts
share/doc/snort/README.csv
-share/doc/snort/README.database
-share/doc/snort/README.dcerpc
+share/doc/snort/README.daq
share/doc/snort/README.dcerpc2
share/doc/snort/README.decode
share/doc/snort/README.decoder_preproc_rules
+share/doc/snort/README.dnp3
share/doc/snort/README.dns
share/doc/snort/README.event_queue
+share/doc/snort/README.file
+share/doc/snort/README.file_ips
share/doc/snort/README.filters
share/doc/snort/README.flowbits
share/doc/snort/README.frag3
share/doc/snort/README.ftptelnet
share/doc/snort/README.gre
+share/doc/snort/README.ha
share/doc/snort/README.http_inspect
+share/doc/snort/README.imap
share/doc/snort/README.ipip
share/doc/snort/README.ipv6
+share/doc/snort/README.modbus
share/doc/snort/README.multipleconfigs
+share/doc/snort/README.normalize
share/doc/snort/README.pcap_readmode
+share/doc/snort/README.pop
share/doc/snort/README.ppm
share/doc/snort/README.reload
+share/doc/snort/README.reputation
+share/doc/snort/README.sensitive_data
share/doc/snort/README.sfportscan
+share/doc/snort/README.sip
share/doc/snort/README.ssh
share/doc/snort/README.ssl
share/doc/snort/README.stream5
share/doc/snort/README.tag
share/doc/snort/README.thresholding
+share/doc/snort/README.u2boat
+share/doc/snort/README.unified2
share/doc/snort/README.variables
-share/doc/snort/README.wireless
share/doc/snort/TODO
share/doc/snort/USAGE
share/doc/snort/WISHLIST
-share/doc/snort/faq.pdf
-share/doc/snort/faq.tex
share/doc/snort/generators
-share/doc/snort/schemas/create_db2
-share/doc/snort/schemas/create_mssql
-share/doc/snort/schemas/create_mysql
-share/doc/snort/schemas/create_oracle.sql
-share/doc/snort/schemas/create_postgresql
share/doc/snort/snort_manual.pdf
share/doc/snort/snort_manual.tex
-share/doc/snort/snort_schema_v106.pdf
+share/examples/snort/attribute_table.dtd
share/examples/snort/classification.config
+share/examples/snort/file_magic.conf
share/examples/snort/gen-msg.map
share/examples/snort/generators
share/examples/snort/reference.config
-share/examples/snort/sid-msg.map
Home |
Main Index |
Thread Index |
Old Index