.gitignore

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

.mcelog.metadata

@@ -1 +1 @@
-31165e23f5a7f0fbe35f1d0e69e915d75524d02a SOURCES/mcelog-195.tar.gz
+d24f00d52bbefdec7ce11ab74afe1492303d3ca7 SOURCES/mcelog-194.tar.gz

SOURCES/mcelog-annocheck-gcc-flags.patch

@@ -1,19 +0,0 @@
-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.service

@@ -1,8 +0,0 @@
-[Unit]
-Description=Machine Check Exception Logging Daemon
-
-[Service]
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
-
-[Install]
-WantedBy=multi-user.target

SPECS/mcelog.spec

@@ -1,20 +1,19 @@
 Summary:	Tool to translate x86-64 CPU Machine Check Exception data
 Name:		mcelog
-Version:	195
+Version:	194
 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
@@ -25,12 +24,10 @@ 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 CFLAGS="$RPM_OPT_FLAGS -fpie -pie" %{?_smp_mflags}
+%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
@@ -44,7 +41,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 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mcelog.service
+install -p -m644 mcelog.service $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/
 
@@ -66,48 +63,64 @@ install -p -m644 mcelog*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 %{_mandir}/*/*
 
 %changelog
-* Fri Mar 29 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3:195-0
+* Mon Jun  5 2022 Prarit Bhargava <prarit@redhat.com> - 3:194-0
-- Rebuilt for MSVSphere 8.10 beta
+* Add support for EMR and SPR
-
+
-* 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
+* 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]
+* Tue Jun 21 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-3
-* Mon Jun 13 2022 Prarit Bhargava <prarit@redhat.com> - 3:182-0
+* 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
 - 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]
+* Wed Apr 20 2022 Prarit Bhargava <prarit@redhat.com> - 3:180-1
-* Mon Oct 11 2021 Prarit Bhargava <prarit@redhat.com> - 3:176-1
+- update .os_version
-- update to v179 [1971908]
+
-* Tue Aug  3 2021 Prarit Bhargava <prarit@redhat.com> - 3:175-1
+* Wed Mar 09 2022 Prarit Bhargava <prarit@redhat.com> - 3:180-0
-- Rebuild for binutils [1954439]
+- Update to v180 [2040073]
-* Wed Apr  7 2021 Prarit Bhargava <prarit@redhat.com> - 3:175-0
+
-- Update to v175 [1921751]
+* Mon Oct 18 2021 Prarit Bhargava <prarit@redhat.com> - 3:179-2
-- adds support for Sapphire Rapids [1838392]
+- Update to v179 [2013002]
-* Mon Nov 16 2020 Prarit Bhargava <prarit@redhat.com> - 3:173-0
+- fix annocheck errors found during CI [2013002]
-- Update to v173
+
-- adds support for Tigerlake, Rocketlake, Alderlake, Lakefield
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3:175-3
-- adds support for CometLake, Icelake server, Icelake-D, and Snow Ridge
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-* Mon Jun  1 2020 Prarit Bhargava <prarit@redhat.com> - 3:166-0
+  Related: rhbz#1991688
-- Add support for Icelake Server [1783101]
+
-* Tue Dec 10 2019 Prarit Bhargava <prarit@redhat.com> - 3:165-0
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3:175-2
-- Add support for Icelake [1485541]
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-* Mon Apr  1 2019 Prarit Bhargava <prarit@redhat.com> - 3:162-2
+
-- Fix version string [1692974]
+* Mon Feb 08 2021 Nicolas Chauvet <kwizart@gmail.com> - 3:175-1
-* Fri Mar 29 2019 Prarit Bhargava <prarit@redhat.com> - 3:160-1
+- Update to 175
-- Deduce channel number for Haswell/Broadwell/Skylake systems [1641046]
+
-- Add decoding for Optane DC persistent memory mode [1645344]
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3:168-3
-* Mon Sep 24 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-- fix annocheck gcc failures [1624140]
+
-
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3:168-2
-* Thu Aug 02 2018 Prarit Bhargava <prarit@redhat.com> - 3:159-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-- update to v159
+
+* 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
 
 * Mon Aug 21 2017 Prarit Bhargava <prarit@redhat.com> - 3:153-1
 - Update to v153