From b4dfc956ad49596bf0296687385c65fab22e7e14 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 1 Oct 2014 20:10:17 +0400 Subject: rsyslog (8.4.1-1+dyson1) unstable; urgency=medium * Package for Dyson * Use dh-smf on illumos-any --- debian/changelog | 7 ++++ debian/control | 1 + debian/rsyslog.install | 1 - debian/rsyslog.postinst.smf | 18 --------- debian/rsyslog.prerm.smf | 11 ------ debian/rsyslog.smf/manifest/system/rsyslog.xml | 54 ++++++++++++++++++++++++++ debian/rsyslog.smf/method/rsyslog | 25 ++++++++++++ debian/rules | 6 +-- debian/smf/manifest/system/rsyslog.xml | 54 -------------------------- debian/smf/method/rsyslog | 25 ------------ 10 files changed, 90 insertions(+), 112 deletions(-) delete mode 100644 debian/rsyslog.postinst.smf delete mode 100644 debian/rsyslog.prerm.smf create mode 100644 debian/rsyslog.smf/manifest/system/rsyslog.xml create mode 100644 debian/rsyslog.smf/method/rsyslog delete mode 100644 debian/smf/manifest/system/rsyslog.xml delete mode 100644 debian/smf/method/rsyslog diff --git a/debian/changelog b/debian/changelog index 07fcdec..7ab4ba4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +rsyslog (8.4.1-1+dyson1) unstable; urgency=medium + + * Package for Dyson + * Use dh-smf on illumos-any + + -- Igor Pashev Wed, 01 Oct 2014 19:48:13 +0400 + rsyslog (8.4.1-1) unstable; urgency=high * New upstream release. diff --git a/debian/control b/debian/control index ca0e0e3..6868842 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Build-Depends: debhelper (>= 8), libjson-c-dev, uuid-dev, pkg-config, + dh-smf [illumos-any], bison Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/collab-maint/rsyslog.git diff --git a/debian/rsyslog.install b/debian/rsyslog.install index 084c5bd..9a31a57 100644 --- a/debian/rsyslog.install +++ b/debian/rsyslog.install @@ -27,4 +27,3 @@ usr/lib/rsyslog/ommail.so usr/lib/rsyslog/omprog.so usr/lib/rsyslog/omuxsock.so usr/lib/rsyslog/pm*.so -lib/systemd/system/rsyslog.service diff --git a/debian/rsyslog.postinst.smf b/debian/rsyslog.postinst.smf deleted file mode 100644 index 244b098..0000000 --- a/debian/rsyslog.postinst.smf +++ /dev/null @@ -1,18 +0,0 @@ - -fmri=svc:/system/system-log:rsyslog - -if [ "$1" = configure ]; then - state=`svcstatus $fmri` - case "$state" in - online) - # Restart only on upgrades. - # On new install the service will start automatically - if [ -n "$2" ]; then - svcadm -v restart $fmri || true - fi - ;; - maintenance) svcadm -v clear $fmri || true;; - offline) svcadm -v refresh $fmri || true;; - esac -fi - diff --git a/debian/rsyslog.prerm.smf b/debian/rsyslog.prerm.smf deleted file mode 100644 index c0032ea..0000000 --- a/debian/rsyslog.prerm.smf +++ /dev/null @@ -1,11 +0,0 @@ -fmri=svc:/system/system-log:rsyslog -state=`svcstatus $fmri` - -case "$1" in - remove) - case "$state" in - online) svcadm -v disable -s $fmri || true;; - esac - ;; -esac - diff --git a/debian/rsyslog.smf/manifest/system/rsyslog.xml b/debian/rsyslog.smf/manifest/system/rsyslog.xml new file mode 100644 index 0000000..2b3e6d0 --- /dev/null +++ b/debian/rsyslog.smf/manifest/system/rsyslog.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/rsyslog.smf/method/rsyslog b/debian/rsyslog.smf/method/rsyslog new file mode 100644 index 0000000..96ef0ee --- /dev/null +++ b/debian/rsyslog.smf/method/rsyslog @@ -0,0 +1,25 @@ +#! /bin/sh + +# This script only starts rsyslog +# For stopping use :kill +# For rotating logs use :kill -HUP + +create_xconsole() { + XCONSOLE=/run/xconsole + ln -sf $XCONSOLE /dev/xconsole + if [ ! -e $XCONSOLE ]; then + mknod -m 640 $XCONSOLE p + chown root:adm $XCONSOLE + fi +} + +NAME=rsyslog + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +DAEMON_ARGS="$RSYSLOGD_OPTIONS" + +create_xconsole +exec /usr/sbin/rsyslogd $DAEMON_ARGS + diff --git a/debian/rules b/debian/rules index f41acfe..51d9263 100755 --- a/debian/rules +++ b/debian/rules @@ -60,20 +60,20 @@ override_dh_auto_install: override_dh_install: dh_install -X .la --list-missing ifeq ($(DEB_HOST_ARCH_OS), linux) + dh_install -p rsyslog lib/systemd/system/rsyslog.service install --mode=644 debian/tmp/usr/lib/rsyslog/imkmsg.so \ debian/rsyslog/usr/lib/rsyslog/ install --mode=644 debian/tmp/usr/lib/rsyslog/imptcp.so \ debian/rsyslog/usr/lib/rsyslog/ endif ifeq (illumos,$(DEB_HOST_ARCH_OS)) + dh_smf rm -rf debian/rsyslog/etc/systemd rm -rf debian/rsyslog/lib/systemd + rm -rf debian/rsyslog/usr/lib/tmpfiles.d install --mode=644 debian/tmp/usr/lib/rsyslog/imsolaris.so \ debian/rsyslog/usr/lib/rsyslog/ echo '$$ModLoad imsolaris' > debian/rsyslog/etc/rsyslog.d/00-load-imsolaris.conf - dh_install -p rsyslog debian/smf/* /lib/svc/ - cat debian/rsyslog.postinst.smf >> debian/rsyslog.postinst.debhelper - cat debian/rsyslog.prerm.smf >> debian/rsyslog.prerm.debhelper else install --mode=644 debian/tmp/usr/lib/rsyslog/imklog.so \ debian/rsyslog/usr/lib/rsyslog/ diff --git a/debian/smf/manifest/system/rsyslog.xml b/debian/smf/manifest/system/rsyslog.xml deleted file mode 100644 index 2b3e6d0..0000000 --- a/debian/smf/manifest/system/rsyslog.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/debian/smf/method/rsyslog b/debian/smf/method/rsyslog deleted file mode 100644 index 96ef0ee..0000000 --- a/debian/smf/method/rsyslog +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -# This script only starts rsyslog -# For stopping use :kill -# For rotating logs use :kill -HUP - -create_xconsole() { - XCONSOLE=/run/xconsole - ln -sf $XCONSOLE /dev/xconsole - if [ ! -e $XCONSOLE ]; then - mknod -m 640 $XCONSOLE p - chown root:adm $XCONSOLE - fi -} - -NAME=rsyslog - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -DAEMON_ARGS="$RSYSLOGD_OPTIONS" - -create_xconsole -exec /usr/sbin/rsyslogd $DAEMON_ARGS - -- cgit v1.2.3