Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2014-12-09 09:13:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-06
13:45:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-12-09
09:13:33.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Dec 8 14:53:00 CET 2014 - m...@suse.de
+
+- Adapt to gpg-2.1 (bnc#908135)
+- rpm: do not obsolete yast2-packagemanager-devel by libzypp-devel-doc
+- replaceAll: fix endless loop on empty search string
+- version 14.31.0 (30)
+
+-------------------------------------------------------------------
Old:
----
libzypp-14.30.2.tar.bz2
New:
----
libzypp-14.31.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.nzXXiU/_old 2014-12-09 09:13:34.000000000 +0100
+++ /var/tmp/diff_new_pack.nzXXiU/_new 2014-12-09 09:13:34.000000000 +0100
@@ -19,7 +19,7 @@
%define force_gcc_46 0
Name: libzypp
-Version: 14.30.2
+Version: 14.31.0
Release: 0
Url: git://gitorious.org/opensuse/libzypp.git
Summary: Package, Patch, Pattern, and Product Management
++++++ libzypp-14.30.2.tar.bz2 -> libzypp-14.31.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/VERSION.cmake
new/libzypp-14.31.0/VERSION.cmake
--- old/libzypp-14.30.2/VERSION.cmake 2014-11-11 17:12:50.000000000 +0100
+++ new/libzypp-14.31.0/VERSION.cmake 2014-12-08 14:56:41.000000000 +0100
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "14")
SET(LIBZYPP_COMPATMINOR "30")
-SET(LIBZYPP_MINOR "30")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_MINOR "31")
+SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 14.30.2 (30)
+# LAST RELEASED: 14.31.0 (30)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/package/libzypp.changes
new/libzypp-14.31.0/package/libzypp.changes
--- old/libzypp-14.30.2/package/libzypp.changes 2014-11-27 15:08:48.000000000
+0100
+++ new/libzypp-14.31.0/package/libzypp.changes 2014-12-08 14:56:41.000000000
+0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Dec 8 14:53:00 CET 2014 - m...@suse.de
+
+- Adapt to gpg-2.1 (bnc#908135)
+- rpm: do not obsolete yast2-packagemanager-devel by libzypp-devel-doc
+- replaceAll: fix endless loop on empty search string
+- version 14.31.0 (30)
+
+-------------------------------------------------------------------
Thu Nov 27 07:40:30 UTC 2014 - dims...@opensuse.org
- Do not provide/obsolete yast2-packagemanager-devel by the -doc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/tests/sat/Solvable_test.cc
new/libzypp-14.31.0/tests/sat/Solvable_test.cc
--- old/libzypp-14.30.2/tests/sat/Solvable_test.cc 2014-07-01
11:30:28.000000000 +0200
+++ new/libzypp-14.31.0/tests/sat/Solvable_test.cc 2014-12-08
13:12:41.000000000 +0100
@@ -87,7 +87,7 @@
BOOST_CHECK_EQUAL(c, 2);
}
-BOOST_AUTO_TEST_CASE(asString)
+BOOST_AUTO_TEST_CASE(asStringTest)
{
BOOST_CHECK_EQUAL( sat::Solvable(0).asString(), "noSolvable" );
BOOST_CHECK_EQUAL( sat::Solvable(1).asString(), "systemSolvable" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/tests/zypp/ContentType_test.cc
new/libzypp-14.31.0/tests/zypp/ContentType_test.cc
--- old/libzypp-14.30.2/tests/zypp/ContentType_test.cc 2014-07-25
12:58:04.000000000 +0200
+++ new/libzypp-14.31.0/tests/zypp/ContentType_test.cc 2014-12-08
13:12:41.000000000 +0100
@@ -1,4 +1,5 @@
#include <boost/test/auto_unit_test.hpp>
+#include <iostream>
#include <set>
#include "zypp/ContentType.h"
@@ -62,4 +63,4 @@
BOOST_CHECK_EQUAL( *(i++), ContentType( "b", "b" ) );
BOOST_CHECK_EQUAL( *(i++), ContentType( "b", "c" ) );
BOOST_CHECK( i == c.end() );
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/tests/zypp/CpeId_test.cc
new/libzypp-14.31.0/tests/zypp/CpeId_test.cc
--- old/libzypp-14.30.2/tests/zypp/CpeId_test.cc 2014-09-05
12:49:26.000000000 +0200
+++ new/libzypp-14.31.0/tests/zypp/CpeId_test.cc 2014-12-08
13:12:41.000000000 +0100
@@ -1,4 +1,5 @@
#include <boost/test/auto_unit_test.hpp>
+#include <iostream>
#include "zypp/CpeId.h"
using std::cout;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/zypp/KeyRing.cc
new/libzypp-14.31.0/zypp/KeyRing.cc
--- old/libzypp-14.30.2/zypp/KeyRing.cc 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.31.0/zypp/KeyRing.cc 2014-12-08 15:10:15.000000000 +0100
@@ -98,13 +98,32 @@
private:
struct Cache
{
- scoped_ptr<WatchFile> _keyringP;
- std::list<PublicKeyData> _data;
-
// Empty copy ctor to allow insert into std::map as
// scoped_ptr is noncopyable.
Cache() {}
Cache( const Cache & rhs ) {}
+
+ void assertCache( const Pathname & keyring_r )
+ {
+ // .kbx since gpg2-2.1
+ if ( !_keyringK )
+ _keyringK.reset( new WatchFile( keyring_r/"pubring.kbx",
WatchFile::NO_INIT ) );
+ if ( !_keyringP )
+ _keyringP.reset( new WatchFile( keyring_r/"pubring.gpg",
WatchFile::NO_INIT ) );
+ }
+
+ bool hasChanged() const
+ {
+ bool k = _keyringK->hasChanged(); // be sure both files are
checked
+ bool p = _keyringP->hasChanged();
+ return k || p;
+ }
+
+ std::list<PublicKeyData> _data;
+
+ private:
+ scoped_ptr<WatchFile> _keyringK;
+ scoped_ptr<WatchFile> _keyringP;
};
typedef std::map<Pathname,Cache> CacheMap;
@@ -112,17 +131,14 @@
const std::list<PublicKeyData> & getData( const Pathname & keyring_r )
const
{
Cache & cache( _cacheMap[keyring_r] );
- if ( ! cache._keyringP )
- {
- // init new cache entry
- cache._keyringP.reset( new WatchFile( keyring_r/"pubring.gpg",
WatchFile::NO_INIT ) );
- }
+ // init new cache entry
+ cache.assertCache( keyring_r );
return getData( keyring_r, cache );
}
const std::list<PublicKeyData> & getData( const Pathname & keyring_r,
Cache & cache_r ) const
{
- if ( cache_r._keyringP->hasChanged() )
+ if ( cache_r.hasChanged() )
{
const char* argv[] =
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/zypp/base/String.h
new/libzypp-14.31.0/zypp/base/String.h
--- old/libzypp-14.30.2/zypp/base/String.h 2014-07-01 11:30:28.000000000
+0200
+++ new/libzypp-14.31.0/zypp/base/String.h 2014-12-08 13:12:41.000000000
+0100
@@ -145,6 +145,7 @@
/** String related utilities and \ref ZYPP_STR_REGEX.
\see \ref ZYPP_STR_REGEX
*/
+
namespace str
{ /////////////////////////////////////////////////////////////////
@@ -1007,10 +1008,12 @@
inline bool endsWith( const C_Str & str_r, const C_Str & prefix_r )
{ return hasSuffix( str_r, prefix_r ); }
//@}
- /////////////////////////////////////////////////////////////////
} // namespace str
///////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////
+
+ // drag into zypp:: namespace
+ using str::asString;
+
} // namespace zypp
///////////////////////////////////////////////////////////////////
#endif // ZYPP_BASE_STRING_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.30.2/zypp/base/Xml.h
new/libzypp-14.31.0/zypp/base/Xml.h
--- old/libzypp-14.30.2/zypp/base/Xml.h 2014-07-01 11:30:28.000000000 +0200
+++ new/libzypp-14.31.0/zypp/base/Xml.h 2014-12-08 13:12:41.000000000 +0100
@@ -32,10 +32,10 @@
using xml::escape;
using xml::unescape;
- /** \relates NodeAttr NODE ATTRIBUTE representation of types
[str::asString] */
+ /** \relates NodeAttr NODE ATTRIBUTE representation of types [asString] */
template <class _Tp>
std::string asXmlNodeAttr( const _Tp & val_r )
- { return str::asString( val_r ); }
+ { return asString( val_r ); }
///////////////////////////////////////////////////////////////////
/// \class NodeAttr
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
