commit: fc90e90736cb4fa551260deb1183389ab129b665
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 09:48:03 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 09:48:03 2025 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fc90e907
sys-apps/watchdog: treeclean
Fixed in ::gentoo in commit 770010701f15 ("sys-apps/watchdog: fix
implicit function declarations") in version 5.16-r1.
Link:
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770010701f15cea7b37c834028df586f9bd0f6cf
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
sys-apps/watchdog/Manifest | 1 -
...sl-Compile-with-musl-when-nfs-is-disabled.patch | 32 ---------------
...inux-param.h-for-EXEC_PAGESIZE-definition.patch | 28 -------------
sys-apps/watchdog/files/watchdog-conf.d | 6 ---
sys-apps/watchdog/files/watchdog-init.d | 48 ----------------------
sys-apps/watchdog/files/watchdog-init.d-r1 | 44 --------------------
sys-apps/watchdog/files/watchdog.service | 10 -----
sys-apps/watchdog/metadata.xml | 14 -------
sys-apps/watchdog/watchdog-5.15.ebuild | 42 -------------------
9 files changed, 225 deletions(-)
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
deleted file mode 100644
index e264a38a..00000000
--- a/sys-apps/watchdog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST watchdog-5.15.tar.gz 228132 SHA256
ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512
a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
\ No newline at end of file
diff --git
a/sys-apps/watchdog/files/musl-Compile-with-musl-when-nfs-is-disabled.patch
b/sys-apps/watchdog/files/musl-Compile-with-musl-when-nfs-is-disabled.patch
deleted file mode 100644
index 4898d218..00000000
--- a/sys-apps/watchdog/files/musl-Compile-with-musl-when-nfs-is-disabled.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f52c40680f0aad44b9ae16648803453ec00cbb2c Mon Sep 17 00:00:00 2001
-From: Paul Crawford <[email protected]>
-Date: Fri, 30 Dec 2016 15:55:45 +0000
-Subject: [PATCH 1/3] 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 <[email protected]>
----
- include/sundries.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-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 <signal.h>
- #include <stdarg.h>
- #include <stdlib.h>
-+#if HAVE_NFS
- #if !defined(bool_t) && !defined(__GLIBC__)
- #include <rpc/types.h>
- #endif
-+#endif
-
- extern int mount_mount_quiet;
- extern int mount_verbose;
---
-2.7.3
-
diff --git
a/sys-apps/watchdog/files/musl-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
b/sys-apps/watchdog/files/musl-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
deleted file mode 100644
index 73f58e26..00000000
---
a/sys-apps/watchdog/files/musl-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c5cb4e1a0339844ae3f55ff1dc4a716c28012f05 Mon Sep 17 00:00:00 2001
-From: Paul Crawford <[email protected]>
-Date: Tue, 28 Jun 2016 18:08:48 +0100
-Subject: [PATCH 1/3] 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 <[email protected]>
----
- src/watchdog.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-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 <sys/param.h> /* For EXEC_PAGESIZE */
- #include <linux/oom.h>
- #include <linux/watchdog.h>
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
- #include <string.h>
-
- #include <libgen.h>
---
-2.7.3
-
diff --git a/sys-apps/watchdog/files/watchdog-conf.d
b/sys-apps/watchdog/files/watchdog-conf.d
deleted file mode 100644
index 60c7843d..00000000
--- a/sys-apps/watchdog/files/watchdog-conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# for more info, see watchdog(8)
-WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-init.d
b/sys-apps/watchdog/files/watchdog-init.d
deleted file mode 100644
index a6468387..00000000
--- a/sys-apps/watchdog/files/watchdog-init.d
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/files/watchdog-init.d-r1
b/sys-apps/watchdog/files/watchdog-init.d-r1
deleted file mode 100644
index 79602017..00000000
--- a/sys-apps/watchdog/files/watchdog-init.d-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/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/files/watchdog.service
b/sys-apps/watchdog/files/watchdog.service
deleted file mode 100644
index 9ec1076e..00000000
--- a/sys-apps/watchdog/files/watchdog.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=watchdog daemon
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/watchdog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
deleted file mode 100644
index 1f74c9cd..00000000
--- a/sys-apps/watchdog/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="nfs">enable support for checking nfs mounts</flag>
-</use>
-<upstream>
- <remote-id type="sourceforge">watchdog</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild
b/sys-apps/watchdog/watchdog-5.15.ebuild
deleted file mode 100644
index 2677d5e4..00000000
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~arm64 ~mips ~ppc ~x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-
"${FILESDIR}/musl-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch"
- "${FILESDIR}/musl-Compile-with-musl-when-nfs-is-disabled.patch"
-)
-
-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
-}
