[arch-commits] Commit in metalog/trunk (4 files)

Eric Bélanger eric at nymeria.archlinux.org
Thu May 30 21:34:50 EDT 2013


    Date: Friday, May 31, 2013 @ 03:34:50
  Author: eric
Revision: 186742

upgpkg: metalog 3.0-2

Move files to /usr/bin, Remove initscripts daemon, Improve description

Modified:
  metalog/trunk/PKGBUILD
  metalog/trunk/metalog.service
Deleted:
  metalog/trunk/metalog
  metalog/trunk/metalog.confd

-----------------+
 PKGBUILD        |   28 +++++++++++-----------------
 metalog         |   42 ------------------------------------------
 metalog.confd   |    8 --------
 metalog.service |    2 +-
 4 files changed, 12 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 01:19:15 UTC (rev 186741)
+++ PKGBUILD	2013-05-31 01:34:50 UTC (rev 186742)
@@ -4,33 +4,27 @@
 
 pkgname=metalog
 pkgver=3.0
-pkgrel=0
-pkgdesc="Metalog is a modern replacement for syslogd and klogd"
+pkgrel=2
+pkgdesc="A modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('pcre')
 provides=('logger')
-backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd'  'metalog.service')
+backup=('etc/metalog.conf')
+source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog.service')
 md5sums=('6fe404e49764fa24108fd090417bacb5'
-         '9e73301a7f0be291749ee30638527cb9'
-         '86bccd5a02996921e29eff8a0394d11f'
-         'f005e6970c25bfdaf0596791e9135f98')
+         '42b8138e8868ecdf0616f73efca7b339')
 
 build() {
-  cd $srcdir/$pkgname-3
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd $pkgname-3
+  ./configure --prefix=/usr --sysconfdir=/etc --sbin=/usr/bin
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-3
-  make DESTDIR=$pkgdir install
-  install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
-  install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
-  install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
-
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/
+  cd $pkgname-3
+  make DESTDIR="$pkgdir" install
+  install -D -m644 metalog.conf "$pkgdir/etc/metalog.conf"
+  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/metalog.service
 }

Deleted: metalog
===================================================================
--- metalog	2013-05-31 01:19:15 UTC (rev 186741)
+++ metalog	2013-05-31 01:34:50 UTC (rev 186742)
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-if [ -f /var/run/metalog.pid ]; then
-    PID=$(cat /var/run/metalog.pid) 2>/dev/null
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Metalog"
-    [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon metalog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Metalog"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon metalog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}" 
-esac
-exit 0 

Deleted: metalog.confd
===================================================================
--- metalog.confd	2013-05-31 01:19:15 UTC (rev 186741)
+++ metalog.confd	2013-05-31 01:34:50 UTC (rev 186742)
@@ -1,8 +0,0 @@
-#
-# Parameters to be passed to metalog
-#
-
-# NOTE: Since v.0.7, metalog disables buffering by default.
-# Add '-a' if you want buffering.
-
-METALOG_OPTS=""

Modified: metalog.service
===================================================================
--- metalog.service	2013-05-31 01:19:15 UTC (rev 186741)
+++ metalog.service	2013-05-31 01:34:50 UTC (rev 186742)
@@ -2,7 +2,7 @@
 Description=System Logger Daemon
 
 [Service]
-ExecStart=/usr/sbin/metalog
+ExecStart=/usr/bin/metalog
 
 [Install]
 WantedBy=multi-user.target



More information about the arch-commits mailing list