--- a/components/rsyslog/Makefile Thu Apr 11 10:53:26 2013 -0700
+++ b/components/rsyslog/Makefile Thu Apr 11 10:55:54 2013 -0700
@@ -40,6 +40,11 @@
# This is needed for things to be built correctly.
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+# 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
CONFIGURE_OPTIONS += --enable-gssapi_krb5
@@ -47,12 +52,14 @@
CONFIGURE_OPTIONS += --disable-klog
CONFIGURE_OPTIONS += --sbindir=/usr/lib/rsyslog
-# common targets
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32)
+# common targets
+build: $(BUILD_64)
-test: $(TEST_32)
+install: $(INSTALL_64)
+
+test: $(TEST_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/rsyslog/rsyslog.p5m Thu Apr 11 10:53:26 2013 -0700
+++ b/components/rsyslog/rsyslog.p5m Thu Apr 11 10:55:54 2013 -0700
@@ -24,12 +24,15 @@
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
+<transform file path=usr/lib/rsyslog/.*\.so -> \
+ add pkg.linted.userland.action001.2 true>
set name=pkg.fmri \
value=pkg:/system/rsyslog@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="reliable and extended syslogd"
set name=pkg.description \
value="Rsyslog is a reliable and extended syslog daemon implementation with a modular design, supporting many features (e.g., filtering, TCP, encryption, high-precision time-stamps, output control)."
-set name=pkg.summary value="reliable and extended syslogd"
-set name=com.oracle.info.description value="rsyslog, a reliable and extended syslogd"
+set name=com.oracle.info.description \
+ value="rsyslog, a reliable and extended syslogd"
set name=com.oracle.info.tpno value=7585
set name=info.classification \
value="org.opensolaris.category.2008:System/Administration and Configuration"
@@ -41,8 +44,8 @@
dir path=var/spool/rsyslog
-file rsyslog.conf-solaris path=etc/rsyslog.conf group=sys preserve=true \
- mode=0644 overlay=allow
+file rsyslog.conf-solaris path=etc/rsyslog.conf group=sys mode=0644 \
+ overlay=allow preserve=true
file rsyslog.xml path=lib/svc/manifest/system/rsyslog.xml
file rsyslog path=lib/svc/method/rsyslog
file path=usr/lib/rsyslog/imgssapi.so
@@ -70,4 +73,4 @@
mangler.bypass=true
file usr/share/man/man5/rsyslog.conf.5 path=usr/share/man/man4/rsyslog.conf.4
license rsyslog.license license=GPLv3
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/stat type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/stat