Hello community, here is the log from the commit of package libvpd2 for openSUSE:Factory checked in at 2018-06-25 11:38:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvpd2 (Old) and /work/SRC/openSUSE:Factory/.libvpd2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvpd2" Mon Jun 25 11:38:24 2018 rev:28 rq:618010 version:2.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libvpd2/libvpd2.changes 2018-06-02 12:15:27.948688885 +0200 +++ /work/SRC/openSUSE:Factory/.libvpd2.new/libvpd2.changes 2018-06-25 11:38:36.385884117 +0200 @@ -1,0 +2,18 @@ +Wed Jun 20 08:19:48 UTC 2018 - [email protected] + +- version update to 2.2.6 (fate#324940) + - Changes run.vpdupdate creation path from /var/lib/lsvpd to /run + +- removed patches: + * 0001-Modify-char-array-initialization-style.patch + * 0002-Null-check-before-passing-pointer-to-strlen-call.patch + * 0003-Typo-correction-in-README-file.patch + * 0004-libvpd-Validate-memory-allocation.patch + * 0005-libvpd-Corrects-data-type-of-variables.patch + * 0006-Changes-run.vpdupdate-creation-path-from-var-lib-lsv.patch + * libvpd.async.patch + +- modified patches: + * libvpd2.makefile.patch + +------------------------------------------------------------------- Old: ---- 0001-Modify-char-array-initialization-style.patch 0002-Null-check-before-passing-pointer-to-strlen-call.patch 0003-Typo-correction-in-README-file.patch 0004-libvpd-Validate-memory-allocation.patch 0005-libvpd-Corrects-data-type-of-variables.patch 0006-Changes-run.vpdupdate-creation-path-from-var-lib-lsv.patch libvpd-2.2.5.tar.gz libvpd.async.patch New: ---- libvpd-2.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvpd2.spec ++++++ --- /var/tmp/diff_new_pack.3iotjm/_old 2018-06-25 11:38:36.981862118 +0200 +++ /var/tmp/diff_new_pack.3iotjm/_new 2018-06-25 11:38:36.985861971 +0200 @@ -17,7 +17,7 @@ Name: libvpd2 -Version: 2.2.5 +Version: 2.2.6 Release: 0 Summary: VPD Database access library for lsvpd License: LGPL-2.1+ @@ -26,13 +26,6 @@ Source: http://downloads.sourceforge.net/project/linux-diag/libvpd/%{version}/libvpd-%{version}.tar.gz Source2: baselibs.conf Patch1: libvpd2.makefile.patch -Patch3: libvpd.async.patch -Patch4: 0001-Modify-char-array-initialization-style.patch -Patch5: 0002-Null-check-before-passing-pointer-to-strlen-call.patch -Patch6: 0003-Typo-correction-in-README-file.patch -Patch7: 0004-libvpd-Validate-memory-allocation.patch -Patch8: 0005-libvpd-Corrects-data-type-of-variables.patch -Patch9: 0006-Changes-run.vpdupdate-creation-path-from-var-lib-lsv.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -61,13 +54,6 @@ %prep %setup -q -n libvpd-%{version} %patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build autoreconf -fiv ++++++ libvpd-2.2.5.tar.gz -> libvpd-2.2.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/90-vpdupdate.rules new/libvpd-2.2.6/90-vpdupdate.rules --- old/libvpd-2.2.5/90-vpdupdate.rules 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/90-vpdupdate.rules 2018-06-12 12:35:22.000000000 +0200 @@ -1 +1 @@ -KERNELS=="*", ACTION=="*", DEVPATH=="/devices/*", RUN+="/bin/touch /var/lib/lsvpd/run.vpdupdate" +KERNELS=="*", ACTION=="*", DEVPATH=="/devices/*", RUN+="/bin/touch /run/run.vpdupdate" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/ChangeLog new/libvpd-2.2.6/ChangeLog --- old/libvpd-2.2.5/ChangeLog 2015-11-03 18:26:35.000000000 +0100 +++ new/libvpd-2.2.6/ChangeLog 2018-06-12 12:35:22.000000000 +0200 @@ -1,3 +1,7 @@ +2.2.6 +- Changes run.vpdupdate creation path from /var/lib/lsvpd to /run +- Improved error handling + 2.2.5 - Fixed security issues like buffer overflow, memory allocation validation - Replaced popen with secured version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/Makefile.am new/libvpd-2.2.6/Makefile.am --- old/libvpd-2.2.5/Makefile.am 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/Makefile.am 2018-06-12 12:35:22.000000000 +0200 @@ -67,7 +67,5 @@ 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' old/libvpd-2.2.5/Makefile.in new/libvpd-2.2.6/Makefile.in --- old/libvpd-2.2.5/Makefile.in 2015-11-03 18:27:07.000000000 +0100 +++ new/libvpd-2.2.6/Makefile.in 2018-06-12 12:35:37.000000000 +0200 @@ -1047,8 +1047,6 @@ 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' old/libvpd-2.2.5/README new/libvpd-2.2.6/README --- old/libvpd-2.2.5/README 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/README 2018-06-12 12:35:22.000000000 +0200 @@ -34,7 +34,7 @@ package. Please check your linux distribution package naming convention and make sure you have installed right packages. - For users of older RHEL and SLES versions - slqite is not available in the default repositories for some of the older + sqlite is not available in the default repositories for some of the older RHEL (<= 5.x?) and SLES (<= 10.x?) versions. If you want to run the new lsvpd/libvpd setup you need build sqlite version 3.0.0 or newer from source (available here: http://www.sqlite.org) or find an appropriate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/configure new/libvpd-2.2.6/configure --- old/libvpd-2.2.5/configure 2015-11-03 18:27:07.000000000 +0100 +++ new/libvpd-2.2.6/configure 2018-06-12 12:35:38.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libvpd 2.2.5. +# Generated by GNU Autoconf 2.69 for libvpd 2.2.6. # -# Report bugs to <[email protected],[email protected]>. +# Report bugs to <[email protected]>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,10 +275,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell [email protected] and -$0: [email protected],[email protected] about your -$0: system, including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: [email protected] about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." fi exit 1 fi @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='libvpd' PACKAGE_TARNAME='libvpd' -PACKAGE_VERSION='2.2.5' -PACKAGE_STRING='libvpd 2.2.5' -PACKAGE_BUGREPORT='[email protected],[email protected]' +PACKAGE_VERSION='2.2.6' +PACKAGE_STRING='libvpd 2.2.6' +PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1329,7 +1329,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libvpd 2.2.5 to adapt to many kinds of systems. +\`configure' configures libvpd 2.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1399,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libvpd 2.2.5:";; + short | recursive ) echo "Configuration of libvpd 2.2.6:";; esac cat <<\_ACEOF @@ -1444,7 +1444,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <[email protected],[email protected]>. +Report bugs to <[email protected]>. _ACEOF ac_status=$? fi @@ -1507,7 +1507,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libvpd configure 2.2.5 +libvpd configure 2.2.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2058,9 +2058,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk ## +( $as_echo "## ------------------------------------- ## ## Report this to [email protected] ## -## kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk ##" +## ------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2149,7 +2149,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libvpd $as_me 2.2.5, which was +It was created by libvpd $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3015,7 +3015,7 @@ # Define the identity of the package. PACKAGE='libvpd' - VERSION='2.2.5' + VERSION='2.2.6' cat >>confdefs.h <<_ACEOF @@ -4216,7 +4216,7 @@ #Release version GENERIC_MAJOR_VERSION=2 GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=5 +GENERIC_MICRO_VERSION=6 GENERIC_API_VERSION=$GENERIC_MAJOR_VERSION @@ -17896,7 +17896,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libvpd $as_me 2.2.5, which was +This file was extended by libvpd $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17956,13 +17956,13 @@ Configuration commands: $config_commands -Report bugs to <[email protected],[email protected]>." +Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libvpd config.status 2.2.5 +libvpd config.status 2.2.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/configure.ac new/libvpd-2.2.6/configure.ac --- old/libvpd-2.2.5/configure.ac 2015-11-03 18:26:35.000000000 +0100 +++ new/libvpd-2.2.6/configure.ac 2018-06-12 12:35:22.000000000 +0200 @@ -4,7 +4,7 @@ AC_PREREQ([2.69]) #base -AC_INIT([libvpd],[2.2.5],[[email protected],[email protected]]) +AC_INIT([libvpd],[2.2.6],[[email protected]]) AC_CONFIG_HEADER([config/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ #Release version GENERIC_MAJOR_VERSION=2 GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=5 +GENERIC_MICRO_VERSION=6 GENERIC_API_VERSION=$GENERIC_MAJOR_VERSION AC_SUBST(GENERIC_API_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/libvpd.spec.in new/libvpd-2.2.6/libvpd.spec.in --- old/libvpd-2.2.5/libvpd.spec.in 2015-11-03 18:26:35.000000000 +0100 +++ new/libvpd-2.2.6/libvpd.spec.in 2018-06-12 12:35:22.000000000 +0200 @@ -53,7 +53,6 @@ %{_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,-) @@ -66,6 +65,9 @@ %changelog +* Tue Jun 12 2018 Vasant Hegde <[email protected]> 2.2.6 +- Changes run.vpdupdate creation path from /var/lib/lsvpd to /run + * Tue Nov 03 2015 Vasant Hegde <[email protected]> 2.2.5 - Fixed security issues like buffer overflow, memory allocation validation - Replaced popen with secured version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/component_c.c new/libvpd-2.2.6/src/component_c.c --- old/libvpd-2.2.5/src/component_c.c 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/component_c.c 2018-06-12 12:35:22.000000000 +0200 @@ -475,7 +475,7 @@ while( strncmp( next, CHILD_END, strlen( CHILD_END ) ) != 0 ) { item = new_list( ); - if( !next ) + if( !item ) goto unpackerr; item->data = strdup( next ); if (item->data == NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/helper_functions.cpp new/libvpd-2.2.6/src/helper_functions.cpp --- old/libvpd-2.2.5/src/helper_functions.cpp 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/helper_functions.cpp 2018-06-12 12:35:22.000000000 +0200 @@ -428,8 +428,8 @@ */ bool HelperFunctions::matches(const string& s1, const string& s2) { - unsigned int beg = 0, end; - unsigned int z; + size_t beg = 0, end; + size_t z; // coutd << " s1 = " << s1 << ", s2 = " << s2 << endl; //strings have matched to end - base case diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/libvpd-2/vpddbenv.h new/libvpd-2.2.6/src/libvpd-2/vpddbenv.h --- old/libvpd-2.2.5/src/libvpd-2/vpddbenv.h 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/libvpd-2/vpddbenv.h 2018-06-12 12:35:22.000000000 +0200 @@ -37,7 +37,6 @@ #define ID "comp_id" #define DATA "comp_data" #define MAX_NAME_LENGTH 256 -#define QUERY_BUF_LENGTH 4096 #if HAVE_SQLITE3_PREPARE_V2 #define SQLITE3_PREPARE sqlite3_prepare_v2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/system_c.c new/libvpd-2.2.6/src/system_c.c --- old/libvpd-2.2.5/src/system_c.c 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/system_c.c 2018-06-12 12:35:22.000000000 +0200 @@ -265,7 +265,7 @@ while( strncmp( next, CHILD_END, strlen( CHILD_END ) ) != 0 ) { item = new_list( ); - if( !next ) + if( !item ) goto unpackerr; item->data = strdup( next ); if (item->data == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/vpddbenv_c.c new/libvpd-2.2.6/src/vpddbenv_c.c --- old/libvpd-2.2.5/src/vpddbenv_c.c 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/vpddbenv_c.c 2018-06-12 12:35:22.000000000 +0200 @@ -88,15 +88,14 @@ sqlite3_stmt *pstmt = NULL; int rc; const char *out; - const char sql[QUERY_BUF_LENGTH] = "SELECT " DATA " FROM " TABLE_NAME " WHERE " ID "=?"; + char sql[] = {"SELECT " DATA " FROM " TABLE_NAME " WHERE " ID "=?"}; - rc = SQLITE3_PREPARE( db->db, sql, strlen( sql ) + 1, - &pstmt, &out ); + rc = SQLITE3_PREPARE( db->db, sql, sizeof( sql ), &pstmt, &out ); if( rc != SQLITE_OK ) goto FETCH_COMP_ERR; rc = sqlite3_bind_text(pstmt, 1, deviceID, - strlen(deviceID), SQLITE_STATIC); + deviceID ? strlen(deviceID):0, SQLITE_STATIC); if (rc != SQLITE_OK) goto FETCH_COMP_ERR; @@ -127,8 +126,7 @@ const char *out; char sql[] = "SELECT " DATA " FROM " TABLE_NAME " WHERE " ID "='" SYS_ID "';"; - rc = SQLITE3_PREPARE( db->db, sql, strlen( sql ) + 1, - &pstmt, &out ); + rc = SQLITE3_PREPARE( db->db, sql, sizeof( sql ), &pstmt, &out ); if( rc != SQLITE_OK ) goto FETCH_SYS_ERR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvpd-2.2.5/src/vpdretriever.cpp new/libvpd-2.2.6/src/vpdretriever.cpp --- old/libvpd-2.2.5/src/vpdretriever.cpp 2015-11-03 18:25:37.000000000 +0100 +++ new/libvpd-2.2.6/src/vpdretriever.cpp 2018-06-12 12:35:22.000000000 +0200 @@ -44,7 +44,7 @@ { const string VpdRetriever::DEFAULT_DIR ( "/var/lib/lsvpd/" ); const string VpdRetriever::DEFAULT_FILE ( "vpd.db" ); - const string VpdRetriever::UDEV_NOTIFY_FILE ( "run.vpdupdate" ); + const string VpdRetriever::UDEV_NOTIFY_FILE ( "/run/run.vpdupdate" ); VpdRetriever::VpdRetriever( string envDir, string dbFileName ) throw( VpdException& ) @@ -63,7 +63,7 @@ { 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; + const string udev_file = VpdRetriever::UDEV_NOTIFY_FILE; Logger logger; int flag = 1; ++++++ libvpd2.makefile.patch ++++++ --- /var/tmp/diff_new_pack.3iotjm/_old 2018-06-25 11:38:37.117857098 +0200 +++ /var/tmp/diff_new_pack.3iotjm/_new 2018-06-25 11:38:37.117857098 +0200 @@ -1,16 +1,14 @@ -Index: libvpd-2.2.4/Makefile.am +Index: libvpd-2.2.6/Makefile.am =================================================================== ---- libvpd-2.2.4.orig/Makefile.am -+++ libvpd-2.2.4/Makefile.am -@@ -65,9 +65,9 @@ libtool: $(LIBTOOL_DEPS) +--- libvpd-2.2.6.orig/Makefile.am ++++ libvpd-2.2.6/Makefile.am +@@ -65,7 +65,7 @@ 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
