diff --git a/srcpkgs/rsyslog/files/rsyslogd/run b/srcpkgs/rsyslog/files/rsyslogd/run new file mode 100755 index 00000000000..30d94a83f17 --- /dev/null +++ b/srcpkgs/rsyslog/files/rsyslogd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec rsyslogd -n diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 10d07596bcf..da9da13a657 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=8.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5 @@ -25,9 +25,8 @@ makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9 libee-devel>=0.4.1 liblogging-devel>=1.0.3" conf_files="/etc/rsyslog.conf" -systemd_services="rsyslog.service on" provides="syslog-daemon-0_1" -replaces="syslog-daemon>=0" +replaces="runit-void<20141013_2 syslog-daemon>=0" make_dirs="/etc/rsyslog.d 0755 root root" if [ "$CROSS_BUILD" ]; then @@ -45,14 +44,15 @@ build_options="systemd" if [ "$build_option_systemd" ]; then makedepends+=" systemd-devel" + systemd_services="rsyslog.service on" fi post_configure() { echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile } - post_install() { - vinstall ${FILESDIR}/rsyslog.conf 644 etc + vsv rsyslogd + vconf ${FILESDIR}/rsyslog.conf } rsyslog-gssapi_package() { @@ -63,7 +63,6 @@ rsyslog-gssapi_package() { vmove "usr/lib/rsyslog/*gss*.so" } } - rsyslog-gnutls_package() { lib32disabled=yes depends="rsyslog" @@ -72,7 +71,6 @@ rsyslog-gnutls_package() { vmove "usr/lib/rsyslog/*gtls*" } } - rsyslog-mysql_package() { lib32disabled=yes depends="rsyslog" @@ -81,7 +79,6 @@ rsyslog-mysql_package() { vmove usr/lib/rsyslog/ommysql.so } } - rsyslog-postgresql_package() { lib32disabled=yes depends="rsyslog"