--- a/components/snort/snort.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/snort/snort.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,31 +32,29 @@
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2009/256 \
- value=PSARC/2013/113 value=PSARC/2014/347
+set name=org.opensolaris.arc-caseid value=PSARC/2009/256 value=PSARC/2013/113 \
+ value=PSARC/2014/347
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file etc/attribute_table.dtd path=etc/snort/attribute_table.dtd
-file etc/classification.config path=etc/snort/classification.config mode=0644 \
- original_name=SUNWsnort:etc/classification.config \
- overlay=allow preserve=renamenew
-file etc/gen-msg.map path=etc/snort/gen-msg.map
-file etc/reference.config path=etc/snort/reference.config mode=0644 \
- original_name=SUNWsnort:etc/reference.config \
- overlay=allow preserve=renamenew
file Solaris/auth_attr path=etc/security/auth_attr.d/snort
file Solaris/exec_attr path=etc/security/exec_attr.d/snort
-file etc/snort.conf path=etc/snort/snort.conf mode=0644 \
- original_name=SUNWsnort:etc/snort.conf \
- overlay=allow preserve=renamenew
-file etc/threshold.conf path=etc/snort/threshold.conf mode=0644 \
- original_name=SUNWsnort:etc/threshold.conf \
- overlay=allow preserve=renamenew
+file etc/attribute_table.dtd path=etc/snort/attribute_table.dtd
+file etc/classification.config path=etc/snort/classification.config mode=0644 \
+ original_name=SUNWsnort:etc/classification.config overlay=allow \
+ preserve=renamenew
+#
+file etc/file_magic.conf path=etc/snort/file_magic.conf
+file etc/gen-msg.map path=etc/snort/gen-msg.map
+dir path=etc/snort/preproc_rules
+file etc/reference.config path=etc/snort/reference.config mode=0644 \
+ original_name=SUNWsnort:etc/reference.config overlay=allow \
+ preserve=renamenew
# Directories for snort rules.
dir path=etc/snort/rules
+file etc/snort.conf path=etc/snort/snort.conf mode=0644 \
+ original_name=SUNWsnort:etc/snort.conf overlay=allow preserve=renamenew
dir path=etc/snort/so_rules
-dir path=etc/snort/preproc_rules
-#
-file etc/file_magic.conf path=etc/snort/file_magic.conf
+file etc/threshold.conf path=etc/snort/threshold.conf mode=0644 \
+ original_name=SUNWsnort:etc/threshold.conf overlay=allow preserve=renamenew
file etc/unicode.map path=etc/snort/unicode.map
file Solaris/snort.xml path=lib/svc/manifest/network/snort.xml
file Solaris/snortd path=lib/svc/method/snortd
@@ -68,14 +66,14 @@
file path=usr/include/snort/dynamic_output/output_common.h
file path=usr/include/snort/dynamic_output/output_lib.h
file path=usr/include/snort/dynamic_output/preprocids.h
+file path=usr/include/snort/dynamic_output/sfPolicy.h
file path=usr/include/snort/dynamic_output/sf_dynamic_common.h
file path=usr/include/snort/dynamic_output/sf_ip.h
file path=usr/include/snort/dynamic_output/sf_protocols.h
file path=usr/include/snort/dynamic_output/sf_snort_packet.h
-file path=usr/include/snort/dynamic_output/sfPolicy.h
+file path=usr/include/snort/dynamic_output/sfrt.h
file path=usr/include/snort/dynamic_output/sfrt_dir.h
file path=usr/include/snort/dynamic_output/sfrt_trie.h
-file path=usr/include/snort/dynamic_output/sfrt.h
file path=usr/include/snort/dynamic_output/snort_debug.h
file path=usr/include/snort/dynamic_output/stream_api.h
file path=usr/include/snort/dynamic_preproc/bitop.h
@@ -116,9 +114,9 @@
file path=usr/include/snort/dynamic_preproc/ssl.h
file path=usr/include/snort/dynamic_preproc/str_search.h
file path=usr/include/snort/dynamic_preproc/stream_api.h
+file path=usr/lib/$(MACH64)/pkgconfig/snort.pc
file path=usr/lib/$(MACH64)/pkgconfig/snort_output.pc
file path=usr/lib/$(MACH64)/pkgconfig/snort_preproc.pc
-file path=usr/lib/$(MACH64)/pkgconfig/snort.pc
#
link path=usr/lib/$(MACH64)/snort_dynamicengine/libsf_engine.so \
target=libsf_engine.so.0.0.0