[arch-commits] Commit in watchdog/repos (12 files)

Thomas Bächler thomas at archlinux.org
Thu Aug 13 11:43:08 UTC 2015


    Date: Thursday, August 13, 2015 @ 13:43:08
  Author: thomas
Revision: 243395

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  watchdog/repos/extra-i686/PKGBUILD
    (from rev 243394, watchdog/trunk/PKGBUILD)
  watchdog/repos/extra-i686/watchdog.logrotate
    (from rev 243394, watchdog/trunk/watchdog.logrotate)
  watchdog/repos/extra-i686/watchdog.systemd
    (from rev 243394, watchdog/trunk/watchdog.systemd)
  watchdog/repos/extra-x86_64/PKGBUILD
    (from rev 243394, watchdog/trunk/PKGBUILD)
  watchdog/repos/extra-x86_64/watchdog.logrotate
    (from rev 243394, watchdog/trunk/watchdog.logrotate)
  watchdog/repos/extra-x86_64/watchdog.systemd
    (from rev 243394, 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.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.systemd

----------------------------------------------------------+
 /PKGBUILD                                                |   80 +++++++++++++
 /watchdog.systemd                                        |   20 +++
 extra-i686/PKGBUILD                                      |   43 ------
 extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch   |   11 -
 extra-i686/watchdog.logrotate                            |    3 
 extra-i686/watchdog.systemd                              |   10 -
 extra-x86_64/PKGBUILD                                    |   43 ------
 extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch |   11 -
 extra-x86_64/watchdog.logrotate                          |    3 
 extra-x86_64/watchdog.systemd                            |   10 -
 10 files changed, 106 insertions(+), 128 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-i686/PKGBUILD	2015-08-13 11:43:08 UTC (rev 243395)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-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/extra-i686/PKGBUILD (from rev 243394, watchdog/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=watchdog
+pkgver=5.14
+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.systemd
+        watchdog.logrotate)
+md5sums=('5b2dba0c593942f4acc100bca0d560c4'
+         '06677f094ec76b7fbb7b0db141209dec'
+         '6430e9071aa724918b47f8c3b0412a5f')
+
+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
+  install -D -m644 "${srcdir}"/watchdog.logrotate "${pkgdir}"/etc/logrotate.d/watchdog
+}

Deleted: extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch
===================================================================
--- extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-i686/watchdog-5.12-fix-oom-in-wd_keepalive.patch	2015-08-13 11:43:08 UTC (rev 243395)
@@ -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.logrotate (from rev 243394, watchdog/trunk/watchdog.logrotate)
===================================================================
--- extra-i686/watchdog.logrotate	                        (rev 0)
+++ extra-i686/watchdog.logrotate	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,3 @@
+/var/log/watchdog/* {
+   missingok
+}

Deleted: extra-i686/watchdog.systemd
===================================================================
--- extra-i686/watchdog.systemd	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-i686/watchdog.systemd	2015-08-13 11:43:08 UTC (rev 243395)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Watchdog Daemon
-
-[Service]
-Type=forking
-PIDFile=/run/watchdog.pid
-ExecStart=/usr/bin/watchdog
-
-[Install]
-WantedBy=multi-user.target

Copied: watchdog/repos/extra-i686/watchdog.systemd (from rev 243394, watchdog/trunk/watchdog.systemd)
===================================================================
--- extra-i686/watchdog.systemd	                        (rev 0)
+++ extra-i686/watchdog.systemd	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/bin/watchdog
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-x86_64/PKGBUILD	2015-08-13 11:43:08 UTC (rev 243395)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-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/extra-x86_64/PKGBUILD (from rev 243394, watchdog/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=watchdog
+pkgver=5.14
+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.systemd
+        watchdog.logrotate)
+md5sums=('5b2dba0c593942f4acc100bca0d560c4'
+         '06677f094ec76b7fbb7b0db141209dec'
+         '6430e9071aa724918b47f8c3b0412a5f')
+
+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
+  install -D -m644 "${srcdir}"/watchdog.logrotate "${pkgdir}"/etc/logrotate.d/watchdog
+}

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	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-x86_64/watchdog-5.12-fix-oom-in-wd_keepalive.patch	2015-08-13 11:43:08 UTC (rev 243395)
@@ -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.logrotate (from rev 243394, watchdog/trunk/watchdog.logrotate)
===================================================================
--- extra-x86_64/watchdog.logrotate	                        (rev 0)
+++ extra-x86_64/watchdog.logrotate	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,3 @@
+/var/log/watchdog/* {
+   missingok
+}

Deleted: extra-x86_64/watchdog.systemd
===================================================================
--- extra-x86_64/watchdog.systemd	2015-08-13 11:42:53 UTC (rev 243394)
+++ extra-x86_64/watchdog.systemd	2015-08-13 11:43:08 UTC (rev 243395)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Watchdog Daemon
-
-[Service]
-Type=forking
-PIDFile=/run/watchdog.pid
-ExecStart=/usr/bin/watchdog
-
-[Install]
-WantedBy=multi-user.target

Copied: watchdog/repos/extra-x86_64/watchdog.systemd (from rev 243394, watchdog/trunk/watchdog.systemd)
===================================================================
--- extra-x86_64/watchdog.systemd	                        (rev 0)
+++ extra-x86_64/watchdog.systemd	2015-08-13 11:43:08 UTC (rev 243395)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/bin/watchdog
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list