Date: Friday, May 31, 2013 @ 09:43:02
Author: tpowa
Revision: 186788
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
watchdog/repos/staging-i686/
watchdog/repos/staging-i686/PKGBUILD
(from rev 186787, watchdog/trunk/PKGBUILD)
watchdog/repos/staging-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch
(from rev 186787,
watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch)
watchdog/repos/staging-i686/watchdog.systemd
(from rev 186787, watchdog/trunk/watchdog.systemd)
watchdog/repos/staging-x86_64/
watchdog/repos/staging-x86_64/PKGBUILD
(from rev 186787, watchdog/trunk/PKGBUILD)
watchdog/repos/staging-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch
(from rev 186787,
watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch)
watchdog/repos/staging-x86_64/watchdog.systemd
(from rev 186787, watchdog/trunk/watchdog.systemd)
------------------------------------------------------------+
staging-i686/PKGBUILD | 43 +++++++++++
staging-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch | 11 ++
staging-i686/watchdog.systemd | 10 ++
staging-x86_64/PKGBUILD | 43 +++++++++++
staging-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch | 11 ++
staging-x86_64/watchdog.systemd | 10 ++
6 files changed, 128 insertions(+)
Copied: watchdog/repos/staging-i686/PKGBUILD (from rev 186787,
watchdog/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-05-31 07:43:02 UTC (rev 186788)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Thomas Bächler <[email protected]>
+
+pkgname=watchdog
+pkgver=5.13
+pkgrel=2
+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'
+ '06677f094ec76b7fbb7b0db141209dec')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --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
+}
Copied: watchdog/repos/staging-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch
(from rev 186787, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch)
===================================================================
--- staging-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch
(rev 0)
+++ staging-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-05-31
07:43:02 UTC (rev 186788)
@@ -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>
Copied: watchdog/repos/staging-i686/watchdog.systemd (from rev 186787,
watchdog/trunk/watchdog.systemd)
===================================================================
--- staging-i686/watchdog.systemd (rev 0)
+++ staging-i686/watchdog.systemd 2013-05-31 07:43:02 UTC (rev 186788)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/bin/watchdog
+
+[Install]
+WantedBy=multi-user.target
Copied: watchdog/repos/staging-x86_64/PKGBUILD (from rev 186787,
watchdog/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-05-31 07:43:02 UTC (rev 186788)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Thomas Bächler <[email protected]>
+
+pkgname=watchdog
+pkgver=5.13
+pkgrel=2
+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'
+ '06677f094ec76b7fbb7b0db141209dec')
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --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
+}
Copied:
watchdog/repos/staging-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch (from
rev 186787, watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch)
===================================================================
--- staging-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch
(rev 0)
+++ staging-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch 2013-05-31
07:43:02 UTC (rev 186788)
@@ -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>
Copied: watchdog/repos/staging-x86_64/watchdog.systemd (from rev 186787,
watchdog/trunk/watchdog.systemd)
===================================================================
--- staging-x86_64/watchdog.systemd (rev 0)
+++ staging-x86_64/watchdog.systemd 2013-05-31 07:43:02 UTC (rev 186788)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/bin/watchdog
+
+[Install]
+WantedBy=multi-user.target
