Hello community, here is the log from the commit of package libvpd2 for openSUSE:Factory checked in at 2014-01-22 13:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvpd2 (Old) and /work/SRC/openSUSE:Factory/.libvpd2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvpd2" Changes: -------- --- /work/SRC/openSUSE:Factory/libvpd2/libvpd2.changes 2012-12-14 09:41:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvpd2.new/libvpd2.changes 2014-01-23 15:48:48.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Jan 17 09:59:59 UTC 2014 - [email protected] + +- version update to 2.2.2 (FATE#315460) + minor bugfixes + add udev rule for vpdupdate + no upstream changelog provided +- libvpd2.makefile.patch: fix udev rules directory +- add udev and automake to BuildRequires for correct udev rules.d + directory + +------------------------------------------------------------------- Old: ---- libvpd-2.2.0.tar.bz2 New: ---- libvpd-2.2.2.tar.bz2 libvpd2.makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvpd2.spec ++++++ --- /var/tmp/diff_new_pack.NLWKU3/_old 2014-01-23 15:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.NLWKU3/_new 2014-01-23 15:48:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvpd2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libvpd2 -Version: 2.2.0 +Version: 2.2.2 Release: 0 Summary: VPD Database access library for lsvpd License: LGPL-2.1+ @@ -26,10 +26,13 @@ Source: libvpd-%{version}.tar.bz2 Source2: baselibs.conf Patch0: libvpd2-gcc47.patch +Patch1: libvpd2.makefile.patch Patch3: libvpd.async.patch +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: sqlite3-devel +BuildRequires: udev BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +54,7 @@ %prep %setup -q -n libvpd-%{version} %patch0 -p1 +%patch1 -p1 %patch3 -p1 %build @@ -67,10 +71,13 @@ %files %defattr(-,root,root) %{_libdir}/*.so.* +/%{_udevrulesdir}/90-vpdupdate.rules +%dir %{_localstatedir}/lib/lsvpd +%{_localstatedir}/lib/lsvpd/run.vpdupdate %files devel %defattr(-,root,root) -%doc COPYING NEWS README TODO +%doc COPYING NEWS README %exclude %{_libdir}/*.la %{_includedir}/* %{_libdir}/*.so ++++++ libvpd-2.2.0.tar.bz2 -> libvpd-2.2.2.tar.bz2 ++++++ ++++ 34374 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/libvpd-2.2.0/90-vpdupdate.rules new/libvpd-2.2.2/90-vpdupdate.rules --- old/libvpd-2.2.0/90-vpdupdate.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.2/90-vpdupdate.rules 2013-11-05 09:43:56.000000000 +0100 @@ -0,0 +1 @@ +KERNELS=="*", ACTION=="*", RUN+="/bin/touch /var/lib/lsvpd/run.vpdupdate" 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/libvpd-2.2.0/ChangeLog new/libvpd-2.2.2/ChangeLog --- old/libvpd-2.2.0/ChangeLog 2007-11-01 22:14:24.000000000 +0100 +++ new/libvpd-2.2.2/ChangeLog 2013-11-05 09:43:56.000000000 +0100 @@ -1 +1,12 @@ -See NEWS \ No newline at end of file +2.1.3 + +Fix numbering of .so files, per bug #69369. + +2.1.0 + +Rebuild rpms for ppc 32-bit. + +2.0.1 + +Updating/fixing C API. +Adding configure time check for which slqite_prepare function to use 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/libvpd-2.2.0/Makefile.am new/libvpd-2.2.2/Makefile.am --- old/libvpd-2.2.0/Makefile.am 2011-02-18 07:11:03.000000000 +0100 +++ new/libvpd-2.2.2/Makefile.am 2013-11-05 09:43:56.000000000 +0100 @@ -18,6 +18,8 @@ src/libvpd-2/common.h \ src/libvpd-2/vpddbenv.h +EXTRA_DIST = bootstrap.sh 90-vpdupdate.rules run.vpdupdate + lib_LTLIBRARIES = libvpd_cxx.la libvpd.la library_includedir=$(includedir)/libvpd-2/ library_include_HEADERS = $(lib_hpp_files) $(lib_h_files) @@ -60,3 +62,11 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck + +install-exec-hook: + mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/ + mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/ + install -D --mode=644 run.vpdupdate \ + ${DESTDIR}/${localstatedir}/lib/lsvpd/run.vpdupdate + install -D --mode=644 90-vpdupdate.rules \ + ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules 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/libvpd-2.2.0/NEWS new/libvpd-2.2.2/NEWS --- old/libvpd-2.2.0/NEWS 2011-06-16 00:13:02.000000000 +0200 +++ new/libvpd-2.2.2/NEWS 2013-11-05 09:43:56.000000000 +0100 @@ -1,12 +1 @@ -2.1.3 - -Fix numbering of .so files, per bug #69369. - -2.1.0 - -Rebuild rpms for ppc 32-bit. - -2.0.1 - -Updating/fixing C API. -Adding configure time check for which slqite_prepare function to use +This file is intentionally blank. 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/libvpd-2.2.0/TODO new/libvpd-2.2.2/TODO --- old/libvpd-2.2.0/TODO 2007-11-01 22:14:24.000000000 +0100 +++ new/libvpd-2.2.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,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/libvpd-2.2.0/bootstrap.sh new/libvpd-2.2.2/bootstrap.sh --- old/libvpd-2.2.0/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libvpd-2.2.2/bootstrap.sh 2013-11-05 09:43:56.000000000 +0100 @@ -0,0 +1,2 @@ +set -x +libtoolize --force && aclocal && autoheader && automake --add-missing --copy && autoconf 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/libvpd-2.2.0/configure.in new/libvpd-2.2.2/configure.in --- old/libvpd-2.2.0/configure.in 2012-09-07 12:49:01.000000000 +0200 +++ new/libvpd-2.2.2/configure.in 2013-11-05 09:43:56.000000000 +0100 @@ -1,5 +1,5 @@ #base -AC_INIT([libvpd],[2.2.0],[[email protected],[email protected]]) +AC_INIT([libvpd],[2.2.2],[[email protected],[email protected]]) AC_CONFIG_HEADER(src/libvpd-2/config.h) AM_INIT_AUTOMAKE AC_SUBST(DATE, [`date`]) @@ -10,7 +10,7 @@ #Release version GENERIC_MAJOR_VERSION=2 GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=0 +GENERIC_MICRO_VERSION=2 GENERIC_API_VERSION=$GENERIC_MAJOR_VERSION AC_SUBST(GENERIC_API_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/libvpd-2.2.0/libvpd.spec.in new/libvpd-2.2.2/libvpd.spec.in --- old/libvpd-2.2.0/libvpd.spec.in 2011-06-16 00:17:24.000000000 +0200 +++ new/libvpd-2.2.2/libvpd.spec.in 2013-11-05 09:43:56.000000000 +0100 @@ -8,6 +8,7 @@ Group: System Environment/Libraries License: LGPLv2+ +Vendor: IBM Corp. URL: http://linux-diag.sf.net/Lsvpd.html Source: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,10 +46,12 @@ %files %defattr(-,root,root,-) -%doc COPYING NEWS README TODO AUTHORS +%doc COPYING NEWS README AUTHORS %exclude %{_libdir}/*.la %{_libdir}/libvpd_cxx-@[email protected].* %{_libdir}/libvpd-@[email protected].* +%{_sysconfdir}/udev/rules.d/90-vpdupdate.rules +%{_var}/lib/lsvpd/run.vpdupdate %files devel %defattr(-,root,root,-) @@ -60,6 +63,19 @@ %{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog + +* Tue Nov 5 2013 Suzuk K Poulose <[email protected]> 2.2.2-0 +- Release version 2.2.2 + +* Thu Oct 31 2013 Phani Yadav <[email protected]> +- Automation of vpdupdate + +* Wed Feb 20 2013 Harsh P Bora <[email protected]> 2.2.1-1 +- Added Vendor tag in RPM package. + +* Fri Jan 18 2013 Harsh P Bora <[email protected]> 2.2.1-0 +- Fixed a possible segfault when fetching a corrupt vpd database + * Fri Dec 4 2009 Jim Keniston <[email protected]> 2.1.2-0 - Fixed a pack/unpack mismatch that was introduced with N5/N6 support. For every Component, all 28 DataItems between sysFsNode and plantMfg 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/libvpd-2.2.0/missing new/libvpd-2.2.2/missing --- old/libvpd-2.2.0/missing 2012-10-04 08:59:35.000000000 +0200 +++ new/libvpd-2.2.2/missing 2013-11-05 09:44:04.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=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 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 @@ -26,68 +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 - 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. +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,228 +70,141 @@ ;; -*) - 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 -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# 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). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - 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 $program 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 - ;; - - 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 - ;; - - 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 - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - 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 $? - 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 - ;; - - *) - 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) 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/libvpd-2.2.0/src/helper_functions.cpp new/libvpd-2.2.2/src/helper_functions.cpp --- old/libvpd-2.2.0/src/helper_functions.cpp 2012-08-10 09:15:24.000000000 +0200 +++ new/libvpd-2.2.2/src/helper_functions.cpp 2013-11-05 09:43:56.000000000 +0100 @@ -24,6 +24,7 @@ #include <libvpd-2/helper_functions.hpp> #include <cstdio> #include <fcntl.h> +#include <unistd.h> #include <cstdlib> #include <cstring> #include <fstream> 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/libvpd-2.2.0/src/libvpd-2/config.h.in new/libvpd-2.2.2/src/libvpd-2/config.h.in --- old/libvpd-2.2.0/src/libvpd-2/config.h.in 2012-10-04 09:00:56.000000000 +0200 +++ new/libvpd-2.2.2/src/libvpd-2/config.h.in 2013-11-05 09:44:03.000000000 +0100 @@ -145,6 +145,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/libvpd-2.2.0/src/libvpd-2/vpdretriever.hpp new/libvpd-2.2.2/src/libvpd-2/vpdretriever.hpp --- old/libvpd-2.2.0/src/libvpd-2/vpdretriever.hpp 2008-02-18 20:44:57.000000000 +0100 +++ new/libvpd-2.2.2/src/libvpd-2/vpdretriever.hpp 2013-11-05 09:43:56.000000000 +0100 @@ -42,6 +42,7 @@ public: static const string DEFAULT_DIR; static const string DEFAULT_FILE; + static const string UDEV_NOTIFY_FILE; /** * Builds A VpdRetriever object that can be used for reading the 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/libvpd-2.2.0/src/vpdretriever.cpp new/libvpd-2.2.2/src/vpdretriever.cpp --- old/libvpd-2.2.0/src/vpdretriever.cpp 2008-02-18 20:44:56.000000000 +0100 +++ new/libvpd-2.2.2/src/vpdretriever.cpp 2013-11-05 09:43:56.000000000 +0100 @@ -27,6 +27,11 @@ #include <vector> #include <string> +#include <sys/types.h> +#include <sys/stat.h> +#include <time.h> +#include <cstdlib> +#include <errno.h> using namespace std; @@ -34,6 +39,7 @@ { const string VpdRetriever::DEFAULT_DIR ( "/var/lib/lsvpd/" ); const string VpdRetriever::DEFAULT_FILE ( "vpd.db" ); + const string VpdRetriever::UDEV_NOTIFY_FILE ( "run.vpdupdate" ); VpdRetriever::VpdRetriever( string envDir, string dbFileName ) throw( VpdException& ) @@ -51,6 +57,40 @@ VpdRetriever::VpdRetriever( ) throw( VpdException& ) { + struct stat vpd_stat,udev_stat; + const string vpddb = VpdRetriever::DEFAULT_DIR + VpdRetriever::DEFAULT_FILE; + const string udev_file = VpdRetriever::DEFAULT_DIR + VpdRetriever::UDEV_NOTIFY_FILE; + Logger logger; + int flag = 1; + + /* Check if stat is successful for UDEV_NOTIFY_FILE. */ + if ( stat ( udev_file.c_str(), &udev_stat ) != 0 ) + { + logger.log( "libvpd: Unable to stat udev rule file, run.vpdupdate.", LOG_INFO ); + } + else + { + /* Find the modification time for default DB. */ + if ( stat ( vpddb.c_str(), &vpd_stat ) != 0 ) + { + logger.log( "libvpd: Unable to stat vpd.db file.", LOG_INFO ); + if ( errno == ENOENT ) + vpd_stat.st_mtime = 0; + else + flag = 0; + } + + if ( flag && ( udev_stat.st_mtime > vpd_stat.st_mtime ) ) + { + /* + * This implies there were changes to devices on the system + * after the VPD db was created/modified. So + * run vpdupdate. + */ + logger.log( "libvpd: Running vpdupdate to update the default db.", LOG_INFO ); + system( "/sbin/vpdupdate >/dev/null 2>&1" ); + } + } db = new VpdDbEnv( VpdRetriever::DEFAULT_DIR, VpdRetriever::DEFAULT_FILE, true ); @@ -74,7 +114,15 @@ System* VpdRetriever::getComponentTree( ) { System *root = db->fetch( ); - buildSubTree( root ); + if (root) + buildSubTree( root ); + else + { + Logger logger; + logger.log( "Failed to fetch VPD DB, it may be corrupt.", LOG_ERR ); + VpdException ve( "Failed to fetch VPD DB, it may be corrupt." ); + throw ve; + } return root; } ++++++ libvpd.async.patch ++++++ --- /var/tmp/diff_new_pack.NLWKU3/_old 2014-01-23 15:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.NLWKU3/_new 2014-01-23 15:48:49.000000000 +0100 @@ -3,8 +3,10 @@ src/vpddbenv_c.c | 9 +++++++++ 2 files changed, 25 insertions(+) ---- a/src/vpddbenv.cpp -+++ b/src/vpddbenv.cpp +Index: libvpd-2.2.2/src/vpddbenv.cpp +=================================================================== +--- libvpd-2.2.2.orig/src/vpddbenv.cpp ++++ libvpd-2.2.2/src/vpddbenv.cpp @@ -77,6 +77,22 @@ namespace lsvpd goto CON_ERR; } @@ -28,8 +30,10 @@ if( !dbExists ) { sqlite3_stmt *pstmt; ---- a/src/vpddbenv_c.c -+++ b/src/vpddbenv_c.c +Index: libvpd-2.2.2/src/vpddbenv_c.c +=================================================================== +--- libvpd-2.2.2.orig/src/vpddbenv_c.c ++++ libvpd-2.2.2/src/vpddbenv_c.c @@ -28,6 +28,9 @@ struct vpddbenv * new_vpddbenv( const char *dir, const char *file ) ++++++ libvpd2-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.NLWKU3/_old 2014-01-23 15:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.NLWKU3/_new 2014-01-23 15:48:49.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvpd-2.2.0/src/helper_functions.cpp +Index: libvpd-2.2.2/src/helper_functions.cpp =================================================================== ---- libvpd-2.2.0.orig/src/helper_functions.cpp -+++ libvpd-2.2.0/src/helper_functions.cpp -@@ -27,6 +27,7 @@ +--- libvpd-2.2.2.orig/src/helper_functions.cpp ++++ libvpd-2.2.2/src/helper_functions.cpp +@@ -28,6 +28,7 @@ #include <cstdlib> #include <cstring> #include <fstream> ++++++ libvpd2.makefile.patch ++++++ Index: libvpd-2.2.2/Makefile.am =================================================================== --- libvpd-2.2.2.orig/Makefile.am +++ libvpd-2.2.2/Makefile.am @@ -64,9 +64,9 @@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck install-exec-hook: - mkdir -p $(DESTDIR)/${sysconfdir}/udev/rules.d/ + mkdir -p $(DESTDIR)/usr/lib/udev/rules.d/ mkdir -p $(DESTDIR)/${localstatedir}/lib/lsvpd/ install -D --mode=644 run.vpdupdate \ ${DESTDIR}/${localstatedir}/lib/lsvpd/run.vpdupdate install -D --mode=644 90-vpdupdate.rules \ - ${DESTDIR}/${sysconfdir}/udev/rules.d/90-vpdupdate.rules + ${DESTDIR}/usr/lib/udev/rules.d/90-vpdupdate.rules -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
