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

- Update to latest git tag v101.
- Mainline decided to finally do a version upgrade to v101
- Remove v1.1 again, obsolete it and go for version v102
- Some important fixes in the latest update:
    - bnc#873159
    - bnc#873725

OBS-URL: https://build.opensuse.org/request/show/231933
OBS-URL: https://build.opensuse.org/package/show/Base:System/mcelog?expand=0&rev=33

email.patch

@@ -7,10 +7,10 @@
  msg.c    |    8 ++
  6 files changed, 343 insertions(+), 2 deletions(-)
 
-Index: mcelog-1.1/Makefile
+Index: mcelog-1.0.1/Makefile
 ===================================================================
---- mcelog-1.1.orig/Makefile
+--- mcelog-1.0.1.orig/Makefile
-+++ mcelog-1.1/Makefile
++++ mcelog-1.0.1/Makefile
 @@ -1,3 +1,4 @@
 +CONFIG_EMAIL := 1
  CFLAGS := -g -Os
@@ -39,10 +39,10 @@ Index: mcelog-1.1/Makefile
  SRC := $(OBJ:.o=.c)
  
  mcelog: ${OBJ}
-Index: mcelog-1.1/email.c
+Index: mcelog-1.0.1/email.c
 ===================================================================
 --- /dev/null
-+++ mcelog-1.1/email.c
++++ mcelog-1.0.1/email.c
 @@ -0,0 +1,199 @@
 +#include <unistd.h>
 +#include <signal.h>
@@ -243,10 +243,10 @@ Index: mcelog-1.1/email.c
 +	smtp_destroy_session (session);
 +	return 0;
 +}
-Index: mcelog-1.1/email.h
+Index: mcelog-1.0.1/email.h
 ===================================================================
 --- /dev/null
-+++ mcelog-1.1/email.h
++++ mcelog-1.0.1/email.h
 @@ -0,0 +1,34 @@
 +#ifndef _MCELOG_EMAIL_H_
 +#define _MCELOG_EMAIL_H_
@@ -282,10 +282,10 @@ Index: mcelog-1.1/email.h
 +#endif
 +
 +#endif
-Index: mcelog-1.1/mcelog.c
+Index: mcelog-1.0.1/mcelog.c
 ===================================================================
---- mcelog-1.1.orig/mcelog.c
+--- mcelog-1.0.1.orig/mcelog.c
-+++ mcelog-1.1/mcelog.c
++++ mcelog-1.0.1/mcelog.c
 @@ -37,6 +37,7 @@
  #include <assert.h>
  #include <signal.h>
@@ -313,7 +313,7 @@ Index: mcelog-1.1/mcelog.c
  static char *inputfile;
  char *processor_flags;
  static int foreground;
-@@ -927,6 +931,7 @@ void usage(void)
+@@ -928,6 +932,7 @@ void usage(void)
  "--pidfile file	     Write pid of daemon into file\n"
  "--no-imc-log	     Disable extended iMC logging\n"
  		);
@@ -321,7 +321,7 @@ Index: mcelog-1.1/mcelog.c
  	diskdb_usage();
  	print_cputypes();
  	exit(1);
-@@ -994,6 +999,7 @@ static struct option options[] = {
+@@ -995,6 +1000,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
@@ -329,7 +329,7 @@ Index: mcelog-1.1/mcelog.c
  	{}
  };
  
-@@ -1171,11 +1177,86 @@ static void drop_cred(void)
+@@ -1170,11 +1176,86 @@ static void drop_cred(void)
  	}
  }
  
@@ -410,13 +410,13 @@ Index: mcelog-1.1/mcelog.c
  static void process(int fd, unsigned recordlen, unsigned loglen, char *buf)
  {	
  	int i; 
- 	int len;
+ 	int len, count;
- 	int finish = 0;
+ 	int finish = 0, flags;
 +	int mail_setup = 0;
  
  	if (recordlen == 0) {
  		Wprintf("no data in mce record\n");
-@@ -1195,12 +1276,16 @@ static void process(int fd, unsigned rec
+@@ -1201,12 +1282,16 @@ static void process(int fd, unsigned rec
  			finish = 1;
  		if (!mce_filter(mce, recordlen)) 
  			continue;
@@ -433,7 +433,7 @@ Index: mcelog-1.1/mcelog.c
  		flushlog();
  	}
  
-@@ -1311,6 +1396,8 @@ int main(int ac, char **av)
+@@ -1317,6 +1402,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.1/mcelog.c
  		} else if (opt == 0)
  			break;		    
  	} 
-@@ -1339,6 +1426,10 @@ int main(int ac, char **av)
+@@ -1345,6 +1432,10 @@ int main(int ac, char **av)
  		logfn = av[optind++];
  	if (av[optind])
  		usage();
@@ -453,10 +453,10 @@ Index: mcelog-1.1/mcelog.c
  	checkdmi();
  	general_setup();
  		
-Index: mcelog-1.1/mcelog.h
+Index: mcelog-1.0.1/mcelog.h
 ===================================================================
---- mcelog-1.1.orig/mcelog.h
+--- mcelog-1.0.1.orig/mcelog.h
-+++ mcelog-1.1/mcelog.h
++++ mcelog-1.0.1/mcelog.h
 @@ -123,6 +123,7 @@ enum cputype {
  enum option_ranges {
  	O_COMMON = 500,
@@ -465,10 +465,10 @@ Index: mcelog-1.1/mcelog.h
  };
  
  enum syslog_opt { 
-Index: mcelog-1.1/msg.c
+Index: mcelog-1.0.1/msg.c
 ===================================================================
---- mcelog-1.1.orig/msg.c
+--- mcelog-1.0.1.orig/msg.c
-+++ mcelog-1.1/msg.c
++++ mcelog-1.0.1/msg.c
 @@ -8,10 +8,13 @@
  #include "mcelog.h"
  #include "msg.h"

mcelog-1.0.1.tar.bz2

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

mcelog-1.1.tar.bz2

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

mcelog.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 28 16:49:38 UTC 2014 - trenn@suse.de
+
+- Update to latest git tag v101.
+- Mainline decided to finally do a version upgrade to v101
+- Remove v1.1 again, obsolete it and go for version v102
+- Some important fixes in the latest update:
+    - bnc#873159
+    - bnc#873725
+
 -------------------------------------------------------------------
 Sun Oct 27 18:00:04 UTC 2013 - crrodriguez@opensuse.org
 

mcelog.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mcelog
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,12 @@
 #
 
 
+
 Name:           mcelog
 Summary:        Log Machine Check Events
 License:        GPL-2.0+
 Group:          System/Monitoring
-Version:        1.1
+Version:        1.0.1
 Release:        0
 ExclusiveArch:  ix86 x86_64
 BuildRequires:  libesmtp-devel
@@ -36,6 +37,9 @@ Patch1:         email.patch
 Patch2:         mcelog_invert_prefill_db_warning.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq
+Url:            https://git.kernel.org/cgit/utils/cpu/mce/mcelog.git
+# Previously version was wrong, mainline decided to go for 1.0.1. not 1.1
+Obsoletes:      mcelog = 1.1
 %{?systemd_requires}
 
 %description
@@ -78,6 +82,7 @@ install -m 644 %SOURCE6 $RPM_BUILD_ROOT/%_docdir/%name/README.email_setup
 install -m 644 lk10-mcelog.pdf $RPM_BUILD_ROOT/%_docdir/%name/lk10-mcelog.pdf
 install -D -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/mcelog.service
 install -D -m 0644 %SOURCE4  %{buildroot}%{_udevrulesdir}/90-mcelog.rules
+ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcmcelog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,5 +113,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_unitdir}/mcelog.service
 %{_udevrulesdir}/90-mcelog.rules
 %_docdir/%name
+%_sbindir/rcmcelog
 
 %changelog

mcelog_invert_prefill_db_warning.patch

@@ -2,11 +2,11 @@
  memdb.c |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: mcelog-1.0.2011.06.08/memdb.c
+Index: mcelog-1.0.1/memdb.c
 ===================================================================
---- mcelog-1.0.2011.06.08.orig/memdb.c
+--- mcelog-1.0.1.orig/memdb.c
-+++ mcelog-1.0.2011.06.08/memdb.c
++++ mcelog-1.0.1/memdb.c
-@@ -417,11 +417,11 @@ void prefill_memdb(void)
+@@ -421,11 +421,11 @@ void prefill_memdb(void)
  		md->location = xstrdup(bl);
  		md->name = xstrdup(dmi_getstring(&d->header, d->device_locator));
  	}