Sync from SUSE:SLFO:1.1 mcelog revision f4e9a55def41239b24f60a7bcc1c5396

_service

@@ -1,12 +1,12 @@
 <services>
-  <service name="obs_scm" mode="manual">
+  <service name="obs_scm" mode="localonly">
     <param name="scm">git</param>
     <param name="url">https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionformat">@PARENT_TAG@</param>
   </service>
-  <service name="set_version" mode="manual"/>
+  <service name="set_version" mode="localonly"/>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>

_servicedata

@@ -7,4 +7,4 @@
                 <param name="url">https://github.com/andikleen/mcelog.git</param>
               <param name="changesrevision">1f3a769c8fb736815a56ea104b7b751c5565cb88</param></service><service name="tar_scm">
                 <param name="url">https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git</param>
-              <param name="changesrevision">ad244c6b60fcbd08a5d73497bfb3487983801598</param></service></servicedata>
+              <param name="changesrevision">f5615e9a2f840ad1238e8a7edc25f2f9fc4c3ba3</param></service></servicedata>

add-f10h-support.patch

@@ -8,10 +8,10 @@ Signed-off-by: Borislav Petkov <bp@suse.de>
  mcelog.h |    1 
  4 files changed, 506 insertions(+), 51 deletions(-)
 
-Index: mcelog-198/amd.c
+Index: mcelog-189/amd.c
 ===================================================================
---- mcelog-198.orig/amd.c
-+++ mcelog-198/amd.c
+--- mcelog-189.orig/amd.c
++++ mcelog-189/amd.c
 @@ -14,7 +14,7 @@
  #include "mcelog.h"
  #include "amd.h"
@@ -561,10 +561,10 @@ Index: mcelog-198/amd.c
 +	}
 +        return 1;
  }
-Index: mcelog-198/amd.h
+Index: mcelog-189/amd.h
 ===================================================================
---- mcelog-198.orig/amd.h
-+++ mcelog-198/amd.h
+--- mcelog-189.orig/amd.h
++++ mcelog-189/amd.h
 @@ -1,6 +1,25 @@
 +#include <stdbool.h>
 +
@@ -628,11 +628,11 @@ Index: mcelog-198/amd.h
  
  enum tt_ids {
  	TT_INSTR = 0,
-Index: mcelog-198/mcelog.c
+Index: mcelog-189/mcelog.c
 ===================================================================
---- mcelog-198.orig/mcelog.c
-+++ mcelog-198/mcelog.c
-@@ -151,8 +151,8 @@ static int mce_filter(struct mce *m, uns
+--- mcelog-189.orig/mcelog.c
++++ mcelog-189/mcelog.c
+@@ -152,8 +152,8 @@ static int mce_filter(struct mce *m, uns
  	/* Filter out known broken MCEs */
  	if (cputype >= CPU_INTEL)
  		return mce_filter_intel(m, recordlen);

email.patch

@@ -7,10 +7,10 @@
  msg.c    |    8 ++
  6 files changed, 346 insertions(+), 3 deletions(-)
 
-Index: mcelog-198/Makefile
+Index: mcelog-195/Makefile
 ===================================================================
---- mcelog-198.orig/Makefile
-+++ mcelog-198/Makefile
+--- mcelog-195.orig/Makefile
++++ mcelog-195/Makefile
 @@ -1,3 +1,4 @@
 +CONFIG_EMAIL := 1
  CFLAGS := -g -Os
@@ -51,10 +51,10 @@ Index: mcelog-198/Makefile
  
  version.tmp: FORCE
  	( printf "char version[] = \"" ; 			\
-Index: mcelog-198/email.c
+Index: mcelog-195/email.c
 ===================================================================
 --- /dev/null
-+++ mcelog-198/email.c
++++ mcelog-195/email.c
 @@ -0,0 +1,200 @@
 +#include <unistd.h>
 +#include <signal.h>
@@ -256,10 +256,10 @@ Index: mcelog-198/email.c
 +	smtp_destroy_session (session);
 +	return 0;
 +}
-Index: mcelog-198/email.h
+Index: mcelog-195/email.h
 ===================================================================
 --- /dev/null
-+++ mcelog-198/email.h
++++ mcelog-195/email.h
 @@ -0,0 +1,34 @@
 +#ifndef _MCELOG_EMAIL_H_
 +#define _MCELOG_EMAIL_H_
@@ -295,10 +295,10 @@ Index: mcelog-198/email.h
 +#endif
 +
 +#endif
-Index: mcelog-198/mcelog.c
+Index: mcelog-195/mcelog.c
 ===================================================================
---- mcelog-198.orig/mcelog.c
-+++ mcelog-198/mcelog.c
+--- mcelog-195.orig/mcelog.c
++++ mcelog-195/mcelog.c
 @@ -37,6 +37,7 @@
  #include <assert.h>
  #include <signal.h>
@@ -307,7 +307,7 @@ Index: mcelog-198/mcelog.c
  #include <fnmatch.h>
  #include "mcelog.h"
  #include "paths.h"
-@@ -59,6 +60,9 @@
+@@ -60,6 +61,9 @@
  #include "bus.h"
  #include "unknown.h"
  
@@ -317,7 +317,7 @@ Index: mcelog-198/mcelog.c
  enum cputype cputype = CPU_GENERIC;	
  
  char *logfn = LOG_DEV_FILENAME; 
-@@ -70,7 +74,7 @@ static double cpumhz;
+@@ -71,7 +75,7 @@ static double cpumhz;
  static int cpumhz_forced;
  int ascii_mode;
  int dump_raw_ascii;
@@ -326,7 +326,7 @@ Index: mcelog-198/mcelog.c
  static char *inputfile;
  char *processor_flags;
  static int foreground;
-@@ -912,6 +916,7 @@ void usage(void)
+@@ -906,6 +910,7 @@ void usage(void)
  "--max-corr-err-counters Max page correctable error counters\n"
  "--help	             Display this message.\n"
  		);
@@ -334,7 +334,7 @@ Index: mcelog-198/mcelog.c
  	printf("\n");
  	print_cputypes();
  }
-@@ -985,6 +990,7 @@ static struct option options[] = {
+@@ -977,6 +982,7 @@ static struct option options[] = {
  	{ "max-corr-err-counters", 1, NULL, O_MAX_CORR_ERR_COUNTERS },
  	{ "help", 0, NULL, O_HELP },
  	{ "is-cpu-supported", 0, NULL, O_IS_CPU_SUPPORTED },
@@ -342,7 +342,7 @@ Index: mcelog-198/mcelog.c
  	{}
  };
  
-@@ -1179,11 +1185,86 @@ static void drop_cred(void)
+@@ -1171,11 +1177,86 @@ static void drop_cred(void)
  	}
  }
  
@@ -429,7 +429,7 @@ Index: mcelog-198/mcelog.c
  
  	if (recordlen == 0) {
  		Wprintf("no data in mce record\n");
-@@ -1210,12 +1291,16 @@ static void process(int fd, unsigned rec
+@@ -1202,12 +1283,16 @@ static void process(int fd, unsigned rec
  			finish = 1;
  		if (!mce_filter(mce, recordlen)) 
  			continue;
@@ -446,7 +446,7 @@ Index: mcelog-198/mcelog.c
  		flushlog();
  	}
  
-@@ -1340,6 +1425,8 @@ int main(int ac, char **av)
+@@ -1321,6 +1406,8 @@ int main(int ac, char **av)
  			noargs(ac, av);
  			fprintf(stderr, "mcelog %s\n", MCELOG_VERSION);
  			exit(0);
@@ -455,7 +455,7 @@ Index: mcelog-198/mcelog.c
  		} else if (opt == 0)
  			break;		    
  	} 
-@@ -1374,6 +1461,10 @@ int main(int ac, char **av)
+@@ -1355,6 +1442,10 @@ int main(int ac, char **av)
  		usage();
  		exit(1);
  	}
@@ -466,10 +466,10 @@ Index: mcelog-198/mcelog.c
  	checkdmi();
  	general_setup();
  		
-Index: mcelog-198/mcelog.h
+Index: mcelog-195/mcelog.h
 ===================================================================
---- mcelog-198.orig/mcelog.h
-+++ mcelog-198/mcelog.h
+--- mcelog-195.orig/mcelog.h
++++ mcelog-195/mcelog.h
 @@ -118,6 +118,7 @@ extern int open_logfile(char *fn);
  enum option_ranges {
  	O_COMMON = 500,
@@ -478,10 +478,10 @@ Index: mcelog-198/mcelog.h
  };
  
  enum syslog_opt { 
-Index: mcelog-198/msg.c
+Index: mcelog-195/msg.c
 ===================================================================
---- mcelog-198.orig/msg.c
-+++ mcelog-198/msg.c
+--- mcelog-195.orig/msg.c
++++ mcelog-195/msg.c
 @@ -8,10 +8,13 @@
  #include "mcelog.h"
  #include "msg.h"
@@ -496,7 +496,7 @@ Index: mcelog-198/msg.c
  static char *output_fn;
  
  int need_stdout(void)
-@@ -137,6 +140,11 @@ int Wprintf(char *fmt, ...)
+@@ -135,6 +138,11 @@ int Wprintf(char *fmt, ...)
  		n = vfprintf(output_fh ? output_fh : stdout, fmt, ap);
  		va_end(ap);
  	}

fix_setgroups_missing_call.patch

@@ -2,10 +2,10 @@
  mcelog.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-Index: mcelog-198/mcelog.c
+Index: mcelog-189/mcelog.c
 ===================================================================
---- mcelog-198.orig/mcelog.c
-+++ mcelog-198/mcelog.c
+--- mcelog-189.orig/mcelog.c
++++ mcelog-189/mcelog.c
 @@ -37,6 +37,7 @@
  #include <assert.h>
  #include <signal.h>
@@ -14,7 +14,7 @@ Index: mcelog-198/mcelog.c
  #include <sys/wait.h>
  #include <fnmatch.h>
  #include "mcelog.h"
-@@ -1163,6 +1164,14 @@ static void general_setup(void)
+@@ -1155,6 +1156,14 @@ static void general_setup(void)
  
  static void drop_cred(void)
  {

mcelog.changes

@@ -1,58 +1,3 @@
--------------------------------------------------------------------
-Fri Apr 11 12:34:24 UTC 2025 - trenn@suse.de
-
-- Update to version 204:
-  * Enable offline retries by default
-  * Add ability to retry failed page offlines with an exponential backoff
-  * Fix misspelling in variable name
-
--------------------------------------------------------------------
-Wed Jan 22 15:32:52 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Drop rcFOO symlinks for CODE16 (PED-266).
-
--------------------------------------------------------------------
-Sat Dec 07 00:18:22 UTC 2024 - trenn@suse.de
-
-- Update to version 202:
-  * mcelog: Wire up model-specific decoding for Clearwater Forest
-  * mcelog: New model number for Clearwater Forest
-- jsc#PED-10052
-
--------------------------------------------------------------------
-Thu Nov 28 08:46:31 UTC 2024 - trenn@suse.de
-
-- Update to version 201:
-  * add listen backlog config for mcelog server
-  * mcelog: Add basic support for Diamond Rapids
-  * mcelog: Add support for other CPU families
-
--------------------------------------------------------------------
-Mon Oct 07 12:57:23 UTC 2024 - trenn@suse.de
-
-- Update to version 200:
-  * mcelog: Reduce default threshold for corrected error page offline
-  * Revert "mcelog: Reduce default threshold for corrected error page offline"
-  * mcelog: Add new model number for Panther Lake
-  * server: Correct prameter type for connect() API
-
--------------------------------------------------------------------
-Mon May 13 12:47:27 UTC 2024 - trenn@suse.de
-
-- Update to version 198:
-  * Remove obsolete on disk dimm database code
-  * page.c: Disable gcc warnings
-  * page.c: Remove obsolete comment
-  * mcelog: Fix clang warnings
-  * mcelog: mempage_replace missing initialization of mempage fields
-  * mcelog: Add third model number for Arrowlake
-- Refresh patches according to mainline:
-M    add-f10h-support.patch
-M    email.patch
-M    fix_setgroups_missing_call.patch
-M    mcelog_invert_prefill_db_warning.patch
-- jsc#PED-10212
-
 -------------------------------------------------------------------
 Mon Feb 12 06:23:11 UTC 2024 - trenn@suse.de
 
@@ -69,7 +14,6 @@ Mon Nov 20 12:01:41 UTC 2023 - trenn@suse.de
 
 - Update to version 196:
   * mcelog: Add second model number for Arrowlake
-- jsc#PED-10217
 
 -------------------------------------------------------------------
 Tue Sep 12 14:08:37 UTC 2023 - trenn@suse.de

mcelog.obsinfo

@@ -1,4 +1,4 @@
 name: mcelog
-version: 204
-mtime: 1739647779
-commit: ad244c6b60fcbd08a5d73497bfb3487983801598
+version: 197
+mtime: 1705598790
+commit: f5615e9a2f840ad1238e8a7edc25f2f9fc4c3ba3

mcelog.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mcelog
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           mcelog
-Version:        204
+Version:        197
 Release:        0
 Summary:        Log Machine Check Events
 License:        GPL-2.0-only
@@ -83,9 +83,7 @@ install -m 644 %{SOURCE6} %{buildroot}/%{_docdir}/%{name}/README.email_setup
 install -m 644 lk10-mcelog.pdf %{buildroot}/%{_docdir}/%{name}/lk10-mcelog.pdf
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/mcelog.service
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/mcelog.conf
-%if 0%{?suse_version} < 1600
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcmcelog
-%endif
 
 %pre
 %service_add_pre %{name}.service
@@ -114,9 +112,7 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcmcelog
 %{_unitdir}/mcelog.service
 %{_tmpfilesdir}/mcelog.conf
 %{_docdir}/%{name}
-%if 0%{?suse_version} < 1600
 %{_sbindir}/rcmcelog
-%endif
 %ghost /run/mcelog
 
 %changelog

mcelog_invert_prefill_db_warning.patch

@@ -2,11 +2,9 @@
  memdb.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: mcelog-198/memdb.c
-===================================================================
---- mcelog-198.orig/memdb.c
-+++ mcelog-198/memdb.c
-@@ -440,11 +440,11 @@ void prefill_memdb(int do_dmi)
+--- a/memdb.c
++++ b/memdb.c
+@@ -431,11 +431,11 @@
  		md->location = xstrdup(bl);
  		md->name = xstrdup(dmi_getstring(&d->header, d->device_locator));
  	}