Hello community, here is the log from the commit of package servicelog for openSUSE:Factory checked in at 2014-03-18 14:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servicelog (Old) and /work/SRC/openSUSE:Factory/.servicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servicelog" Changes: -------- --- /work/SRC/openSUSE:Factory/servicelog/servicelog.changes 2014-01-23 15:56:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.servicelog.new/servicelog.changes 2014-03-18 14:06:57.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 10 13:29:50 UTC 2014 - [email protected] + +- version update to 1.1.12 (BNC#867347, FATE#315457) + No upstream changelog provided + +------------------------------------------------------------------- Old: ---- servicelog-1.1.11.tar.bz2 New: ---- servicelog-1.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servicelog.spec ++++++ --- /var/tmp/diff_new_pack.r8OC51/_old 2014-03-18 14:06:57.000000000 +0100 +++ /var/tmp/diff_new_pack.r8OC51/_new 2014-03-18 14:06:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: servicelog -Version: 1.1.11 +Version: 1.1.12 Release: 0 Summary: Servicelog Tools License: GPL-2.0 ++++++ servicelog-1.1.11.tar.bz2 -> servicelog-1.1.12.tar.bz2 ++++++ ++++ 32139 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.11/configure.ac new/servicelog-1.1.12/configure.ac --- old/servicelog-1.1.11/configure.ac 2012-09-07 12:16:36.000000000 +0200 +++ new/servicelog-1.1.12/configure.ac 2014-03-07 11:32:33.000000000 +0100 @@ -17,7 +17,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([servicelog],[1.1.11],[[email protected],[email protected]]) +AC_INIT([servicelog],[1.1.12],[[email protected], [email protected]]) AC_CONFIG_SRCDIR([src/servicelog.c]) AC_CONFIG_SRCDIR([doc/servicelog.8]) AC_CONFIG_HEADER([src/config.h]) @@ -26,7 +26,7 @@ GENERIC_MAJOR_VERSION=1 GENERIC_MINOR_VERSION=1 -GENERIC_MICRO_VERSION=11 +GENERIC_MICRO_VERSION=12 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION 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.11/doc/Makefile new/servicelog-1.1.12/doc/Makefile --- old/servicelog-1.1.11/doc/Makefile 2013-03-27 10:51:55.000000000 +0100 +++ new/servicelog-1.1.12/doc/Makefile 2014-03-07 11:32:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # doc/Makefile. Generated from Makefile.in by configure. -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -29,9 +29,55 @@ # You should have received a copy of the GNU Library General Public # Licence along with this program; if not, see <http://www.gnu.org/licenses/>. +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/servicelog -pkglibdir = $(libdir)/servicelog pkgincludedir = $(includedir)/servicelog +pkglibdir = $(libdir)/servicelog +pkglibexecdir = $(libexecdir)/servicelog am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -44,10 +90,10 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = powerpc64-suse-linux-gnu -host_triplet = powerpc64-suse-linux-gnu +build_triplet = powerpc64-unknown-linux-gnu +host_triplet = powerpc64-unknown-linux-gnu subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -55,19 +101,66 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_$(V)) +am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY)) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run aclocal-1.10 -AMTAR = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run tar +ACLOCAL = ${SHELL} /home/hegdevasant/build/servicelog/missing aclocal-1.13 +AMTAR = $${TAR-tar} +AM_DEFAULT_VERBOSITY = 1 AR = ar -AUTOCONF = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run automake-1.10 +AUTOCONF = ${SHELL} /home/hegdevasant/build/servicelog/missing autoconf +AUTOHEADER = ${SHELL} /home/hegdevasant/build/servicelog/missing autoheader +AUTOMAKE = ${SHELL} /home/hegdevasant/build/servicelog/missing automake-1.13 AWK = gawk CC = gcc CCDEPMODE = depmode=gcc3 @@ -77,6 +170,7 @@ CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps +DLLTOOL = false DSYMUTIL = DUMPBIN = ECHO_C = @@ -86,14 +180,14 @@ EXEEXT = FGREP = /usr/bin/grep -F GENERIC_RELEASE = 1.1 -GENERIC_VERSION = 1.1.11 +GENERIC_VERSION = 1.1.12 GREP = /usr/bin/grep INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LD = /usr/powerpc64-suse-linux/bin/ld -m elf64ppc +LD = /usr/bin/ld -m elf64ppc LDFLAGS = LIBOBJS = LIBS = @@ -101,8 +195,9 @@ LIPO = LN_S = ln -s LTLIBOBJS = -MAKEINFO = ${SHELL} /home/hegdevasant/sf/servicelog-1.1/missing --run makeinfo -MKDIR_P = /bin/mkdir -p +MAKEINFO = ${SHELL} /home/hegdevasant/build/servicelog/missing makeinfo +MANIFEST_TOOL = : +MKDIR_P = /usr/bin/mkdir -p NM = /usr/bin/nm -B NMEDIT = OBJDUMP = objdump @@ -110,57 +205,58 @@ OTOOL = OTOOL64 = PACKAGE = servicelog -PACKAGE_BUGREPORT = [email protected],[email protected] +PACKAGE_BUGREPORT = [email protected], [email protected] PACKAGE_NAME = servicelog -PACKAGE_STRING = servicelog 1.1.11 +PACKAGE_STRING = servicelog 1.1.12 PACKAGE_TARNAME = servicelog -PACKAGE_VERSION = 1.1.11 +PACKAGE_URL = +PACKAGE_VERSION = 1.1.12 PATH_SEPARATOR = : RANLIB = ranlib SED = /usr/bin/sed SET_MAKE = SHELL = /bin/sh STRIP = strip -VERSION = 1.1.11 -abs_builddir = /home/hegdevasant/sf/servicelog-1.1/doc -abs_srcdir = /home/hegdevasant/sf/servicelog-1.1/doc -abs_top_builddir = /home/hegdevasant/sf/servicelog-1.1 -abs_top_srcdir = /home/hegdevasant/sf/servicelog-1.1 +VERSION = 1.1.12 +abs_builddir = /home/hegdevasant/build/servicelog/doc +abs_srcdir = /home/hegdevasant/build/servicelog/doc +abs_top_builddir = /home/hegdevasant/build/servicelog +abs_top_srcdir = /home/hegdevasant/build/servicelog +ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = am__include = include am__leading_dot = . am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - +am__tar = $${TAR-tar} chof - "$$tardir" +am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = powerpc64-suse-linux-gnu +build = powerpc64-unknown-linux-gnu build_alias = build_cpu = powerpc64 build_os = linux-gnu -build_vendor = suse +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = powerpc64-suse-linux-gnu +host = powerpc64-unknown-linux-gnu host_alias = host_cpu = powerpc64 host_os = linux-gnu -host_vendor = suse +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/hegdevasant/sf/servicelog-1.1/install-sh +install_sh = ${SHELL} /home/hegdevasant/build/servicelog/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var -lt_ECHO = echo mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p +mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} prefix = /usr/local @@ -182,14 +278,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -207,62 +303,61 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -install-man8: $(man8_MANS) $(man_MANS) +install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ + fi; \ done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ + done; } + uninstall-man8: @$(NORMAL_UNINSTALL) - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ - done -tags: TAGS -TAGS: + @list=''; test -n "$(man8dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.8[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -281,13 +376,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -308,16 +407,22 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -336,6 +441,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -344,18 +451,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-man8 install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -381,16 +498,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man8 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man8 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. 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.11/missing new/servicelog-1.1.12/missing --- old/servicelog-1.1.11/missing 2013-03-27 10:51:37.000000000 +0100 +++ new/servicelog-1.1.12/missing 2014-03-07 11:32:46.000000000 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2006-05-10.23 +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 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 @@ -18,9 +17,7 @@ # 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# 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 @@ -28,66 +25,40 @@ # 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" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +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 - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + 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 <[email protected]>." exit $? @@ -99,269 +70,146 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case $1 in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $1 in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# 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 -exit 0 +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-end: "$" +# 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.11/servicelog.spec.in new/servicelog-1.1.12/servicelog.spec.in --- old/servicelog-1.1.11/servicelog.spec.in 2013-01-29 10:25:07.000000000 +0100 +++ new/servicelog-1.1.12/servicelog.spec.in 2014-03-07 11:32:33.000000000 +0100 @@ -3,7 +3,7 @@ Name: %{name} Version: %{version} -Release: 3%{?dist} +Release: 0%{?dist} Summary: Servicelog Tools Group: System Environment/Base @@ -49,6 +49,9 @@ %{__rm} -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 07 2014 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> 1.1.12 +- Added platform validation + * Tue Jan 29 2013 Vasant Hegde <hegdevasant at linux.vnet.ibm.com> 1.1.11-3 - log_repair_action : usage message format fix 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.11/src/Makefile.am new/servicelog-1.1.12/src/Makefile.am --- old/servicelog-1.1.11/src/Makefile.am 2010-07-30 21:15:02.000000000 +0200 +++ new/servicelog-1.1.12/src/Makefile.am 2014-03-07 11:32:33.000000000 +0100 @@ -5,10 +5,11 @@ servicelog_manage v1_servicelog v29_servicelog sbin_PROGRAMS = slog_common_event -servicelog_SOURCES = servicelog_switch.c -v1_servicelog_SOURCES = servicelog.c -v29_servicelog_SOURCES = v29_servicelog.c -servicelog_notify_SOURCES = servicelog_notify.c -log_repair_action_SOURCES = log_repair_action.c -slog_common_event_SOURCES = slog_common_event.c -servicelog_manage_SOURCES = v29_servicelog_manage.c +platform_SOURCES = platform.c platform.h +servicelog_SOURCES = servicelog_switch.c $(platform_SOURCES) +v1_servicelog_SOURCES = servicelog.c $(platform_SOURCES) +v29_servicelog_SOURCES = v29_servicelog.c $(platform_SOURCES) +servicelog_notify_SOURCES = servicelog_notify.c $(platform_SOURCES) +log_repair_action_SOURCES = log_repair_action.c $(platform_SOURCES) +slog_common_event_SOURCES = slog_common_event.c $(platform_SOURCES) +servicelog_manage_SOURCES = v29_servicelog_manage.c $(platform_SOURCES) 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.11/src/config.h.in new/servicelog-1.1.12/src/config.h.in --- old/servicelog-1.1.11/src/config.h.in 2013-03-27 10:51:35.000000000 +0100 +++ new/servicelog-1.1.12/src/config.h.in 2014-03-07 11:32:45.000000000 +0100 @@ -58,6 +58,9 @@ /* 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 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.11/src/log_repair_action.c new/servicelog-1.1.12/src/log_repair_action.c --- old/servicelog-1.1.11/src/log_repair_action.c 2013-01-17 11:47:44.000000000 +0100 +++ new/servicelog-1.1.12/src/log_repair_action.c 2014-03-07 11:32:33.000000000 +0100 @@ -28,6 +28,7 @@ #include <unistd.h> #include <servicelog-1/servicelog.h> #include "config.h" +#include "platform.h" #define BUF_SIZE 512 #define ARG_LIST "l:p:d:n:t:qvVh" @@ -95,6 +96,16 @@ struct sl_event *events = NULL; time_t epoch; int api_version = 0; // Short for version 0.2.9 + int platform = 0; + + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s is not supported on the %s platform\n", + argv[0], __power_platform_name(platform)); + exit(1); + } memset(ra, 0, sizeof(*ra)); 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.11/src/platform.c new/servicelog-1.1.12/src/platform.c --- old/servicelog-1.1.11/src/platform.c 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.12/src/platform.c 2014-03-07 11:32:33.000000000 +0100 @@ -0,0 +1,51 @@ +/** + * @file platform.c + * + * Copyright (C) 2014 IBM Corporation + * See 'COPYING' for License of this code + * + * @author Aruna Balakrishnaiah <[email protected]> + */ + +#include <stdio.h> +#include <string.h> + +#include "platform.h" + +#define LENGTH 512 + +const char *__platform_name[] = { + "Unknown", + "PowerKVM Host", + "PowerKVM pSeries Guest", + "PowerVM pSeries LPAR", + /* Add new platforms name here */ +}; + +int +get_platform(void) +{ + int rc = PLATFORM_UNKNOWN; + FILE *fp; + char line[LENGTH]; + + if((fp = fopen(PLATFORM_FILE, "r")) == NULL) + return rc; + + while (fgets(line, LENGTH, fp)) { + if (strstr(line, "PowerNV")) { + rc = PLATFORM_POWERKVM; + break; + } else if (strstr(line, "pSeries (emulated by qemu)")) { + rc = PLATFORM_POWERKVM_GUEST; + break; + } else if (strstr(line, "pSeries")) { + rc = PLATFORM_PSERIES_LPAR; + /* catch model for PowerNV guest */ + continue; + } + } + + fclose(fp); + return rc; +} 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.11/src/platform.h new/servicelog-1.1.12/src/platform.h --- old/servicelog-1.1.11/src/platform.h 1970-01-01 01:00:00.000000000 +0100 +++ new/servicelog-1.1.12/src/platform.h 2014-03-07 11:32:33.000000000 +0100 @@ -0,0 +1,31 @@ +/** + * Copyright (C) 2014 IBM Corporation + * See 'COPYING' for License of this code. + */ + +#ifndef PLATFORM_H +#define PLARFORM_H + +#define PLATFORM_FILE "/proc/cpuinfo" + +enum { + PLATFORM_UNKNOWN = 0, + PLATFORM_POWERKVM, + PLATFORM_POWERKVM_GUEST, + PLATFORM_PSERIES_LPAR, + /* Add new platforms here */ + PLATFORM_MAX, +}; + +extern const char *__platform_name[]; + +extern int get_platform(void); + +static inline const char * __power_platform_name(int platform) +{ + if (platform > PLATFORM_UNKNOWN && platform < PLATFORM_MAX) + return __platform_name[platform]; + + return __platform_name[PLATFORM_UNKNOWN]; +} +#endif 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.11/src/servicelog.c new/servicelog-1.1.12/src/servicelog.c --- old/servicelog-1.1.11/src/servicelog.c 2012-02-11 23:57:09.000000000 +0100 +++ new/servicelog-1.1.12/src/servicelog.c 2014-03-07 11:32:33.000000000 +0100 @@ -27,6 +27,7 @@ #include <getopt.h> #include <servicelog-1/servicelog.h> #include "config.h" +#include "platform.h" static char *cmd; @@ -102,12 +103,22 @@ { int option_index, rc; int dump = 0; + int platform = 0; char *query = NULL; servicelog *slog; struct sl_event *event; cmd = argv[0]; + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s: is not supported on the %s platform\n", + cmd, __power_platform_name(platform)); + exit(1); + } + for (;;) { option_index = 0; rc = getopt_long(argc, argv, "dq:vVh", long_options, 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.11/src/servicelog_notify.c new/servicelog-1.1.12/src/servicelog_notify.c --- old/servicelog-1.1.11/src/servicelog_notify.c 2013-01-17 10:43:50.000000000 +0100 +++ new/servicelog-1.1.12/src/servicelog_notify.c 2014-03-07 11:32:33.000000000 +0100 @@ -29,6 +29,7 @@ #include <sys/stat.h> #include <servicelog-1/servicelog.h> #include "config.h" +#include "platform.h" #define ACTION_TOOMANY -1 #define ACTION_UNSPECIFIED 0 @@ -185,10 +186,20 @@ struct stat sbuf; char *tSev = NULL; int tRepAct = 0; + int platform = 0; char *connector = ""; cmd = argv[0]; + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s: is not supported on the %s platform\n", + cmd, __power_platform_name(platform)); + exit(1); + } + if (argc <= 1) { print_usage(); exit(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.11/src/servicelog_switch.c new/servicelog-1.1.12/src/servicelog_switch.c --- old/servicelog-1.1.11/src/servicelog_switch.c 2009-11-06 00:24:44.000000000 +0100 +++ new/servicelog-1.1.12/src/servicelog_switch.c 2014-03-07 11:32:33.000000000 +0100 @@ -32,6 +32,7 @@ #include <errno.h> #include <limits.h> #include "config.h" +#include "platform.h" static struct option long_options[] = { /* v0.2.9 options: */ @@ -153,8 +154,19 @@ { int v29_opts = 0, v1_opts = 0; int option_index, rc; + int platform = 0; cmd = argv[0]; + + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s: is not supported on the %s platform\n", + cmd, __power_platform_name(platform)); + exit(1); + } + set_up_commands(); for (;;) { 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.11/src/slog_common_event.c new/servicelog-1.1.12/src/slog_common_event.c --- old/servicelog-1.1.11/src/slog_common_event.c 2009-10-23 03:32:47.000000000 +0200 +++ new/servicelog-1.1.12/src/slog_common_event.c 2014-03-07 11:32:33.000000000 +0100 @@ -27,6 +27,7 @@ #include <getopt.h> #include <servicelog-1/servicelog.h> #include "config.h" +#include "platform.h" static struct option long_options[] = { {"event", required_argument, NULL, 'e'}, @@ -77,6 +78,16 @@ servicelog *slog; struct sl_event event; uint64_t event_id; + int platform = 0; + + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s is not supported on the %s platform\n", + argv[0], __power_platform_name(platform)); + exit(1); + } 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.11/src/v29_servicelog.c new/servicelog-1.1.12/src/v29_servicelog.c --- old/servicelog-1.1.11/src/v29_servicelog.c 2012-02-13 23:59:20.000000000 +0100 +++ new/servicelog-1.1.12/src/v29_servicelog.c 2014-03-07 11:32:33.000000000 +0100 @@ -15,6 +15,7 @@ #include <getopt.h> #include <servicelog-1/libservicelog.h> #include "config.h" +#include "platform.h" #define ARG_LIST "i:t:s:e:E:S:R:r:l:hvV" @@ -150,6 +151,7 @@ { int option_index, rc; int verbose = 0; + int platform = 0; uint32_t id = 0; int other_flag = 0; size_t sz; @@ -160,6 +162,15 @@ cmd = argv[0]; + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s: is not supported on the %s platform\n", + cmd, __power_platform_name(platform)); + exit(1); + } + if (argc <= 1) { print_usage(); exit(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.11/src/v29_servicelog_manage.c new/servicelog-1.1.12/src/v29_servicelog_manage.c --- old/servicelog-1.1.11/src/v29_servicelog_manage.c 2012-09-18 11:22:31.000000000 +0200 +++ new/servicelog-1.1.12/src/v29_servicelog_manage.c 2014-03-07 11:32:33.000000000 +0100 @@ -19,6 +19,7 @@ #define _GNU_SOURCE #include <getopt.h> #include <servicelog-1/servicelog.h> +#include "platform.h" #define ACTION_TOOMANY -1 #define ACTION_UNSPECIFIED 0 @@ -84,6 +85,7 @@ 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; @@ -93,6 +95,15 @@ cmd = argv[0]; + platform = get_platform(); + switch (platform) { + case PLATFORM_UNKNOWN: + case PLATFORM_POWERKVM: + fprintf(stderr, "%s: is not supported on the %s platform\n", + cmd, __power_platform_name(platform)); + exit(1); + } + if (argc <= 1) { print_usage(); exit(0); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
