.fmf/version

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

.gitignore

@@ -1,2 +1 @@
-mcelog-*.tar.gz
-/v179.zip
+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[] = \"" ; 			\

SPECS/mcelog.spec

@@ -1,19 +1,20 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
-Version:	201
-Release:	1%{?dist}
+Version:	195
+Release:	0%{?dist}
 Epoch:		3
+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,10 +25,12 @@ on x86-32 and x86-64 systems.
 %autosetup
 
 %build
+%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_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
@@ -41,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/
 
@@ -63,75 +66,45 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 %{_mandir}/*/*
 
 %changelog
-* Wed Dec 4 2024 Jakub Čajka <jcajka@redhat.com> - 3:201-1
-- Update to v201
-- Resolves: RHEL-47462
-
-* Thu Apr  4 2024 Prarit Bhargava <prarit@redhat.com> - 3:198.0
-- Update to v198
-- cleanup changelog
-
 * Mon Oct 16 2023 Prarit Bhargava <prarit@redhat.com> - 3:195.0
 - Update to v195
-
-* Mon Jun  5 2023 Prarit Bhargava <prarit@redhat.com> - 3:194-0
-- Add support for EMR and SPR
-
+* 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
-
-* Tue Jun 21 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-3
-- Also update local mcelog.conf
-
-* Wed Jun 15 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-2
-- Bump NVR to kick build
-
-* Mon Jun 13 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-1
+* 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]
 
-* Wed Apr 20 2022 Prarit Bhargava <prarit@redhat.com> - 3:180-1
-- update .os_version
-
-* Wed Mar 09 2022 Prarit Bhargava <prarit@redhat.com> - 3:180-0
-- Update to v180 [2040073]
-
-* Mon Oct 18 2021 Prarit Bhargava <prarit@redhat.com> - 3:179-2
-- Update to v179 [2013002]
-- fix annocheck errors found during CI [2013002]
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3:175-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3:175-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* 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,11 +0,0 @@
---- !Policy
-
-product_versions:
-
-  - rhel-9
-
-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-201.tar.gz) = d91cc85337a0ebd1ccb66b936bf7db80384bd5255b0a18117dcb6121e272ff12547d41246ee548f768934b6e7a0b1219c03e84f3a5290d49d0f6960764a7c078

tests/.gitignore

@@ -1,3 +0,0 @@
-artifacts/
-*.patch
-*.diff

tests/run_tests.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# fail the whole test set if any of the command pipelines fail
-set -ex
-
-# when running this in 1minutetip the PATH must be specified to execute
-# in the local directory.
-echo "Setting path to local directory"
-PATH=$PATH:$(pwd)
-
-# simple version test
-version.sh

tests/tests.yml

@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      tests:
-        - simple:
-            dir: .                                 # switch to subfolder. This parameter is REQUIRED, use `dir: .` for current folder
-            run: ./run_tests.sh                             # this is your test command, its exit code is the outcome of the test

tests/version.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# This is a simple version test to satisfy the RHEL8.1 onboard gating
-# requirement.
-
-# fail the whole test if any of the command pipelines below fails
-set -ex
-
-version=$(mcelog --version 2>&1 | awk ' { print $2 } ')
-if [ "$version" == "unknown" ]; then
-	echo "mcelog version is unknown."
-	exit 1
-fi
-
-# if we get here, it's OK

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