diff options
Diffstat (limited to 'community/rsyslog')
-rw-r--r-- | community/rsyslog/PKGBUILD | 13 | ||||
-rw-r--r-- | community/rsyslog/rsyslog | 39 | ||||
-rw-r--r-- | community/rsyslog/rsyslog.conf.d | 6 | ||||
-rw-r--r-- | community/rsyslog/rsyslog.logrotate | 2 |
4 files changed, 5 insertions, 55 deletions
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 9d8e173b6..90f24a027 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88526 2013-04-19 10:32:19Z spupykin $ +# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.7 -pkgrel=1 +pkgrel=3 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -19,19 +19,16 @@ backup=('etc/rsyslog.conf' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d' 'rsyslog.conf') md5sums=('4a61d182acb5b5487e7b99dea8974857' - 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' - '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e' + '304bc9ea26aa1ff910870899a30512f1' 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-mysql \ --enable-pgsql \ --enable-mail \ @@ -47,11 +44,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} # Install Daemons and Configuration Files - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} # fix location of systemctl and remove start precondition sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ diff --git a/community/rsyslog/rsyslog b/community/rsyslog/rsyslog deleted file mode 100644 index ee0145418..000000000 --- a/community/rsyslog/rsyslog +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rsyslog - -PID=`pidof -o %PPID /usr/sbin/rsyslogd` -case "$1" in - start) - stat_busy "Starting RSyslogd" - [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyslogd - stat_done - fi - ;; - stop) - stat_busy "Stopping RSyslogd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/rsyslogd.pid - rm -f /var/rsyslogd.persist - rm_daemon rsyslogd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d deleted file mode 100644 index fc0770666..000000000 --- a/community/rsyslog/rsyslog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to rsyslogd -# This should almost certainly include at least the current compatability -# level, e.g. -c4 -# -RSYSLOGD_ARGS="-c6" diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 76306c560..354581767 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd + /usr/bin/killall -HUP /usr/bin/rsyslogd endscript } |