Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
Date: Thu, 29 Dec 2022 17:26:41
Message-Id: 1672334789.973ccf5af3917e0e50bcbfcb0321da80846a67d3.sam@gentoo
1 commit: 973ccf5af3917e0e50bcbfcb0321da80846a67d3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 17:25:33 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 17:26:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973ccf5a
7
8 app-admin/rasdaemon: add 0.6.8
9
10 Closes: https://bugs.gentoo.org/834964
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-admin/rasdaemon/Manifest | 1 +
14 .../files/rasdaemon-0.6.8-bashisms-configure.patch | 186 +++++++++++++++++++++
15 app-admin/rasdaemon/rasdaemon-0.6.8.ebuild | 76 +++++++++
16 3 files changed, 263 insertions(+)
17
18 diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
19 index 1b6919f9da7f..7c6fda66f703 100644
20 --- a/app-admin/rasdaemon/Manifest
21 +++ b/app-admin/rasdaemon/Manifest
22 @@ -1 +1,2 @@
23 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
24 +DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
25
26 diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
27 new file mode 100644
28 index 000000000000..6a3beaae217c
29 --- /dev/null
30 +++ b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
31 @@ -0,0 +1,186 @@
32 +https://github.com/mchehab/rasdaemon/pull/81
33 +
34 +From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
35 +From: Sam James <sam@g.o>
36 +Date: Thu, 29 Dec 2022 17:23:47 +0000
37 +Subject: [PATCH] configure.ac: fix bashisms
38 +MIME-Version: 1.0
39 +Content-Type: text/plain; charset=UTF-8
40 +Content-Transfer-Encoding: 8bit
41 +
42 +configure scripts need to be runnable with a POSIX-compliant /bin/sh.
43 +
44 +On many (but not all!) systems, /bin/sh is provided by Bash, so errors
45 +like this aren't spotted. Notably Debian defaults to /bin/sh provided
46 +by dash which doesn't tolerate such bashisms as '=='.
47 +
48 +This retains compatibility with bash.
49 +
50 +Signed-off-by: Sam James <sam@g.o>
51 +--- a/configure.ac
52 ++++ b/configure.ac
53 +@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
54 + AC_ARG_ENABLE([sqlite3],
55 + AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
56 +
57 +-AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
58 ++AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
59 + AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
60 + SQLITE3_LIBS="-lsqlite3"
61 + AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
62 + AC_SUBST([WITH_SQLITE3])
63 + ])
64 +
65 +-AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
66 ++AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
67 + AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
68 +
69 + AC_SUBST([SQLITE3_LIBS])
70 +@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
71 + AC_ARG_ENABLE([aer],
72 + AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
73 +
74 +-AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
75 ++AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
76 + AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
77 + AC_SUBST([WITH_AER])
78 + ])
79 +-AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
80 ++AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
81 + AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
82 +
83 +
84 + AC_ARG_ENABLE([non_standard],
85 + AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
86 +
87 +-AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
88 ++AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
89 + AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
90 + AC_SUBST([WITH_NON_STANDARD])
91 + ])
92 +-AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
93 ++AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
94 + AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
95 +
96 + AC_ARG_ENABLE([arm],
97 + AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
98 +
99 +-AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
100 ++AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
101 + AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
102 + AC_SUBST([WITH_ARM])
103 + ])
104 +-AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
105 ++AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
106 + AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
107 +
108 + AC_ARG_ENABLE([mce],
109 + AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
110 +
111 +-AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
112 ++AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
113 + AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
114 + AC_SUBST([WITH_MCE])
115 + ])
116 +-AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
117 ++AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
118 + AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
119 +
120 + AC_ARG_ENABLE([extlog],
121 + AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
122 +
123 +-AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
124 ++AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
125 + AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
126 + AC_SUBST([WITH_EXTLOG])
127 + ])
128 +-AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
129 ++AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
130 + AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
131 +
132 + AC_ARG_ENABLE([devlink],
133 + AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
134 +
135 +-AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
136 ++AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
137 + AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
138 + AC_SUBST([WITH_DEVLINK])
139 + ])
140 +-AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
141 ++AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
142 + AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
143 +
144 + AC_ARG_ENABLE([diskerror],
145 + AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
146 +
147 +-AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
148 ++AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
149 + AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
150 + AC_SUBST([WITH_DISKERROR])
151 + ])
152 +-AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
153 ++AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
154 + AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
155 +
156 + AC_ARG_ENABLE([memory_failure],
157 + AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
158 +
159 +-AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
160 ++AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
161 + AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
162 + AC_SUBST([WITH_MEMORY_FAILURE])
163 + ])
164 +-AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
165 ++AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
166 + AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
167 +
168 + AC_ARG_ENABLE([abrt_report],
169 + AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
170 +
171 +-AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
172 ++AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
173 + AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
174 + AC_SUBST([WITH_ABRT_REPORT])
175 + ])
176 +-AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
177 ++AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
178 + AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
179 +
180 + AC_ARG_ENABLE([hisi_ns_decode],
181 + AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
182 +
183 +-AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
184 ++AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
185 + AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
186 + AC_SUBST([WITH_HISI_NS_DECODE])
187 + ])
188 +-AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
189 ++AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
190 + AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
191 +
192 + AC_ARG_ENABLE([memory_ce_pfa],
193 + AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
194 +
195 +-AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
196 ++AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
197 + AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
198 + AC_SUBST([WITH_MEMORY_CE_PFA])
199 + ])
200 +-AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
201 ++AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
202 + AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
203 +
204 + AC_ARG_ENABLE([amp_ns_decode],
205 + AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
206 +
207 +-AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
208 ++AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
209 + AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
210 + AC_SUBST([WITH_AMP_NS_DECODE])
211 + ])
212 +-AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
213 ++AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
214 + AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
215 +
216 + test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
217 +
218
219 diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
220 new file mode 100644
221 index 000000000000..3a80aa0e89a8
222 --- /dev/null
223 +++ b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
224 @@ -0,0 +1,76 @@
225 +# Copyright 1999-2022 Gentoo Authors
226 +# Distributed under the terms of the GNU General Public License v2
227 +
228 +EAPI=8
229 +
230 +inherit autotools flag-o-matic linux-info systemd
231 +
232 +DESCRIPTION="Reliability, Availability and Serviceability logging tool"
233 +HOMEPAGE="https://github.com/mchehab/rasdaemon"
234 +SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
235 +
236 +LICENSE="GPL-2"
237 +SLOT="0"
238 +KEYWORDS="~amd64 ~arm64 ~x86"
239 +
240 +DEPEND="
241 + dev-db/sqlite
242 + elibc_musl? ( sys-libs/argp-standalone )
243 +"
244 +RDEPEND="
245 + ${DEPEND}
246 + dev-perl/DBI
247 + dev-perl/DBD-SQLite
248 + sys-apps/dmidecode
249 +"
250 +BDEPEND="sys-devel/gettext"
251 +
252 +PATCHES=(
253 + "${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch
254 +)
255 +
256 +pkg_setup() {
257 + linux-info_pkg_setup
258 + local CONFIG_CHECK="~ACPI_EXTLOG"
259 + check_extra_config
260 +}
261 +
262 +src_prepare() {
263 + default
264 +
265 + eautoreconf
266 +}
267 +
268 +src_configure() {
269 + local myconfargs=(
270 + --enable-sqlite3
271 + --enable-abrt-report
272 + --enable-aer
273 + --enable-arm
274 + --enable-extlog
275 + --enable-hisi-ns-decode
276 + --enable-mce
277 + --enable-non-standard
278 + --enable-devlink
279 + --enable-diskerror
280 + --enable-memory-ce-pfa
281 + --includedir="/usr/include/${PN}"
282 + --localstatedir=/var
283 + )
284 +
285 + use elibc_musl && append-libs -largp
286 +
287 + econf "${myconfargs[@]}"
288 +}
289 +
290 +src_install() {
291 + default
292 +
293 + keepdir "/var/lib/${PN}"
294 +
295 + systemd_dounit misc/*.service
296 +
297 + newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
298 + newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
299 + newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
300 +}