From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0682C158012 for ; Sat, 10 Sep 2022 13:30:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47274E0937; Sat, 10 Sep 2022 13:30:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EF07E0937 for ; Sat, 10 Sep 2022 13:30:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EA1533C1C2 for ; Sat, 10 Sep 2022 13:30:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFB9858B for ; Sat, 10 Sep 2022 13:30:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1662816593.770010701f15cea7b37c834028df586f9bd0f6cf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/watchdog/, sys-apps/watchdog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/watchdog/files/watchdog-5.16-implicit-func-decls-musl.patch sys-apps/watchdog/watchdog-5.16-r1.ebuild X-VCS-Directories: sys-apps/watchdog/files/ sys-apps/watchdog/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 770010701f15cea7b37c834028df586f9bd0f6cf X-VCS-Branch: master Date: Sat, 10 Sep 2022 13:30:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fbb57d94-253a-453c-bd45-3f7278148b1f X-Archives-Hash: 91656a9ab50209eed26c19f24ced1a19 commit: 770010701f15cea7b37c834028df586f9bd0f6cf Author: Sam James gentoo org> AuthorDate: Sat Sep 10 12:34:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 10 13:29:53 2022 +0000 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 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 +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 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 +}