FreeBSD Bugzilla – Attachment 117883 Details for
Bug 160044
[update] security/snort to 2.9.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.26 KB, created by
Ryan Steinmetz
on 2011-08-24 03:50:07 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Ryan Steinmetz
Created:
2011-08-24 03:50:07 UTC
Size:
10.26 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/security/snort/Makefile,v >retrieving revision 1.134 >diff -u -r1.134 Makefile >--- Makefile 12 Apr 2011 04:31:21 -0000 1.134 >+++ Makefile 24 Aug 2011 02:40:27 -0000 >@@ -6,7 +6,7 @@ > # > > PORTNAME= snort >-PORTVERSION= 2.9.0.5 >+PORTVERSION= 2.9.1 > CATEGORIES= security > MASTER_SITES= SF/snort/snort > >@@ -15,10 +15,13 @@ > MAINTAINER= wfreeman@sourcefire.com > COMMENT= Lightweight network intrusion detection system > >+LICENSE= GPLv2 >+LICENSE_FILE= ${WRKSRC}/LICENSE >+ > LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre >-BUILD_DEPENDS= daq>=0.5_1:${PORTSDIR}/net/daq \ >+BUILD_DEPENDS= daq>=0.6.1:${PORTSDIR}/net/daq \ > ${LOCALBASE}/lib/libnet11/libnet.a:${PORTSDIR}/net/libnet >-RUN_DEPENDS= daq>=0.5_1:${PORTSDIR}/net/daq \ >+RUN_DEPENDS= daq>=0.6.1:${PORTSDIR}/net/daq \ > ${LOCALBASE}/lib/libnet11/libnet.a:${PORTSDIR}/net/libnet > > OPTIONS= IPV6 "Enable IPv6 support" on \ >@@ -35,6 +38,7 @@ > ODBC "Enable ODBC support" off \ > POSTGRESQL "Enable PostgreSQL support" off \ > PRELUDE "Enable Prelude NIDS integration" off \ >+ LRGPCAP "Enable pcaps larger than 2GB" off \ > SNORTSAM "Unofficial Snortsam Patch" off > > .include <bsd.port.options.mk> >@@ -71,7 +75,7 @@ > LIBNET_LIBDIR= ${LIBNET_LIBS:M-L*:S/-L//} > > CONFIGURE_ARGS= --enable-dynamicplugin --enable-build-dynamic-examples \ >- --enable-reload --enable-reload-restart \ >+ --enable-reload --enable-reload-error-restart \ > --disable-corefiles \ > --with-dnet-includes=${LIBNET_INCDIR} \ > --with-dnet-libraries=${LIBNET_LIBDIR} >@@ -117,6 +121,10 @@ > PLIST_SUB+= PRELUDE="@comment " > .endif > >+.if defined(WITH_LRGPCAP) >+CONFIGURE_ARGS+= --enable-large-pcap >+.endif >+ > .if defined(WITH_PERFPROFILE) > CONFIGURE_ARGS+= --enable-perfprofiling --enable-ppm > .endif >@@ -156,7 +164,7 @@ > .if defined(WITH_SNORTSAM) > USE_AUTOTOOLS+= automake > PATCH_SITES+= http://www.snortsam.net/files/snort-plugin/:snortsam >-PATCHFILES+= snortsam-2.9.0.3.diff.gz:snortsam >+PATCHFILES+= snortsam-2.9.1.diff.gz:snortsam > .endif > > post-patch: >@@ -171,6 +179,8 @@ > ${REINPLACE_CMD} -e 's|^dynamicdetection|#dynamicdetection|' ${WRKSRC}/etc/snort.conf > ${REINPLACE_CMD} -e '/var HOME_NET/s/any/[YOU_NEED_TO_SET_HOME_NET_IN_snort.conf]/' ${WRKSRC}/etc/snort.conf > ${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in >+ ${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \ >+ ${WRKSRC}/src/dynamic-preprocessors/libs/Makefile.in > ${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|g' ${WRKSRC}/configure > .if !defined(WITH_IPV6) > ${REINPLACE_CMD} -e 's|^ipvar |var |' ${WRKSRC}/etc/snort.conf >Index: distinfo >=================================================================== >RCS file: /home/ncvs/ports/security/snort/distinfo,v >retrieving revision 1.70 >diff -u -r1.70 distinfo >--- distinfo 13 Apr 2011 15:42:08 -0000 1.70 >+++ distinfo 23 Aug 2011 23:45:34 -0000 >@@ -1,4 +1,2 @@ >-SHA256 (snort-2.9.0.5.tar.gz) = f997fddbbd1a5f7ccdd4153610b0916fcbe105ea3316d4ed3487fd0054287e94 >-SIZE (snort-2.9.0.5.tar.gz) = 5867934 >-SHA256 (snortsam-2.9.0.3.diff.gz) = da0f9567f213c69e3682bfda4c6310090ce255b0495c02984b3f7e089b19e149 >-SIZE (snortsam-2.9.0.3.diff.gz) = 28889 >+SHA256 (snort-2.9.1.tar.gz) = cf7e792e3df872eb4345c2af160be2b9e49765ac3d41c292f4f8f96d2d7da089 >+SIZE (snort-2.9.1.tar.gz) = 6265578 >Index: pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/security/snort/pkg-plist,v >retrieving revision 1.37 >diff -u -r1.37 pkg-plist >--- pkg-plist 13 Feb 2011 22:17:19 -0000 1.37 >+++ pkg-plist 24 Aug 2011 02:22:40 -0000 >@@ -33,7 +33,6 @@ > @dirrmtry etc/snort/preproc_rules > @dirrmtry etc/snort > %%DYNAMIC%%src/snort_dynamicsrc/bitop.h >-%%DYNAMIC%%src/snort_dynamicsrc/debug.h > %%DYNAMIC%%src/snort_dynamicsrc/event.h > %%DYNAMIC%%src/snort_dynamicsrc/obfuscation.h > %%DYNAMIC%%src/snort_dynamicsrc/pcap_pkthdr32.h >@@ -41,6 +40,7 @@ > %%DYNAMIC%%src/snort_dynamicsrc/preprocids.h > %%DYNAMIC%%src/snort_dynamicsrc/profiler.h > %%DYNAMIC%%src/snort_dynamicsrc/rule_option_types.h >+%%DYNAMIC%%src/snort_dynamicsrc/snort_debug.h > %%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.c > %%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.h > %%DYNAMIC%%src/snort_dynamicsrc/sf_base64decode.c >@@ -52,7 +52,11 @@ > %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.c > %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.h > %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preprocessor.h >+%%DYNAMIC%%src/snort_dynamicsrc/sf_email_attach_decode.h >+%%DYNAMIC%%src/snort_dynamicsrc/sf_email_attach_decode.c > %%DYNAMIC%%src/snort_dynamicsrc/sf_ip.h >+%%DYNAMIC%%src/snort_dynamicsrc/sf_decompression.h >+%%DYNAMIC%%src/snort_dynamicsrc/sf_protocols.h > %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_packet.h > %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_plugin_api.h > %%DYNAMIC%%src/snort_dynamicsrc/sf_types.h >@@ -64,8 +68,44 @@ > %%DYNAMIC%%src/snort_dynamicsrc/str_search.h > %%DYNAMIC%%src/snort_dynamicsrc/stream_api.h > %%DYNAMIC%%src/snort_dynamicsrc/treenodes.h >+%%DYNAMIC%%src/snort_dynamicsrc/util_unfold.h >+%%DYNAMIC%%src/snort_dynamicsrc/util_unfold.c >+%%DYNAMIC%%src/snort_dynamicsrc/Unified2_common.h > %%DYNAMIC%%@dirrmtry src/snort_dynamicsrc > %%DYNAMIC%%@dirrmtry src >+%%DYNAMIC%%include/snort/dynamic_preproc/ssl.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfcommon.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_preproc_info.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_snort_packet.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_protocols.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_snort_plugin_api.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_decompression.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfPolicyUserData.h >+%%DYNAMIC%%include/snort/dynamic_preproc/snort_debug.h >+%%DYNAMIC%%include/snort/dynamic_preproc/snort_bounds.h >+%%DYNAMIC%%include/snort/dynamic_preproc/cpuclock.h >+%%DYNAMIC%%include/snort/dynamic_preproc/profiler.h >+%%DYNAMIC%%include/snort/dynamic_preproc/bitop.h >+%%DYNAMIC%%include/snort/dynamic_preproc/mempool.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_sdlist_types.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_ip.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_common.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_engine.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_define.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_meta.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_preprocessor.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_preproc_lib.h >+%%DYNAMIC%%include/snort/dynamic_preproc/ipv6_port.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfPolicy.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_dir.h >+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_trie.h >+%%DYNAMIC%%include/snort/dynamic_preproc/obfuscation.h >+%%DYNAMIC%%include/snort/dynamic_preproc/stream_api.h >+%%DYNAMIC%%include/snort/dynamic_preproc/str_search.h >+%%DYNAMIC%%include/snort/dynamic_preproc/preprocids.h >+%%DYNAMIC%%@dirrmtry include/snort/dynamic_preproc >+@dirrmtry include/snort > %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so > %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so.0 > %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.la >@@ -75,6 +115,9 @@ > %%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so.0 > %%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so > %%DYNAMIC%%@dirrmtry lib/snort/dynamicrules >+%%DYNAMIC%%lib/snort/dynamic_preproc/libsf_dynamic_preproc.la >+%%DYNAMIC%%lib/snort/dynamic_preproc/libsf_dynamic_preproc.a >+%%DYNAMIC%%@dirrmtry lib/snort/dynamic_preproc > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.so > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.so.0 >@@ -84,9 +127,21 @@ > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.so >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.la >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.so >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.la >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.so >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.so.0 >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.so >+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.la > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so > %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so.0 >@@ -130,6 +185,7 @@ > %%PORTDOCS%%%%DOCSDIR%%/README.active > %%PORTDOCS%%%%DOCSDIR%%/README.alert_order > %%PORTDOCS%%%%DOCSDIR%%/README.asn1 >+%%PORTDOCS%%%%DOCSDIR%%/README.counts > %%PORTDOCS%%%%DOCSDIR%%/README.csv > %%PORTDOCS%%%%DOCSDIR%%/README.database > %%PORTDOCS%%%%DOCSDIR%%/README.daq >@@ -144,15 +200,19 @@ > %%PORTDOCS%%%%DOCSDIR%%/README.ftptelnet > %%PORTDOCS%%%%DOCSDIR%%/README.gre > %%PORTDOCS%%%%DOCSDIR%%/README.http_inspect >+%%PORTDOCS%%%%DOCSDIR%%/README.imap > %%PORTDOCS%%%%DOCSDIR%%/README.ipip > %%PORTDOCS%%%%DOCSDIR%%/README.ipv6 > %%PORTDOCS%%%%DOCSDIR%%/README.multipleconfigs > %%PORTDOCS%%%%DOCSDIR%%/README.normalize > %%PORTDOCS%%%%DOCSDIR%%/README.pcap_readmode >+%%PORTDOCS%%%%DOCSDIR%%/README.pop > %%PORTDOCS%%%%DOCSDIR%%/README.ppm > %%PORTDOCS%%%%DOCSDIR%%/README.reload >+%%PORTDOCS%%%%DOCSDIR%%/README.reputation > %%PORTDOCS%%%%DOCSDIR%%/README.sensitive_data > %%PORTDOCS%%%%DOCSDIR%%/README.sfportscan >+%%PORTDOCS%%%%DOCSDIR%%/README.sip > %%PORTDOCS%%%%DOCSDIR%%/README.ssh > %%PORTDOCS%%%%DOCSDIR%%/README.ssl > %%PORTDOCS%%%%DOCSDIR%%/README.stream5 >@@ -171,3 +231,4 @@ > %%PORTDOCS%%%%DOCSDIR%%/snort_schema_v106.pdf > %%PORTDOCS%%@dirrm %%DOCSDIR%% > libdata/pkgconfig/snort.pc >+libdata/pkgconfig/snort_preproc.pc
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 160044
: 117883