From e7441a56152170e35cb05dff99f844897022a9906aaf4b2217ce2f5d07fc2e28 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 14 May 2024 06:52:51 +0000 Subject: [PATCH] Accepting request 1173682 from home:trenn:branches:Base:System - 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 OBS-URL: https://build.opensuse.org/request/show/1173682 OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=111 --- _service | 4 +-- _servicedata | 2 +- add-f10h-support.patch | 20 +++++------ email.patch | 50 +++++++++++++------------- fix_setgroups_missing_call.patch | 8 ++--- mcelog-197.obscpio | 3 -- mcelog-198.obscpio | 3 ++ mcelog.changes | 16 +++++++++ mcelog.obsinfo | 6 ++-- mcelog.spec | 2 +- mcelog_invert_prefill_db_warning.patch | 8 +++-- 11 files changed, 70 insertions(+), 52 deletions(-) delete mode 100644 mcelog-197.obscpio create mode 100644 mcelog-198.obscpio diff --git a/_service b/_service index 1235af1..caaba48 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - + git https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git enable v(.*) @PARENT_TAG@ - + *.tar diff --git a/_servicedata b/_servicedata index b905b84..48413fd 100644 --- a/_servicedata +++ b/_servicedata @@ -7,4 +7,4 @@ https://github.com/andikleen/mcelog.git 1f3a769c8fb736815a56ea104b7b751c5565cb88 https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git - f5615e9a2f840ad1238e8a7edc25f2f9fc4c3ba3 \ No newline at end of file + 23c24878c2e004f360575d564b825753212a09e5 \ No newline at end of file diff --git a/add-f10h-support.patch b/add-f10h-support.patch index c4cddbc..15b096e 100644 --- a/add-f10h-support.patch +++ b/add-f10h-support.patch @@ -8,10 +8,10 @@ Signed-off-by: Borislav Petkov mcelog.h | 1 4 files changed, 506 insertions(+), 51 deletions(-) -Index: mcelog-189/amd.c +Index: mcelog-198/amd.c =================================================================== ---- mcelog-189.orig/amd.c -+++ mcelog-189/amd.c +--- mcelog-198.orig/amd.c ++++ mcelog-198/amd.c @@ -14,7 +14,7 @@ #include "mcelog.h" #include "amd.h" @@ -561,10 +561,10 @@ Index: mcelog-189/amd.c + } + return 1; } -Index: mcelog-189/amd.h +Index: mcelog-198/amd.h =================================================================== ---- mcelog-189.orig/amd.h -+++ mcelog-189/amd.h +--- mcelog-198.orig/amd.h ++++ mcelog-198/amd.h @@ -1,6 +1,25 @@ +#include + @@ -628,11 +628,11 @@ Index: mcelog-189/amd.h enum tt_ids { TT_INSTR = 0, -Index: mcelog-189/mcelog.c +Index: mcelog-198/mcelog.c =================================================================== ---- mcelog-189.orig/mcelog.c -+++ mcelog-189/mcelog.c -@@ -152,8 +152,8 @@ static int mce_filter(struct mce *m, uns +--- mcelog-198.orig/mcelog.c ++++ mcelog-198/mcelog.c +@@ -151,8 +151,8 @@ static int mce_filter(struct mce *m, uns /* Filter out known broken MCEs */ if (cputype >= CPU_INTEL) return mce_filter_intel(m, recordlen); diff --git a/email.patch b/email.patch index 22f5fc2..bfd74cf 100644 --- a/email.patch +++ b/email.patch @@ -7,10 +7,10 @@ msg.c | 8 ++ 6 files changed, 346 insertions(+), 3 deletions(-) -Index: mcelog-195/Makefile +Index: mcelog-198/Makefile =================================================================== ---- mcelog-195.orig/Makefile -+++ mcelog-195/Makefile +--- mcelog-198.orig/Makefile ++++ mcelog-198/Makefile @@ -1,3 +1,4 @@ +CONFIG_EMAIL := 1 CFLAGS := -g -Os @@ -51,10 +51,10 @@ Index: mcelog-195/Makefile version.tmp: FORCE ( printf "char version[] = \"" ; \ -Index: mcelog-195/email.c +Index: mcelog-198/email.c =================================================================== --- /dev/null -+++ mcelog-195/email.c ++++ mcelog-198/email.c @@ -0,0 +1,200 @@ +#include +#include @@ -256,10 +256,10 @@ Index: mcelog-195/email.c + smtp_destroy_session (session); + return 0; +} -Index: mcelog-195/email.h +Index: mcelog-198/email.h =================================================================== --- /dev/null -+++ mcelog-195/email.h ++++ mcelog-198/email.h @@ -0,0 +1,34 @@ +#ifndef _MCELOG_EMAIL_H_ +#define _MCELOG_EMAIL_H_ @@ -295,10 +295,10 @@ Index: mcelog-195/email.h +#endif + +#endif -Index: mcelog-195/mcelog.c +Index: mcelog-198/mcelog.c =================================================================== ---- mcelog-195.orig/mcelog.c -+++ mcelog-195/mcelog.c +--- mcelog-198.orig/mcelog.c ++++ mcelog-198/mcelog.c @@ -37,6 +37,7 @@ #include #include @@ -307,7 +307,7 @@ Index: mcelog-195/mcelog.c #include #include "mcelog.h" #include "paths.h" -@@ -60,6 +61,9 @@ +@@ -59,6 +60,9 @@ #include "bus.h" #include "unknown.h" @@ -317,7 +317,7 @@ Index: mcelog-195/mcelog.c enum cputype cputype = CPU_GENERIC; char *logfn = LOG_DEV_FILENAME; -@@ -71,7 +75,7 @@ static double cpumhz; +@@ -70,7 +74,7 @@ static double cpumhz; static int cpumhz_forced; int ascii_mode; int dump_raw_ascii; @@ -326,7 +326,7 @@ Index: mcelog-195/mcelog.c static char *inputfile; char *processor_flags; static int foreground; -@@ -906,6 +910,7 @@ void usage(void) +@@ -912,6 +916,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-195/mcelog.c printf("\n"); print_cputypes(); } -@@ -977,6 +982,7 @@ static struct option options[] = { +@@ -985,6 +990,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-195/mcelog.c {} }; -@@ -1171,11 +1177,86 @@ static void drop_cred(void) +@@ -1179,11 +1185,86 @@ static void drop_cred(void) } } @@ -429,7 +429,7 @@ Index: mcelog-195/mcelog.c if (recordlen == 0) { Wprintf("no data in mce record\n"); -@@ -1202,12 +1283,16 @@ static void process(int fd, unsigned rec +@@ -1210,12 +1291,16 @@ static void process(int fd, unsigned rec finish = 1; if (!mce_filter(mce, recordlen)) continue; @@ -446,7 +446,7 @@ Index: mcelog-195/mcelog.c flushlog(); } -@@ -1321,6 +1406,8 @@ int main(int ac, char **av) +@@ -1340,6 +1425,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-195/mcelog.c } else if (opt == 0) break; } -@@ -1355,6 +1442,10 @@ int main(int ac, char **av) +@@ -1374,6 +1461,10 @@ int main(int ac, char **av) usage(); exit(1); } @@ -466,10 +466,10 @@ Index: mcelog-195/mcelog.c checkdmi(); general_setup(); -Index: mcelog-195/mcelog.h +Index: mcelog-198/mcelog.h =================================================================== ---- mcelog-195.orig/mcelog.h -+++ mcelog-195/mcelog.h +--- mcelog-198.orig/mcelog.h ++++ mcelog-198/mcelog.h @@ -118,6 +118,7 @@ extern int open_logfile(char *fn); enum option_ranges { O_COMMON = 500, @@ -478,10 +478,10 @@ Index: mcelog-195/mcelog.h }; enum syslog_opt { -Index: mcelog-195/msg.c +Index: mcelog-198/msg.c =================================================================== ---- mcelog-195.orig/msg.c -+++ mcelog-195/msg.c +--- mcelog-198.orig/msg.c ++++ mcelog-198/msg.c @@ -8,10 +8,13 @@ #include "mcelog.h" #include "msg.h" @@ -496,7 +496,7 @@ Index: mcelog-195/msg.c static char *output_fn; int need_stdout(void) -@@ -135,6 +138,11 @@ int Wprintf(char *fmt, ...) +@@ -137,6 +140,11 @@ int Wprintf(char *fmt, ...) n = vfprintf(output_fh ? output_fh : stdout, fmt, ap); va_end(ap); } diff --git a/fix_setgroups_missing_call.patch b/fix_setgroups_missing_call.patch index cf890a3..4b1049f 100644 --- a/fix_setgroups_missing_call.patch +++ b/fix_setgroups_missing_call.patch @@ -2,10 +2,10 @@ mcelog.c | 9 +++++++++ 1 file changed, 9 insertions(+) -Index: mcelog-189/mcelog.c +Index: mcelog-198/mcelog.c =================================================================== ---- mcelog-189.orig/mcelog.c -+++ mcelog-189/mcelog.c +--- mcelog-198.orig/mcelog.c ++++ mcelog-198/mcelog.c @@ -37,6 +37,7 @@ #include #include @@ -14,7 +14,7 @@ Index: mcelog-189/mcelog.c #include #include #include "mcelog.h" -@@ -1155,6 +1156,14 @@ static void general_setup(void) +@@ -1163,6 +1164,14 @@ static void general_setup(void) static void drop_cred(void) { diff --git a/mcelog-197.obscpio b/mcelog-197.obscpio deleted file mode 100644 index 84fe1d6..0000000 --- a/mcelog-197.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f0b1333bdf05b8a9823c49877ab92ec6228b2f6e76d11191ed4ce0b3c14d115 -size 653324 diff --git a/mcelog-198.obscpio b/mcelog-198.obscpio new file mode 100644 index 0000000..2a1ccbb --- /dev/null +++ b/mcelog-198.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a0fb636f73e4110a63c5150d5084d7ae8a9593e5d97d48389f80721b677931a +size 642572 diff --git a/mcelog.changes b/mcelog.changes index f796d2e..941a30b 100644 --- a/mcelog.changes +++ b/mcelog.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Mon Feb 12 06:23:11 UTC 2024 - trenn@suse.de diff --git a/mcelog.obsinfo b/mcelog.obsinfo index 52c5198..e966823 100644 --- a/mcelog.obsinfo +++ b/mcelog.obsinfo @@ -1,4 +1,4 @@ name: mcelog -version: 197 -mtime: 1705598790 -commit: f5615e9a2f840ad1238e8a7edc25f2f9fc4c3ba3 +version: 198 +mtime: 1711644509 +commit: 23c24878c2e004f360575d564b825753212a09e5 diff --git a/mcelog.spec b/mcelog.spec index 652c477..dbbd2d7 100644 --- a/mcelog.spec +++ b/mcelog.spec @@ -21,7 +21,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: mcelog -Version: 197 +Version: 198 Release: 0 Summary: Log Machine Check Events License: GPL-2.0-only diff --git a/mcelog_invert_prefill_db_warning.patch b/mcelog_invert_prefill_db_warning.patch index 47466d3..9e9510e 100644 --- a/mcelog_invert_prefill_db_warning.patch +++ b/mcelog_invert_prefill_db_warning.patch @@ -2,9 +2,11 @@ memdb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---- a/memdb.c -+++ b/memdb.c -@@ -431,11 +431,11 @@ +Index: mcelog-198/memdb.c +=================================================================== +--- mcelog-198.orig/memdb.c ++++ mcelog-198/memdb.c +@@ -440,11 +440,11 @@ void prefill_memdb(int do_dmi) md->location = xstrdup(bl); md->name = xstrdup(dmi_getstring(&d->header, d->device_locator)); }