gentoo resync : 02.02.2022

3 files changed, 115 insertions, 0 deletions

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 3a2a41e578d7..35b6bf1d9915 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,7 +1,9 @@
 AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
+AUX rasdaemon-0.6.7-musl.patch 1032 BLAKE2B 4185df738abec830fe1fa202cf15b9e12fe4fa09056ffcc77be3189310526b4e1b1aa2c938f30493e6ad8626902d58ea2d1c8ee0398226ea315d51155b2c64e0 SHA512 17d83cd502e32f8ad70655dd9d94d2a6d4b0535054488b56decdeefeb83bbd5d314e0740f51ed3df198cee18c0e0c91462fe01dd3816c3f2a41e659aa7ad0f58
 AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 AUX sysconfig-fix-0.6.7.patch 1226 BLAKE2B 58c30284cb2d7fbf65a6f9233a9fc934f7d48b184cb3364aede9d4080dfab398c41e9f91b9c1728a3bab584ea0881d67857e9e04ba4c1c5e9dedf3c6e119a91a SHA512 3923737c47b04edc80eb5cb3b0cc5fca597fa4dfdbe42ffc262e7cedaf5debc73996befadf3fae65c1244857eabded5844c067ec0f5f3fe9468b24c5f4b780c2
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
+EBUILD rasdaemon-0.6.7-r1.ebuild 1498 BLAKE2B 5ce9cd638606bfbdacb737859d23fc8a529df3bafa2b9603c3388f9d66dd2bff857ebd52353e9b75ebef317706951dc461932146c33d1388f075f8d0e92c7594 SHA512 36e847a1e5a209415363ef0bfd993e2a55aef2a2026743b74591f07a9ee730540a5c451db38daed23920b93ea2296007a93d770a3cc8183ce168d45ecb644293
 EBUILD rasdaemon-0.6.7.ebuild 1268 BLAKE2B 34f2d2bb59ffb2a35c990980f1ff669712ef4a3d14e4e3270b0874b122a5323ca089ebf9df0558cac4ff88330b5b5c9ebdc9c1fac600f0b5147d2b3ab8843e45 SHA512 e7223ec552f72bc1c73b7a9831448a97b278f8654ca19449d08121fd93b3e80b541e4a34c6dbcc53ff887be3739866d0c9799357654089c65c3be9db59b3e010
 MISC metadata.xml 872 BLAKE2B 70a9674434222532c7a597ad6b1ad202dce198398271cd3d45cd5b7e13f904b72b05e95305048a46ec86416cdafb5b9989ae14f221675234ccab4f54350a2820 SHA512 66d320b2c1c6292a1bff84bfa4ee9f379b300b320fb7cf8a3a2985fa8c968569e6f7b2fc44643a9439735d1cdb4a8158ea6319129a640a7e8c9d657267df434f
diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch
new file mode 100644
index 000000000000..9df9eff6d947
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch
@@ -0,0 +1,34 @@
+From c450d2334d59c2441d9b4fcee1284afb55b9639c Mon Sep 17 00:00:00 2001
+From: Stijn Tintel <stijn@linux-ipv6.be>
+Date: Wed, 1 Sep 2021 03:32:18 +0300
+Subject: [PATCH] rasdaemon: fix compile against musl libc
+
+Fix the following compile errors that occurs when building against musl:
+
+ras-events.c: In function 'read_ras_event_all_cpus':
+ras-events.c:366:16: error: 'PATH_MAX' undeclared (first use in this function)
+  366 |  char pipe_raw[PATH_MAX];
+      |                ^~~~~~~~
+
+ras-events.c: In function 'handle_ras_events_cpu':
+ras-events.c:564:16: error: 'PATH_MAX' undeclared (first use in this function)
+  564 |  char pipe_raw[PATH_MAX];
+      |
+
+Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
+---
+ ras-events.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ras-events.c b/ras-events.c
+index fe4bd26..39cab20 100644
+--- a/ras-events.c
++++ b/ras-events.c
+@@ -18,6 +18,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..7a8d2aa43192
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="sqlite"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	sys-apps/dmidecode
+	sqlite? (
+		dev-db/sqlite
+		dev-perl/DBD-SQLite
+	)
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+
+PATCHES=(
+	"${FILESDIR}/sysconfig-fix-0.6.7.patch"
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG"
+	check_extra_config
+}
+
+src_prepare() {
+	default
+
+	# avoid re-configure due to automake trigger
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable sqlite sqlite3)
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-devlink
+		--enable-diskerror
+		--enable-memory-ce-pfa
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	use elibc_musl && append-libs argp
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}