Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package servicelog for openSUSE:Factory checked in at 2021-10-08 00:06:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servicelog (Old) and /work/SRC/openSUSE:Factory/.servicelog.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servicelog" Fri Oct 8 00:06:09 2021 rev:29 rq:923673 version:1.1.16 Changes: -------- --- /work/SRC/openSUSE:Factory/servicelog/servicelog.changes 2019-10-02 11:59:44.666901173 +0200 +++ /work/SRC/openSUSE:Factory/.servicelog.new.2443/servicelog.changes 2021-10-08 00:07:05.401859057 +0200 @@ -1,0 +2,7 @@ +Fri Oct 1 09:49:06 UTC 2021 - Michal Suchanek <msucha...@suse.com> + +- Update to version 1.1.16 (jsc#SLE-18190). +- Update project URL +- Clean up spec file + +------------------------------------------------------------------- Old: ---- servicelog-1.1.15.tar.gz New: ---- servicelog-1.1.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servicelog.spec ++++++ --- /var/tmp/diff_new_pack.1af2N9/_old 2021-10-08 00:07:05.833859790 +0200 +++ /var/tmp/diff_new_pack.1af2N9/_new 2021-10-08 00:07:05.837859796 +0200 @@ -1,7 +1,7 @@ # # spec file for package servicelog # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,18 @@ Name: servicelog -Version: 1.1.15 +Version: 1.1.16 Release: 0 Summary: Servicelog Tools License: GPL-2.0-only Group: System/Management +BuildRequires: autoconf +BuildRequires: automake BuildRequires: librtas-devel BuildRequires: libservicelog-devel BuildRequires: sqlite3-devel -Url: http://linux-diag.sourceforge.net/servicelog -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/power-ras/servicelog/ +Source0: https://github.com/power-ras/servicelog/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz ExclusiveArch: ppc ppc64 ppc64le %description @@ -47,6 +48,7 @@ %setup -q %build +autoreconf -fvi %configure %{__make} %{?_smp_mflags} @@ -56,9 +58,13 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT +%if %{undefined license} +%define license %doc +%endif + %files -%defattr(-,root,root) -%doc COPYING +%license COPYING +%doc README %{_bindir}/servicelog %{_bindir}/servicelog_notify %{_bindir}/log_repair_action ++++++ servicelog-1.1.15.tar.gz -> servicelog-1.1.16.tar.gz ++++++ ++++ 46401 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.15/.gitignore new/servicelog-1.1.16/.gitignore --- old/servicelog-1.1.15/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/.gitignore 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,84 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* +*.o +*.o.* +*.a +*.s +*.so +*.so.dbg +*.mod.c +*.i +*.order +*.gz +*.bz2 +*.lzma +*.zip +*.lzo +*.patch +*.gcno + +# +# Build files +# +/aclocal.m4 +/autom4te.cache/ +/config/ +/config.log +/config.status +/configure +/Makefile +/Makefile.in +/servicelog.spec + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.travis.yml + +# stgit generated dirs +patches-* + +# quilt's files +patches +series + +# cscope files +cscope.* +ncscope.* + +# ctags +tags +TAGS + +# gnu global files +GPATH +GRTAGS +GSYMS +GTAGS + +# Executables +/src/servicelog +/src/v1_servicelog +/src/v29_servicelog +/src/servicelog_notify +/src/log_repair_action +/src/servicelog_manage +/src/slog_common_event + +# Man pages +/man/*.gz + +*.orig +*~ +\#*# 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.15/.travis.yml new/servicelog-1.1.16/.travis.yml --- old/servicelog-1.1.15/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/.travis.yml 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,25 @@ +language: c + +os: linux-ppc64le + +sudo: required + +services: docker + +env: + matrix: + - RUN_ON_CONTAINER=fedora-33 + - RUN_ON_CONTAINER=ubuntu-20.04 + +install: + - docker build --pull -t ${RUN_ON_CONTAINER} -f servicelog-ci/Dockerfile-${RUN_ON_CONTAINER} . + +script: + - > + docker run + --security-opt seccomp=unconfined + --volume $HOME/.ccache:/root/.ccache + --volume `pwd`:/build + --tmpfs /tmp/ + --rm -t $RUN_ON_CONTAINER + bash -c "./servicelog-ci/build-${RUN_ON_CONTAINER}.sh"; 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.15/Makefile.am new/servicelog-1.1.16/Makefile.am --- old/servicelog-1.1.15/Makefile.am 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/Makefile.am 2021-09-07 12:04:03.000000000 +0200 @@ -14,6 +14,7 @@ # Licence along with this program; if not, see <http://www.gnu.org/licenses/>. ACLOCAL_AMFLAGS = -I m4 +AM_CFLAGS = -Wall man_MANS = man/servicelog.8 man/servicelog_notify.8 \ man/log_repair_action.8 man/servicelog_manage.8 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.15/README new/servicelog-1.1.16/README --- old/servicelog-1.1.15/README 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/README 2021-09-07 12:04:03.000000000 +0200 @@ -8,12 +8,7 @@ Source: ------- -http://linux-diag.sf.net/servicelog.html - -Mailing list: -------------- -linux-diag-de...@lists.sourceforge.net -Info/subscribe : https://lists.sourceforge.net/lists/listinfo/linux-diag-devel +https://github.com/power-ras/servicelog License: -------- @@ -54,24 +49,32 @@ $ rpmbuild -ba [--target=ppc/ppc64] <path-to-spec-file> +Reporting issue: +---------------- +Create a GitHub issue if you have any request for change, assuming one does +not already exist. Clearly describe the issue including steps to reproduce +if it is a bug. + +How to contribute: +------------------ +If you plan to submit the changes, submit a pull request based on top of +master. Include a descriptive commit message. Changes contributed should +focus on a single issue at a time to the extent possible. + Hacking: -------- -All patches should be sent to the mailing list with linux-kernel style -'Signed-Off-By'. The following git commands are your friends: -- git commit -s -- git format-patch +The following workflow should work for you: +- Fork the repository on GitHub into your account. +- Create a topic branch from where you want to base your work. + This is usually the master branch. +- Make sure you have added the necessary tests for your changes and make sure + all tests pass. +- Push your changes to the topic branch in your fork of the repository. +- Include a descriptive commit message, and each commit should have + linux-kernel style 'Signed-Off-By'. +- Submit a pull request to this repository. You probably want to read the linux Documentation/SubmittingPatches as much of it applies to libservicelog. -Submitting patch: ------------------ -We use same mailing list for all Power Linux VPD and diagnostics projects -(ppc64-diag, libvpd, lsvpd, [lib]servicelog). It is common convention to -prefix your subject line with project name. This lets maintainer and other -developers more easily identify patches from patches targeted to other -projects. For example, - - Subject: [servicelog PATCH 01/10] Summary phrase - -- 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.15/bootstrap.sh new/servicelog-1.1.16/bootstrap.sh --- old/servicelog-1.1.15/bootstrap.sh 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/bootstrap.sh 2021-09-07 12:04:03.000000000 +0200 @@ -5,10 +5,4 @@ mkdir config; fi -if [ ! -d m4 ]; -then - mkdir m4; -fi - -aclocal && libtoolize --force && autoheader && \ -automake --add-missing --copy && autoconf +autoreconf --install --verbose --force 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.15/config/compile new/servicelog-1.1.16/config/compile --- old/servicelog-1.1.15/config/compile 2019-09-10 10:45:19.000000000 +0200 +++ new/servicelog-1.1.16/config/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey <tro...@cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-autom...@gnu.org> or send patches to -# <automake-patc...@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-autom...@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: 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.15/config/config.h.in new/servicelog-1.1.16/config/config.h.in --- old/servicelog-1.1.15/config/config.h.in 2019-09-10 10:45:18.000000000 +0200 +++ new/servicelog-1.1.16/config/config.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,159 +0,0 @@ -/* config/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `servicelog' library (-lservicelog). */ -#undef HAVE_LIBSERVICELOG - -/* Define to 1 if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the <vfork.h> header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#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 - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -#undef _UINT32_T - -/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -#undef _UINT64_T - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - -/* Define to `int' if <sys/types.h> does not define. */ -#undef pid_t - -/* Define to `unsigned int' if <sys/types.h> does not define. */ -#undef size_t - -/* Define to `int' if <sys/types.h> does not define. */ -#undef ssize_t - -/* Define to the type of an unsigned integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ -#undef uint32_t - -/* Define to the type of an unsigned integer type of width exactly 64 bits if - such a type exists and the standard includes do not define it. */ -#undef uint64_t - -/* Define as `fork' if `vfork' does not work. */ -#undef vfork 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.15/config/missing new/servicelog-1.1.16/config/missing --- old/servicelog-1.1.15/config/missing 2019-09-10 10:45:19.000000000 +0200 +++ new/servicelog-1.1.16/config/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2012-06-26.16; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <bug-autom...@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: 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.15/configure.ac new/servicelog-1.1.16/configure.ac --- old/servicelog-1.1.15/configure.ac 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/configure.ac 2021-09-07 12:04:03.000000000 +0200 @@ -1,17 +1,16 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([ppu_version], 1.1.15) +m4_define([ppu_version], 1.1.16) AC_PREREQ([2.69]) -AC_INIT([servicelog], ppu_version, [hegdevas...@linux.ibm.com, sb...@linux.ibm.com]) +AC_INIT([servicelog], ppu_version, [hegdevas...@linux.ibm.com]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall subdir-objects -Werror foreign]) AC_CONFIG_SRCDIR([src/servicelog.c]) AC_CONFIG_SRCDIR([man/servicelog.8]) AC_CONFIG_HEADERS([config/config.h]) -AM_INIT_AUTOMAKE LT_INIT # Checks for programs. @@ -38,6 +37,20 @@ AC_TYPE_UINT32_T AC_TYPE_UINT64_T +AC_MSG_CHECKING([whether to enable test]) +AC_ARG_WITH([test], + [AS_HELP_STRING([--with-test], + [compile test binaries [default=no]])], + [if test "$withval" = "yes"; then + AC_MSG_RESULT([yes]) + AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) + AX_APPEND_COMPILE_FLAGS([-DSERVICELOG_TEST]) + else + AC_MSG_RESULT([no]) + fi + ], + [AC_MSG_RESULT([no])]) + # Checks for library functions. AC_CHECK_FUNCS([memset strtol strcasecmp strchr strdup strerror strrchr strstr strtoul]) 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.15/m4/ax_append_compile_flags.m4 new/servicelog-1.1.16/m4/ax_append_compile_flags.m4 --- old/servicelog-1.1.15/m4/ax_append_compile_flags.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/m4/ax_append_compile_flags.m4 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,65 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) +done +])dnl AX_APPEND_COMPILE_FLAGS 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.15/m4/ax_append_flag.m4 new/servicelog-1.1.16/m4/ax_append_flag.m4 --- old/servicelog-1.1.15/m4/ax_append_flag.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/m4/ax_append_flag.m4 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,69 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_APPEND_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl +AS_VAR_SET_IF(FLAGS, + [case " AS_VAR_GET(FLAGS) " in + *" $1 "*) + AC_RUN_LOG([: FLAGS already contains $1]) + ;; + *) + AC_RUN_LOG([: FLAGS="$FLAGS $1"]) + AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"]) + ;; + esac], + [AS_VAR_SET(FLAGS,["$1"])]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG 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.15/m4/ax_check_compile_flag.m4 new/servicelog-1.1.16/m4/ax_check_compile_flag.m4 --- old/servicelog-1.1.15/m4/ax_check_compile_flag.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/m4/ax_check_compile_flag.m4 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosm...@gmail.com> +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS 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.15/m4/ax_require_defined.m4 new/servicelog-1.1.16/m4/ax_require_defined.m4 --- old/servicelog-1.1.15/m4/ax_require_defined.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/m4/ax_require_defined.m4 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger <vap...@gentoo.org> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED 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.15/servicelog-ci/Dockerfile-fedora-33 new/servicelog-1.1.16/servicelog-ci/Dockerfile-fedora-33 --- old/servicelog-1.1.15/servicelog-ci/Dockerfile-fedora-33 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/servicelog-ci/Dockerfile-fedora-33 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,5 @@ +FROM fedora:33 +RUN dnf -y install gcc make valgrind strace servicelog libservicelog libservicelog-devel +RUN dnf -y install sqlite-devel bison flex librtas-devel libtool automake rpm-build git +COPY . /build/ +WORKDIR /build 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.15/servicelog-ci/Dockerfile-ubuntu-20.04 new/servicelog-1.1.16/servicelog-ci/Dockerfile-ubuntu-20.04 --- old/servicelog-1.1.15/servicelog-ci/Dockerfile-ubuntu-20.04 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/servicelog-ci/Dockerfile-ubuntu-20.04 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,8 @@ +FROM ubuntu:20.04 +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update -qq +RUN apt-get update -qq && apt-get install -y automake libtool git make gcc bison flex valgrind +RUN apt-get update -qq && apt-get install -y libsqlite3-dev librtas-dev librtasevent-dev +RUN apt-get update -qq && apt-get install -y libservicelog-1.1-1 libservicelog-dev strace +COPY . /build/ +WORKDIR /build 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.15/servicelog-ci/build-fedora-33.sh new/servicelog-1.1.16/servicelog-ci/build-fedora-33.sh --- old/servicelog-1.1.15/servicelog-ci/build-fedora-33.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/servicelog-ci/build-fedora-33.sh 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx +MAKE_J=$(grep -c processor /proc/cpuinfo) + +./bootstrap.sh +./configure +make -j $MAKE_J +make -j $MAKE_J check +mkdir -p /root/rpmbuild/SOURCES/ +make dist-gzip +cp *.tar.gz /root/rpmbuild/SOURCES/ +rpmbuild -ba servicelog.spec 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.15/servicelog-ci/build-ubuntu-20.04.sh new/servicelog-1.1.16/servicelog-ci/build-ubuntu-20.04.sh --- old/servicelog-1.1.15/servicelog-ci/build-ubuntu-20.04.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.16/servicelog-ci/build-ubuntu-20.04.sh 2021-09-07 12:04:03.000000000 +0200 @@ -0,0 +1,12 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx +MAKE_J=$(grep -c processor /proc/cpuinfo) + +./bootstrap.sh +./configure +make -j $MAKE_J +make -j $MAKE_J check +make dist-gzip 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.15/servicelog.spec.in new/servicelog-1.1.16/servicelog.spec.in --- old/servicelog-1.1.15/servicelog.spec.in 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/servicelog.spec.in 2021-09-07 12:04:03.000000000 +0200 @@ -8,9 +8,9 @@ Group: System Environment/Base License: GPLv2 -Vendor: IBM Corp. -URL: http://linux-diag.sourceforge.net/servicelog -Source0: http://downloads.sourceforge.net/linux-diag/%{name}/%{version}/%{name}-%{version}.tar.gz +Vendor: IBM Corp. +URL: https://github.com/power-ras/%{name}/releases +Source0: https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: libservicelog-devel libtool automake ExclusiveArch: ppc ppc64 ppc64le @@ -49,6 +49,9 @@ %{__rm} -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 7 2021 Vasant Hegde <hegdevas...@inux.vnet.ibm.com> 1.1.16 +- Code cleanup, minor bug fixes + * Tue Sep 10 2019 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> 1.1.15 - Code cleanup, minor bug fixes 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.15/src/log_repair_action.c new/servicelog-1.1.16/src/log_repair_action.c --- old/servicelog-1.1.15/src/log_repair_action.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/log_repair_action.c 2021-09-07 12:04:03.000000000 +0200 @@ -96,11 +96,12 @@ struct sl_repair_action repair_action, *ra = &repair_action; struct sl_event *events = NULL; time_t epoch; - int platform = 0; pid_t cpid; /* Pid of child */ int rc; /* Holds return value */ int status; /* exit value of child */ int pipefd[2]; /* pipe file descriptor */ +#ifndef SERVICELOG_TEST + int platform = 0; platform = get_platform(); switch (platform) { @@ -110,6 +111,7 @@ argv[0], __power_platform_name(platform)); exit(1); } +#endif memset(ra, 0, sizeof(*ra)); memset(buf, 0, BUF_SIZE); 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.15/src/servicelog.c new/servicelog-1.1.16/src/servicelog.c --- old/servicelog-1.1.15/src/servicelog.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/servicelog.c 2021-09-07 12:04:03.000000000 +0200 @@ -104,21 +104,22 @@ { int option_index, rc; int dump = 0; - int platform = 0; char *query = NULL; servicelog *slog; struct sl_event *event; - - cmd = argv[0]; + int platform = 0; +#ifndef SERVICELOG_TEST platform = get_platform(); switch (platform) { case PLATFORM_UNKNOWN: case PLATFORM_POWERNV: fprintf(stderr, "%s: is not supported on the %s platform\n", - cmd, __power_platform_name(platform)); + argv[0], __power_platform_name(platform)); exit(1); } +#endif + cmd = argv[0]; for (;;) { option_index = 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.15/src/servicelog_notify.c new/servicelog-1.1.16/src/servicelog_notify.c --- old/servicelog-1.1.15/src/servicelog_notify.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/servicelog_notify.c 2021-09-07 12:04:03.000000000 +0200 @@ -187,19 +187,20 @@ struct stat sbuf; char *tSev = NULL; int tRepAct = 0; - int platform = 0; char *connector = ""; - - cmd = argv[0]; +#ifndef SERVICELOG_TEST + int platform = 0; platform = get_platform(); switch (platform) { case PLATFORM_UNKNOWN: case PLATFORM_POWERNV: fprintf(stderr, "%s: is not supported on the %s platform\n", - cmd, __power_platform_name(platform)); + argv[0], __power_platform_name(platform)); exit(1); } +#endif + cmd = argv[0]; if (argc <= 1) { 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.15/src/servicelog_switch.c new/servicelog-1.1.16/src/servicelog_switch.c --- old/servicelog-1.1.15/src/servicelog_switch.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/servicelog_switch.c 2021-09-07 12:04:03.000000000 +0200 @@ -95,13 +95,15 @@ setup_failed("pathname lacks /"); exit(2); } + pathlen -= (strlen(last_slash) - 1); /* account for trailing / */ last_slash[1] = '\0'; + (void) strncpy(v1_cmd, self_dir, PATH_MAX - 1); - (void) strncat(v1_cmd, "v1_servicelog", - (PATH_MAX - strlen(v1_cmd) - 1 )); + v1_cmd[pathlen] = '\0'; + (void) strncat(v1_cmd, "v1_servicelog", (PATH_MAX - pathlen - 1 )); (void) strncpy(v29_cmd, self_dir, PATH_MAX - 1); - (void) strncat(v29_cmd, "v29_servicelog", - (PATH_MAX - strlen(v29_cmd) - 1)); + v29_cmd[pathlen] = '\0'; + (void) strncat(v29_cmd, "v29_servicelog", (PATH_MAX - pathlen - 1)); } static void @@ -156,18 +158,19 @@ { int v29_opts = 0, v1_opts = 0; int option_index, rc; +#ifndef SERVICELOG_TEST int platform = 0; - cmd = argv[0]; - platform = get_platform(); switch (platform) { case PLATFORM_UNKNOWN: case PLATFORM_POWERNV: fprintf(stderr, "%s: is not supported on the %s platform\n", - cmd, __power_platform_name(platform)); + argv[0], __power_platform_name(platform)); exit(1); } +#endif + cmd = argv[0]; set_up_commands(); 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.15/src/slog_common_event.c new/servicelog-1.1.16/src/slog_common_event.c --- old/servicelog-1.1.15/src/slog_common_event.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/slog_common_event.c 2021-09-07 12:04:03.000000000 +0200 @@ -79,16 +79,6 @@ servicelog *slog; struct sl_event event; uint64_t event_id; - int platform = 0; - - platform = get_platform(); - switch (platform) { - case PLATFORM_UNKNOWN: - case PLATFORM_POWERNV: - fprintf(stderr, "%s is not supported on the %s platform\n", - argv[0], __power_platform_name(platform)); - exit(1); - } for (;;) { option_index = 0; @@ -137,6 +127,19 @@ } } +#ifndef SERVICELOG_TEST + int platform = 0; + + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERNV: + fprintf(stderr, "%s is not supported on the %s platform\n", + argv[0], __power_platform_name(platform)); + exit(1); + } +#endif + if (e == NULL) { if (verbose) { fprintf(stderr, "The --event command-line argument is " 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.15/src/v29_servicelog.c new/servicelog-1.1.16/src/v29_servicelog.c --- old/servicelog-1.1.15/src/v29_servicelog.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/v29_servicelog.c 2021-09-07 12:04:03.000000000 +0200 @@ -151,7 +151,6 @@ { int option_index, rc; int verbose = 0; - int platform = 0; uint32_t id = 0; int other_flag = 0; size_t sz; @@ -159,17 +158,18 @@ char *location = NULL; struct servicelog slog; struct sl_query query; - - cmd = argv[0]; - +#ifndef SERVICELOG_TEST + int platform = 0; platform = get_platform(); switch (platform) { case PLATFORM_UNKNOWN: case PLATFORM_POWERNV: fprintf(stderr, "%s: is not supported on the %s platform\n", - cmd, __power_platform_name(platform)); + argv[0], __power_platform_name(platform)); exit(1); } +#endif + cmd = argv[0]; if (argc <= 1) { 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.15/src/v29_servicelog_manage.c new/servicelog-1.1.16/src/v29_servicelog_manage.c --- old/servicelog-1.1.15/src/v29_servicelog_manage.c 2019-09-10 10:45:09.000000000 +0200 +++ new/servicelog-1.1.16/src/v29_servicelog_manage.c 2021-09-07 12:04:03.000000000 +0200 @@ -85,24 +85,25 @@ int option_index, action=ACTION_UNSPECIFIED; int flag_force=0; int age = 60; /* default age for --clean */ - int platform = 0; char buf[124]; char *tmp; char *next_char; uint32_t num=0, num_repaired=0, num_unrepaired=0, num_info=0, num_ra=0; uint32_t span; time_t now; - - cmd = argv[0]; +#ifndef SERVICELOG_TEST + int platform = 0; platform = get_platform(); switch (platform) { case PLATFORM_UNKNOWN: case PLATFORM_POWERNV: fprintf(stderr, "%s: is not supported on the %s platform\n", - cmd, __power_platform_name(platform)); + argv[0], __power_platform_name(platform)); exit(1); } +#endif + cmd = argv[0]; if (argc <= 1) { print_usage();
