Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-08-13 17:19:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-07-29 16:48:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-08-13 17:19:55.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 31 19:22:56 CEST 2014 - [email protected] + +- Fix gpg key creation/modification date computation to properly + update trusted keys stored in the rpm database. +- version 14.27.1 (27) + +------------------------------------------------------------------- Old: ---- libzypp-14.27.0.tar.bz2 New: ---- libzypp-14.27.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.7r2uXW/_old 2014-08-13 17:19:56.000000000 +0200 +++ /var/tmp/diff_new_pack.7r2uXW/_new 2014-08-13 17:19:56.000000000 +0200 @@ -23,7 +23,7 @@ Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.27.0 +Version: 14.27.1 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-14.27.0.tar.bz2 -> libzypp-14.27.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.0/VERSION.cmake new/libzypp-14.27.1/VERSION.cmake --- old/libzypp-14.27.0/VERSION.cmake 2014-07-25 12:58:04.000000000 +0200 +++ new/libzypp-14.27.1/VERSION.cmake 2014-07-31 19:25:11.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "27") SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 14.27.0 (27) +# LAST RELEASED: 14.27.1 (27) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.0/package/libzypp.changes new/libzypp-14.27.1/package/libzypp.changes --- old/libzypp-14.27.0/package/libzypp.changes 2014-07-28 11:43:25.000000000 +0200 +++ new/libzypp-14.27.1/package/libzypp.changes 2014-07-31 19:25:11.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 31 19:22:56 CEST 2014 - [email protected] + +- Fix gpg key creation/modification date computation to properly + update trusted keys stored in the rpm database. +- version 14.27.1 (27) + +------------------------------------------------------------------- Mon Jul 28 11:32:40 CEST 2014 - [email protected] - reverted last commit to make yast2-pkg-bindings build again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.0/zypp/PublicKey.cc new/libzypp-14.27.1/zypp/PublicKey.cc --- old/libzypp-14.27.0/zypp/PublicKey.cc 2014-07-01 11:30:28.000000000 +0200 +++ new/libzypp-14.27.1/zypp/PublicKey.cc 2014-07-31 19:25:11.000000000 +0200 @@ -251,7 +251,8 @@ case pSIG: // Update creation/modification date from signatures type "13x". - if ( _words[_words.size()-2] == "13x" ) + if ( ( _words.size() > 10 && _words[10] == "13x" ) + || ( _words.size() > 12 && _words[12] == "13x" ) ) { Date cdate(str::strtonum<Date::ValueType>(_words[5])); if ( key->_pimpl->_created < cdate ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.27.0/zypp/base/PtrTypes.h new/libzypp-14.27.1/zypp/base/PtrTypes.h --- old/libzypp-14.27.0/zypp/base/PtrTypes.h 2014-07-28 11:32:49.000000000 +0200 +++ new/libzypp-14.27.1/zypp/base/PtrTypes.h 2014-07-31 15:57:12.000000000 +0200 @@ -13,6 +13,7 @@ #ifndef ZYPP_BASE_PTRTYPES_H #define ZYPP_BASE_PTRTYPES_H +#include <iosfwd> #include <string> #include <boost/scoped_ptr.hpp> @@ -24,6 +25,12 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + namespace str + { + // printing void* (prevents us from including <ostream>) + std::string form( const char * format, ... ) __attribute__ ((format (printf, 1, 2))); + } + /** \defgroup ZYPP_SMART_PTR Smart pointer types * Smart pointer types. * @@ -122,6 +129,15 @@ return str << *obj; return str << std::string("NULL"); } + /** \overload specialize for void */ + template<> + inline std::ostream & operator<<( std::ostream & str, const zypp::shared_ptr<void> & obj ) + { + if ( obj ) + return str << zypp::str::form( "%p", (void*)obj.get() ); + return str << std::string("NULL"); + } + /** \relates zypp::shared_ptr Stream output. */ template<class _D> inline std::ostream & dumpOn( std::ostream & str, const zypp::shared_ptr<_D> & obj ) @@ -130,6 +146,10 @@ return dumpOn( str, *obj ); return str << std::string("NULL"); } + /** \overload specialize for void */ + template<> + inline std::ostream & dumpOn( std::ostream & str, const zypp::shared_ptr<void> & obj ) + { return str << obj; } /** \relates zypp::intrusive_ptr Stream output. */ template<class _D> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
