PSARC/2014/388 rsyslog 8.4.2 s11-update
authorJames Chang <james.c.chang@Oracle.COM>
Tue, 09 Jun 2015 14:56:12 -0700
branchs11-update
changeset 4450 423f06e4bc35
parent 4449 7824aa88c6b2
child 4451 a9174862fe73
PSARC/2014/388 rsyslog 8.4.2 17506040 Upgrade rsyslog to 8.4.2 17928635 rsyslog Uncompression of a message failed with return code -3 19723420 problem in SERVICE/RSYSLOG 20573000 rsyslog man page missing attributes 18887444 Rsyslog does not deliver queued messages after restart.
components/libee/Makefile
components/libee/libee.p5m
components/libestr/Makefile
components/libestr/libestr.p5m
components/liblogging/Makefile
components/liblogging/liblogging.p5m
components/rsyslog/Makefile
components/rsyslog/files/rsyslog
components/rsyslog/files/rsyslog.xml
components/rsyslog/patches/plugins-imsolaris-imsolaris.c.patch
components/rsyslog/patches/runtime-parser.c.patch
components/rsyslog/patches/runtime-srutils.c.patch
components/rsyslog/patches/tcp-restart.patch
components/rsyslog/patches/tools-Makefile.in.patch
components/rsyslog/patches/tools-rsyslog.conf.patch
components/rsyslog/patches/tools-rsyslogd.8.patch
components/rsyslog/rsyslog-doc.license
components/rsyslog/rsyslog.p5m
--- a/components/libee/Makefile	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/libee/Makefile	Tue Jun 09 14:56:12 2015 -0700
@@ -23,15 +23,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libee
-COMPONENT_VERSION=	0.3.2
+COMPONENT_VERSION=	0.4.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.libee.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:4e19bf297fb76f18fef773c651767152ebf65ecd4a1f4b06fe1c5f117fa4f81a
+COMPONENT_ARCHIVE_HASH=	sha256:c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
-
-TPNO=			7585
+COMPONENT_BUGDB=	service/rsyslog
+TPNO=			20532
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -43,13 +42,20 @@
 # This is needed for the 64-bit library to be built correctly.
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
 # common targets
+configure:	$(CONFIGURE_32_and_64)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
-test:		$(TEST_32_and_64)
+# Tests are currently broken
+test:		$(NO_TESTS)
 
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 REQUIRED_PACKAGES += library/libestr
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/libee/libee.p5m	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/libee/libee.p5m	Tue Jun 09 14:56:12 2015 -0700
@@ -33,11 +33,8 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="Rainer Gerhards <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/197
+set name=org.opensolaris.arc-caseid value=PSARC/2012/197 value=PSARC/2014/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/include
-dir  path=usr/include/libee
 file path=usr/include/libee/apache.h
 file path=usr/include/libee/ctx.h
 file path=usr/include/libee/event.h
@@ -59,14 +56,10 @@
 file path=usr/include/libee/valnode.h
 file path=usr/include/libee/value.h
 file path=usr/include/libee/valuetype.h
-dir  path=usr/lib
-dir  path=usr/lib/$(MACH64)
 link path=usr/lib/$(MACH64)/libee.so target=libee.so.0
 file path=usr/lib/$(MACH64)/libee.so.0
-dir  path=usr/lib/$(MACH64)/pkgconfig
 file path=usr/lib/$(MACH64)/pkgconfig/libee.pc
 link path=usr/lib/libee.so target=libee.so.0
 file path=usr/lib/libee.so.0
-dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/libee.pc
 license libee.license license=LGPLv2.1
--- a/components/libestr/Makefile	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/libestr/Makefile	Tue Jun 09 14:56:12 2015 -0700
@@ -20,18 +20,18 @@
 #
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libestr
-COMPONENT_VERSION=	0.1.2
+COMPONENT_VERSION=	0.1.9
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://libestr.adiscon.com/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:0e8b95374fa271dc2afdfadfc9afc0f5826252a1b698ddea1474d5600a7c66ca
+COMPONENT_ARCHIVE_HASH=	sha256:822c6e2d01eaca1e72201f403a2ca01f3e86410b880e508e5204e3c2694d751a
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
-
-TPNO=			7585
+COMPONENT_BUGDB=	service/rsyslog
+TPNO=			20531
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -43,12 +43,18 @@
 # This is needed for the 64-bit library to be built correctly.
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
 # common targets
+configure:	$(CONFIGURE_32_and_64)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
-test:		$(TEST_32_and_64)
+# No longer seems to have tests
+test:		$(NO_TESTS)
 
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 REQUIRED_PACKAGES += system/library
--- a/components/libestr/libestr.p5m	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/libestr/libestr.p5m	Tue Jun 09 14:56:12 2015 -0700
@@ -34,19 +34,13 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="Rainer Gerhards <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/197
+set name=org.opensolaris.arc-caseid value=PSARC/2012/197 value=PSARC/2014/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/include
 file path=usr/include/libestr.h
-dir  path=usr/lib
-dir  path=usr/lib/$(MACH64)
 link path=usr/lib/$(MACH64)/libestr.so target=libestr.so.0
 file path=usr/lib/$(MACH64)/libestr.so.0
-dir  path=usr/lib/$(MACH64)/pkgconfig
 file path=usr/lib/$(MACH64)/pkgconfig/libestr.pc
 link path=usr/lib/libestr.so target=libestr.so.0
 file path=usr/lib/libestr.so.0
-dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/libestr.pc
 license libestr.license license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/liblogging/Makefile	Tue Jun 09 14:56:12 2015 -0700
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		liblogging
+COMPONENT_VERSION=	1.0.4
+COMPONENT_PROJECT_URL=	http://www.liblogging.org/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:aceb5d2aa8bdc771ff66f407f9adf4176b654db63e34a8605795b68be537b81c
+COMPONENT_ARCHIVE_URL=	\
+    http://download.rsyslog.com/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	service/rsyslog
+TPNO=			20535
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+# Means build only stdlog
+CONFIGURE_OPTIONS +=    --disable-journal
+
+# There are built man pages in the tarball, which we shall patch. Making them
+# here would require python-docutils.
+CONFIGURE_OPTIONS +=	--disable-man-pages
+CONFIGURE_OPTIONS +=    --bindir=$(USRBINDIR)
+
+# Set -m32 or -m64 correctly for 32 and 64 bit versions.
+CC +=	$(CC_BITS)
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+REQUIRED_PACKAGES += system/library
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/liblogging/liblogging.p5m	Tue Jun 09 14:56:12 2015 -0700
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="liblogging system logger library"
+set name=pkg.description \
+    value="The liblogging library offers an enhanced replacement for the syslog(3C) API, but retains its ease of use. It permits system administrators to direct application log output to different destinations without requiring application developers to rewrite their application."
+set name=com.oracle.info.description \
+    value="liblogging, an enhanced syslog(3C) API"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+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/2014/388
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/stdlogctl
+file path=usr/include/liblogging/stdlog.h
+link path=usr/lib/$(MACH64)/liblogging-stdlog.so \
+    target=liblogging-stdlog.so.0.0.0
+link path=usr/lib/$(MACH64)/liblogging-stdlog.so.0 \
+    target=liblogging-stdlog.so.0.0.0
+file path=usr/lib/$(MACH64)/liblogging-stdlog.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/liblogging-stdlog.pc
+link path=usr/lib/liblogging-stdlog.so target=liblogging-stdlog.so.0.0.0
+link path=usr/lib/liblogging-stdlog.so.0 target=liblogging-stdlog.so.0.0.0
+file path=usr/lib/liblogging-stdlog.so.0.0.0
+file path=usr/lib/pkgconfig/liblogging-stdlog.pc
+license COPYING license=BSD
--- a/components/rsyslog/Makefile	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/rsyslog/Makefile	Tue Jun 09 14:56:12 2015 -0700
@@ -21,27 +21,68 @@
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-COMPILER = gcc3
-
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		rsyslog
-COMPONENT_VERSION=	6.2.0
+COMPONENT_VERSION=	8.4.2
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://rsyslog.com/
+COMPONENT_PROJECT_URL=	http://www.rsyslog.com/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:f8869a1c25d0dd9ff04468743969ffc9ff89c6f7afa3046f77f91c3982543cc1
+COMPONENT_ARCHIVE_HASH=	sha256:71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/logger
+COMPONENT_BUGDB=	service/rsyslog
+
+TPNO=                   22636
 
-TPNO=			7585
+# The documentation is in a separate download
+COMPONENT_SRC_DOC=		$(COMPONENT_NAME)-doc-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE_DOC=		$(COMPONENT_SRC_DOC).tar.gz
+COMPONENT_ARCHIVE_HASH_DOC=	sha256:21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48
+COMPONENT_ARCHIVE_URL_DOC=	$(COMPONENT_PROJECT_URL)files/download/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE_DOC)
+
+UNPACK_ARGS_DOC=		-r $(COMPONENT_SRC_DOC)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+# Note: the following document unpacking directory may not be the same as those
+# in other branches due to differences in build tools.
+# In case the docs ever need patching, they are extracted before patching takes
+# place.The doc tarball does not unpack cleanly into its own directory.
+# Also, we only want the "build" directory inside of it.
+CLEAN_PATHS +=			$(COMPONENT_SRC_DOC)
+COMPONENT_POST_UNPACK_ACTION=	$(MKDIR) $(COMPONENT_SRC_DOC) ; \
+				cd $(COMPONENT_SRC_DOC) ; \
+				tar xf ../$(COMPONENT_ARCHIVE_DOC) build
+
+# Automake fix, regenerates configure file to get rid of the
+# automake 'probably too old' error. This fixes gmake test
+# needing more than one try to run. This does not fix the
+# fact that gmake test runs no tests.
+COMPONENT_PRE_CONFIGURE_ACTION= cd $(SOURCE_DIR); \
+				aclocal; \
+				autoconf; \
+				automake -a;
+
+# gmake test will generate different outputs if run multiple
+# times. This gets rid of all the unimportant output
+COMPONENT_TEST_TRANSFORMS += '-e "/\(CC\).*/d" '
+COMPONENT_TEST_TRANSFORMS += '-e "/\(make\).*/d" '
+COMPONENT_TEST_TRANSFORMS += '-e "/\(source\).*/d" '
+COMPONENT_TEST_TRANSFORMS += '-e "/\(check\).*/d" '
+COMPONENT_TEST_TRANSFORMS += '-e "/\(usr\).*/d" '
+COMPONENT_TEST_TRANSFORMS += '-e "/\(SOURCE_DIR\).*/d" '
+
+COMPILER =	gcc
 
 # This is needed for things to be built correctly.
-CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_ENV +=	CFLAGS="$(CFLAGS) -std=c99"
+
+# A normal 64-bit build would result in /usr/lib/$(MACH64)/rsyslog but since we
+# have a self-contained eco-system, simplify things for customers and just use
+# /usr/lib/rsyslog .
+CONFIGURE_LIBDIR.64 =	$(CONFIGURE_LIBDIR.32)
 
 CONFIGURE_OPTIONS +=    --enable-imsolaris
 CONFIGURE_OPTIONS +=    --enable-mail
@@ -50,24 +91,45 @@
 CONFIGURE_OPTIONS +=    --disable-klog
 CONFIGURE_OPTIONS +=    --sbindir=/usr/lib/rsyslog
 
+# libgcrypt is not approved.
+CONFIGURE_OPTIONS +=	--disable-libgcrypt
+CONFIGURE_OPTIONS +=	--enable-extended-tests
+
+# There are man pages in the tarball, which will require modification for
+# content. Also, building them from here requires python-docutils.
+CONFIGURE_OPTIONS +=	--disable-generate-man-pages
+
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+PROTODOCDIR=	$(PROTOUSRSHAREDIR)/doc/$(COMPONENT_NAME)
+# Docs to install are the tree under docs/build with some exceptions.
+install:	$(INSTALL_64)
+	$(MKDIR) $(PROTODOCDIR)
+	cd $(COMPONENT_SRC_DOC)/build ; \
+	find . \(    -name '_sources' \
+	          -o -name '.doctrees' \
+	          -o -name '.buildinfo' \
+	          -o -name 'objects.inv' \) \
+	     -prune -o -print0 \
+	| cpio -pd0u $(PROTODOCDIR)
 
-test:		$(TEST_32)
-
+# There are tests, but gmake test is currently broken. 
+# It was working in the previous version, but not sure why
+# it breaks now. Leaving it at no tests for now.
+test:		$(NO_TESTS)
 
 PKG_PROTO_DIRS +=	$(COMPONENT_DIR)/files
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)
 
-REQUIRED_PACKAGES += file/gnu-coreutils
 REQUIRED_PACKAGES += library/gnutls
-REQUIRED_PACKAGES += library/libee
+REQUIRED_PACKAGES += library/json-c
 REQUIRED_PACKAGES += library/libestr
+REQUIRED_PACKAGES += library/liblogging
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
-REQUIRED_PACKAGES += system/library/gcc-3-runtime
-REQUIRED_PACKAGES += system/library/gcc-45-runtime
-REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
--- a/components/rsyslog/files/rsyslog	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/rsyslog/files/rsyslog	Tue Jun 09 14:56:12 2015 -0700
@@ -1,25 +1,8 @@
 #!/usr/sbin/sh
 #
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /lib/svc/share/smf_include.sh
@@ -58,6 +41,7 @@
 	# previous crash dumps so that messages appear
 	# in chronological order.
 	#
+        # Need to be root to use savecore
 	/usr/bin/savecore -m
 	if [ -r /etc/dumpadm.conf ]; then
 		. /etc/dumpadm.conf
@@ -87,5 +71,4 @@
 	/usr/bin/chown $owner_group $LOGADM_CONF
 fi
 
-# The -c4 argument is needed to silence a compatibility warning.
-/usr/lib/rsyslog/rsyslogd -c4 >/dev/msglog 2>&1 &
+/usr/lib/rsyslog/rsyslogd >/dev/msglog 2>&1
--- a/components/rsyslog/files/rsyslog.xml	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/rsyslog/files/rsyslog.xml	Tue Jun 09 14:56:12 2015 -0700
@@ -1,26 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-    CDDL HEADER START
 
-    The contents of this file are subject to the terms of the
-    Common Development and Distribution License (the "License").
-    You may not use this file except in compliance with the License.
-
-    You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-    or http://www.opensolaris.org/os/licensing.
-    See the License for the specific language governing permissions
-    and limitations under the License.
-
-    When distributing Covered Code, include this CDDL HEADER in each
-    file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-    If applicable, add the following below this CDDL HEADER, with the
-    fields enclosed by brackets "[]" replaced with your own identifying
-    information: Portions Copyright [yyyy] [name of copyright owner]
-
-    CDDL HEADER END
    
-    Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 
     NOTE:  This service manifest is not editable; its contents will
     be overwritten by package or patch operations, including
@@ -41,7 +24,13 @@
 			type='method'
 			name='start'
 			exec='/lib/svc/method/rsyslog'
-			timeout_seconds='600' />
+			timeout_seconds='600'>
+			<method_context>
+			<method_credential
+			  user='root' group='root'
+			  privileges='basic,net_privaddr' />
+			</method_context>
+		</exec_method>
 
 		<template>
 			<common_name>
--- a/components/rsyslog/patches/plugins-imsolaris-imsolaris.c.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- rsyslog/plugins/imsolaris/imsolaris.c.orig	Mon Jan  9 06:05:17 2012
-+++ rsyslog/plugins/imsolaris/imsolaris.c	Thu Mar  1 12:55:01 2012
[email protected]@ -392,9 +392,9 @@
- 
- 	/* register config file handlers */
- 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
--		resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
-+		resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjGlobal));
-         CHKiRet(omsdRegCFSLineHdlr((uchar *)"imsolarislogsocketname", 0, eCmdHdlrGetWord,
--                NULL, &LogName, STD_LOADABLE_MODULE_ID));
-+                NULL, &LogName, STD_LOADABLE_MODULE_ID, eConfObjGlobal));
- ENDmodInit
- /* vim:set ai:
-  */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rsyslog/patches/runtime-parser.c.patch	Tue Jun 09 14:56:12 2015 -0700
@@ -0,0 +1,19 @@
+# This patch is a fix for proper uncompression 
+# source: written internally
+# Should be sent upstream, but hasn't been.
+# Bug has existed a long time (probably since rsyslog implemented compression),
+# last noticed in 8.4.0
+--- rsyslog/runtime/parser.c	2014-08-18 02:14:06.000000000 -0700
++++ rsyslog/runtime/parser.c	2014-09-18 14:46:49.068679264 -0700
[email protected]@ -336,8 +336,10 @@
+ 
+ 	/* we first need to check if we have a compressed record. If so,
+ 	 * we must decompress it.
++	 * If NO_PRI_IN_RAW is set, this is a local Solaris message and
++	 * therefore not compressed (though it may well begin with 'z'!).
+ 	 */
+-	if(lenMsg > 0 && *pszMsg == 'z') { /* compressed data present? (do NOT change order if conditions!) */
++	if(lenMsg > 0 && *pszMsg == 'z' && pMsg->msgFlags & NO_PRI_IN_RAW == 0) { /* compressed data present? (do NOT change order if conditions!) */
+ 		/* we have compressed data, so let's deflate it. We support a maximum
+ 		 * message size of iMaxLine. If it is larger, an error message is logged
+ 		 * and the message is dropped. We do NOT try to decompress larger messages
--- a/components/rsyslog/patches/runtime-srutils.c.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- rsyslog/runtime/srutils.c	Mon Jan  9 06:05:17 2012
-+++ rsyslog/runtime/srutils.c	Thu May 24 11:11:58 2012
[email protected]@ -76,6 +76,9 @@
- #	define LOG_AUTHPRIV LOG_AUTH
- #endif
- syslogName_t	syslogFacNames[] = {
-+#if defined(LOG_AUDIT)
-+	{"audit",        LOG_AUDIT},
-+#endif
- 	{"auth",         LOG_AUTH},
- 	{"authpriv",     LOG_AUTHPRIV},
- 	{"cron",         LOG_CRON},
--- a/components/rsyslog/patches/tcp-restart.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-# This patch is to fix:
-# 16134419 rsyslogd forwarding over TCP does not detect server restart
-# which was fixed in upstream version 6.4.1; this patch is a minor variant
-# on the upstream patch, adapted for 6.2.0 .  This can go away once we
-# upgrade to 6.4.1 or later, except for the CheckConnection() part in
-# runtime/netstrm.c which needs to make sure to return a value, as there
-# was a bug in the 6.4.1 code that failed to do this:
-# http://bugzilla.adiscon.com/show_bug.cgi?id=511
-
---- rsyslog/runtime/netstrm.c.orig	2012-01-09 06:05:45.000000000 -0800
-+++ rsyslog/runtime/netstrm.c	2014-01-29 10:16:47.131765870 -0800
[email protected]@ -250,11 +250,13 @@
- 
- 
- /* check connection - slim wrapper for NSD driver function */
--static void
-+static rsRetVal
- CheckConnection(netstrm_t *pThis)
- {
-+	DEFiRet;
- 	ISOBJ_TYPE_assert(pThis, netstrm);
--	pThis->Drvr.CheckConnection(pThis->pDrvrData);
-+	iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData);
-+	RETiRet;
- }
- 
- 
---- rsyslog/runtime/netstrm.h~	2011-12-01 02:26:19.000000000 -0800
-+++ rsyslog/runtime/netstrm.h	2013-12-02 09:30:45.155766988 -0800
[email protected]@ -53,7 +53,7 @@
- 	rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode);
- 	rsRetVal (*SetDrvrAuthMode)(netstrm_t *pThis, uchar*);
- 	rsRetVal (*SetDrvrPermPeers)(netstrm_t *pThis, permittedPeers_t*);
--	void     (*CheckConnection)(netstrm_t *pThis);	/* This is a trick mostly for plain tcp syslog */
-+	rsRetVal (*CheckConnection)(netstrm_t *pThis);	/* This is a trick mostly for plain tcp syslog */
- 	/* the GetSock() below is a hack to make imgssapi work. In the long term,
- 	 * we should migrate imgssapi to a stream driver, which will relieve us of
- 	 * this problem. Please note that nobody else should use GetSock(). Using it 
[email protected]@ -72,9 +72,10 @@
- 	/* v4 */
- 	rsRetVal (*EnableKeepAlive)(netstrm_t *pThis);
- ENDinterface(netstrm)
--#define netstrmCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */
-+#define netstrmCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */
- /* interface version 3 added GetRemAddr()
-  * interface version 4 added EnableKeepAlive() -- rgerhards, 2009-06-02
-+ * interface version 5 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06
-  * */
- 
- /* prototypes */
---- rsyslog/runtime/nsd.h.orig	2012-01-09 06:05:45.000000000 -0800
-+++ rsyslog/runtime/nsd.h	2013-12-02 09:21:26.146155301 -0800
[email protected]@ -65,7 +65,7 @@
- 	rsRetVal (*SetMode)(nsd_t *pThis, int mode); /* sets a driver specific mode - see driver doc for details */
- 	rsRetVal (*SetAuthMode)(nsd_t *pThis, uchar*); /* sets a driver specific mode - see driver doc for details */
- 	rsRetVal (*SetPermPeers)(nsd_t *pThis, permittedPeers_t*); /* sets driver permitted peers for auth needs */
--	void     (*CheckConnection)(nsd_t *pThis);	/* This is a trick mostly for plain tcp syslog */
-+	rsRetVal (*CheckConnection)(nsd_t *pThis);	/* This is a trick mostly for plain tcp syslog */
- 	rsRetVal (*GetSock)(nsd_t *pThis, int *pSock);
- 	rsRetVal (*SetSock)(nsd_t *pThis, int sock);
- 	/* GetSock() and SetSock() return an error if the driver does not use plain
[email protected]@ -82,9 +82,10 @@
- 	/* v5 */
- 	rsRetVal (*EnableKeepAlive)(nsd_t *pThis);
- ENDinterface(nsd)
--#define nsdCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */
-+#define nsdCURR_IF_VERSION 6 /* increment whenever you change the interface structure! */
- /* interface version 4 added GetRemAddr()
-  * interface version 5 added EnableKeepAlive() -- rgerhards, 2009-06-02
-+ * interface version 6 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06
-  */
- 
- /* interface  for the select call */
---- rsyslog/runtime/nsd_gtls.c~	2012-01-09 06:05:45.000000000 -0800
-+++ rsyslog/runtime/nsd_gtls.c	2013-12-02 10:14:55.324156585 -0800
[email protected]@ -1310,13 +1310,16 @@
-  * This is a dummy here. For details, check function common in ptcp driver.
-  * rgerhards, 2008-06-09
-  */
--static void
-+static rsRetVal
- CheckConnection(nsd_t __attribute__((unused)) *pNsd)
- {
-+	DEFiRet;
- 	nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
- 	ISOBJ_TYPE_assert(pThis, nsd_gtls);
- 
--	nsd_ptcp.CheckConnection(pThis->pTcp);
-+	CHKiRet(nsd_ptcp.CheckConnection(pThis->pTcp));
-+finalize_it:
-+	RETiRet;
- }
- 
- 
---- rsyslog/runtime/nsd_ptcp.c~	2012-01-09 06:05:17.000000000 -0800
-+++ rsyslog/runtime/nsd_ptcp.c	2013-12-02 10:13:48.561929979 -0800
[email protected]@ -726,9 +726,10 @@
-  * http://blog.gerhards.net/2008/06/getting-bit-more-reliability-from-plain.html
-  * rgerhards, 2008-06-09
-  */
--static void
-+static rsRetVal
- CheckConnection(nsd_t *pNsd)
- {
-+	DEFiRet;
- 	int rc;
- 	char msgbuf[1]; /* dummy */
- 	nsd_ptcp_t *pThis = (nsd_ptcp_t*) pNsd;
[email protected]@ -741,7 +742,10 @@
- 		 * need to close our side, too.
- 		 */
- 		sockClose(&pThis->sock);
-+		ABORT_FINALIZE(RS_RET_IO_ERROR);
- 	}
-+finalize_it:
-+	RETiRet;
- }
- 
- 
---- rsyslog/tools/omfwd.c.orig	2012-01-09 06:05:45.000000000 -0800
-+++ rsyslog/tools/omfwd.c	2013-12-02 09:01:51.293926230 -0800
[email protected]@ -310,7 +310,7 @@
- 
- 	alreadySent = 0;
- dbgprintf("omfwd: XXXX: pData %p, pNetStrm %p\n", pData, pData->pNetstrm);
--	netstrm.CheckConnection(pData->pNetstrm); /* hack for plain tcp syslog - see ptcp driver for details */
-+	CHKiRet(netstrm.CheckConnection(pData->pNetstrm)); /* hack for plain tcp syslog - see ptcp driver for details */
- 	while(alreadySent != len) {
- 		lenSend = len - alreadySent;
- 		CHKiRet(netstrm.Send(pData->pNetstrm, buf+alreadySent, &lenSend));
[email protected]@ -319,6 +319,12 @@
- 	}
- 
- finalize_it:
-+	if(iRet != RS_RET_OK) {
-+		/* error! */
-+		dbgprintf("TCPSendBuf error %d, destruct TCP Connection!\n", iRet);
-+		DestructTCPInstanceData(pData);
-+		iRet = RS_RET_SUSPENDED;
-+	}
- 	RETiRet;
- }
- 
[email protected]@ -363,6 +369,7 @@
- {
- 	DEFiRet;
- 	instanceData *pData = (instanceData *) pvData;
-+	dbgprintf("TCPSendPrepRetry performs a DestructTCPInstanceData\n");
- 
- 	assert(pData != NULL);
- 	DestructTCPInstanceData(pData);
[email protected]@ -380,6 +387,7 @@
- 
- 	assert(pData != NULL);
- 	if(pData->pNetstrm == NULL) {
-+		dbgprintf("TCPSendInit CREATE\n");
- 		CHKiRet(netstrms.Construct(&pData->pNS));
- 		/* the stream driver must be set before the object is finalized! */
- 		CHKiRet(netstrms.SetDrvrName(pData->pNS, cs.pszStrmDrvr));
[email protected]@ -403,6 +411,7 @@
- 
- finalize_it:
- 	if(iRet != RS_RET_OK) {
-+		dbgprintf("TCPSendInit FAILED with %d.\n", iRet);
- 		DestructTCPInstanceData(pData);
- 	}
- 
--- a/components/rsyslog/patches/tools-Makefile.in.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- rsyslog/tools/Makefile.in	Mon Jan  9 06:15:51 2012
-+++ rsyslog/tools/Makefile.in	Thu Feb 16 11:23:14 2012
[email protected]@ -339,7 +339,7 @@
- 	../dirty.h
- 
- rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
--rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS)
-+rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
- rsyslogd_LDFLAGS = -export-dynamic
- @[email protected]_diag_hostname_SOURCES = gethostn.c
- @[email protected]_SOURCES = zpipe.c
--- a/components/rsyslog/patches/tools-rsyslog.conf.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
---- rsyslog/tools/rsyslog.conf.5	Thu Dec  1 02:26:19 2011
-+++ rsyslog/tools/rsyslog.conf.5	Fri May 25 11:09:56 2012
[email protected]@ -17,27 +17,23 @@
- .\" along with this program; if not, write to the Free Software
- .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- .\"
--.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration"
-+.TH RSYSLOG.CONF 4 "16 May 2012" "Version 6.2.0" "File Formats"
- .SH NAME
--rsyslog.conf \- rsyslogd(8) configuration file
-+rsyslog.conf \- rsyslogd(1M) configuration file
- .SH DESCRIPTION
- The
- .I rsyslog.conf
- file is the main configuration file for the
--.BR rsyslogd (8)
-+.BR rsyslogd (1M)
- which logs system messages on *nix systems.  This file specifies rules
- for logging.  For special features see the
--.BR rsyslogd (8)
--manpage. Rsyslog.conf is backward-compatible with sysklogd's syslog.conf file. So if you migrate
--from sysklogd you can rename it and it should work.
-+.BR rsyslogd (1M)
-+manpage.
- 
--.B Note that this version of rsyslog ships with extensive documentation in html format.
--This is provided in the ./doc subdirectory and probably
--in a separate package if you installed rsyslog via a packaging system.
- To use rsyslog's advanced features, you
- .B need
--to look at the html documentation, because the man pages only cover
--basic aspects of operation.
-+to look at the online documentation at http://www.rsyslog.com/doc,
-+because the man pages only cover basic aspects of operation.
- 
- 
- .SH MODULES
[email protected]@ -184,7 +180,7 @@
- priority and higher are logged according to the given action. Rsyslogd behaves
- the same, but has some extensions.
- 
--In addition to the above mentioned names the rsyslogd(8) understands the
-+In addition to the above mentioned names the rsyslogd(1M) understands the
- following extensions: An asterisk ('*') stands for all facilities or all
- priorities, depending on where it is used (before or after the period). The
- keyword none stands for no priority of the given facility.
[email protected]@ -231,10 +227,10 @@
- .RE
- 
- .SS Named pipes
--This version of rsyslogd(8) has support for logging output to named pipes (fifos). A fifo or 
-+This version of rsyslogd(1M) has support for logging output to named pipes (fifos). A fifo or 
- named pipe can be used as a destination for log messages by prepending a pipe symbol ('|') 
- to the name of the file. This is handy for debugging. Note that the fifo must be created with 
--the mkfifo(1) command before rsyslogd(8) is started.
-+the mkfifo(1) command before rsyslogd(1M) is started.
- 
- .SS Terminal and console
- If the file you specified is a tty, special tty-handling is done, same with /dev/console.
[email protected]@ -426,7 +422,8 @@
- 
- Properties can be accessed by the property replacer (see there for details).
- 
--.B Please note that templates can also by used to generate selector lines with dynamic file names.
-+.B Please note
-+that templates can also be used to generate selector lines with dynamic file names.
- For example, if you would like to split syslog messages from different hosts 
- to different files (one per host), you can define the following template:
- 
[email protected]@ -472,7 +469,8 @@
- that several vendors have violated the sql standard and introduced their own 
- escape methods, it is impossible to have a single option doing all the work.  
- So you yourself must make sure you are using the right format.
--.B If you choose the wrong one, you are still vulnerable to sql injection.
-+.B If you choose the wrong one,
-+you are still vulnerable to sql injection.
- 
- Please note that the database writer *checks* that the sql option is present 
- in the template. If it is not present, the write database action is disabled. 
[email protected]@ -758,9 +756,9 @@
- .B rsyslogd
- 
- .SH SEE ALSO
--.BR rsyslogd (8),
-+.BR rsyslogd (1M),
- .BR logger (1),
--.BR syslog (3)
-+.BR syslog (3C)
- 
- The complete documentation can be found in the doc folder of the rsyslog distribution or online at
- 
--- a/components/rsyslog/patches/tools-rsyslogd.8.patch	Mon Jun 08 13:37:19 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-# Solaris-specific patch. Not going upstream.
-# Covers Solaris-specific configuration and makes it compatible with nroff.
---- rsyslog/tools/rsyslogd.8	2011-04-18 06:36:33.000000000 -0700
-+++ rsyslog/tools/rsyslogd.8	2014-10-14 09:41:01.559928606 -0700
[email protected]@ -1,7 +1,8 @@
-+'\" te
- .\" Copyright 2004-2008 Rainer Gerhards and Adiscon for the rsyslog modifications
- .\" May be distributed under the GNU General Public License
- .\"
--.TH RSYSLOGD 8 "29 July 2008" "Version 3.21.1" "Linux System Administration"
-+.TH RSYSLOGD 1M "16 May 2012" "Version 6.2.0" "System Administration Commands"
- .SH NAME
- rsyslogd \- reliable and extended syslogd 
- .SH SYNOPSIS
[email protected]@ -44,17 +45,16 @@
- unix domain sockets enables this utility to support both local
- and remote logging.
- 
--.B Note that this version of rsyslog ships with extensive documentation in html format.
--This is provided in the ./doc subdirectory and probably
--in a separate package if you installed rsyslog via a packaging system.
-+.B "Note that this version of rsyslog ships with extensive documentation in html format."
-+This is provided in the /usr/share/doc/rsyslog directory.
- To use rsyslog's advanced features, you
- .B need
- to look at the html documentation, because the man pages only cover
- basic aspects of operation.
--.B For details and configuration examples, see the rsyslog.conf (5)
--.B man page and the online documentation at http://www.rsyslog.com/doc
-+.B "For details and configuration examples, see the rsyslog.conf (4)"
-+.B "man page and the online documentation at http://www.rsyslog.com/doc"
- 
--.BR Rsyslogd (8)
-+.BR rsyslogd (1M)
- is derived from the sysklogd package which in turn is derived from the
- stock BSD sources.
- 
[email protected]@ -93,9 +93,9 @@
- 
- .LP
- .SH OPTIONS
--.B Note that in version 3 of rsyslog a number of command line options
--.B have been deprecated and replaced with config file directives. The
--.B -c option controls the backward compatibility mode in use.
-+.B "Note that in version 3 of rsyslog a number of command line options"
-+.B "have been deprecated and replaced with config file directives. The"
-+.B "-c option controls the backward compatibility mode in use."
- .TP
- .BI "\-A"
- When sending UDP messages, there are potentially multiple paths to
[email protected]@ -132,8 +132,8 @@
- is the rsyslog version that it shall be
- compatible with. Using -c0 tells rsyslog to be command-line compatible
- to sysklogd, which is the default if -c is not given.
--.B Please note that rsyslogd issues warning messages if the -c3
--.B command line option is not given.
-+.B "Please note that rsyslogd issues warning messages if the -c3"
-+.B "command line option is not given."
- This is to alert you that your are running in compatibility
- mode. Compatibility mode interferes with your rsyslog.conf commands and
- may cause some undesired side-effects. It is meant to be used with a
[email protected]@ -170,7 +170,8 @@
- Avoid auto-backgrounding.  This is needed especially if the
- .B rsyslogd
- is started and controlled by
--.BR init (8).
-+.BR init (1M),
-+which is not the case on Solaris.
- .TP
- .B "\-N " "level"
- Do a coNfig check. Do NOT run in regular mode, just check configuration
[email protected]@ -181,9 +182,6 @@
- not specifying the -N option at all (so this makes limited sense) and
- 1 actually activates the code. Later, higher levels will mean more
- verbosity (this is a forward-compatibility option).
--.B rsyslogd
--is started and controlled by
--.BR init (8).
- .TP
- .BI "\-q " "add hostname if DNS fails during ACL processing"
- During ACL processing, hostnames are resolved to IP addresses for
[email protected]@ -257,7 +255,7 @@
- operation and should only be done when actually necessary. Actually, it is
- a rsyslgod stop immediately followed by a restart. Future versions will remove
- this restart functionality of HUP (it will go away in v5). So it is advised to use
--HUP only for closing files, and a "real restart" (e.g. /etc/rc.d/rsyslogd restart)
-+HUP only for closing files, and a "real restart" (e.g. svcadm restart svc:/system/system-log:rsyslog)
- to activate configuration changes.
- .TP
- .B TERM ", " INT ", " QUIT
[email protected]@ -330,12 +328,10 @@
- The file containing the process id of 
- .BR rsyslogd .
- .TP
--.I prefix/lib/rsyslog
-+.I /usr/lib/rsyslog
- Default directory for
- .B rsyslogd
--modules. The
--.I prefix
--is specified during compilation (e.g. /usr/local).
-+modules.
- .SH ENVIRONMENT
- .TP
- .B RSYSLOG_DEBUG
[email protected]@ -378,20 +374,42 @@
- .B RSYSLOG_MODDIR
- Provides the default directory in which loadable modules reside.
- .PD
--.SH BUGS
--Please review the file BUGS for up-to-date information on known
--bugs and annoyances.
- .SH Further Information
- Please visit
- .BR http://www.rsyslog.com/doc
- for additional information, tutorials and a support forum.
-+.SH ATTRIBUTES
-+.sp
-+.LP
-+See \fBattributes\fR(5) for descriptions of the following attributes:
-+.sp
-+
-+.sp
-+.TS
-+tab() box;
-+cw(2.75i) |cw(2.75i) 
-+lw(2.75i) |lw(2.75i) 
-+.
-+ATTRIBUTE TYPEATTRIBUTE VALUE
-+_
-+Availabilitypkg:/system/rsyslog
-+_
-+Servicesvc:/system/system-log:rsyslog
-+.TE
-+
-+.SH Solaris Usage
-+The rsyslog instance of the system-log service is not enabled by default.
-+To enable it, first "svcadm disable svc:/system/system-log:default", then
-+"svcadm enable svc:/system/system-log:rsyslog".  If you wish to enable log
-+rotation, then add each file referenced in
-+.BR rsyslog.conf(4)
-+to /etc/logadm.conf.
- .SH SEE ALSO
--.BR rsyslog.conf (5),
-+.BR rsyslog.conf (4),
- .BR logger (1),
--.BR syslog (2),
--.BR syslog (3),
--.BR services (5),
--.BR savelog (8)
-+.BR syslog (3C),
-+.BR services (4)
-+.BR logadm.conf (4)
- .LP
- .SH COLLABORATORS
- .B rsyslogd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rsyslog/rsyslog-doc.license	Tue Jun 09 14:56:12 2015 -0700
@@ -0,0 +1,175 @@
+-------------------------------------------------------------------------------
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
--- a/components/rsyslog/rsyslog.p5m	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/rsyslog/rsyslog.p5m	Tue Jun 09 14:56:12 2015 -0700
@@ -24,7 +24,8 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
-<transform file path=usr/share/doc/rsyslog/(.+)$ -> set action.hash doc/%<1> >
+<transform file path=usr/lib/rsyslog/.*\.so -> \
+    add pkg.linted.userland.action001.2 true>
 set name=pkg.fmri \
     value=pkg:/system/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="reliable and extended syslogd"
@@ -38,9 +39,9 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="Rainer Gerhards"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/197
+set name=org.opensolaris.arc-caseid value=PSARC/2012/197 value=PSARC/2014/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file rsyslog.conf-solaris path=etc/rsyslog.conf group=sys mode=0644 \
+file rsyslog.conf-solaris path=etc/rsyslog.conf owner=root mode=0644 \
     overlay=allow preserve=true
 file rsyslog.xml path=lib/svc/manifest/system/rsyslog.xml
 file rsyslog path=lib/svc/method/rsyslog
@@ -60,154 +61,267 @@
 file path=usr/lib/rsyslog/lmtcpclt.so
 file path=usr/lib/rsyslog/lmtcpsrv.so
 file path=usr/lib/rsyslog/lmzlibw.so
+file path=usr/lib/rsyslog/mmexternal.so
 file path=usr/lib/rsyslog/omgssapi.so
 file path=usr/lib/rsyslog/ommail.so
-file path=usr/lib/rsyslog/omruleset.so
 file path=usr/lib/rsyslog/omtesting.so
 file path=usr/lib/rsyslog/rsyslogd mode=0555
-file path=usr/share/doc/rsyslog/bugs.html
-file path=usr/share/doc/rsyslog/build_from_repo.html
-file path=usr/share/doc/rsyslog/contributors.html
-file path=usr/share/doc/rsyslog/dataflow.png
-file path=usr/share/doc/rsyslog/debug.html
-file path=usr/share/doc/rsyslog/dev_queue.html
-file path=usr/share/doc/rsyslog/direct_queue0.png
-file path=usr/share/doc/rsyslog/direct_queue1.png
-file path=usr/share/doc/rsyslog/direct_queue2.png
-file path=usr/share/doc/rsyslog/direct_queue3.png
-file path=usr/share/doc/rsyslog/direct_queue_directq.png
-file path=usr/share/doc/rsyslog/direct_queue_rsyslog.png
-file path=usr/share/doc/rsyslog/direct_queue_rsyslog2.png
-file path=usr/share/doc/rsyslog/droppriv.html
-file path=usr/share/doc/rsyslog/expression.html
+dir  path=usr/share/doc/rsyslog
+dir  path=usr/share/doc/rsyslog/_downloads
+file path=usr/share/doc/rsyslog/_downloads/rsyslog-example.conf
+dir  path=usr/share/doc/rsyslog/_images
+file path=usr/share/doc/rsyslog/_images/dataflow.png
+file path=usr/share/doc/rsyslog/_images/direct_queue0.png
+file path=usr/share/doc/rsyslog/_images/direct_queue1.png
+file path=usr/share/doc/rsyslog/_images/direct_queue2.png
+file path=usr/share/doc/rsyslog/_images/direct_queue3.png
+file path=usr/share/doc/rsyslog/_images/direct_queue_directq.png
+file path=usr/share/doc/rsyslog/_images/direct_queue_rsyslog.png
+file path=usr/share/doc/rsyslog/_images/direct_queue_rsyslog2.png
+file path=usr/share/doc/rsyslog/_images/gssapi.png
+file path=usr/share/doc/rsyslog/_images/module_workflow.png
+file path=usr/share/doc/rsyslog/_images/queueWorkerLogic.jpg
+file path=usr/share/doc/rsyslog/_images/queue_analogy_tv.png
+file path=usr/share/doc/rsyslog/_images/rfc5424layers.png
+file path=usr/share/doc/rsyslog/_images/rsyslog_confgraph_complex.png
+file path=usr/share/doc/rsyslog/_images/rsyslog_confgraph_std.png
+file path=usr/share/doc/rsyslog/_images/tls_cert.jpg
+file path=usr/share/doc/rsyslog/_images/tls_cert_100.jpg
+file path=usr/share/doc/rsyslog/_images/tls_cert_ca.jpg
+dir  path=usr/share/doc/rsyslog/_static
+file path=usr/share/doc/rsyslog/_static/ajax-loader.gif
+file path=usr/share/doc/rsyslog/_static/basic.css
+file path=usr/share/doc/rsyslog/_static/comment-bright.png
+file path=usr/share/doc/rsyslog/_static/comment-close.png
+file path=usr/share/doc/rsyslog/_static/comment.png
+file path=usr/share/doc/rsyslog/_static/default.css
+file path=usr/share/doc/rsyslog/_static/doctools.js
+file path=usr/share/doc/rsyslog/_static/down-pressed.png
+file path=usr/share/doc/rsyslog/_static/down.png
+file path=usr/share/doc/rsyslog/_static/file.png
+file path=usr/share/doc/rsyslog/_static/jquery.js
+file path=usr/share/doc/rsyslog/_static/minus.png
+file path=usr/share/doc/rsyslog/_static/plus.png
+file path=usr/share/doc/rsyslog/_static/pygments.css
+file path=usr/share/doc/rsyslog/_static/rsyslog.css
+file path=usr/share/doc/rsyslog/_static/searchtools.js
+file path=usr/share/doc/rsyslog/_static/sidebar.js
+file path=usr/share/doc/rsyslog/_static/underscore.js
+file path=usr/share/doc/rsyslog/_static/up-pressed.png
+file path=usr/share/doc/rsyslog/_static/up.png
+file path=usr/share/doc/rsyslog/_static/websupport.js
+file path=usr/share/doc/rsyslog/community.html
+dir  path=usr/share/doc/rsyslog/compatibility
+file path=usr/share/doc/rsyslog/compatibility/index.html
+file path=usr/share/doc/rsyslog/compatibility/v3compatibility.html
+file path=usr/share/doc/rsyslog/compatibility/v4compatibility.html
+file path=usr/share/doc/rsyslog/compatibility/v5compatibility.html
+file path=usr/share/doc/rsyslog/compatibility/v6compatibility.html
+file path=usr/share/doc/rsyslog/compatibility/v7compatibility.html
+file path=usr/share/doc/rsyslog/compatibility/v8compatibility.html
+dir  path=usr/share/doc/rsyslog/concepts
+file path=usr/share/doc/rsyslog/concepts/index.html
+file path=usr/share/doc/rsyslog/concepts/janitor.html
+file path=usr/share/doc/rsyslog/concepts/messageparser.html
+file path=usr/share/doc/rsyslog/concepts/multi_ruleset.html
+file path=usr/share/doc/rsyslog/concepts/netstrm_drvr.html
+file path=usr/share/doc/rsyslog/concepts/ns_gtls.html
+file path=usr/share/doc/rsyslog/concepts/ns_ptcp.html
+file path=usr/share/doc/rsyslog/concepts/queues.html
+dir  path=usr/share/doc/rsyslog/configuration
+dir  path=usr/share/doc/rsyslog/configuration/action
+file path=usr/share/doc/rsyslog/configuration/action/index.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_actionexeconlywhenpreviousissuspended.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_actionresumeinterval.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_dirgroup.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_dirowner.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_dynafilecachesize.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_filecreatemode.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_filegroup.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_fileowner.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_gssforwardservicename.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_gssmode.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_omfileforcechown.html
+file path=usr/share/doc/rsyslog/configuration/action/rsconf1_repeatedmsgreduction.html
+file path=usr/share/doc/rsyslog/configuration/actions.html
+file path=usr/share/doc/rsyslog/configuration/basic_structure.html
+file path=usr/share/doc/rsyslog/configuration/config_param_types.html
+file path=usr/share/doc/rsyslog/configuration/cryprov_gcry.html
+file path=usr/share/doc/rsyslog/configuration/droppriv.html
+file path=usr/share/doc/rsyslog/configuration/examples.html
+file path=usr/share/doc/rsyslog/configuration/filters.html
+dir  path=usr/share/doc/rsyslog/configuration/global
+file path=usr/share/doc/rsyslog/configuration/global/index.html
+dir  path=usr/share/doc/rsyslog/configuration/global/options
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_abortonuncleanconfig.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_debugprintcfsyslinehandlerlist.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_debugprintmodulelist.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_debugprinttemplatelist.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_failonchownfailure.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_generateconfiggraph.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_includeconfig.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_mainmsgqueuesize.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_maxopenfiles.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_moddir.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_modload.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_resetconfigvariables.html
+file path=usr/share/doc/rsyslog/configuration/global/options/rsconf1_umask.html
+file path=usr/share/doc/rsyslog/configuration/index.html
+file path=usr/share/doc/rsyslog/configuration/index_directives.html
+file path=usr/share/doc/rsyslog/configuration/input.html
+dir  path=usr/share/doc/rsyslog/configuration/input_directives
+file path=usr/share/doc/rsyslog/configuration/input_directives/index.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_allowedsender.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_controlcharacterescapeprefix.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_droptrailinglfonreception.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_escape8bitcharsonreceive.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_escapecontrolcharactersonreceive.html
+file path=usr/share/doc/rsyslog/configuration/input_directives/rsconf1_markmessageperiod.html
+file path=usr/share/doc/rsyslog/configuration/ipv6.html
+dir  path=usr/share/doc/rsyslog/configuration/modules
+file path=usr/share/doc/rsyslog/configuration/modules/gssapi.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_input.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_library.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_messagemod.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_output.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_parser.html
+file path=usr/share/doc/rsyslog/configuration/modules/idx_stringgen.html
+file path=usr/share/doc/rsyslog/configuration/modules/im3195.html
+file path=usr/share/doc/rsyslog/configuration/modules/imfile.html
+file path=usr/share/doc/rsyslog/configuration/modules/imgssapi.html
+file path=usr/share/doc/rsyslog/configuration/modules/imjournal.html
+file path=usr/share/doc/rsyslog/configuration/modules/imklog.html
+file path=usr/share/doc/rsyslog/configuration/modules/imkmsg.html
+file path=usr/share/doc/rsyslog/configuration/modules/impstats.html
+file path=usr/share/doc/rsyslog/configuration/modules/imptcp.html
+file path=usr/share/doc/rsyslog/configuration/modules/imrelp.html
+file path=usr/share/doc/rsyslog/configuration/modules/imsolaris.html
+file path=usr/share/doc/rsyslog/configuration/modules/imtcp.html
+file path=usr/share/doc/rsyslog/configuration/modules/imudp.html
+file path=usr/share/doc/rsyslog/configuration/modules/imuxsock.html
+file path=usr/share/doc/rsyslog/configuration/modules/index.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmanon.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmcount.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmexternal.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmfields.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmjsonparse.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmnormalize.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmpstrucdata.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmrfc5424addhmac.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmsequence.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmsnmptrapd.html
+file path=usr/share/doc/rsyslog/configuration/modules/mmutf8fix.html
+file path=usr/share/doc/rsyslog/configuration/modules/omelasticsearch.html
+file path=usr/share/doc/rsyslog/configuration/modules/omfile.html
+file path=usr/share/doc/rsyslog/configuration/modules/omfwd.html
+file path=usr/share/doc/rsyslog/configuration/modules/omhdfs.html
+file path=usr/share/doc/rsyslog/configuration/modules/omlibdbi.html
+file path=usr/share/doc/rsyslog/configuration/modules/ommail.html
+file path=usr/share/doc/rsyslog/configuration/modules/ommongodb.html
+file path=usr/share/doc/rsyslog/configuration/modules/ommysql.html
+file path=usr/share/doc/rsyslog/configuration/modules/omoracle.html
+file path=usr/share/doc/rsyslog/configuration/modules/omprog.html
+file path=usr/share/doc/rsyslog/configuration/modules/omrelp.html
+file path=usr/share/doc/rsyslog/configuration/modules/omruleset.html
+file path=usr/share/doc/rsyslog/configuration/modules/omsnmp.html
+file path=usr/share/doc/rsyslog/configuration/modules/omstdout.html
+file path=usr/share/doc/rsyslog/configuration/modules/omudpspoof.html
+file path=usr/share/doc/rsyslog/configuration/modules/omuxsock.html
+file path=usr/share/doc/rsyslog/configuration/modules/pmciscoios.html
+file path=usr/share/doc/rsyslog/configuration/modules/pmlastmsg.html
+file path=usr/share/doc/rsyslog/configuration/modules/pmrfc3164.html
+file path=usr/share/doc/rsyslog/configuration/modules/pmrfc3164sd.html
+file path=usr/share/doc/rsyslog/configuration/modules/pmrfc5424.html
+file path=usr/share/doc/rsyslog/configuration/modules/workflow.html
+file path=usr/share/doc/rsyslog/configuration/nomatch.html
+file path=usr/share/doc/rsyslog/configuration/output_channels.html
+file path=usr/share/doc/rsyslog/configuration/parser.html
+file path=usr/share/doc/rsyslog/configuration/properties.html
+file path=usr/share/doc/rsyslog/configuration/property_replacer.html
+dir  path=usr/share/doc/rsyslog/configuration/ruleset
+file path=usr/share/doc/rsyslog/configuration/ruleset/index.html
+file path=usr/share/doc/rsyslog/configuration/ruleset/rsconf1_rulesetcreatemainqueue.html
+file path=usr/share/doc/rsyslog/configuration/ruleset/rsconf1_rulesetparser.html
+file path=usr/share/doc/rsyslog/configuration/templates.html
+file path=usr/share/doc/rsyslog/configuration/timezone.html
+dir  path=usr/share/doc/rsyslog/development
+file path=usr/share/doc/rsyslog/development/config_data_model.html
+file path=usr/share/doc/rsyslog/development/dev_oplugins.html
+file path=usr/share/doc/rsyslog/development/dev_queue.html
+file path=usr/share/doc/rsyslog/development/generic_design.html
+file path=usr/share/doc/rsyslog/development/index.html
+dir  path=usr/share/doc/rsyslog/examples
+file path=usr/share/doc/rsyslog/examples/high_performance.html
+file path=usr/share/doc/rsyslog/examples/index.html
 file path=usr/share/doc/rsyslog/features.html
-file path=usr/share/doc/rsyslog/generic_design.html
-file path=usr/share/doc/rsyslog/gssapi.html
-file path=usr/share/doc/rsyslog/gssapi.png
+file path=usr/share/doc/rsyslog/free_support.html
+file path=usr/share/doc/rsyslog/genindex.html
+dir  path=usr/share/doc/rsyslog/historical
+file path=usr/share/doc/rsyslog/historical/index.html
+file path=usr/share/doc/rsyslog/historical/module_devel.html
+file path=usr/share/doc/rsyslog/historical/multi_ruleset_legacy_format_samples.html
+file path=usr/share/doc/rsyslog/historical/php_syslog_ng.html
+file path=usr/share/doc/rsyslog/historical/stunnel.html
 file path=usr/share/doc/rsyslog/history.html
 file path=usr/share/doc/rsyslog/how2help.html
-file path=usr/share/doc/rsyslog/im3195.html
-file path=usr/share/doc/rsyslog/imfile.html
-file path=usr/share/doc/rsyslog/imgssapi.html
-file path=usr/share/doc/rsyslog/imklog.html
-file path=usr/share/doc/rsyslog/impstats.html
-file path=usr/share/doc/rsyslog/imptcp.html
-file path=usr/share/doc/rsyslog/imrelp.html
-file path=usr/share/doc/rsyslog/imsolaris.html
-file path=usr/share/doc/rsyslog/imtcp.html
-file path=usr/share/doc/rsyslog/imuxsock.html
 file path=usr/share/doc/rsyslog/index.html
-file path=usr/share/doc/rsyslog/install.html
-file path=usr/share/doc/rsyslog/ipv6.html
+dir  path=usr/share/doc/rsyslog/installation
+file path=usr/share/doc/rsyslog/installation/build_from_repo.html
+file path=usr/share/doc/rsyslog/installation/index.html
+file path=usr/share/doc/rsyslog/installation/install_from_source.html
+file path=usr/share/doc/rsyslog/installation/packages.html
 file path=usr/share/doc/rsyslog/licensing.html
-file path=usr/share/doc/rsyslog/log_rotation_fix_size.html
-file path=usr/share/doc/rsyslog/manual.html
-file path=usr/share/doc/rsyslog/mmnormalize.html
-file path=usr/share/doc/rsyslog/mmsnmptrapd.html
-file path=usr/share/doc/rsyslog/module_workflow.png
-file path=usr/share/doc/rsyslog/modules.html
-file path=usr/share/doc/rsyslog/multi_ruleset.html
-file path=usr/share/doc/rsyslog/netstream.html
-file path=usr/share/doc/rsyslog/ns_gtls.html
-file path=usr/share/doc/rsyslog/ns_ptcp.html
-file path=usr/share/doc/rsyslog/omlibdbi.html
-file path=usr/share/doc/rsyslog/ommail.html
-file path=usr/share/doc/rsyslog/ommysql.html
-file path=usr/share/doc/rsyslog/omoracle.html
-file path=usr/share/doc/rsyslog/omrelp.html
-file path=usr/share/doc/rsyslog/omruleset.html
-file path=usr/share/doc/rsyslog/omsnmp.html
-file path=usr/share/doc/rsyslog/omstdout.html
-file path=usr/share/doc/rsyslog/omudpspoof.html
-file path=usr/share/doc/rsyslog/omuxsock.html
-file path=usr/share/doc/rsyslog/pmlastmsg.html
-file path=usr/share/doc/rsyslog/property_replacer.html
-file path=usr/share/doc/rsyslog/queueWorkerLogic.jpg
-file path=usr/share/doc/rsyslog/queueWorkerLogic_small.jpg
-file path=usr/share/doc/rsyslog/queue_analogy_tv.png
-file path=usr/share/doc/rsyslog/queues.html
-file path=usr/share/doc/rsyslog/queues_analogy.html
-file path=usr/share/doc/rsyslog/rainerscript.html
-file path=usr/share/doc/rsyslog/rfc5424layers.png
-file path=usr/share/doc/rsyslog/rsconf1_actionexeconlywhenpreviousissuspended.html
-file path=usr/share/doc/rsyslog/rsconf1_actionresumeinterval.html
-file path=usr/share/doc/rsyslog/rsconf1_allowedsender.html
-file path=usr/share/doc/rsyslog/rsconf1_controlcharacterescapeprefix.html
-file path=usr/share/doc/rsyslog/rsconf1_debugprintcfsyslinehandlerlist.html
-file path=usr/share/doc/rsyslog/rsconf1_debugprintmodulelist.html
-file path=usr/share/doc/rsyslog/rsconf1_debugprinttemplatelist.html
-file path=usr/share/doc/rsyslog/rsconf1_dircreatemode.html
-file path=usr/share/doc/rsyslog/rsconf1_dirgroup.html
-file path=usr/share/doc/rsyslog/rsconf1_dirowner.html
-file path=usr/share/doc/rsyslog/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
-file path=usr/share/doc/rsyslog/rsconf1_droptrailinglfonreception.html
-file path=usr/share/doc/rsyslog/rsconf1_dynafilecachesize.html
-file path=usr/share/doc/rsyslog/rsconf1_escape8bitcharsonreceive.html
-file path=usr/share/doc/rsyslog/rsconf1_escapecontrolcharactersonreceive.html
-file path=usr/share/doc/rsyslog/rsconf1_failonchownfailure.html
-file path=usr/share/doc/rsyslog/rsconf1_filecreatemode.html
-file path=usr/share/doc/rsyslog/rsconf1_filegroup.html
-file path=usr/share/doc/rsyslog/rsconf1_fileowner.html
-file path=usr/share/doc/rsyslog/rsconf1_generateconfiggraph.html
-file path=usr/share/doc/rsyslog/rsconf1_gssforwardservicename.html
-file path=usr/share/doc/rsyslog/rsconf1_gsslistenservicename.html
-file path=usr/share/doc/rsyslog/rsconf1_gssmode.html
-file path=usr/share/doc/rsyslog/rsconf1_includeconfig.html
-file path=usr/share/doc/rsyslog/rsconf1_mainmsgqueuesize.html
-file path=usr/share/doc/rsyslog/rsconf1_markmessageperiod.html
-file path=usr/share/doc/rsyslog/rsconf1_moddir.html
-file path=usr/share/doc/rsyslog/rsconf1_modload.html
-file path=usr/share/doc/rsyslog/rsconf1_repeatedmsgreduction.html
-file path=usr/share/doc/rsyslog/rsconf1_resetconfigvariables.html
-file path=usr/share/doc/rsyslog/rsconf1_rulesetcreatemainqueue.html
-file path=usr/share/doc/rsyslog/rsconf1_rulesetparser.html
-file path=usr/share/doc/rsyslog/rsconf1_umask.html
-file path=usr/share/doc/rsyslog/rscript_abnf.html
-file path=usr/share/doc/rsyslog/rsyslog-example.conf
-file path=usr/share/doc/rsyslog/rsyslog-vers.png
-file path=usr/share/doc/rsyslog/rsyslog_conf.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_actions.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_examples.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_filter.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_global.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_modules.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_nomatch.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_output.html
-file path=usr/share/doc/rsyslog/rsyslog_conf_templates.html
-file path=usr/share/doc/rsyslog/rsyslog_confgraph_complex.png
-file path=usr/share/doc/rsyslog/rsyslog_confgraph_std.png
-file path=usr/share/doc/rsyslog/rsyslog_high_database_rate.html
-file path=usr/share/doc/rsyslog/rsyslog_mysql.html
-file path=usr/share/doc/rsyslog/rsyslog_ng_comparison.html
-file path=usr/share/doc/rsyslog/rsyslog_packages.html
-file path=usr/share/doc/rsyslog/rsyslog_pgsql.html
-file path=usr/share/doc/rsyslog/rsyslog_php_syslog_ng.html
-file path=usr/share/doc/rsyslog/rsyslog_recording_pri.html
-file path=usr/share/doc/rsyslog/rsyslog_reliable_forwarding.html
-file path=usr/share/doc/rsyslog/rsyslog_secure_tls.html
-file path=usr/share/doc/rsyslog/rsyslog_stunnel.html
-file path=usr/share/doc/rsyslog/rsyslog_tls.html
-file path=usr/share/doc/rsyslog/syslog_parsing.html
-file path=usr/share/doc/rsyslog/syslog_protocol.html
-file path=usr/share/doc/rsyslog/tls_cert.jpg
-file path=usr/share/doc/rsyslog/tls_cert_100.jpg
-file path=usr/share/doc/rsyslog/tls_cert_ca.html
-file path=usr/share/doc/rsyslog/tls_cert_ca.jpg
-file path=usr/share/doc/rsyslog/tls_cert_client.html
-file path=usr/share/doc/rsyslog/tls_cert_errmsgs.html
-file path=usr/share/doc/rsyslog/tls_cert_machine.html
-file path=usr/share/doc/rsyslog/tls_cert_scenario.html
-file path=usr/share/doc/rsyslog/tls_cert_server.html
-file path=usr/share/doc/rsyslog/tls_cert_summary.html
-file path=usr/share/doc/rsyslog/tls_cert_udp_relay.html
-file path=usr/share/doc/rsyslog/troubleshoot.html
-file path=usr/share/doc/rsyslog/v3compatibility.html
-file path=usr/share/doc/rsyslog/v4compatibility.html
-file path=usr/share/doc/rsyslog/v5compatibility.html
-file path=usr/share/doc/rsyslog/version_naming.html
+dir  path=usr/share/doc/rsyslog/proposals
+file path=usr/share/doc/rsyslog/proposals/index.html
+file path=usr/share/doc/rsyslog/proposals/lookup_tables.html
+file path=usr/share/doc/rsyslog/proposals/version_naming.html
+dir  path=usr/share/doc/rsyslog/rainerscript
+file path=usr/share/doc/rsyslog/rainerscript/configuration_objects.html
+file path=usr/share/doc/rsyslog/rainerscript/constant_strings.html
+file path=usr/share/doc/rsyslog/rainerscript/data_types.html
+file path=usr/share/doc/rsyslog/rainerscript/expressions.html
+file path=usr/share/doc/rsyslog/rainerscript/functions.html
+file path=usr/share/doc/rsyslog/rainerscript/global.html
+file path=usr/share/doc/rsyslog/rainerscript/index.html
+file path=usr/share/doc/rsyslog/rainerscript/lookup_tables.html
+file path=usr/share/doc/rsyslog/rainerscript/queue_parameters.html
+file path=usr/share/doc/rsyslog/rainerscript/rainerscript_call.html
+file path=usr/share/doc/rsyslog/rainerscript/variable_property_types.html
+file path=usr/share/doc/rsyslog/search.html
+file path=usr/share/doc/rsyslog/searchindex.js
+dir  path=usr/share/doc/rsyslog/troubleshooting
+file path=usr/share/doc/rsyslog/troubleshooting/debug.html
+file path=usr/share/doc/rsyslog/troubleshooting/index.html
+file path=usr/share/doc/rsyslog/troubleshooting/troubleshoot.html
+dir  path=usr/share/doc/rsyslog/tutorials
+file path=usr/share/doc/rsyslog/tutorials/database.html
+file path=usr/share/doc/rsyslog/tutorials/failover_syslog_server.html
+file path=usr/share/doc/rsyslog/tutorials/high_database_rate.html
+file path=usr/share/doc/rsyslog/tutorials/index.html
+file path=usr/share/doc/rsyslog/tutorials/log_rotation_fix_size.html
+file path=usr/share/doc/rsyslog/tutorials/recording_pri.html
+file path=usr/share/doc/rsyslog/tutorials/reliable_forwarding.html
+file path=usr/share/doc/rsyslog/tutorials/tls.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_ca.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_client.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_errmsgs.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_machine.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_scenario.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_server.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_summary.html
+file path=usr/share/doc/rsyslog/tutorials/tls_cert_udp_relay.html
+dir  path=usr/share/doc/rsyslog/whitepapers
+file path=usr/share/doc/rsyslog/whitepapers/index.html
+file path=usr/share/doc/rsyslog/whitepapers/preserve_in_nat.html
+file path=usr/share/doc/rsyslog/whitepapers/queues_analogy.html
+file path=usr/share/doc/rsyslog/whitepapers/reliable_logging.html
+file path=usr/share/doc/rsyslog/whitepapers/syslog_parsing.html
+file path=usr/share/doc/rsyslog/whitepapers/syslog_protocol.html
 file usr/share/man/man8/rsyslogd.8 path=usr/share/man/man1m/rsyslogd.1m \
-    mangler.bypass=true
+    mangler.bypass=false
 file usr/share/man/man5/rsyslog.conf.5 path=usr/share/man/man4/rsyslog.conf.4
 dir  path=var/spool/rsyslog
+license rsyslog-doc.license license="Apache v2.0"
 license rsyslog.license license=GPLv3
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/stat
+license COPYING.LESSER license=LGPLv3