gentoo auto-resync : 14:09:2022 - 11:10:10

3 files changed, 74 insertions, 0 deletions

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 523f6c65a890..b6a1ddccb709 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,6 +1,8 @@
+AUX watchdog-5.16-implicit-func-decls-musl.patch 1065 BLAKE2B e68886290417ee92f3b493e7eaa6d52a9562415b62107e1ff974348d41def0eac3e6f42e07788e731ce36cc4d7a943a92d5176eb10b65c1f48266281af14a01a SHA512 77f69cca9734285ab5948d831ea97ec629e0aca57460a9cfb37ee0e7fa37eb30f8669dc990b636af0442aca11896b7b79d25ac9159373cc8aaa018cc6ba83ff0
 AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643464e355179cc01bed2f78f0506209e2911398b072c48d109aeb3b7be37f3aee89c382361cd2f2748 SHA512 73178a2159a8f9420db1e5a6f2b3fea01315074f3e109acd5d02140e610db81aa771a2ab96b5ca1cf1cc1639679d26c0b42e511b1ab08a89957a8f4dd66f1c62
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
 DIST watchdog-5.16.tar.gz 203910 BLAKE2B 517f2f8085829e5c5ff576f1dff920a2667d0e96a71dcbcebf381ccf349e95dfb0b7b598b565eda4cc8ec31f5f34e367dd719eeaf522cdee074c3bc23589dfb2 SHA512 1c9c921570ec7ddc3e4ff88b2029f1c3865277e547fb8970575df4b61fdf1f06f443f49ad09f11c29d913ca7d6ab05c5b19ec049ac218a8bcebd20b1bf5f0bbd
+EBUILD watchdog-5.16-r1.ebuild 983 BLAKE2B d8f9e8cc601a0d55f2aa913b1171215369a9859dd4ab2a532bc6d998e36265e87f84be0d3e429244f0a5c3a1f75c2805615e4ddf9cd34389135d6ba609c0b5ad SHA512 14b0ad5c0014ff8436f622a07922927a5fc267d11dcd99062ebd25dcb86dab8045ee724b72e9b97c36a7b87defc710a901e134801a27f72ac4df47251ba4967b
 EBUILD watchdog-5.16.ebuild 909 BLAKE2B a752b4b31fa65a21a1047e1be00d4cbef44817949e9ca077bdf62bcee34319b5500e10e00f64ac634b7fff0ab3bac88a91c8bd2e6b769964b7b27d43599c8a6f SHA512 d0da86be1ad6c229dc0be3f5f142082388a335a3ec7a8272743768719bc18c96dd8a6b78578a920d0f6ae097b5ce7c6acf769c25a33984b5ea406cb118fe7467
 MISC metadata.xml 406 BLAKE2B 8a6d54669265e43ff308b76436932e8e7697ddf42810862bf2f564bc8ef2858ce205007075d33645165c1fb288a0db3ed43bcc68398fef43a13822615ac08a2a SHA512 039fe377ab47618ee42909c5608eae38c76bcc1df867c8f3097f3c230d465b25bd032bb7e7f49b1528cd57b4e0c4fba65c234eaab79b7cb39fbe152768a90a76
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 000000000000..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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+--- a/src/shutdown.c
++++ b/src/shutdown.c
+@@ -29,13 +29,9 @@
+ #include "extern.h"
+ #include "ext2_mnt.h"
+ 
+-#if defined __GLIBC__
+ #include <sys/quota.h>
+ #include <sys/swap.h>
+ #include <sys/reboot.h>
+-#else				/* __GLIBC__ */
+-#include <linux/quota.h>
+-#endif				/* __GLIBC__ */
+ 
+ #include <unistd.h>
+ 
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 000000000000..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
+}