Hello community,
here is the log from the commit of package servicelog for openSUSE:Factory checked in at 2019-09-30 16:03:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/servicelog (Old)
and /work/SRC/openSUSE:Factory/.servicelog.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servicelog"
Mon Sep 30 16:03:17 2019 rev:27 rq:734036 version:1.1.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/servicelog/servicelog.changes 2017-10-24 22:24:26.105448724 +0200
+++ /work/SRC/openSUSE:Factory/.servicelog.new.2352/servicelog.changes 2019-09-30 16:03:33.968551221 +0200
@@ -1,0 +2,7 @@
+Thu Sep 26 07:03:34 UTC 2019 - Josef Möllers
+
+- version update to 1.1.15
+ - Code cleanup, minor bug fixes
+ [jsc#SLE-8266]
+
+-------------------------------------------------------------------
Old:
----
servicelog-1.1.14.tar.gz
New:
----
servicelog-1.1.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ servicelog.spec ++++++
--- /var/tmp/diff_new_pack.TKFXHl/_old 2019-09-30 16:03:35.376547474 +0200
+++ /var/tmp/diff_new_pack.TKFXHl/_new 2019-09-30 16:03:35.376547474 +0200
@@ -1,7 +1,7 @@
#
# spec file for package servicelog
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,15 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: servicelog
-Version: 1.1.14
+Version: 1.1.15
Release: 0
Summary: Servicelog Tools
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/Management
BuildRequires: librtas-devel
BuildRequires: libservicelog-devel
++++++ servicelog-1.1.14.tar.gz -> servicelog-1.1.15.tar.gz ++++++
++++ 2436 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/config/compile new/servicelog-1.1.15/config/compile
--- old/servicelog-1.1.14/config/compile 2016-03-16 09:39:31.000000000 +0100
+++ new/servicelog-1.1.15/config/compile 2019-09-10 10:45:19.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/config/config.h.in new/servicelog-1.1.15/config/config.h.in
--- old/servicelog-1.1.14/config/config.h.in 2016-03-16 09:39:28.000000000 +0100
+++ new/servicelog-1.1.15/config/config.h.in 2019-09-10 10:45:18.000000000 +0200
@@ -86,6 +86,9 @@
*/
#undef LT_OBJDIR
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/config/missing new/servicelog-1.1.15/config/missing
--- old/servicelog-1.1.14/config/missing 2016-03-16 09:39:31.000000000 +0100
+++ new/servicelog-1.1.15/config/missing 2019-09-10 10:45:19.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'autom4te' program to be rebuilt."
+ echo "the 'automa4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/configure.ac new/servicelog-1.1.15/configure.ac
--- old/servicelog-1.1.14/configure.ac 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/configure.ac 2019-09-10 10:45:09.000000000 +0200
@@ -1,10 +1,10 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-m4_define([ppu_version], 1.1.14)
+m4_define([ppu_version], 1.1.15)
AC_PREREQ([2.69])
-AC_INIT([servicelog], ppu_version, [hegdevasant@in.ibm.com, kamaleshb@in.ibm.com])
+AC_INIT([servicelog], ppu_version, [hegdevasant@linux.ibm.com, sbhat@linux.ibm.com])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall subdir-objects -Werror foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/servicelog.spec.in new/servicelog-1.1.15/servicelog.spec.in
--- old/servicelog-1.1.14/servicelog.spec.in 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/servicelog.spec.in 2019-09-10 10:45:09.000000000 +0200
@@ -49,6 +49,9 @@
%{__rm} -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 10 2019 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> 1.1.15
+- Code cleanup, minor bug fixes
+
* Wed Mar 16 2016 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> 1.1.14
- PowerKVM is a distro, not a platform
- Replace popen with native time function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/src/log_repair_action.c new/servicelog-1.1.15/src/log_repair_action.c
--- old/servicelog-1.1.14/src/log_repair_action.c 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/src/log_repair_action.c 2019-09-10 10:45:09.000000000 +0200
@@ -36,7 +36,8 @@
#include "platform.h"
#define BUF_SIZE 512
-#define ARG_LIST "l:p:d:n:t:qvVh"
+
+#define ARG_LIST "l:p:d:n:t:qVh"
static struct option long_options[] = {
{"location", required_argument, NULL, 'l'},
@@ -45,7 +46,6 @@
{"note", required_argument, NULL, 'n'},
{"quiet", no_argument, NULL, 'q'},
{"type", required_argument, NULL, 't'},
-// {"api_version", required_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'V'},
{0,0,0,0}
@@ -70,11 +70,8 @@
printf(" (useful for indicating who performed the repair)\n");
printf(" -q: quiet mode (log the repair action without prompting\n");
printf(" for confirmation)\n");
- printf(" -t: type of event this repair action is for (v0.2.9)\n");
- printf(" Valid types: (os, ppc64_rtas, or ppc64_encl)\n");
+ printf(" -t: type of event this repair action is for (deprecated)\n");
printf(" -V: print the version of the command and exit\n");
-// printf(" -v: Version of API to use. \n");
-// printf(" Valid arguments: '-v 1', otherwise defaults to v0.2.9)\n");
printf(" -h: print this help text and exit\n");
return;
@@ -99,7 +96,6 @@
struct sl_repair_action repair_action, *ra = &repair_action;
struct sl_event *events = NULL;
time_t epoch;
- int api_version = 0; // Short for version 0.2.9
int platform = 0;
pid_t cpid; /* Pid of child */
int rc; /* Holds return value */
@@ -146,10 +142,6 @@
printf("%s: Version %s\n", argv[0], VERSION);
exit(0);
break;
- case 'v':
- if ((strncmp(optarg, "1", 1) == 0))
- api_version = 1;
- break;
case 't': /* type - Added for backwards v29 compatibility */
/* Not actually used. Loc code is sufficient for device lookup with v1 API */
// if ((rc = valid_type(optarg)) == -1) {
@@ -313,6 +305,9 @@
"(y to continue, any other key to cancel): ",
ctime(&epoch), ra->location, ra->procedure);
dummy = fgets(buf, BUF_SIZE, stdin);
+ if (!dummy)
+ return 4;
+
if (strlen(buf) != 2 || buf[0] != 'y') {
printf("\nCancelled.\n");
return 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/src/servicelog.c new/servicelog-1.1.15/src/servicelog.c
--- old/servicelog-1.1.14/src/servicelog.c 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/src/servicelog.c 2019-09-10 10:45:09.000000000 +0200
@@ -175,11 +175,13 @@
rc = servicelog_event_query(slog, "", &event);
if (rc != 0) {
fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
exit(2);
}
rc = servicelog_event_print(stdout, event, 1);
if (rc < 0) {
fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
exit(2);
}
servicelog_event_free(event);
@@ -188,11 +190,13 @@
rc = servicelog_event_query(slog, query, &event);
if (rc != 0) {
fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
exit(2);
}
rc = servicelog_event_print(stdout, event, 1);
if (rc < 0) {
fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
exit(2);
}
servicelog_event_free(event);
@@ -217,6 +221,11 @@
printf("Servicelog Statistics:\n\n");
rc = servicelog_event_query(slog, "", &event);
+ if (rc != 0) {
+ fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
+ exit(2);
+ }
e = event;
while (e) {
n_events++;
@@ -294,6 +303,11 @@
rc = servicelog_repair_query(slog, "", &repair);
+ if (rc != 0) {
+ fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
+ exit(2);
+ }
r = repair;
while (r) {
n_repair++;
@@ -303,6 +317,11 @@
printf("Logged Repair Actions: %d\n", n_repair);
rc = servicelog_notify_query(slog, "", ¬ify);
+ if (rc != 0) {
+ fprintf(stderr, "%s\n", servicelog_error(slog));
+ servicelog_close(slog);
+ exit(2);
+ }
n = notify;
while (n) {
n_notify++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/src/servicelog_notify.c new/servicelog-1.1.15/src/servicelog_notify.c
--- old/servicelog-1.1.14/src/servicelog_notify.c 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/src/servicelog_notify.c 2019-09-10 10:45:09.000000000 +0200
@@ -155,7 +155,7 @@
main(int argc, char *argv[])
{
int option_index, rc, action=ACTION_UNSPECIFIED;
- int flag_type=0, flag_cmd=0, flag_match=0, flag_id=0, flag_method=0;
+ int flag_id=0;
int add_flags=0, method=0, servicable = 0;
/*
@@ -254,11 +254,9 @@
case 't':
type_tmp = optarg;
add_flags++;
- flag_type = 1;
break;
case 'c':
command = optarg;
- flag_cmd = 1;
/* verify command argument */
snprintf(cmdbuf, 256, "%s", command);
@@ -285,7 +283,6 @@
case 'm':
match = optarg;
add_flags++;
- flag_match = 1;
break;
case 'M':
method = valid_method_arg(optarg);
@@ -295,7 +292,6 @@
exit(1);
}
add_flags++;
- flag_method = 1;
break;
case 'h': /* help */
print_usage();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/servicelog-1.1.14/src/v29_servicelog_manage.c new/servicelog-1.1.15/src/v29_servicelog_manage.c
--- old/servicelog-1.1.14/src/v29_servicelog_manage.c 2016-03-16 09:39:12.000000000 +0100
+++ new/servicelog-1.1.15/src/v29_servicelog_manage.c 2019-09-10 10:45:09.000000000 +0200
@@ -271,6 +271,9 @@
"from the servicelog?\n");
printf("Enter 'yes' to continue > ");
tmp = fgets(buf, 80, stdin);
+ if (!tmp)
+ exit(2);
+
if (strcasecmp(buf, "yes\n")) {
printf("Operation cancelled.\n");
exit(4);
@@ -330,6 +333,9 @@
"notification tools from the servicelog?\n");
printf("Enter 'yes' to continue > ");
tmp = fgets(buf, 80, stdin);
+ if (!tmp)
+ exit(2);
+
if (strcasecmp(buf, "yes\n")) {
printf("Operation cancelled.\n");
exit(4);
@@ -378,7 +384,10 @@
" - Delete anything older than 1 year\n",
age, age);
printf("Enter 'yes' to continue > ");
- fgets(buf, 80, stdin);
+ tmp = fgets(buf, 80, stdin);
+ if (!tmp)
+ exit(2);
+
if (strcasecmp(buf, "yes\n")) {
printf("Operation cancelled.\n");
break;