Imported Upstream version 14.27.1

Change-Id: I3283e29b819048863caed699419f72744e9698d7
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 55cc0fa..49d9cc8 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -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 --git a/package/libzypp.changes b/package/libzypp.changes
index 7ba7e63..4dfafac 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Thu Jul 31 19:22:56 CEST 2014 - ma@suse.de
+
+- 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 - mls@suse.de
+
+- reverted last commit to make yast2-pkg-bindings build again
+
+-------------------------------------------------------------------
 Fri Jul 25 12:56:17 CEST 2014 - ma@suse.de
 
 - JobReport: extend callback to allow passing UserData

diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
index af8c698..4d3d773 100644 (file)
--- a/zypp/PublicKey.cc
+++ b/zypp/PublicKey.cc
@@ -251,7 +251,8 @@ namespace zypp
 
        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 --git a/zypp/base/PtrTypes.h b/zypp/base/PtrTypes.h
index 3950a38..e6d26d1 100644 (file)
--- a/zypp/base/PtrTypes.h
+++ b/zypp/base/PtrTypes.h
@@ -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.
      *
@@ -127,7 +134,7 @@ namespace std
   inline std::ostream & operator<<( std::ostream & str, const zypp::shared_ptr<void> & obj )
   {
     if ( obj )
-      return str << (void*)obj.get();
+      return str << zypp::str::form( "%p", (void*)obj.get() );
     return str << std::string("NULL");
   }
 
@@ -142,11 +149,7 @@ namespace std
   /** \overload specialize for void */
   template<>
   inline std::ostream & dumpOn( std::ostream & str, const zypp::shared_ptr<void> & obj )
-  {
-    if ( obj )
-      return str << (void*)obj.get();
-    return str << std::string("NULL");
-  }
+  { return str << obj; }
 
   /** \relates zypp::intrusive_ptr Stream output. */
   template<class _D>