Date: Wednesday, February 27, 2013 @ 16:05:46 Author: thomas Revision: 178840
archrelease: copy trunk to extra-i686, extra-x86_64 Added: watchdog/repos/extra-i686/PKGBUILD (from rev 178839, watchdog/trunk/PKGBUILD) watchdog/repos/extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch (from rev 178839, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch) watchdog/repos/extra-i686/watchdog.systemd (from rev 178839, watchdog/trunk/watchdog.systemd) watchdog/repos/extra-x86_64/PKGBUILD (from rev 178839, watchdog/trunk/PKGBUILD) watchdog/repos/extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch (from rev 178839, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch) watchdog/repos/extra-x86_64/watchdog.systemd (from rev 178839, watchdog/trunk/watchdog.systemd) Deleted: watchdog/repos/extra-i686/PKGBUILD watchdog/repos/extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch watchdog/repos/extra-i686/watchdog.cf watchdog/repos/extra-i686/watchdog.sh watchdog/repos/extra-i686/watchdog.systemd watchdog/repos/extra-x86_64/PKGBUILD watchdog/repos/extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch watchdog/repos/extra-x86_64/watchdog.cf watchdog/repos/extra-x86_64/watchdog.sh watchdog/repos/extra-x86_64/watchdog.systemd ----------------------------------------------------------+ extra-i686/PKGBUILD | 92 +++++-------- extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch | 22 +-- extra-i686/watchdog.cf | 2 extra-i686/watchdog.sh | 44 ------ extra-i686/watchdog.systemd | 20 +- extra-x86_64/PKGBUILD | 92 +++++-------- extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch | 22 +-- extra-x86_64/watchdog.cf | 2 extra-x86_64/watchdog.sh | 44 ------ extra-x86_64/watchdog.systemd | 20 +- 10 files changed, 120 insertions(+), 240 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-i686/PKGBUILD 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=watchdog -pkgver=5.12 -pkgrel=2 -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) -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' - 'c90c2686975b5254f82b3de683f1f442' - 'a835ae5cbdbb21c19a468dedb5d734e4') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-pidfile=/run/watchdog.pid \ - --with-ka_pidfile=/run/wd_keepalive.pid - - make -} - -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 -} Copied: watchdog/repos/extra-i686/PKGBUILD (from rev 178839, watchdog/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=watchdog +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) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + watchdog-5.12-fix-oom-in-wd_keepalive.patch + watchdog.systemd) +md5sums=('153455f008f1cf8f65f6ad9586a21ff1' + 'c90c2686975b5254f82b3de683f1f442' + 'a835ae5cbdbb21c19a468dedb5d734e4') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-pidfile=/run/watchdog.pid \ + --with-ka_pidfile=/run/wd_keepalive.pid + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" + install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service +} Deleted: extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch =================================================================== --- extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,11 +0,0 @@ -diff -Nur watchdog-5.12.orig/src/wd_keepalive.c watchdog-5.12/src/wd_keepalive.c ---- watchdog-5.12.orig/src/wd_keepalive.c 2012-04-05 12:16:33.000000000 +0200 -+++ watchdog-5.12/src/wd_keepalive.c 2012-05-13 16:15:36.786543263 +0200 -@@ -26,6 +26,7 @@ - #include <sys/mman.h> - #include <sys/ioctl.h> - #include <sys/wait.h> -+#include <linux/oom.h> - #include <linux/watchdog.h> - #include <libgen.h> - #include <string.h> Copied: watchdog/repos/extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch (from rev 178839, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch) =================================================================== --- extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch (rev 0) +++ extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,11 @@ +diff -Nur watchdog-5.12.orig/src/wd_keepalive.c watchdog-5.12/src/wd_keepalive.c +--- watchdog-5.12.orig/src/wd_keepalive.c 2012-04-05 12:16:33.000000000 +0200 ++++ watchdog-5.12/src/wd_keepalive.c 2012-05-13 16:15:36.786543263 +0200 +@@ -26,6 +26,7 @@ + #include <sys/mman.h> + #include <sys/ioctl.h> + #include <sys/wait.h> ++#include <linux/oom.h> + #include <linux/watchdog.h> + #include <libgen.h> + #include <string.h> Deleted: extra-i686/watchdog.cf =================================================================== --- extra-i686/watchdog.cf 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-i686/watchdog.cf 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,2 +0,0 @@ -# watchdog configuration -WATCHDOG_OPTIONS="" Deleted: extra-i686/watchdog.sh =================================================================== --- extra-i686/watchdog.sh 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-i686/watchdog.sh 2013-02-27 15:05:46 UTC (rev 178840) @@ -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 Deleted: extra-i686/watchdog.systemd =================================================================== --- extra-i686/watchdog.systemd 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-i686/watchdog.systemd 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,10 +0,0 @@ -[Unit] -Description=Watchdog Daemon - -[Service] -Type=forking -PIDFile=/run/watchdog.pid -ExecStart=/usr/sbin/watchdog - -[Install] -WantedBy=multi-user.target Copied: watchdog/repos/extra-i686/watchdog.systemd (from rev 178839, watchdog/trunk/watchdog.systemd) =================================================================== --- extra-i686/watchdog.systemd (rev 0) +++ extra-i686/watchdog.systemd 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,10 @@ +[Unit] +Description=Watchdog Daemon + +[Service] +Type=forking +PIDFile=/run/watchdog.pid +ExecStart=/usr/sbin/watchdog + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-x86_64/PKGBUILD 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=watchdog -pkgver=5.12 -pkgrel=2 -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) -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' - 'c90c2686975b5254f82b3de683f1f442' - 'a835ae5cbdbb21c19a468dedb5d734e4') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-pidfile=/run/watchdog.pid \ - --with-ka_pidfile=/run/wd_keepalive.pid - - make -} - -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 -} Copied: watchdog/repos/extra-x86_64/PKGBUILD (from rev 178839, watchdog/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=watchdog +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) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + watchdog-5.12-fix-oom-in-wd_keepalive.patch + watchdog.systemd) +md5sums=('153455f008f1cf8f65f6ad9586a21ff1' + 'c90c2686975b5254f82b3de683f1f442' + 'a835ae5cbdbb21c19a468dedb5d734e4') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-pidfile=/run/watchdog.pid \ + --with-ka_pidfile=/run/wd_keepalive.pid + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" + install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service +} Deleted: extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch =================================================================== --- extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,11 +0,0 @@ -diff -Nur watchdog-5.12.orig/src/wd_keepalive.c watchdog-5.12/src/wd_keepalive.c ---- watchdog-5.12.orig/src/wd_keepalive.c 2012-04-05 12:16:33.000000000 +0200 -+++ watchdog-5.12/src/wd_keepalive.c 2012-05-13 16:15:36.786543263 +0200 -@@ -26,6 +26,7 @@ - #include <sys/mman.h> - #include <sys/ioctl.h> - #include <sys/wait.h> -+#include <linux/oom.h> - #include <linux/watchdog.h> - #include <libgen.h> - #include <string.h> Copied: watchdog/repos/extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch (from rev 178839, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch) =================================================================== --- extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch (rev 0) +++ extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,11 @@ +diff -Nur watchdog-5.12.orig/src/wd_keepalive.c watchdog-5.12/src/wd_keepalive.c +--- watchdog-5.12.orig/src/wd_keepalive.c 2012-04-05 12:16:33.000000000 +0200 ++++ watchdog-5.12/src/wd_keepalive.c 2012-05-13 16:15:36.786543263 +0200 +@@ -26,6 +26,7 @@ + #include <sys/mman.h> + #include <sys/ioctl.h> + #include <sys/wait.h> ++#include <linux/oom.h> + #include <linux/watchdog.h> + #include <libgen.h> + #include <string.h> Deleted: extra-x86_64/watchdog.cf =================================================================== --- extra-x86_64/watchdog.cf 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-x86_64/watchdog.cf 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,2 +0,0 @@ -# watchdog configuration -WATCHDOG_OPTIONS="" Deleted: extra-x86_64/watchdog.sh =================================================================== --- extra-x86_64/watchdog.sh 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-x86_64/watchdog.sh 2013-02-27 15:05:46 UTC (rev 178840) @@ -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 Deleted: extra-x86_64/watchdog.systemd =================================================================== --- extra-x86_64/watchdog.systemd 2013-02-27 15:05:06 UTC (rev 178839) +++ extra-x86_64/watchdog.systemd 2013-02-27 15:05:46 UTC (rev 178840) @@ -1,10 +0,0 @@ -[Unit] -Description=Watchdog Daemon - -[Service] -Type=forking -PIDFile=/run/watchdog.pid -ExecStart=/usr/sbin/watchdog - -[Install] -WantedBy=multi-user.target Copied: watchdog/repos/extra-x86_64/watchdog.systemd (from rev 178839, watchdog/trunk/watchdog.systemd) =================================================================== --- extra-x86_64/watchdog.systemd (rev 0) +++ extra-x86_64/watchdog.systemd 2013-02-27 15:05:46 UTC (rev 178840) @@ -0,0 +1,10 @@ +[Unit] +Description=Watchdog Daemon + +[Service] +Type=forking +PIDFile=/run/watchdog.pid +ExecStart=/usr/sbin/watchdog + +[Install] +WantedBy=multi-user.target