.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1 +1 @@
-mcelog-*.tar.gz
+SOURCES/mcelog-195.tar.gz

SOURCES/mcelog-annocheck-gcc-flags.patch

@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index d28d17a24aea..c6603251be31 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ CFLAGS := -g -Os
++LDFLAGS = -Wl,-z,now -pie
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man
+@@ -82,7 +83,7 @@ dbquery: db.o dbquery.o memutil.o
+ depend: .depend
+ 
+ %.o: %.c
+-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(ADD_DEFINES) -o $@ $<
++	$(CC) $(LDFLAGS) -c $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(ADD_DEFINES) -o $@ $<
+ 
+ version.tmp: FORCE
+ 	( printf "char version[] = \"" ; 			\

SOURCES/mcelog.conf

@@ -26,10 +26,16 @@ dmi-prepopulate = no
 
 # execute these triggers when the rate of corrected or uncorrected
 # errors per DIMM exceeds the threshold
+# The default of 10/24h was reasonable for server quality
+# DDR3 DIMMs as of 2009/10. Newer systems can benefit from
+# more aggressive page offline when corrected errors are seen
+# See:
+# https://www.intel.com/content/dam/www/public/us/en/documents/intel-and-samsung-mrt-improving-memory-reliability-at-data-centers.pdf
+# for details.
 uc-error-trigger = dimm-error-trigger
 uc-error-threshold = 1 / 24h
 ce-error-trigger = dimm-error-trigger
-ce-error-threshold = 10 / 24h
+ce-error-threshold = 2 / 24h
 
 [socket]
 # Memory error accounting per socket

SPECS/mcelog.spec

@@ -1,19 +1,20 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
-Version:	202
-Release:	1%{?dist}
+Version:	195
+Release:	0%{?dist}
 Epoch:		3
-License:	GPL-2.0-only
+Group:		System Environment/Base
+License:	GPLv2
 URL:		https://github.com/andikleen/mcelog
 Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 # note that this source OVERRIDES the one on the tarball above!
 Source1:	mcelog.conf
+Source2:	mcelog.service
+Patch0:		mcelog-annocheck-gcc-flags.patch
 ExclusiveArch:	i686 x86_64
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-BuildRequires: make
-BuildRequires:  gcc
 BuildRequires: systemd
 
 %description
@@ -24,7 +25,12 @@ on x86-32 and x86-64 systems.
 %autosetup
 
 %build
-%make_build CFLAGS="$RPM_OPT_FLAGS -fpie -pie"
+%set_build_flags
+
+# automatically populate the .os_version file so that "mcelog --version"
+# returns a valid value instead of "unknown"
+echo "%{version}-%{release}" > .os_version
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
@@ -38,7 +44,7 @@ install -p -m755 triggers/cache-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mce
 install -p -m755 triggers/dimm-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/dimm-error-trigger
 install -p -m755 triggers/page-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/page-error-trigger
 install -p -m755 triggers/socket-memory-error-trigger $RPM_BUILD_ROOT/%{_sysconfdir}/mcelog/triggers/socket-memory-error-trigger
-install -p -m644 mcelog.service $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
 install -p -m644 mcelog*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 
@@ -60,75 +66,45 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 %{_mandir}/*/*
 
 %changelog
-* Fri Jan 03 2025 Jakub Čajka <jcajka@redhat.com> - 3:202-1
-- Update to latest upstream version
-- Resolves: RHEL-45088 and RHEL-33324
+* Mon Oct 16 2023 Prarit Bhargava <prarit@redhat.com> - 3:195.0
+- Update to v195
+* Thu Jun  8 2023 Prarit Bhargava <prarit@redhat.com> - 3:194.1
+- Add tests
+* Mon Jun  5 2023 Prarit Bhargava <prarit@redhat.com> - 3:194.0
+- Add support for EMR
+* Fri Sep  2 2022 Prarit Bhargava <prarit@redhat.com> - 3:189-0
+- Add support for RPL-P, RPL-S, ADL-N
+* Fri Jun 24 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-1
+- Update local copy of mcelog.conf [2094574]
+* Mon Jun 13 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-0
+- Change CE threshhold from 10/day to 2/day [2094574]
+* Wed Mar  9 2022 Prarit Bhargava <prarit@redhat.com> - 3:180-0
+- update to v180 [1971908]
+* Mon Oct 11 2021 Prarit Bhargava <prarit@redhat.com> - 3:176-1
+- update to v179 [1971908]
+* Tue Aug  3 2021 Prarit Bhargava <prarit@redhat.com> - 3:175-1
+- Rebuild for binutils [1954439]
+* Wed Apr  7 2021 Prarit Bhargava <prarit@redhat.com> - 3:175-0
+- Update to v175 [1921751]
+- adds support for Sapphire Rapids [1838392]
+* Mon Nov 16 2020 Prarit Bhargava <prarit@redhat.com> - 3:173-0
+- Update to v173
+- adds support for Tigerlake, Rocketlake, Alderlake, Lakefield
+- adds support for CometLake, Icelake server, Icelake-D, and Snow Ridge
+* Mon Jun  1 2020 Prarit Bhargava <prarit@redhat.com> - 3:166-0
+- Add support for Icelake Server [1783101]
+* Tue Dec 10 2019 Prarit Bhargava <prarit@redhat.com> - 3:165-0
+- Add support for Icelake [1485541]
+* Mon Apr  1 2019 Prarit Bhargava <prarit@redhat.com> - 3:162-2
+- Fix version string [1692974]
+* Fri Mar 29 2019 Prarit Bhargava <prarit@redhat.com> - 3:160-1
+- Deduce channel number for Haswell/Broadwell/Skylake systems [1641046]
+- Add decoding for Optane DC persistent memory mode [1645344]
+* Mon Sep 24 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-2
+- fix annocheck gcc failures [1624140]
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3:200-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jul 22 2024 Jakub Čajka <jcajka@redhat.com> - 3:200-1
-- Update to latest upstream version
-- Resolves: RHEL-20091, RHEL-20085, RHEL-20556, RHEL-47461 and RHEL-37248
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3:175-11
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 29 2023 Prarit Bhargava <prarit@redhat.com> 3:175-8
-- migrated to SPDX license
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:175-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3:175-2
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Mon Feb 08 2021 Nicolas Chauvet <kwizart@gmail.com> - 3:175-1
-- Update to 175
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:168-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:168-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Feb 24 2020 Nicolas Chauvet <kwizart@gmail.com> - 3:168-1
-- Update to 168
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:153-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:153-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3:153-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3:153-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3:153-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Thu Aug 02 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-1
+- update to v159
 
 * Mon Aug 21 2017 Prarit Bhargava <prarit@redhat.com> - 3:153-1
 - Update to v153

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

mcelog.setup

@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# An upstream kernel bug prevents mcelog from starting normally in
-# daemon mode the first time it is run. So, in the systemd service,
-# we want to start it twice - one as a ExecStartPre that will fail.
-# But systemd will abort the process if the "pre" fails, so we use
-# this script - temporarily - to start the first process.
-#
-# Waiting on Andi Kleen to fix upstream.
-#
-/usr/sbin/mcelog --ignorenodev --syslog --foreground
-exit 0

sources

@@ -1 +0,0 @@
-SHA512 (mcelog-202.tar.gz) = 3240958e467757913759b904ef780630735e741a657b4e37689e61de91400581cfac22753b651c6204bab8e073ff0a3a1d110d01ea1b44081f01aeaa90ee25ac

whatever.fmf

@@ -1,7 +0,0 @@
-summary: Basic smoke tests
-discover:
-    - name: internal
-      how: fmf
-      url: git://pkgs.devel.redhat.com/tests/mcelog
-execute:
-    how: tmt