Accepting request 508836 from home:fschnizlein:branches:Base:System

- Update to version 1.53:
  * Add service file
  * dmi: Handle NULL DMI string
  * Compress some fields in mempage.
  * Add coverity fixes
  * Fix typo in man page
  * mcelog: Check whether we successfully changed directory for trigger.
  * mcelog version: Add ability for OS to define version
  * Document .os_release in README
  * Set SO_PASSCRED on listen sockets
  * memutil.h: add missing include for va_list

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

_service

@@ -0,0 +1,16 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/andikleen/mcelog</param>
+    <param name="subdir"></param>
+    <param name="filename">mcelog</param>
+    <param name="versionformat">1.53</param>
+    <param name="changesgenerate">enable</param>
+    <param name="revision">refs/tags/v153</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">mcelog*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>

_servicedata

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

email.patch

@@ -7,10 +7,10 @@
  msg.c    |    8 ++
  6 files changed, 343 insertions(+), 2 deletions(-)
 
-Index: mcelog-1.46/Makefile
+Index: mcelog-1.53/Makefile
 ===================================================================
---- mcelog-1.46.orig/Makefile
-+++ mcelog-1.46/Makefile
+--- mcelog-1.53.orig/Makefile
++++ mcelog-1.53/Makefile
 @@ -1,3 +1,4 @@
 +CONFIG_EMAIL := 1
  CFLAGS := -g -Os
@@ -49,11 +49,11 @@ Index: mcelog-1.46/Makefile
 +	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(ADD_DEFINES) $< -o $@
  
  version.tmp: FORCE
- 	( echo -n "char version[] = \"" ; 	\
-Index: mcelog-1.46/email.c
+ 	( printf "char version[] = \"" ; 			\
+Index: mcelog-1.53/email.c
 ===================================================================
 --- /dev/null
-+++ mcelog-1.46/email.c
++++ mcelog-1.53/email.c
 @@ -0,0 +1,200 @@
 +#include <unistd.h>
 +#include <signal.h>
@@ -255,10 +255,10 @@ Index: mcelog-1.46/email.c
 +	smtp_destroy_session (session);
 +	return 0;
 +}
-Index: mcelog-1.46/email.h
+Index: mcelog-1.53/email.h
 ===================================================================
 --- /dev/null
-+++ mcelog-1.46/email.h
++++ mcelog-1.53/email.h
 @@ -0,0 +1,34 @@
 +#ifndef _MCELOG_EMAIL_H_
 +#define _MCELOG_EMAIL_H_
@@ -294,10 +294,10 @@ Index: mcelog-1.46/email.h
 +#endif
 +
 +#endif
-Index: mcelog-1.46/mcelog.c
+Index: mcelog-1.53/mcelog.c
 ===================================================================
---- mcelog-1.46.orig/mcelog.c
-+++ mcelog-1.46/mcelog.c
+--- mcelog-1.53.orig/mcelog.c
++++ mcelog-1.53/mcelog.c
 @@ -37,6 +37,7 @@
  #include <assert.h>
  #include <signal.h>
@@ -325,7 +325,7 @@ Index: mcelog-1.46/mcelog.c
  static char *inputfile;
  char *processor_flags;
  static int foreground;
-@@ -980,6 +984,7 @@ void usage(void)
+@@ -983,6 +987,7 @@ void usage(void)
  "--no-imc-log	     Disable extended iMC logging\n"
  "--is-cpu-supported  Exit with return code indicating whether the CPU is supported\n"
  		);
@@ -333,7 +333,7 @@ Index: mcelog-1.46/mcelog.c
  	printf("\n");
  	print_cputypes();
  	exit(1);
-@@ -1048,6 +1053,7 @@ static struct option options[] = {
+@@ -1051,6 +1056,7 @@ static struct option options[] = {
  	{ "debug-numerrors", 0, NULL, O_DEBUG_NUMERRORS }, /* undocumented: for testing */
  	{ "no-imc-log", 0, NULL, O_NO_IMC_LOG },
  	{ "is-cpu-supported", 0, NULL, O_IS_CPU_SUPPORTED },
@@ -341,7 +341,7 @@ Index: mcelog-1.46/mcelog.c
  	{}
  };
  
-@@ -1226,11 +1232,86 @@ static void drop_cred(void)
+@@ -1229,11 +1235,86 @@ static void drop_cred(void)
  	}
  }
  
@@ -428,7 +428,7 @@ Index: mcelog-1.46/mcelog.c
  
  	if (recordlen == 0) {
  		Wprintf("no data in mce record\n");
-@@ -1257,12 +1338,16 @@ static void process(int fd, unsigned rec
+@@ -1260,12 +1341,16 @@ static void process(int fd, unsigned rec
  			finish = 1;
  		if (!mce_filter(mce, recordlen)) 
  			continue;
@@ -445,7 +445,7 @@ Index: mcelog-1.46/mcelog.c
  		flushlog();
  	}
  
-@@ -1371,6 +1456,8 @@ int main(int ac, char **av)
+@@ -1374,6 +1459,8 @@ int main(int ac, char **av)
  			noargs(ac, av);
  			fprintf(stderr, "mcelog %s\n", MCELOG_VERSION);
  			exit(0);
@@ -454,7 +454,7 @@ Index: mcelog-1.46/mcelog.c
  		} else if (opt == 0)
  			break;		    
  	} 
-@@ -1403,6 +1490,10 @@ int main(int ac, char **av)
+@@ -1406,6 +1493,10 @@ int main(int ac, char **av)
  		logfn = av[optind++];
  	if (av[optind])
  		usage();
@@ -465,11 +465,11 @@ Index: mcelog-1.46/mcelog.c
  	checkdmi();
  	general_setup();
  		
-Index: mcelog-1.46/mcelog.h
+Index: mcelog-1.53/mcelog.h
 ===================================================================
---- mcelog-1.46.orig/mcelog.h
-+++ mcelog-1.46/mcelog.h
-@@ -138,6 +138,7 @@ enum cputype {
+--- mcelog-1.53.orig/mcelog.h
++++ mcelog-1.53/mcelog.h
+@@ -141,6 +141,7 @@ enum cputype {
  enum option_ranges {
  	O_COMMON = 500,
  	O_DISKDB = 1000,
@@ -477,10 +477,10 @@ Index: mcelog-1.46/mcelog.h
  };
  
  enum syslog_opt { 
-Index: mcelog-1.46/msg.c
+Index: mcelog-1.53/msg.c
 ===================================================================
---- mcelog-1.46.orig/msg.c
-+++ mcelog-1.46/msg.c
+--- mcelog-1.53.orig/msg.c
++++ mcelog-1.53/msg.c
 @@ -8,10 +8,13 @@
  #include "mcelog.h"
  #include "msg.h"

mcelog-1.48.tar.gz

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

mcelog-1.53.tar.xz

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

mcelog.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jul 07 13:59:28 UTC 2017 - fschnizlein@suse.com
+
+- Update to version 1.53:
+  * Add service file
+  * dmi: Handle NULL DMI string
+  * Compress some fields in mempage.
+  * Add coverity fixes
+  * Fix typo in man page
+  * mcelog: Check whether we successfully changed directory for trigger.
+  * mcelog version: Add ability for OS to define version
+  * Document .os_release in README
+  * Set SO_PASSCRED on listen sockets
+  * memutil.h: add missing include for va_list
+
 -------------------------------------------------------------------
 Mon Mar 20 14:28:54 UTC 2017 - trenn@suse.de
 

mcelog.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mcelog
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,13 +17,13 @@
 
 
 Name:           mcelog
-Version:        1.48
+Version:        1.53
 Release:        0
 Summary:        Log Machine Check Events
 License:        GPL-2.0
 Group:          System/Monitoring
 Url:            http://www.mcelog.org/
-Source:         https://github.com/andikleen/mcelog/archive/v148.tar.gz#/%{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.xz
 Source2:        mcelog.sysconfig
 Source3:        mcelog.systemd
 Source5:        mcelog.tmpfiles
@@ -58,7 +58,7 @@ It should run on any x86-64 system.
 In addition, it allows decoding machine check kernel panic messages.
 
 %prep
-%setup -q -n %{name}-148
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1