[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2023-06-28 Thread Sam James 
commit: 31c2d1000602719f0ad4d1819c26b587baf14242
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 28 07:39:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 07:50:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31c2d100

sys-apps/watchdog: add missing selinux policy dep

Signed-off-by: Sam James  gentoo.org>

 sys-apps/watchdog/watchdog-5.16-r1.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 2c909e19992d..8b95e45fda2a 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -12,10 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
-IUSE="nfs"
+IUSE="nfs selinux"
 
-RDEPEND="nfs? ( net-libs/libtirpc )"
-DEPEND="${RDEPEND}"
+DEPEND="nfs? ( net-libs/libtirpc )"
+RDEPEND="
+   ${DEPEND}
+   selinux? ( sec-policy/selinux-watchdog )
+"
 BDEPEND="
virtual/pkgconfig
 "

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2023-03-04 Thread Arthur Zamarin 
commit: 4d4094798f76aad75eb7b7d2b3314f284712ddc4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:32:30 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:32:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d409479

sys-apps/watchdog: Stabilize 5.16-r1 ppc, #899308

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/watchdog/watchdog-5.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 6b60318ba93b..2c909e19992d 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2023-03-04 Thread Arthur Zamarin 
commit: 5f87e8d30220c6ed17c86046166df8bc92eed4d6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:33:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:33:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f87e8d3

sys-apps/watchdog: Stabilize 5.16-r1 x86, #899308

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/watchdog/watchdog-5.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 28ed36dca500..6b60318ba93b 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2023-03-04 Thread Arthur Zamarin 
commit: 9b68a84802b9d637da8d3f7148c8f74741d31dbb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 09:15:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 09:15:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b68a848

sys-apps/watchdog: Stabilize 5.16-r1 amd64, #899308

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/watchdog/watchdog-5.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 036303355acd..28ed36dca500 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2023-03-03 Thread Arthur Zamarin 
commit: 8829f71fde9e3f9c13d28906f3220c12a9007a60
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:55:17 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:55:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8829f71f

sys-apps/watchdog: Stabilize 5.16-r1 arm, #899308

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/watchdog/watchdog-5.16-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
index 896261cadca2..036303355acd 100644
--- a/sys-apps/watchdog/watchdog-5.16-r1.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/, sys-apps/watchdog/files/

2022-09-10 Thread Sam James 
commit: 770010701f15cea7b37c834028df586f9bd0f6cf
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 12:34:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 13:29:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77001070

sys-apps/watchdog: fix implicit function declarations

Signed-off-by: Sam James  gentoo.org>

 .../watchdog-5.16-implicit-func-decls-musl.patch   | 30 
 sys-apps/watchdog/watchdog-5.16-r1.ebuild  | 42 ++
 2 files changed, 72 insertions(+)

diff --git 
a/sys-apps/watchdog/files/watchdog-5.16-implicit-func-decls-musl.patch 
b/sys-apps/watchdog/files/watchdog-5.16-implicit-func-decls-musl.patch
new file mode 100644
index ..82f41ed63420
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.16-implicit-func-decls-musl.patch
@@ -0,0 +1,30 @@
+https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-extended/watchdog/watchdog/0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch?id=a53722b962e79e0831c0fba24ef7c1cfda24971a
+
+From ca1d379fa13c4055d42d2ff3a647b4397768efcd Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 23 Aug 2022 19:23:26 -0700
+Subject: [PATCH] shutdown: Do not guard sys/quota.h sys/swap.h and
+ sys/reboot.h with __GLIBC__
+
+These headers are provided by uclibc/musl/glibc and bionic so we can
+assume they are not needed to be glibc specific includes. This also
+ensures that we get proper declaration of reboot() API
+
+Upstream-Status: Submitted [https://sourceforge.net/p/watchdog/patches/12/]
+Signed-off-by: Khem Raj 
+--- a/src/shutdown.c
 b/src/shutdown.c
+@@ -29,13 +29,9 @@
+ #include "extern.h"
+ #include "ext2_mnt.h"
+ 
+-#if defined __GLIBC__
+ #include 
+ #include 
+ #include 
+-#else /* __GLIBC__ */
+-#include 
+-#endif/* __GLIBC__ */
+ 
+ #include 
+ 

diff --git a/sys-apps/watchdog/watchdog-5.16-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
new file mode 100644
index ..896261cadca2
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A software watchdog and /dev/watchdog daemon"
+HOMEPAGE="https://sourceforge.net/projects/watchdog/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+IUSE="nfs"
+
+RDEPEND="nfs? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.16-implicit-func-decls-musl.patch
+)
+
+src_configure() {
+   if use nfs; then
+   append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)"
+   append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)"
+   fi
+   econf $(use_enable nfs)
+}
+
+src_install() {
+   default
+   dodoc -r examples
+
+   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+   newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+   systemd_dounit "${FILESDIR}"/watchdog.service
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2022-04-07 Thread Jakov Smolić 
commit: cd63f62276689d646dfcf4effc1fd965e800c799
Author: Atharva Amritkar  protonmail  com>
AuthorDate: Mon Apr  4 17:05:39 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Apr  7 15:30:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd63f622

sys-apps/watchdog: Keyword 5.16 for ~riscv

Signed-off-by: Atharva Amritkar  protonmail.com>
Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/watchdog/watchdog-5.16.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
index a8bd491e861d..9ae30c929351 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/, sys-apps/watchdog/files/

2021-05-13 Thread David Seifert 
commit: 9b79f1b4b7cc46dc8e2cab90bd087f42b3dbf8ae
Author: David Seifert  gentoo  org>
AuthorDate: Thu May 13 20:24:09 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 13 20:24:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b79f1b4

sys-apps/watchdog: Remove old 5.15

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/watchdog/Manifest |  1 -
 .../watchdog/files/watchdog-5.15-musl-nfs.patch| 27 -
 sys-apps/watchdog/files/watchdog-5.15-musl.patch   | 23 ---
 sys-apps/watchdog/files/watchdog-init.d| 47 --
 sys-apps/watchdog/watchdog-5.15.ebuild | 41 ---
 5 files changed, 139 deletions(-)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 644169d7c3a..9da68e1e098 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,2 +1 @@
-DIST watchdog-5.15.tar.gz 228132 BLAKE2B 
040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323
 SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 DIST watchdog-5.16.tar.gz 203910 BLAKE2B 
517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2
 SHA512 
1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd

diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch 
b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
deleted file mode 100644
index bee4ddc8d7b..000
--- a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit f52c40680f0aad44b9ae16648803453ec00cbb2c
-Author: Paul Crawford 
-Date:   Fri Dec 30 15:55:45 2016 +
-
-Compile with musl when nfs is disabled
-
-musl does by default not ship with rpc headers. The watchdog should
-not require rpc headers when nfs support is disabled.
-
-Patch by Felix Janda 
-
-diff --git a/include/sundries.h b/include/sundries.h
-index 4379982..98c489a 100644
 a/include/sundries.h
-+++ b/include/sundries.h
-@@ -9,9 +9,11 @@
- #include 
- #include 
- #include 
-+#if HAVE_NFS
- #if !defined(bool_t) && !defined(__GLIBC__)
- #include 
- #endif
-+#endif
- 
- extern int mount_mount_quiet;
- extern int mount_verbose;

diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl.patch 
b/sys-apps/watchdog/files/watchdog-5.15-musl.patch
deleted file mode 100644
index ae62c8014e5..000
--- a/sys-apps/watchdog/files/watchdog-5.15-musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit c5cb4e1a0339844ae3f55ff1dc4a716c28012f05
-Author: Paul Crawford 
-Date:   Tue Jun 28 18:08:48 2016 +0100
-
-Include linux/param.h for EXEC_PAGESIZE definition
-
-Musl does not include linux/param.h whereas glibc does, so it fails
-to build on musl. Patch supplied by Khem Raj 
-
-diff --git a/src/watchdog.c b/src/watchdog.c
-index acf6450..486384a 100644
 a/src/watchdog.c
-+++ b/src/watchdog.c
-@@ -26,6 +26,9 @@
- #include /* For EXEC_PAGESIZE */
- #include 
- #include 
-+#ifdef __linux__
-+#include 
-+#endif
- #include 
- 
- #include 

diff --git a/sys-apps/watchdog/files/watchdog-init.d 
b/sys-apps/watchdog/files/watchdog-init.d
deleted file mode 100644
index 734a02cdbcb..000
--- a/sys-apps/watchdog/files/watchdog-init.d
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need localmount
-   use logger
-}
-
-get_config() {
-   set -- ${WATCHDOG_OPTS}
-   while [ -n "$1" ] ; do
-   if [ "$1" = "-c" -o "$1" = "--config-file" ] ; then
-   echo $2
-   return
-   fi
-   shift
-   done
-   echo /etc/watchdog.conf
-}
-
-get_delay() {
-   # man this is fugly
-   sed -n \
-   -e '1{x;s:.*:10:;x}' \
-   -e 's:#.*::' \
-   -e 's:^[[:space:]]*::' \
-   -e '/^interval/{s:.*=::;h}' \
-   -e '${g;p}' \
-   $(get_config)
-}
-
-start() {
-   ebegin "Starting watchdog"
-   start-stop-daemon --start \
-   --exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \
-   -- ${WATCHDOG_OPTS}
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping watchdog"
-   start-stop-daemon --stop \
-   --exec /usr/sbin/watchdog --pidfile /var/run/watchdog.pid \
-   --retry $(get_delay)
-   eend $?
-}

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
deleted file mode 100644
index 88927995858..000
---

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2021-05-13 Thread Sam James 
commit: 8c877a3a6e3a9c28d8690542de1a5d9d29046daa
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 18:57:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 18:57:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c877a3a

sys-apps/watchdog: Stabilize 5.16 ppc, #789867

Signed-off-by: Sam James  gentoo.org>

 sys-apps/watchdog/watchdog-5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
index 0e324aec432..a8bd491e861 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2021-05-13 Thread Sam James 
commit: b6f984e52d4df0b302acf9715608169733cc299f
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 17:10:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 17:10:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f984e5

sys-apps/watchdog: Stabilize 5.16 x86, #789867

Signed-off-by: Sam James  gentoo.org>

 sys-apps/watchdog/watchdog-5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
index 688d81b3eb3..0e324aec432 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2021-05-13 Thread Sam James 
commit: 75ff679c2408709a472672ce2088c63e07fc8c7c
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:21:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:21:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ff679c

sys-apps/watchdog: Stabilize 5.16 arm, #789867

Signed-off-by: Sam James  gentoo.org>

 sys-apps/watchdog/watchdog-5.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
index b33ac35b7f6..688d81b3eb3 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2021-05-13 Thread Sam James 
commit: eb1b1e20d269647b8226a6df0059769c2647f795
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 16:17:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 16:17:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1b1e20

sys-apps/watchdog: Stabilize 5.16 amd64, #789867

Signed-off-by: Sam James  gentoo.org>

 sys-apps/watchdog/watchdog-5.16.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
index a9e42800d85..b33ac35b7f6 100644
--- a/sys-apps/watchdog/watchdog-5.16.ebuild
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2020-04-30 Thread Lars Wendler 
commit: de2b6fc1016c833c19b17792d794d9d67300c9e8
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Apr 30 10:34:02 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 30 10:34:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2b6fc1

sys-apps/watchdog: Bump to version 5.16

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/watchdog/Manifest |  1 +
 sys-apps/watchdog/watchdog-5.16.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 5c65f5ee3cc..644169d7c3a 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1 +1,2 @@
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 
040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323
 SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
+DIST watchdog-5.16.tar.gz 203910 BLAKE2B 
517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2
 SHA512 
1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd

diff --git a/sys-apps/watchdog/watchdog-5.16.ebuild 
b/sys-apps/watchdog/watchdog-5.16.ebuild
new file mode 100644
index 000..a9e42800d85
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.16.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A software watchdog and /dev/watchdog daemon"
+HOMEPAGE="https://sourceforge.net/projects/watchdog/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+IUSE="nfs"
+
+RDEPEND="nfs? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   if use nfs; then
+   append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)"
+   append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)"
+   fi
+   econf $(use_enable nfs)
+}
+
+src_install() {
+   default
+   dodoc -r examples
+
+   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+   newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+   systemd_dounit "${FILESDIR}"/watchdog.service
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2018-01-07 Thread Mikle Kolyada 
commit: d4cf026d2e26cfc61b5696db947af4f467ceb949
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jan  7 14:46:42 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jan  7 14:46:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4cf026d

sys-apps/watchdog: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-apps/watchdog/Manifest |  1 -
 sys-apps/watchdog/watchdog-5.14.ebuild | 37 --
 2 files changed, 38 deletions(-)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 1ade9c0946a..5c65f5ee3cc 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,2 +1 @@
-DIST watchdog-5.14.tar.gz 216384 BLAKE2B 
e27f6cb3595c54a2128d828434fcbde7a42be3a31a8c837153950f360146526a809d55dbe68fa248e2efcd7063a888f563eb36075d7334e5b7307fb02da67c29
 SHA512 
ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 
040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323
 SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75

diff --git a/sys-apps/watchdog/watchdog-5.14.ebuild 
b/sys-apps/watchdog/watchdog-5.14.ebuild
deleted file mode 100644
index f22eacd43f2..000
--- a/sys-apps/watchdog/watchdog-5.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic systemd
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="https://sourceforge.net/projects/watchdog/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm m68k ~mips ppc s390 sh ~sparc x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   if use nfs ; then
-   tc-export PKG_CONFIG
-   append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-   export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
-   fi
-   econf $(use_enable nfs)
-}
-
-src_install() {
-   default
-   docinto examples
-   dodoc examples/*
-
-   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-   newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-   systemd_dounit "${FILESDIR}"/watchdog.service
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2018-01-07 Thread Mikle Kolyada 
commit: 1ff4f3f825c90e73e92a94a5b51b5f7ae0fb1075
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jan  7 14:45:20 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jan  7 14:45:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff4f3f8

sys-apps/watchdog: arm stable wrt bug #639506

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-apps/watchdog/watchdog-5.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 3c3b6f51e11..1907cbce3c0 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh 
~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2017-12-27 Thread Sergei Trofimovich 
commit: 6a6590c12b90768914e53cb2938ac587ab5df82e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Dec 27 12:18:49 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 27 12:20:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6590c1

sys-apps/watchdog: stable 5.15 for ppc, bug #639506

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 sys-apps/watchdog/watchdog-5.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 0f79bd4cb7f..3c3b6f51e11 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 
~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2017-12-18 Thread Jason Zaman 
commit: 9738192454b5a02c6cbb283eba1b6accc79c9afe
Author: Jason Zaman  gentoo  org>
AuthorDate: Mon Dec 18 16:34:59 2017 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Dec 18 16:40:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97381924

sys-apps/watchdog: amd64 stable

Gentoo-bug: 639506
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-apps/watchdog/watchdog-5.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index e7de74cd10d..0f79bd4cb7f 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2017-12-08 Thread Thomas Deutschmann 
commit: e723cb85eb6a4febf62aab5f1b148b358694e46e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  8 20:31:38 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  8 20:31:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e723cb85

sys-apps/watchdog: x86 stable (bug #639506)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/watchdog/watchdog-5.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 1c38ff5e002..e7de74cd10d 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2017-12-02 Thread David Seifert 
commit: df0e4512f3ec5c66fff3425d07d3d4cdef9a8be4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Dec  2 14:14:36 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec  2 14:15:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0e4512

sys-apps/watchdog: [QA] Add virtual/pkgconfig to DEPEND

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/watchdog/Manifest |  2 +-
 sys-apps/watchdog/watchdog-5.15.ebuild | 17 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index b521b01b07f..8d7c98b5cbc 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,2 +1,2 @@
 DIST watchdog-5.14.tar.gz 216384 SHA256 
620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 
ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 WHIRLPOOL 
5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c
-DIST watchdog-5.15.tar.gz 228132 SHA256 
ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 WHIRLPOOL 
ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9
+DIST watchdog-5.15.tar.gz 228132 BLAKE2B 
040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323
 SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 887cff30080..1c38ff5e002 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs flag-o-matic systemd
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="A software watchdog and /dev/watchdog daemon"
 HOMEPAGE="https://sourceforge.net/projects/watchdog/;
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 IUSE="nfs"
 
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
+RDEPEND="nfs? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
 
 PATCHES=(
"${FILESDIR}"/${P}-musl.patch
@@ -23,18 +24,16 @@ PATCHES=(
 )
 
 src_configure() {
-   if use nfs ; then
-   tc-export PKG_CONFIG
-   append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-   export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
+   if use nfs; then
+   append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)"
+   append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)"
fi
econf $(use_enable nfs)
 }
 
 src_install() {
default
-   docinto examples
-   dodoc examples/*
+   dodoc -r examples
 
newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/, sys-apps/watchdog/files/

2017-06-05 Thread Robin H. Johnson 
commit: b25df17dd08aa5150ea3e09dbf79cdf7c73e02ed
Author: Felix Janda  posteo  de>
AuthorDate: Fri Apr 14 21:56:20 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun  5 21:13:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25df17d

sys-apps/watchdog: add two musl patches and bump eapi

Gentoo-Bug: https://bugs.gentoo.org/604260
(cherry picked from commit 02ab37b0d2b57a6c40e0b93978d37d8c4dc611bb)
Signed-off-by: Robin H. Johnson  gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/4423

 .../watchdog/files/watchdog-5.15-musl-nfs.patch| 27 ++
 sys-apps/watchdog/files/watchdog-5.15-musl.patch   | 23 ++
 sys-apps/watchdog/watchdog-5.15.ebuild |  9 ++--
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch 
b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
new file mode 100644
index 000..bee4ddc8d7b
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.15-musl-nfs.patch
@@ -0,0 +1,27 @@
+commit f52c40680f0aad44b9ae16648803453ec00cbb2c
+Author: Paul Crawford 
+Date:   Fri Dec 30 15:55:45 2016 +
+
+Compile with musl when nfs is disabled
+
+musl does by default not ship with rpc headers. The watchdog should
+not require rpc headers when nfs support is disabled.
+
+Patch by Felix Janda 
+
+diff --git a/include/sundries.h b/include/sundries.h
+index 4379982..98c489a 100644
+--- a/include/sundries.h
 b/include/sundries.h
+@@ -9,9 +9,11 @@
+ #include 
+ #include 
+ #include 
++#if HAVE_NFS
+ #if !defined(bool_t) && !defined(__GLIBC__)
+ #include 
+ #endif
++#endif
+ 
+ extern int mount_mount_quiet;
+ extern int mount_verbose;

diff --git a/sys-apps/watchdog/files/watchdog-5.15-musl.patch 
b/sys-apps/watchdog/files/watchdog-5.15-musl.patch
new file mode 100644
index 000..ae62c8014e5
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.15-musl.patch
@@ -0,0 +1,23 @@
+commit c5cb4e1a0339844ae3f55ff1dc4a716c28012f05
+Author: Paul Crawford 
+Date:   Tue Jun 28 18:08:48 2016 +0100
+
+Include linux/param.h for EXEC_PAGESIZE definition
+
+Musl does not include linux/param.h whereas glibc does, so it fails
+to build on musl. Patch supplied by Khem Raj 
+
+diff --git a/src/watchdog.c b/src/watchdog.c
+index acf6450..486384a 100644
+--- a/src/watchdog.c
 b/src/watchdog.c
+@@ -26,6 +26,9 @@
+ #include /* For EXEC_PAGESIZE */
+ #include 
+ #include 
++#ifdef __linux__
++#include 
++#endif
+ #include 
+ 
+ #include 

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 900a3d31388..887cff30080 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit toolchain-funcs flag-o-matic systemd
 
@@ -17,6 +17,11 @@ IUSE="nfs"
 DEPEND="nfs? ( net-libs/libtirpc )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-musl.patch
+   "${FILESDIR}"/${P}-musl-nfs.patch
+)
+
 src_configure() {
if use nfs ; then
tc-export PKG_CONFIG

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2016-03-02 Thread Mike Frysinger 
commit: de66fed27cf353f1b4a2eeb605fe9635fe7202ff
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Mar  3 07:31:19 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Mar  3 07:32:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de66fed2

sys-apps/watchdog: add alpha/arm64/hppa/ia64/ppc64 love

 sys-apps/watchdog/watchdog-5.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
index 81fefb8..cc04e56 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 IUSE="nfs"
 
 DEPEND="nfs? ( net-libs/libtirpc )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/files/, sys-apps/watchdog/

2016-02-29 Thread Lars Wendler 
commit: a38428a032bde813630b4670454588dc1d8581f8
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar  1 07:38:41 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar  1 07:54:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38428a0

sys-apps/watchdog: Bump to version 5.15

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/watchdog/Manifest |  1 +
 sys-apps/watchdog/files/watchdog-init.d-r1 | 44 ++
 sys-apps/watchdog/watchdog-5.15.ebuild | 38 ++
 3 files changed, 83 insertions(+)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 300c92b..67fb0dd 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,2 +1,3 @@
 DIST watchdog-5.13.tar.gz 201202 SHA256 
141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0 SHA512 
ff68bc748446c060c86362105013d3ccf741e165d497d743a986d2dd28027e0290c83a67317d603d095a5d79c840991224aaa31b1bd2b66f6e858d3a35536d1f
 WHIRLPOOL 
00c511d4a66d6adc3ad499b9348837261d672088527637db9a0b535550a3ce5cdf2b8fdf2a05ac039fb9111c81b8e9578dceddf759de418d305d5ffddf257584
 DIST watchdog-5.14.tar.gz 216384 SHA256 
620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 
ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 WHIRLPOOL 
5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c
+DIST watchdog-5.15.tar.gz 228132 SHA256 
ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 WHIRLPOOL 
ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9

diff --git a/sys-apps/watchdog/files/watchdog-init.d-r1 
b/sys-apps/watchdog/files/watchdog-init.d-r1
new file mode 100644
index 000..7960201
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-init.d-r1
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/var/run/watchdog.pid"
+command="/usr/sbin/watchdog"
+command_args="${WATCHDOG_OPTS}"
+
+depend() {
+   need localmount
+   use logger
+}
+
+get_config() {
+   set -- ${WATCHDOG_OPTS}
+   while [ -n "$1" ] ; do
+   if [ "$1" = "-c" -o "$1" = "--config-file" ] ; then
+   echo $2
+   return
+   fi
+   shift
+   done
+   echo /etc/watchdog.conf
+}
+
+get_delay() {
+   # man this is fugly
+   sed -n \
+   -e '1{x;s:.*:10:;x}' \
+   -e 's:#.*::' \
+   -e 's:^[[:space:]]*::' \
+   -e '/^interval/{s:.*=::;h}' \
+   -e '${g;p}' \
+   $(get_config)
+}
+
+stop() {
+   ebegin "Stopping watchdog"
+   start-stop-daemon --stop \
+   --exec ${command} --pidfile ${pidfile} \
+   --retry $(get_delay)
+   eend $?
+}

diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild 
b/sys-apps/watchdog/watchdog-5.15.ebuild
new file mode 100644
index 000..81fefb8
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic systemd
+
+DESCRIPTION="A software watchdog and /dev/watchdog daemon"
+HOMEPAGE="http://sourceforge.net/projects/watchdog/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="nfs"
+
+DEPEND="nfs? ( net-libs/libtirpc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   if use nfs ; then
+   tc-export PKG_CONFIG
+   append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
+   export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
+   fi
+   econf $(use_enable nfs)
+}
+
+src_install() {
+   default
+   docinto examples
+   dodoc examples/*
+
+   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+   newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+   systemd_dounit "${FILESDIR}"/watchdog.service
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/

2016-02-29 Thread Lars Wendler 
commit: d2acc8bbe9466b3ed5da60e7d2bbf2e77876bc29
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Mar  1 07:39:17 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar  1 07:54:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2acc8bb

sys-apps/watchdog: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/watchdog/Manifest|  1 -
 sys-apps/watchdog/watchdog-5.13-r1.ebuild | 38 ---
 2 files changed, 39 deletions(-)

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 67fb0dd..b521b01 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,3 +1,2 @@
-DIST watchdog-5.13.tar.gz 201202 SHA256 
141e0faf3ee4d8187a6ff4e00b18ef7b7a4ce432a2d4c8a6e6fdc62507fc6eb0 SHA512 
ff68bc748446c060c86362105013d3ccf741e165d497d743a986d2dd28027e0290c83a67317d603d095a5d79c840991224aaa31b1bd2b66f6e858d3a35536d1f
 WHIRLPOOL 
00c511d4a66d6adc3ad499b9348837261d672088527637db9a0b535550a3ce5cdf2b8fdf2a05ac039fb9111c81b8e9578dceddf759de418d305d5ffddf257584
 DIST watchdog-5.14.tar.gz 216384 SHA256 
620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 
ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 WHIRLPOOL 
5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c
 DIST watchdog-5.15.tar.gz 228132 SHA256 
ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
 WHIRLPOOL 
ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9

diff --git a/sys-apps/watchdog/watchdog-5.13-r1.ebuild 
b/sys-apps/watchdog/watchdog-5.13-r1.ebuild
deleted file mode 100644
index b79ee95..000
--- a/sys-apps/watchdog/watchdog-5.13-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic systemd
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="http://sourceforge.net/projects/watchdog/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm m68k ~mips ppc s390 sh ~sparc x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   if use nfs ; then
-   tc-export PKG_CONFIG
-   append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-   export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
-   fi
-   econf $(use_enable nfs)
-}
-
-src_install() {
-   default
-   docinto examples
-   dodoc examples/*
-
-   newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-   newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-   systemd_dounit "${FILESDIR}"/watchdog.service
-}