- Updated to latest git HEAD:
commit c7bf28088f056925c04d4fd5768504c59bbf19c4 Author: Robin Holt <robinmholt@gmail.com> Date: Mon Sep 16 04:30:02 2013 -0500 Because upstream does not use proper tags/revisions, I now versioned this one mcelog-1.1 OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=29
This commit is contained in:
parent
27c39d9525
commit
85d54dd1f7
52
email.patch
52
email.patch
@ -7,10 +7,10 @@
|
||||
msg.c | 8 ++
|
||||
6 files changed, 343 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/Makefile
|
||||
Index: mcelog-1.1/Makefile
|
||||
===================================================================
|
||||
--- mcelog-1.0pre3.6e4e2a000124.orig/Makefile
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/Makefile
|
||||
--- mcelog-1.1.orig/Makefile
|
||||
+++ mcelog-1.1/Makefile
|
||||
@@ -1,3 +1,4 @@
|
||||
+CONFIG_EMAIL := 1
|
||||
CFLAGS := -g -Os
|
||||
@ -18,7 +18,7 @@ Index: mcelog-1.0pre3.6e4e2a000124/Makefile
|
||||
etcprefix :=
|
||||
@@ -34,7 +35,8 @@ OBJ := p4.o k8.o mcelog.o dmi.o tsc.o co
|
||||
client.o cache.o sysfs.o yellow.o page.o rbtree.o \
|
||||
xeon75xx.o sandy-bridge.o
|
||||
xeon75xx.o sandy-bridge.o ivy-bridge.o msr.o
|
||||
DISKDB_OBJ := diskdb.o dimm.o db.o
|
||||
-CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o ${DISKDB_OBJ}
|
||||
+EMAIL_OBJ := email.o
|
||||
@ -39,10 +39,10 @@ Index: mcelog-1.0pre3.6e4e2a000124/Makefile
|
||||
SRC := $(OBJ:.o=.c)
|
||||
|
||||
mcelog: ${OBJ}
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/email.c
|
||||
Index: mcelog-1.1/email.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/email.c
|
||||
+++ mcelog-1.1/email.c
|
||||
@@ -0,0 +1,199 @@
|
||||
+#include <unistd.h>
|
||||
+#include <signal.h>
|
||||
@ -243,10 +243,10 @@ Index: mcelog-1.0pre3.6e4e2a000124/email.c
|
||||
+ smtp_destroy_session (session);
|
||||
+ return 0;
|
||||
+}
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/email.h
|
||||
Index: mcelog-1.1/email.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/email.h
|
||||
+++ mcelog-1.1/email.h
|
||||
@@ -0,0 +1,34 @@
|
||||
+#ifndef _MCELOG_EMAIL_H_
|
||||
+#define _MCELOG_EMAIL_H_
|
||||
@ -282,10 +282,10 @@ Index: mcelog-1.0pre3.6e4e2a000124/email.h
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
Index: mcelog-1.1/mcelog.c
|
||||
===================================================================
|
||||
--- mcelog-1.0pre3.6e4e2a000124.orig/mcelog.c
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
--- mcelog-1.1.orig/mcelog.c
|
||||
+++ mcelog-1.1/mcelog.c
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <assert.h>
|
||||
#include <signal.h>
|
||||
@ -313,23 +313,23 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
static char *inputfile;
|
||||
char *processor_flags;
|
||||
static int foreground;
|
||||
@@ -914,6 +918,7 @@ void usage(void)
|
||||
"--num-errors N Only process N errors (for testing)\n"
|
||||
@@ -927,6 +931,7 @@ void usage(void)
|
||||
"--pidfile file Write pid of daemon into file\n"
|
||||
"--no-imc-log Disable extended iMC logging\n"
|
||||
);
|
||||
+ email_usage();
|
||||
diskdb_usage();
|
||||
print_cputypes();
|
||||
exit(1);
|
||||
@@ -979,6 +984,7 @@ static struct option options[] = {
|
||||
{ "pidfile", 1, NULL, O_PIDFILE },
|
||||
@@ -994,6 +999,7 @@ static struct option options[] = {
|
||||
{ "debug-numerrors", 0, NULL, O_DEBUG_NUMERRORS }, /* undocumented: for testing */
|
||||
{ "no-imc-log", 0, NULL, O_NO_IMC_LOG },
|
||||
DISKDB_OPTIONS
|
||||
+ EMAIL_OPTIONS
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -1153,11 +1159,86 @@ static void drop_cred(void)
|
||||
@@ -1171,11 +1177,86 @@ static void drop_cred(void)
|
||||
}
|
||||
}
|
||||
|
||||
@ -416,7 +416,7 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
|
||||
if (recordlen == 0) {
|
||||
Wprintf("no data in mce record\n");
|
||||
@@ -1177,12 +1258,16 @@ static void process(int fd, unsigned rec
|
||||
@@ -1195,12 +1276,16 @@ static void process(int fd, unsigned rec
|
||||
finish = 1;
|
||||
if (!mce_filter(mce, recordlen))
|
||||
continue;
|
||||
@ -433,7 +433,7 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
flushlog();
|
||||
}
|
||||
|
||||
@@ -1293,6 +1378,8 @@ int main(int ac, char **av)
|
||||
@@ -1311,6 +1396,8 @@ int main(int ac, char **av)
|
||||
exit(0);
|
||||
} else if (diskdb_cmd(opt, ac, av)) {
|
||||
exit(0);
|
||||
@ -442,7 +442,7 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
} else if (opt == 0)
|
||||
break;
|
||||
}
|
||||
@@ -1301,6 +1388,10 @@ int main(int ac, char **av)
|
||||
@@ -1339,6 +1426,10 @@ int main(int ac, char **av)
|
||||
logfn = av[optind++];
|
||||
if (av[optind])
|
||||
usage();
|
||||
@ -453,11 +453,11 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.c
|
||||
checkdmi();
|
||||
general_setup();
|
||||
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/mcelog.h
|
||||
Index: mcelog-1.1/mcelog.h
|
||||
===================================================================
|
||||
--- mcelog-1.0pre3.6e4e2a000124.orig/mcelog.h
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/mcelog.h
|
||||
@@ -120,6 +120,7 @@ enum cputype {
|
||||
--- mcelog-1.1.orig/mcelog.h
|
||||
+++ mcelog-1.1/mcelog.h
|
||||
@@ -123,6 +123,7 @@ enum cputype {
|
||||
enum option_ranges {
|
||||
O_COMMON = 500,
|
||||
O_DISKDB = 1000,
|
||||
@ -465,10 +465,10 @@ Index: mcelog-1.0pre3.6e4e2a000124/mcelog.h
|
||||
};
|
||||
|
||||
enum syslog_opt {
|
||||
Index: mcelog-1.0pre3.6e4e2a000124/msg.c
|
||||
Index: mcelog-1.1/msg.c
|
||||
===================================================================
|
||||
--- mcelog-1.0pre3.6e4e2a000124.orig/msg.c
|
||||
+++ mcelog-1.0pre3.6e4e2a000124/msg.c
|
||||
--- mcelog-1.1.orig/msg.c
|
||||
+++ mcelog-1.1/msg.c
|
||||
@@ -8,10 +8,13 @@
|
||||
#include "mcelog.h"
|
||||
#include "msg.h"
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:08355a9fb7be9d3ab94886bfbe7e639ea9fb33fcdb8bea103f67ad2870888557
|
||||
size 270953
|
3
mcelog-1.1.tar.bz2
Normal file
3
mcelog-1.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2b3831068691a46da78ebe7fd98831d16ab99ce048b6036fe61c7442f8bd292d
|
||||
size 274275
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 15 17:02:13 UTC 2013 - trenn@suse.de
|
||||
|
||||
- Updated to latest git HEAD:
|
||||
commit c7bf28088f056925c04d4fd5768504c59bbf19c4
|
||||
Author: Robin Holt <robinmholt@gmail.com>
|
||||
Date: Mon Sep 16 04:30:02 2013 -0500
|
||||
Because upstream does not use proper tags/revisions, I now
|
||||
versioned this one mcelog-1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 22 13:00:21 UTC 2013 - rmilasan@suse.com
|
||||
|
||||
|
@ -16,11 +16,12 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: mcelog
|
||||
Summary: Log Machine Check Events
|
||||
License: GPL-2.0+
|
||||
Group: System/Monitoring
|
||||
Version: 1.0pre3.6e4e2a000124
|
||||
Version: 1.1
|
||||
Release: 0
|
||||
ExclusiveArch: ix86 x86_64
|
||||
BuildRequires: libesmtp-devel
|
||||
|
Loading…
Reference in New Issue
Block a user