gentoo auto-resync : 09:01:2023 - 12:18:20

6 files changed, 4 insertions, 153 deletions

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 009a19101707..abdba37a3302 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,11 +1,7 @@
 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-0.6.8-bashisms-configure.patch 9566 BLAKE2B 8a59f4255ff37bda63047bacbecd6a90856f9fa8acc42f8fffec653e20161d0cd6ebde06c9d54004f9c81e17c3e18b8673345690af75604557a7d97d45b72149 SHA512 f8a98bd9c3cb1050f66207105fac80efd1a4ea7f1dcbe997d0f8f611d345eb1026c9d8a4923eef4240fd072fec99e9f1fcb0e2b46d85c053d3d5fcf7da4469b2
-AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
+AUX rasdaemon.confd 108 BLAKE2B 0a6f45d7984965411fe31350bc14e263c0994230b0eff4051a7210bb3e8cbdc293d8c0bccb6417802be879326f127b2fb691a8db73c37f433a258b46eb8bd857 SHA512 f22d7273c5ac57fef57dae5c5c6d765c1554a17889b96a9aedfe13e1b31d969298a537042cd70d3d9cec6896e8b5c1e3e20313e5b4feaeca2a206dc51e3f2ee9
 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
 DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
-EBUILD rasdaemon-0.6.7-r1.ebuild 1496 BLAKE2B a3da9b07cce0c7673877c8e46d8176a89da6eccf952494ead9c3abc4c13315279657de96be8b0c2b70be6ef3e323b073527ee9ba952f7873c333d5c1c6c1c838 SHA512 7c68b384e41416d41fa9aa0f73cad14dbb7ca9f655c763b4d30219dc7e6b8ba0546a308c6eb0249dd791511e33e454aa4417905e62a84228d2abc610cda91619
-EBUILD rasdaemon-0.6.8.ebuild 1463 BLAKE2B d4e70e11797957233f61f476ba0165fcdcf57ee09979b8be5199ee45124991b76c220097a7af06e9c351f20958f010499f15e50866e388900e19afd7b057f853 SHA512 ec7e8b628a477632ab581f554970042857d939d61495bbb81aff98b2b20d1289447b85c2c60e6d667e3d379ce5c510ad0fe430689aec68988a6bb32f5f323075
+EBUILD rasdaemon-0.6.8-r1.ebuild 1462 BLAKE2B 3fc7a39aa1b485de50cbec5b24f9f163c64697f6a1c560deff1d89c9a2a8f31c206521a049d9f0b9eddda71602413cf692487558b641a0eeb70eaaa56eb8fb57 SHA512 543a5af27d7eaacc81a15f28d78b282dc8a5262a2b2ba899a3d159b8659e8317a9e68bfe14296f2f09d49ee4a5a2556e99ceb15cb70db49e1cc84c9a53bf86e9
 MISC metadata.xml 1086 BLAKE2B d9017158e600a5aca8b1ca0600a36efec9f12c26493e28b129a0029caa37224b2e5341292ffdebabdc81893aebddba7b893d69f66f87ff4fd927e5310a4482c8 SHA512 3801a8c374a0d38f9efc07a288eb338739e74d1e7e41a182b871f01ce8cfd695621cfb6c883e5ce8da267e1440bf8106db6ad5ac12ef5e156bba958f72ea6297
diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch
deleted file mode 100644
index 9df9eff6d947..000000000000
--- a/app-admin/rasdaemon/files/rasdaemon-0.6.7-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/rasdaemon.confd b/app-admin/rasdaemon/files/rasdaemon.confd
index 3241ef438dab..413f9f742cd4 100644
--- a/app-admin/rasdaemon/files/rasdaemon.confd
+++ b/app-admin/rasdaemon/files/rasdaemon.confd
@@ -1,2 +1,2 @@
 # pass the --record option if sqlite is enabled and you wish store events in sqlite
-#RASDAEMON_ARGS=--record
+RASDAEMON_ARGS=--record
diff --git a/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch b/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
deleted file mode 100644
index ce4f5ce92bc2..000000000000
--- a/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2379c720a7e490854a2f352ca53af6fbd99c0832 Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <whitslack@users.noreply.github.com>
-Date: Wed, 9 Jun 2021 10:25:18 -0400
-Subject: [PATCH] configure.ac: fix SYSCONFDEFDIR default value
-
-configure.ac was using AC_ARG_WITH incorrectly, yielding a generated configure script like:
-
-    # Check whether --with-sysconfdefdir was given.
-    if test "${with_sysconfdefdir+set}" = set; then :
-      withval=$with_sysconfdefdir; SYSCONFDEFDIR=$withval
-    else
-      "/etc/sysconfig"
-    fi
-
-This commit fixes the default case so that the SYSCONFDEFDIR variable is assigned the value "/etc/sysconfig" rather than trying to execute "/etc/sysconfig" as a command.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f7d1947..33b81fe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -172,7 +172,7 @@ AC_SUBST([RASSTATEDIR])
- AC_ARG_WITH(sysconfdefdir,
-     AC_HELP_STRING([--with-sysconfdefdir=DIR], [rasdaemon environment file dir]),
-     [SYSCONFDEFDIR=$withval],
--    ["/etc/sysconfig"])
-+    [SYSCONFDEFDIR=/etc/sysconfig])
- AC_SUBST([SYSCONFDEFDIR])
- 
- AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database])
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
deleted file mode 100644
index 0ca8b21dd672..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild
index d20c814b12f1..68acb037cef6 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	dev-db/sqlite