pool/mcelog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 749941 from home:trenn:branches:Base:System

Browse Source 
- Update to version 1.66 (jira SLE-10087, jira SLE-8853):
  * mcelog: Add support for Icelake server, Icelake-D, and Snow Ridge
M email.patch
-> Patched with fuzz, refresh needed

- Update to version 1.65:
  * mcelog: Add Cascade Lake to supported models

OBS-URL: https://build.opensuse.org/request/show/749941
OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=79
This commit is contained in:
Thomas Renninger 2019-11-22 15:08:04 +00:00 committed by Git OBS Bridge
parent d1c9d49d64
commit 8329c1cbe3
7 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@ -5,8 +5,8 @@
<param name="subdir"></param>
<param name="filename">mcelog</param>
<param name="changesgenerate">enable</param>
<param name="revision">refs/tags/v164</param>
<param name="versionformat">1.64</param>
<param name="revision">refs/tags/v166</param>
<param name="versionformat">1.66</param>
<!--
<param name="versionformat">1.64+git%cd.%h</param>
-->

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/andikleen/mcelog</param>
<param name="changesrevision">e53631f84a181be371c08e0b961180bff77fd2ab</param></service></servicedata>
<param name="changesrevision">ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4</param></service></servicedata>

56
email.patch
View File

@ -7,16 +7,18 @@
msg.c | 8 ++
6 files changed, 343 insertions(+), 2 deletions(-)
--- mcelog-1.64+git20190805.e53631f.orig/Makefile 2019-09-06 14:06:51.841228190 +0200
+++ mcelog-1.64+git20190805.e53631f/Makefile 2019-09-06 14:06:56.229228424 +0200
Index: mcelog-1.66/Makefile
===================================================================
--- mcelog-1.66.orig/Makefile 2019-11-12 20:05:12.000000000 +0100
+++ mcelog-1.66/Makefile 2019-11-20 15:22:48.408692817 +0100
@@ -1,3 +1,4 @@
+CONFIG_EMAIL := 1
CFLAGS := -g -Os
prefix := /usr
etcprefix :=
@@ -37,15 +38,23 @@
@@ -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 \
denverton.o i10nm.o \
msr.o bus.o unknown.o
+EMAIL_OBJ := email.o
CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \
@ -39,7 +41,7 @@
# dbquery intentionally not installed by default
install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5
@@ -80,7 +89,7 @@
@@ -80,7 +89,7 @@ dbquery: db.o dbquery.o memutil.o
depend: .depend
%.o: %.c
@ -48,8 +50,10 @@
version.tmp: FORCE
( printf "char version[] = \"" ; \
Index: mcelog-1.66/email.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ mcelog-1.64+git20190805.e53631f/email.c 2019-09-06 14:06:56.229228424 +0200
+++ mcelog-1.66/email.c 2019-11-20 15:22:48.408692817 +0100
@@ -0,0 +1,200 @@
+#include <unistd.h>
+#include <signal.h>
@ -251,8 +255,10 @@
+ smtp_destroy_session (session);
+ return 0;
+}
Index: mcelog-1.66/email.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ mcelog-1.64+git20190805.e53631f/email.h 2019-09-06 14:06:56.229228424 +0200
+++ mcelog-1.66/email.h 2019-11-20 15:22:48.408692817 +0100
@@ -0,0 +1,34 @@
+#ifndef _MCELOG_EMAIL_H_
+#define _MCELOG_EMAIL_H_
@ -288,8 +294,10 @@
+#endif
+
+#endif
--- mcelog-1.64+git20190805.e53631f.orig/mcelog.c 2019-09-06 14:06:51.841228190 +0200
+++ mcelog-1.64+git20190805.e53631f/mcelog.c 2019-09-06 14:06:56.229228424 +0200
Index: mcelog-1.66/mcelog.c
===================================================================
--- mcelog-1.66.orig/mcelog.c 2019-11-12 20:05:12.000000000 +0100
+++ mcelog-1.66/mcelog.c 2019-11-20 15:22:48.408692817 +0100
@@ -37,6 +37,7 @@
#include <assert.h>
#include <signal.h>
@ -308,7 +316,7 @@
enum cputype cputype = CPU_GENERIC;
char *logfn = LOG_DEV_FILENAME;
@@ -71,7 +75,7 @@
@@ -71,7 +75,7 @@ static double cpumhz;
static int cpumhz_forced;
int ascii_mode;
int dump_raw_ascii;
@ -317,7 +325,7 @@
static char *inputfile;
char *processor_flags;
static int foreground;
@@ -994,6 +998,7 @@
@@ -1003,6 +1007,7 @@ void usage(void)
"--is-cpu-supported Exit with return code indicating whether the CPU is supported\n"
"--help Display this message.\n"
);
@ -325,7 +333,7 @@
printf("\n");
print_cputypes();
}
@@ -1063,6 +1068,7 @@
@@ -1072,6 +1077,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 },
@ -333,7 +341,7 @@
{}
};
@@ -1254,11 +1260,86 @@
@@ -1263,11 +1269,86 @@ static void drop_cred(void)
}
}
@ -420,7 +428,7 @@
if (recordlen == 0) {
Wprintf("no data in mce record\n");
@@ -1285,12 +1366,16 @@
@@ -1294,12 +1375,16 @@ static void process(int fd, unsigned rec
finish = 1;
if (!mce_filter(mce, recordlen))
continue;
@ -437,7 +445,7 @@
flushlog();
}
@@ -1404,6 +1489,8 @@
@@ -1413,6 +1498,8 @@ int main(int ac, char **av)
noargs(ac, av);
fprintf(stderr, "mcelog %s\n", MCELOG_VERSION);
exit(0);
@ -446,7 +454,7 @@
} else if (opt == 0)
break;
}
@@ -1438,6 +1525,10 @@
@@ -1447,6 +1534,10 @@ int main(int ac, char **av)
usage();
exit(1);
}
@ -457,9 +465,11 @@
checkdmi();
general_setup();
--- mcelog-1.64+git20190805.e53631f.orig/mcelog.h 2019-09-06 14:06:51.841228190 +0200
+++ mcelog-1.64+git20190805.e53631f/mcelog.h 2019-09-06 14:06:56.229228424 +0200
@@ -145,6 +145,7 @@
Index: mcelog-1.66/mcelog.h
===================================================================
--- mcelog-1.66.orig/mcelog.h 2019-11-12 20:05:12.000000000 +0100
+++ mcelog-1.66/mcelog.h 2019-11-20 15:22:48.408692817 +0100
@@ -148,6 +148,7 @@ enum cputype {
enum option_ranges {
O_COMMON = 500,
O_DISKDB = 1000,
@ -467,8 +477,10 @@
};
enum syslog_opt {
--- mcelog-1.64+git20190805.e53631f.orig/msg.c 2019-09-06 14:06:51.841228190 +0200
+++ mcelog-1.64+git20190805.e53631f/msg.c 2019-09-06 14:06:56.229228424 +0200
Index: mcelog-1.66/msg.c
===================================================================
--- mcelog-1.66.orig/msg.c 2019-11-12 20:05:12.000000000 +0100
+++ mcelog-1.66/msg.c 2019-11-20 15:22:48.408692817 +0100
@@ -8,10 +8,13 @@
#include "mcelog.h"
#include "msg.h"
@ -483,7 +495,7 @@
static char *output_fn;
int need_stdout(void)
@@ -135,6 +138,11 @@
@@ -135,6 +138,11 @@ int Wprintf(char *fmt, ...)
n = vfprintf(output_fh ? output_fh : stdout, fmt, ap);
va_end(ap);
}

3
mcelog-1.64.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a863e3f2d123b0f165ba86cf4641f23678523895424d13cf11bce750b1259c14
size 278832

3
mcelog-1.66.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c34d02513aa760296f4932c1d21ce0ba349961b8ded5736b1b75d4a6d492348
size 280796

14
mcelog.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Nov 20 14:00:53 UTC 2019 - trenn@suse.de
- Update to version 1.66 (jira SLE-10087, jira SLE-8853):
* mcelog: Add support for Icelake server, Icelake-D, and Snow Ridge
M email.patch
-> Patched with fuzz, refresh needed
-------------------------------------------------------------------
Tue Oct 29 15:57:54 UTC 2019 - trenn@suse.de
- Update to version 1.65:
* mcelog: Add Cascade Lake to supported models
-------------------------------------------------------------------
Fri Sep 13 16:04:20 UTC 2019 - Jean Delvare <jdelvare@suse.com>

2
mcelog.spec
View File

@ -22,7 +22,7 @@
%endif
Name: mcelog
Version: 1.64
Version: 1.66
Release: 0
Summary: Log Machine Check Events
License: GPL-2.0-only