commit: 538061f2f97f1a31eafa7681c679f2b08600ac44
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 05:41:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 05:41:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538061f2
app-admin/rasdaemon: drop 0.6.7-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/rasdaemon/Manifest | 1 -
.../rasdaemon/files/rasdaemon-0.6.7-musl.patch | 34 ----------
.../rasdaemon/files/sysconfig-fix-0.6.7.patch | 32 ---------
app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild | 79 ----------------------
4 files changed, 146 deletions(-)
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 7c6fda66f703..1e16c310cda2 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,2 +1 @@
-DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B
32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5
SHA512
15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B
95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86
SHA512
634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
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 <st...@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 <st...@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/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 <whitsl...@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
-}
