From 277832baf3cfc7b7eaf5c9cad9a3dbaa270ffe20f88944b2e9986ea0ef17df0c Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 24 Sep 2018 13:47:13 +0000 Subject: [PATCH] Accepting request 637679 from home:trenn:branches:Base:System (by trenn@suse.de) - Update to version 1.60 (fate#326221): * Turn back rb_color field into unsigned long * trigger: add a sync argument for waiting trigger child process exit * page: trigger: add pre/post sync trigger when doing soft memory offline * fixed build errors for some lose code when merging code * transfer the page address to pre/post-sync-trigger scripts * mcelog: Fix "--ascii" parsing to cope with change in kernel output since v4.10 * Remove now unused local variable * Add scripts file to do MCA error code validation for a selected CPU model * Add license file * mcelog: Improve decoding for APEI reported errors OBS-URL: https://build.opensuse.org/request/show/637679 OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=71 --- Start-consolidating-AMD-specific-stuff.patch | 32 +++++----- _service | 4 +- _servicedata | 2 +- add-f10h-support.patch | 36 +++++------ add-f11h-support.patch | 30 ++++----- add-f12h-support.patch | 30 ++++----- add-f14h-support.patch | 30 ++++----- add-f15h-support.patch | 30 ++++----- add-f16h-support.patch | 30 ++++----- email.patch | 64 ++++++++++---------- fix_setgroups_missing_call.patch | 8 +-- mcelog-1.53.tar.xz | 3 - mcelog-1.60.tar.xz | 3 + mcelog.changes | 16 +++++ mcelog.spec | 4 +- 15 files changed, 169 insertions(+), 153 deletions(-) delete mode 100644 mcelog-1.53.tar.xz create mode 100644 mcelog-1.60.tar.xz diff --git a/Start-consolidating-AMD-specific-stuff.patch b/Start-consolidating-AMD-specific-stuff.patch index 67e87f8..50cf9d8 100644 --- a/Start-consolidating-AMD-specific-stuff.patch +++ b/Start-consolidating-AMD-specific-stuff.patch @@ -16,11 +16,11 @@ Signed-off-by: Borislav Petkov rename k8.c => amd.c (97%) rename k8.h => amd.h (79%) -Index: mcelog-1.36/Makefile +Index: mcelog-1.60/Makefile =================================================================== ---- mcelog-1.36.orig/Makefile 2016-05-03 17:44:06.934899300 +0200 -+++ mcelog-1.36/Makefile 2016-05-03 17:44:29.032158410 +0200 -@@ -33,7 +33,7 @@ all: mcelog +--- mcelog-1.60.orig/Makefile 2018-09-24 15:14:09.591339926 +0200 ++++ mcelog-1.60/Makefile 2018-09-24 15:14:18.771885991 +0200 +@@ -30,7 +30,7 @@ all: mcelog .PHONY: install clean depend FORCE @@ -29,9 +29,9 @@ Index: mcelog-1.36/Makefile nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o \ eventloop.o leaky-bucket.o memdb.o server.o trigger.o \ client.o cache.o sysfs.o yellow.o page.o rbtree.o \ -Index: mcelog-1.36/k8.c +Index: mcelog-1.60/k8.c =================================================================== ---- mcelog-1.36.orig/k8.c 2016-05-03 17:44:06.938899528 +0200 +--- mcelog-1.60.orig/k8.c 2018-08-09 23:49:49.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,281 +0,0 @@ -/* Based on K8 decoding code written for the 2.4 kernel by Andi Kleen and @@ -315,10 +315,10 @@ Index: mcelog-1.36/k8.c - } - return 1; -} -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcelog-1.36/amd.c 2016-05-03 17:44:29.036158703 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:14:18.771885991 +0200 @@ -0,0 +1,282 @@ +/* Based on K8 decoding code written for the 2.4 kernel by Andi Kleen and + * Eric Morton. Hacked and extended for mcelog by AK. @@ -602,9 +602,9 @@ Index: mcelog-1.36/amd.c + } + return 1; +} -Index: mcelog-1.36/k8.h +Index: mcelog-1.60/k8.h =================================================================== ---- mcelog-1.36.orig/k8.h 2016-05-03 17:44:06.938899528 +0200 +--- mcelog-1.60.orig/k8.h 2018-08-09 23:49:49.000000000 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -char *k8_bank_name(unsigned num); @@ -618,10 +618,10 @@ Index: mcelog-1.36/k8.h -#define K8_MCELOG_THRESHOLD_LINK (4 * 9 + 1) -#define K8_MCELOG_THRESHOLD_L3_CACHE (4 * 9 + 2) -#define K8_MCELOG_THRESHOLD_FBDIMM (4 * 9 + 3) -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mcelog-1.36/amd.h 2016-05-03 17:44:29.036158703 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:14:18.775886227 +0200 @@ -0,0 +1,14 @@ +char *k8_bank_name(unsigned num); +void decode_amd_mc(enum cputype, struct mce *mce, int *ismemerr); @@ -637,10 +637,10 @@ Index: mcelog-1.36/amd.h + +#define CASE_AMD_CPUS \ + case CPU_K8 -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:44:06.938899528 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:44:29.036158703 +0200 +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:14:09.599340401 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:14:18.775886227 +0200 @@ -41,7 +41,7 @@ #include #include "mcelog.h" @@ -650,7 +650,7 @@ Index: mcelog-1.36/mcelog.c #include "intel.h" #include "p4.h" #include "dmi.h" -@@ -421,9 +421,9 @@ static void dump_mce(struct mce *m, unsi +@@ -429,9 +429,9 @@ static void dump_mce(struct mce *m, unsi time_t t = m->time; Wprintf("TIME %llu %s", m->time, ctime(&t)); } diff --git a/_service b/_service index 29b7052..6f27479 100644 --- a/_service +++ b/_service @@ -4,9 +4,9 @@ https://github.com/andikleen/mcelog mcelog - 1.53 + 1.60 enable - refs/tags/v153 + refs/tags/v160 mcelog*.tar diff --git a/_servicedata b/_servicedata index cef0468..193ef24 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/andikleen/mcelog - 524ed1cd16de5adcb4a5015777d3dfc63afda1fe \ No newline at end of file + 10b832edec31d48adf414709dec9327354310f52 \ No newline at end of file diff --git a/add-f10h-support.patch b/add-f10h-support.patch index 03275a4..f5fb7f5 100644 --- a/add-f10h-support.patch +++ b/add-f10h-support.patch @@ -1,10 +1,10 @@ Add F10h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.46/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.46.orig/amd.c -+++ mcelog-1.46/amd.c +--- mcelog-1.60.orig/amd.c 2018-09-24 15:14:18.771885991 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:05.902689347 +0200 @@ -14,7 +14,7 @@ #include "mcelog.h" #include "amd.h" @@ -554,10 +554,10 @@ Index: mcelog-1.46/amd.c + } + return 1; } -Index: mcelog-1.46/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.46.orig/amd.h -+++ mcelog-1.46/amd.h +--- mcelog-1.60.orig/amd.h 2018-09-24 15:14:55.678081186 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:05.902689347 +0200 @@ -1,6 +1,25 @@ +#include + @@ -632,11 +632,11 @@ Index: mcelog-1.46/amd.h +#define CASE_AMD_CPUS \ + case CPU_K8: \ + case CPU_F10H -Index: mcelog-1.46/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.46.orig/mcelog.h -+++ mcelog-1.46/mcelog.h -@@ -111,6 +111,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:14:09.599340401 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:05.902689347 +0200 +@@ -117,6 +117,7 @@ enum cputype { CPU_P6OLD, CPU_CORE2, /* 65nm and 45nm */ CPU_K8, @@ -644,11 +644,11 @@ Index: mcelog-1.46/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.46/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.46.orig/mcelog.c -+++ mcelog-1.46/mcelog.c -@@ -144,19 +144,20 @@ static void resolveaddr(unsigned long lo +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:14:18.775886227 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:05.906689585 +0200 +@@ -147,19 +147,20 @@ static void resolveaddr(unsigned long lo static int mce_filter(struct mce *m, unsigned recordlen) { @@ -673,7 +673,7 @@ Index: mcelog-1.46/mcelog.c } static void print_tsc(int cpunum, __u64 tsc, unsigned long time) -@@ -223,6 +224,7 @@ static char *cputype_name[] = { +@@ -226,6 +227,7 @@ static char *cputype_name[] = { [CPU_P6OLD] = "Intel PPro/P2/P3/old Xeon", [CPU_CORE2] = "Intel Core", /* 65nm and 45nm */ [CPU_K8] = "AMD K8 and derivates", @@ -681,7 +681,7 @@ Index: mcelog-1.46/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -252,6 +254,7 @@ static struct config_choice cpu_choices[ +@@ -255,6 +257,7 @@ static struct config_choice cpu_choices[ { "p6old", CPU_P6OLD }, { "core2", CPU_CORE2 }, { "k8", CPU_K8 }, @@ -689,7 +689,7 @@ Index: mcelog-1.46/mcelog.c { "p4", CPU_P4 }, { "dunnington", CPU_DUNNINGTON }, { "xeon74xx", CPU_DUNNINGTON }, -@@ -363,9 +366,7 @@ static enum cputype setup_cpuid(u32 cpuv +@@ -366,9 +369,7 @@ static enum cputype setup_cpuid(u32 cpuv case X86_VENDOR_INTEL: return select_intel_cputype(family, model); case X86_VENDOR_AMD: @@ -700,7 +700,7 @@ Index: mcelog-1.46/mcelog.c default: Eprintf("Unknown CPU type vendor %u family %u model %u", cpuvendor, family, model); -@@ -542,14 +543,9 @@ int is_cpu_supported(void) +@@ -551,14 +552,9 @@ int is_cpu_supported(void) } if (seen == ALL) { diff --git a/add-f11h-support.patch b/add-f11h-support.patch index ae322a9..d7d7047 100644 --- a/add-f11h-support.patch +++ b/add-f11h-support.patch @@ -1,10 +1,10 @@ Add F11h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.36.orig/amd.c 2016-05-03 17:45:35.943971068 +0200 -+++ mcelog-1.36/amd.c 2016-05-03 17:45:39.500173684 +0200 +--- mcelog-1.60.orig/amd.c 2018-09-24 15:15:05.902689347 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:10.454960116 +0200 @@ -155,6 +155,8 @@ enum cputype select_amd_cputype(u32 fami return CPU_K8; case 0x10: @@ -54,10 +54,10 @@ Index: mcelog-1.36/amd.c default: Eprintf("Huh? What family is it: 0x%x?!\n", cpu); return; -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.36.orig/amd.h 2016-05-03 17:45:35.943971068 +0200 -+++ mcelog-1.36/amd.h 2016-05-03 17:45:39.500173684 +0200 +--- mcelog-1.60.orig/amd.h 2018-09-24 15:15:05.902689347 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:10.454960116 +0200 @@ -93,4 +93,5 @@ enum rrrr_ids { #define CASE_AMD_CPUS \ @@ -65,11 +65,11 @@ Index: mcelog-1.36/amd.h - case CPU_F10H + case CPU_F10H: \ + case CPU_F11H -Index: mcelog-1.36/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.36.orig/mcelog.h 2016-05-03 17:45:35.943971068 +0200 -+++ mcelog-1.36/mcelog.h 2016-05-03 17:45:39.500173684 +0200 -@@ -112,6 +112,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:15:05.902689347 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:10.454960116 +0200 +@@ -118,6 +118,7 @@ enum cputype { CPU_CORE2, /* 65nm and 45nm */ CPU_K8, CPU_F10H, @@ -77,11 +77,11 @@ Index: mcelog-1.36/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:35.943971068 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:39.500173684 +0200 -@@ -226,6 +226,7 @@ static char *cputype_name[] = { +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:05.906689585 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:10.458960355 +0200 +@@ -228,6 +228,7 @@ static char *cputype_name[] = { [CPU_CORE2] = "Intel Core", /* 65nm and 45nm */ [CPU_K8] = "AMD K8 and derivates", [CPU_F10H] = "AMD Greyhound", @@ -89,7 +89,7 @@ Index: mcelog-1.36/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -253,6 +254,7 @@ static struct config_choice cpu_choices[ +@@ -258,6 +259,7 @@ static struct config_choice cpu_choices[ { "core2", CPU_CORE2 }, { "k8", CPU_K8 }, { "f10h", CPU_F10H }, diff --git a/add-f12h-support.patch b/add-f12h-support.patch index 2c349f6..3327570 100644 --- a/add-f12h-support.patch +++ b/add-f12h-support.patch @@ -1,10 +1,10 @@ Add F12h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.36.orig/amd.c 2016-05-03 17:45:39.500173684 +0200 -+++ mcelog-1.36/amd.c 2016-05-03 17:45:41.996315929 +0200 +--- mcelog-1.60.orig/amd.c 2018-09-24 15:15:10.454960116 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:15.607266576 +0200 @@ -157,6 +157,8 @@ enum cputype select_amd_cputype(u32 fami return CPU_F10H; case 0x11: @@ -37,10 +37,10 @@ Index: mcelog-1.36/amd.c default: Eprintf("Huh? What family is it: 0x%x?!\n", cpu); return; -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.36.orig/amd.h 2016-05-03 17:45:39.500173684 +0200 -+++ mcelog-1.36/amd.h 2016-05-03 17:45:41.996315929 +0200 +--- mcelog-1.60.orig/amd.h 2018-09-24 15:15:10.454960116 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:15.607266576 +0200 @@ -9,6 +9,7 @@ enum amdcpu { AMD_K8 = 0, AMD_F10H, @@ -56,11 +56,11 @@ Index: mcelog-1.36/amd.h - case CPU_F11H + case CPU_F11H: \ + case CPU_F12H -Index: mcelog-1.36/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.36.orig/mcelog.h 2016-05-03 17:45:39.500173684 +0200 -+++ mcelog-1.36/mcelog.h 2016-05-03 17:45:41.996315929 +0200 -@@ -113,6 +113,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:15:10.454960116 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:15.607266576 +0200 +@@ -119,6 +119,7 @@ enum cputype { CPU_K8, CPU_F10H, CPU_F11H, @@ -68,11 +68,11 @@ Index: mcelog-1.36/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:39.500173684 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:41.996315929 +0200 -@@ -227,6 +227,7 @@ static char *cputype_name[] = { +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:10.458960355 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:15.611266814 +0200 +@@ -229,6 +229,7 @@ static char *cputype_name[] = { [CPU_K8] = "AMD K8 and derivates", [CPU_F10H] = "AMD Greyhound", [CPU_F11H] = "AMD Griffin", @@ -80,7 +80,7 @@ Index: mcelog-1.36/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -255,6 +256,7 @@ static struct config_choice cpu_choices[ +@@ -260,6 +261,7 @@ static struct config_choice cpu_choices[ { "k8", CPU_K8 }, { "f10h", CPU_F10H }, { "f11h", CPU_F11H }, diff --git a/add-f14h-support.patch b/add-f14h-support.patch index 4cfd71a..de07c3b 100644 --- a/add-f14h-support.patch +++ b/add-f14h-support.patch @@ -1,10 +1,10 @@ Add F14h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.36.orig/amd.c 2016-05-03 17:45:41.996315929 +0200 -+++ mcelog-1.36/amd.c 2016-05-03 17:45:43.452398891 +0200 +--- mcelog-1.60.orig/amd.c 2018-09-24 15:15:15.607266576 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:19.007468820 +0200 @@ -159,6 +159,8 @@ enum cputype select_amd_cputype(u32 fami return CPU_F11H; case 0x12: @@ -128,11 +128,11 @@ Index: mcelog-1.36/amd.c default: Eprintf("Huh? What family is it: 0x%x?!\n", cpu); return; -Index: mcelog-1.36/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.36.orig/mcelog.h 2016-05-03 17:45:41.996315929 +0200 -+++ mcelog-1.36/mcelog.h 2016-05-03 17:45:43.452398891 +0200 -@@ -114,6 +114,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:15:15.607266576 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:19.007468820 +0200 +@@ -120,6 +120,7 @@ enum cputype { CPU_F10H, CPU_F11H, CPU_F12H, @@ -140,10 +140,10 @@ Index: mcelog-1.36/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.36.orig/amd.h 2016-05-03 17:45:41.996315929 +0200 -+++ mcelog-1.36/amd.h 2016-05-03 17:45:43.452398891 +0200 +--- mcelog-1.60.orig/amd.h 2018-09-24 15:15:15.607266576 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:19.007468820 +0200 @@ -96,4 +96,5 @@ enum rrrr_ids { case CPU_K8: \ case CPU_F10H: \ @@ -151,11 +151,11 @@ Index: mcelog-1.36/amd.h - case CPU_F12H + case CPU_F12H: \ + case CPU_F14H -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:41.996315929 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:43.456399118 +0200 -@@ -228,6 +228,7 @@ static char *cputype_name[] = { +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:15.611266814 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:19.011469058 +0200 +@@ -230,6 +230,7 @@ static char *cputype_name[] = { [CPU_F10H] = "AMD Greyhound", [CPU_F11H] = "AMD Griffin", [CPU_F12H] = "AMD Llano", @@ -163,7 +163,7 @@ Index: mcelog-1.36/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -257,6 +258,7 @@ static struct config_choice cpu_choices[ +@@ -262,6 +263,7 @@ static struct config_choice cpu_choices[ { "f10h", CPU_F10H }, { "f11h", CPU_F11H }, { "f12h", CPU_F12H }, diff --git a/add-f15h-support.patch b/add-f15h-support.patch index 47c29d9..36d2cbe 100644 --- a/add-f15h-support.patch +++ b/add-f15h-support.patch @@ -1,10 +1,10 @@ Add F15h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.36.orig/amd.c 2016-05-03 17:45:43.452398891 +0200 -+++ mcelog-1.36/amd.c 2016-05-03 17:45:45.316505087 +0200 +--- mcelog-1.60.orig/amd.c 2018-09-24 15:15:19.007468820 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:22.903700568 +0200 @@ -72,6 +72,43 @@ static char *nbextendederr[] = { "L3 Cache LRU Error" }; @@ -214,11 +214,11 @@ Index: mcelog-1.36/amd.c default: Eprintf("Huh? What family is it: 0x%x?!\n", cpu); return; -Index: mcelog-1.36/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.36.orig/mcelog.h 2016-05-03 17:45:43.452398891 +0200 -+++ mcelog-1.36/mcelog.h 2016-05-03 17:45:45.316505087 +0200 -@@ -115,6 +115,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:15:19.007468820 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:22.907700806 +0200 +@@ -121,6 +121,7 @@ enum cputype { CPU_F11H, CPU_F12H, CPU_F14H, @@ -226,10 +226,10 @@ Index: mcelog-1.36/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.36.orig/amd.h 2016-05-03 17:45:43.452398891 +0200 -+++ mcelog-1.36/amd.h 2016-05-03 17:45:45.316505087 +0200 +--- mcelog-1.60.orig/amd.h 2018-09-24 15:15:19.007468820 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:22.907700806 +0200 @@ -97,4 +97,5 @@ enum rrrr_ids { case CPU_F10H: \ case CPU_F11H: \ @@ -237,11 +237,11 @@ Index: mcelog-1.36/amd.h - case CPU_F14H + case CPU_F14H: \ + case CPU_F15H -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:43.456399118 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:45.320505319 +0200 -@@ -229,6 +229,7 @@ static char *cputype_name[] = { +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:19.011469058 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:22.907700806 +0200 +@@ -231,6 +231,7 @@ static char *cputype_name[] = { [CPU_F11H] = "AMD Griffin", [CPU_F12H] = "AMD Llano", [CPU_F14H] = "AMD Bobcat", @@ -249,7 +249,7 @@ Index: mcelog-1.36/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -259,6 +260,7 @@ static struct config_choice cpu_choices[ +@@ -264,6 +265,7 @@ static struct config_choice cpu_choices[ { "f11h", CPU_F11H }, { "f12h", CPU_F12H }, { "f14h", CPU_F14H }, diff --git a/add-f16h-support.patch b/add-f16h-support.patch index b430ab7..fc9aebf 100644 --- a/add-f16h-support.patch +++ b/add-f16h-support.patch @@ -1,10 +1,10 @@ Add F16h decoding support Signed-off-by: Borislav Petkov -Index: mcelog-1.36/amd.c +Index: mcelog-1.60/amd.c =================================================================== ---- mcelog-1.36.orig/amd.c 2016-05-03 17:45:45.316505087 +0200 -+++ mcelog-1.36/amd.c 2016-05-03 17:45:47.828648285 +0200 +--- mcelog-1.60.orig/amd.c 2018-09-24 15:15:33.848351555 +0200 ++++ mcelog-1.60/amd.c 2018-09-24 15:15:35.660459339 +0200 @@ -200,6 +200,8 @@ enum cputype select_amd_cputype(u32 fami return CPU_F14H; case 0x15: @@ -86,11 +86,11 @@ Index: mcelog-1.36/amd.c default: Eprintf("Huh? What family is it: 0x%x?!\n", cpu); return; -Index: mcelog-1.36/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.36.orig/mcelog.h 2016-05-03 17:45:45.316505087 +0200 -+++ mcelog-1.36/mcelog.h 2016-05-03 17:45:47.828648285 +0200 -@@ -116,6 +116,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:15:33.848351555 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:15:35.664459576 +0200 +@@ -122,6 +122,7 @@ enum cputype { CPU_F12H, CPU_F14H, CPU_F15H, @@ -98,10 +98,10 @@ Index: mcelog-1.36/mcelog.h CPU_P4, CPU_NEHALEM, CPU_DUNNINGTON, -Index: mcelog-1.36/amd.h +Index: mcelog-1.60/amd.h =================================================================== ---- mcelog-1.36.orig/amd.h 2016-05-03 17:45:45.316505087 +0200 -+++ mcelog-1.36/amd.h 2016-05-03 17:45:47.832648501 +0200 +--- mcelog-1.60.orig/amd.h 2018-09-24 15:15:33.848351555 +0200 ++++ mcelog-1.60/amd.h 2018-09-24 15:15:35.664459576 +0200 @@ -98,4 +98,5 @@ enum rrrr_ids { case CPU_F11H: \ case CPU_F12H: \ @@ -109,11 +109,11 @@ Index: mcelog-1.36/amd.h - case CPU_F15H + case CPU_F15H: \ + case CPU_F16H -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:45.320505319 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:47.832648501 +0200 -@@ -230,6 +230,7 @@ static char *cputype_name[] = { +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:33.848351555 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:35.668459814 +0200 +@@ -232,6 +232,7 @@ static char *cputype_name[] = { [CPU_F12H] = "AMD Llano", [CPU_F14H] = "AMD Bobcat", [CPU_F15H] = "AMD Bulldozer", @@ -121,7 +121,7 @@ Index: mcelog-1.36/mcelog.c [CPU_P4] = "Intel P4", [CPU_NEHALEM] = "Intel Xeon 5500 series / Core i3/5/7 (\"Nehalem/Westmere\")", [CPU_DUNNINGTON] = "Intel Xeon 7400 series", -@@ -261,6 +262,7 @@ static struct config_choice cpu_choices[ +@@ -266,6 +267,7 @@ static struct config_choice cpu_choices[ { "f12h", CPU_F12H }, { "f14h", CPU_F14H }, { "f15h", CPU_F15H }, diff --git a/email.patch b/email.patch index c6a5bc4..6daa198 100644 --- a/email.patch +++ b/email.patch @@ -7,16 +7,16 @@ msg.c | 8 ++ 6 files changed, 343 insertions(+), 2 deletions(-) -Index: mcelog-1.53/Makefile +Index: mcelog-1.60/Makefile =================================================================== ---- mcelog-1.53.orig/Makefile -+++ mcelog-1.53/Makefile +--- mcelog-1.60.orig/Makefile 2018-09-24 15:06:48.757117766 +0200 ++++ mcelog-1.60/Makefile 2018-09-24 15:07:38.900100531 +0200 @@ -1,3 +1,4 @@ +CONFIG_EMAIL := 1 CFLAGS := -g -Os prefix := /usr etcprefix := -@@ -35,15 +36,23 @@ OBJ := p4.o k8.o mcelog.o dmi.o tsc.o co +@@ -37,15 +38,23 @@ OBJ := p4.o k8.o mcelog.o dmi.o tsc.o co broadwell_de.o broadwell_epex.o skylake_xeon.o \ denverton.o \ msr.o bus.o unknown.o @@ -41,7 +41,7 @@ Index: mcelog-1.53/Makefile # dbquery intentionally not installed by default install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5 -@@ -78,7 +87,7 @@ dbquery: db.o dbquery.o memutil.o +@@ -80,7 +89,7 @@ dbquery: db.o dbquery.o memutil.o depend: .depend %.o: %.c @@ -50,10 +50,10 @@ Index: mcelog-1.53/Makefile version.tmp: FORCE ( printf "char version[] = \"" ; \ -Index: mcelog-1.53/email.c +Index: mcelog-1.60/email.c =================================================================== ---- /dev/null -+++ mcelog-1.53/email.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mcelog-1.60/email.c 2018-09-24 15:07:38.904100771 +0200 @@ -0,0 +1,200 @@ +#include +#include @@ -255,10 +255,10 @@ Index: mcelog-1.53/email.c + smtp_destroy_session (session); + return 0; +} -Index: mcelog-1.53/email.h +Index: mcelog-1.60/email.h =================================================================== ---- /dev/null -+++ mcelog-1.53/email.h +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mcelog-1.60/email.h 2018-09-24 15:07:38.904100771 +0200 @@ -0,0 +1,34 @@ +#ifndef _MCELOG_EMAIL_H_ +#define _MCELOG_EMAIL_H_ @@ -294,10 +294,10 @@ Index: mcelog-1.53/email.h +#endif + +#endif -Index: mcelog-1.53/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.53.orig/mcelog.c -+++ mcelog-1.53/mcelog.c +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:06:48.765118243 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:12:49.910600461 +0200 @@ -37,6 +37,7 @@ #include #include @@ -325,23 +325,23 @@ Index: mcelog-1.53/mcelog.c static char *inputfile; char *processor_flags; static int foreground; -@@ -983,6 +987,7 @@ void usage(void) - "--no-imc-log Disable extended iMC logging\n" +@@ -990,6 +994,7 @@ void usage(void) "--is-cpu-supported Exit with return code indicating whether the CPU is supported\n" + "--help Display this message.\n" ); + email_usage(); printf("\n"); print_cputypes(); - exit(1); -@@ -1051,6 +1056,7 @@ static struct option options[] = { - { "debug-numerrors", 0, NULL, O_DEBUG_NUMERRORS }, /* undocumented: for testing */ + } +@@ -1059,6 +1064,7 @@ static struct option options[] = { { "no-imc-log", 0, NULL, O_NO_IMC_LOG }, + { "help", 0, NULL, O_HELP }, { "is-cpu-supported", 0, NULL, O_IS_CPU_SUPPORTED }, + EMAIL_OPTIONS {} }; -@@ -1229,11 +1235,86 @@ static void drop_cred(void) +@@ -1250,11 +1256,86 @@ static void drop_cred(void) } } @@ -428,7 +428,7 @@ Index: mcelog-1.53/mcelog.c if (recordlen == 0) { Wprintf("no data in mce record\n"); -@@ -1260,12 +1341,16 @@ static void process(int fd, unsigned rec +@@ -1281,12 +1362,16 @@ static void process(int fd, unsigned rec finish = 1; if (!mce_filter(mce, recordlen)) continue; @@ -445,7 +445,7 @@ Index: mcelog-1.53/mcelog.c flushlog(); } -@@ -1374,6 +1459,8 @@ int main(int ac, char **av) +@@ -1400,6 +1485,8 @@ int main(int ac, char **av) noargs(ac, av); fprintf(stderr, "mcelog %s\n", MCELOG_VERSION); exit(0); @@ -454,10 +454,10 @@ Index: mcelog-1.53/mcelog.c } else if (opt == 0) break; } -@@ -1406,6 +1493,10 @@ int main(int ac, char **av) - logfn = av[optind++]; - if (av[optind]) +@@ -1434,6 +1521,10 @@ int main(int ac, char **av) usage(); + exit(1); + } + if (email_mode == 0) + email_mode = email_env(); + /* email sending only in daemon mode */ @@ -465,11 +465,11 @@ Index: mcelog-1.53/mcelog.c checkdmi(); general_setup(); -Index: mcelog-1.53/mcelog.h +Index: mcelog-1.60/mcelog.h =================================================================== ---- mcelog-1.53.orig/mcelog.h -+++ mcelog-1.53/mcelog.h -@@ -141,6 +141,7 @@ enum cputype { +--- mcelog-1.60.orig/mcelog.h 2018-09-24 15:06:48.769118480 +0200 ++++ mcelog-1.60/mcelog.h 2018-09-24 15:07:38.908101010 +0200 +@@ -144,6 +144,7 @@ enum cputype { enum option_ranges { O_COMMON = 500, O_DISKDB = 1000, @@ -477,10 +477,10 @@ Index: mcelog-1.53/mcelog.h }; enum syslog_opt { -Index: mcelog-1.53/msg.c +Index: mcelog-1.60/msg.c =================================================================== ---- mcelog-1.53.orig/msg.c -+++ mcelog-1.53/msg.c +--- mcelog-1.60.orig/msg.c 2018-09-24 15:06:48.769118480 +0200 ++++ mcelog-1.60/msg.c 2018-09-24 15:07:38.908101010 +0200 @@ -8,10 +8,13 @@ #include "mcelog.h" #include "msg.h" diff --git a/fix_setgroups_missing_call.patch b/fix_setgroups_missing_call.patch index 5663561..3042660 100644 --- a/fix_setgroups_missing_call.patch +++ b/fix_setgroups_missing_call.patch @@ -1,7 +1,7 @@ -Index: mcelog-1.36/mcelog.c +Index: mcelog-1.60/mcelog.c =================================================================== ---- mcelog-1.36.orig/mcelog.c 2016-05-03 17:45:47.832648501 +0200 -+++ mcelog-1.36/mcelog.c 2016-05-03 17:45:53.348962792 +0200 +--- mcelog-1.60.orig/mcelog.c 2018-09-24 15:15:35.668459814 +0200 ++++ mcelog-1.60/mcelog.c 2018-09-24 15:15:41.648815524 +0200 @@ -37,6 +37,7 @@ #include #include @@ -10,7 +10,7 @@ Index: mcelog-1.36/mcelog.c #include #include #include "mcelog.h" -@@ -1223,6 +1224,14 @@ static void general_setup(void) +@@ -1247,6 +1248,14 @@ static void general_setup(void) static void drop_cred(void) { diff --git a/mcelog-1.53.tar.xz b/mcelog-1.53.tar.xz deleted file mode 100644 index 4aa5ead..0000000 --- a/mcelog-1.53.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be5787d819553ecf7b6fe4e16f7acd54b8c1c70ee59ef82d96e564cd50da6c95 -size 270324 diff --git a/mcelog-1.60.tar.xz b/mcelog-1.60.tar.xz new file mode 100644 index 0000000..4c85b42 --- /dev/null +++ b/mcelog-1.60.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7772667527a3b4089a72387b0b4fb52fa3095a5e1e7743c88edd5dc944bf45c +size 279564 diff --git a/mcelog.changes b/mcelog.changes index 782c37a..fcb9001 100644 --- a/mcelog.changes +++ b/mcelog.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Sep 21 15:52:28 UTC 2018 - opensuse-packaging@opensuse.org + +(by trenn@suse.de) +- Update to version 1.60 (fate#326221): + * Turn back rb_color field into unsigned long + * trigger: add a sync argument for waiting trigger child process exit + * page: trigger: add pre/post sync trigger when doing soft memory offline + * fixed build errors for some lose code when merging code + * transfer the page address to pre/post-sync-trigger scripts + * mcelog: Fix "--ascii" parsing to cope with change in kernel output since v4.10 + * Remove now unused local variable + * Add scripts file to do MCA error code validation for a selected CPU model + * Add license file + * mcelog: Improve decoding for APEI reported errors + ------------------------------------------------------------------- Thu Nov 23 13:40:46 UTC 2017 - rbrown@suse.com diff --git a/mcelog.spec b/mcelog.spec index 2e0beb2..57621d5 100644 --- a/mcelog.spec +++ b/mcelog.spec @@ -1,7 +1,7 @@ # # spec file for package mcelog # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: mcelog -Version: 1.53 +Version: 1.60 Release: 0 Summary: Log Machine Check Events License: GPL-2.0