Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38e4f9f4b4cb6c8afdea8601c0917bfc95951b85
commit 38e4f9f4b4cb6c8afdea8601c0917bfc95951b85 Author: Miklos Vajna <[email protected]> Date: Wed Jan 11 14:37:16 2012 +0100 rsyslog-5.8.6-3-i686 - require systemd-38 diff --git a/source/base/rsyslog/FrugalBuild b/source/base/rsyslog/FrugalBuild index 540d8fe..3b7e0a0 100644 --- a/source/base/rsyslog/FrugalBuild +++ b/source/base/rsyslog/FrugalBuild @@ -3,14 +3,14 @@ pkgname=rsyslog pkgver=5.8.6 -pkgrel=2 +pkgrel=3 pkgdesc="Enhanced system logging and kernel message trapping daemon" url="http://www.rsyslog.com/"; backup=(etc/rsyslog.conf) -conflicts=('sysklogd') +conflicts=('sysklogd' 'syslog-ng') provides=('sysklogd') replaces=('sysklogd') -depends=('zlib' 'systemd') +depends=('zlib' 'systemd>=38') makedepends=('krb5' 'mysql' 'postgresql') groups=('base') archs=('i686' 'x86_64' 'ppc' 'arm') @@ -18,7 +18,7 @@ up2date="lynx -dump http://www.rsyslog.com/download/|grep '(stable)'|sed 's/.*rs source=(http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz \ rsyslog.conf rsyslog) sha1sums=('1afe39077253dc9f636f676e8374d09a101a9c94' \ - '7b37cdbcd145eb65b584fb0f5e9c06a1cba88e88' \ + '093b836523485daab0d1c01ef5c77e7b246d67e5' \ 'a21d517bb2a39011db7478302172171f91906233') subpkgs=('rsyslog-gnutls') @@ -81,6 +81,7 @@ build() Frm usr/lib/rsyslog/*.la Ffile /etc/rsyslog.conf Ffile /etc/logrotate.d/rsyslog + Fln /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service Fsplit rsyslog-gnutls /usr/lib/rsyslog/lmnsd_gtls.so Fsplit rsyslog-gssapi /usr/lib/rsyslog/{lmgssutil,imgssapi,omgssapi}.so diff --git a/source/base/rsyslog/rsyslog.conf b/source/base/rsyslog/rsyslog.conf index 97eb2da..0980ce9 100644 --- a/source/base/rsyslog/rsyslog.conf +++ b/source/base/rsyslog/rsyslog.conf @@ -27,6 +27,8 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # not useful and an extreme performance hit #$ActionFileEnableSync on +$SystemLogSocketName /run/systemd/journal/syslog + # Include all config files in /etc/rsyslog.d/ $IncludeConfig /etc/rsyslog.d/*.conf _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
