[arch-commits] Commit in watchdog/trunk (PKGBUILD watchdog.cf watchdog.sh)

[Thomas Bächler]

    Date: Wednesday, February 27, 2013 @ 16:05:06
  Author: thomas
Revision: 178839

upgpkg: watchdog 5.13-1

Modified:
  watchdog/trunk/PKGBUILD
Deleted:
  watchdog/trunk/watchdog.cf
  watchdog/trunk/watchdog.sh

-------------+
 PKGBUILD    |   22 ++++------------------
 watchdog.cf |    2 --
 watchdog.sh |   44 --------------------------------------------
 3 files changed, 4 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-27 14:54:16 UTC (rev 178838)
+++ PKGBUILD	2013-02-27 15:05:06 UTC (rev 178839)
@@ -2,24 +2,18 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=watchdog
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/watchdog"
 license=('GPL')
 depends=('glibc')
-backup=(etc/watchdog.conf
-        etc/conf.d/watchdog
-        etc/conf.d/wd_keepalive)
+backup=(etc/watchdog.conf)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        watchdog.sh
-        watchdog.cf
         watchdog-5.12-fix-oom-in-wd_keepalive.patch
         watchdog.systemd)
-md5sums=('cea28bea70e54f3625062bc808aef9af'
-         'f57d33967eb9404dd52e3c4e73795a20'
-         '01c1e2e13f515131180b4ebe9b8b7cc3'
+md5sums=('153455f008f1cf8f65f6ad9586a21ff1'
          'c90c2686975b5254f82b3de683f1f442'
          'a835ae5cbdbb21c19a468dedb5d734e4')
 
@@ -41,13 +35,5 @@
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make install DESTDIR="${pkgdir}"
-  for fil in watchdog wd_keepalive ; do
-	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
-	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
-  done
   install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
-
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
-  sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive
 }

Deleted: watchdog.cf
===================================================================
--- watchdog.cf	2013-02-27 14:54:16 UTC (rev 178838)
+++ watchdog.cf	2013-02-27 15:05:06 UTC (rev 178839)
@@ -1,2 +0,0 @@
-# watchdog configuration
-WATCHDOG_OPTIONS=""

Deleted: watchdog.sh
===================================================================
--- watchdog.sh	2013-02-27 14:54:16 UTC (rev 178838)
+++ watchdog.sh	2013-02-27 15:05:06 UTC (rev 178839)
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$( cat /run/watchdog.pid 2>/dev/null )"
-[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog
-
-case "$1" in
-  start)
-    stat_busy "Starting Watchdog Daemon"
-
-    [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS}
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon watchdog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Watchdog Daemon"
-
-    [ -n "$PID" ] && kill $PID &> /dev/null
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon watchdog
-      stat_done
-    fi
-
-    rm -f /run/watchdog.pid
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0