summaryrefslogtreecommitdiff
path: root/extra/watchdog
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-05-15 00:02:45 +0000
committerroot <root@rshg054.dnsready.net>2012-05-15 00:02:45 +0000
commit52a4948b9138662b1e7b23b04ef0d72101519f2d (patch)
tree701b562dc98245a57c6a93f3c2f94e3b1832f0eb /extra/watchdog
parentd3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff)
Tue May 15 00:02:45 UTC 2012
Diffstat (limited to 'extra/watchdog')
-rw-r--r--extra/watchdog/PKGBUILD14
-rw-r--r--extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch11
2 files changed, 18 insertions, 7 deletions
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index cb4c36d88..4c45af820 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $
+# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=watchdog
-pkgver=5.9
-pkgrel=2
+pkgver=5.12
+pkgrel=1
pkgdesc="Watchdog daemon"
arch=(i686 x86_64)
url="http://sourceforge.net/projects/watchdog"
@@ -15,16 +15,16 @@ backup=(etc/watchdog.conf
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
watchdog.sh
watchdog.cf
- watchdog-5.9-use-oom_score_adj.patch)
-md5sums=('d7cae3c9829f5d9a680764f314234867'
+ watchdog-5.12-fix-oom-in-wd_keepalive.patch)
+md5sums=('cea28bea70e54f3625062bc808aef9af'
'854451f554718b55186599faaa8d85f6'
'01c1e2e13f515131180b4ebe9b8b7cc3'
- '9a1ab454e42a7f2969ef6bf2da8a4543')
+ 'c90c2686975b5254f82b3de683f1f442')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch
+ patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
diff --git a/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch b/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch
new file mode 100644
index 000000000..dfc06b867
--- /dev/null
+++ b/extra/watchdog/watchdog-5.12-fix-oom-in-wd_keepalive.patch
@@ -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>