[arch-commits] Commit in rsyslog/trunk (PKGBUILD rsyslog rsyslog.conf.d)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:36:41
  Author: spupykin
Revision: 90718

upgpkg: rsyslog 7.2.7-2

upd

Modified:
  rsyslog/trunk/PKGBUILD
Deleted:
  rsyslog/trunk/rsyslog
  rsyslog/trunk/rsyslog.conf.d

----------------+
 PKGBUILD       |    8 +-------
 rsyslog        |   39 ---------------------------------------
 rsyslog.conf.d |    6 ------
 3 files changed, 1 insertion(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:36:35 UTC (rev 90717)
+++ PKGBUILD	2013-05-13 14:36:41 UTC (rev 90718)
@@ -3,7 +3,7 @@
 
 pkgname=rsyslog
 pkgver=7.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
 arch=('i686' 'x86_64')
@@ -19,14 +19,10 @@
 	'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'
          'd61dd424e660eb16401121eed20d98bc')
 
 build() {
@@ -47,11 +43,9 @@
   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" \

Deleted: rsyslog
===================================================================
--- rsyslog	2013-05-13 14:36:35 UTC (rev 90717)
+++ rsyslog	2013-05-13 14:36:41 UTC (rev 90718)
@@ -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

Deleted: rsyslog.conf.d
===================================================================
--- rsyslog.conf.d	2013-05-13 14:36:35 UTC (rev 90717)
+++ rsyslog.conf.d	2013-05-13 14:36:41 UTC (rev 90718)
@@ -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"