[arch-commits] Commit in watchdog/trunk (3 files)

[Thomas Bächler]

    Date: Thursday, August 13, 2015 @ 13:42:53
  Author: thomas
Revision: 243394

upgpkg: watchdog 5.14-1

Added:
  watchdog/trunk/watchdog.logrotate
Modified:
  watchdog/trunk/PKGBUILD
Deleted:
  watchdog/trunk/watchdog-5.12-fix-oom-in-wd_keepalive.patch

---------------------------------------------+
 PKGBUILD                                    |   19 ++++++++-----------
 watchdog-5.12-fix-oom-in-wd_keepalive.patch |   11 -----------
 watchdog.logrotate                          |    3 +++
 3 files changed, 11 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-13 08:46:04 UTC (rev 243393)
+++ PKGBUILD	2015-08-13 11:42:53 UTC (rev 243394)
@@ -2,8 +2,8 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=watchdog
-pkgver=5.13
-pkgrel=2
+pkgver=5.14
+pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/watchdog"
@@ -11,15 +11,11 @@
 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
-}
+        watchdog.systemd
+        watchdog.logrotate)
+md5sums=('5b2dba0c593942f4acc100bca0d560c4'
+         '06677f094ec76b7fbb7b0db141209dec'
+         '6430e9071aa724918b47f8c3b0412a5f')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -40,4 +36,5 @@
   cd "${srcdir}"/${pkgname}-${pkgver}
   make install DESTDIR="${pkgdir}"
   install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
+  install -D -m644 "${srcdir}"/watchdog.logrotate "${pkgdir}"/etc/logrotate.d/watchdog
 }

Deleted: watchdog-5.12-fix-oom-in-wd_keepalive.patch
===================================================================
--- watchdog-5.12-fix-oom-in-wd_keepalive.patch	2015-08-13 08:46:04 UTC (rev 243393)
+++ watchdog-5.12-fix-oom-in-wd_keepalive.patch	2015-08-13 11:42:53 UTC (rev 243394)
@@ -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>

Added: watchdog.logrotate
===================================================================
--- watchdog.logrotate	                        (rev 0)
+++ watchdog.logrotate	2015-08-13 11:42:53 UTC (rev 243394)
@@ -0,0 +1,3 @@
+/var/log/watchdog/* {
+   missingok
+}