Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2014-05-10 07:48:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-02 20:51:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-05-10 07:48:28.000000000 +0200 @@ -1,0 +2,17 @@ +Thu May 8 18:54:25 CEST 2014 - [email protected] + +- KeyRingReport: New infoVerify callback showing the trusted key + that will be used for verification. +- version 14.19.0 (19) + +------------------------------------------------------------------- +Sun May 4 01:15:49 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu May 1 01:15:38 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-14.18.0.tar.bz2 New: ---- libzypp-14.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.ac3IJk/_old 2014-05-10 07:48:29.000000000 +0200 +++ /var/tmp/diff_new_pack.ac3IJk/_new 2014-05-10 07:48:29.000000000 +0200 @@ -23,7 +23,7 @@ Summary: Package, Patch, Pattern, and Product Management License: GPL-2.0+ Group: System/Packages -Version: 14.18.0 +Version: 14.19.0 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -60,6 +60,7 @@ %endif BuildRequires: gettext-devel BuildRequires: graphviz +BuildRequires: graphviz-gnome BuildRequires: libxml2-devel %if 0%{?suse_version} != 1110 # No libproxy on SLES ++++++ libzypp-14.18.0.tar.bz2 -> libzypp-14.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/VERSION.cmake new/libzypp-14.19.0/VERSION.cmake --- old/libzypp-14.18.0/VERSION.cmake 2014-04-28 15:36:46.000000000 +0200 +++ new/libzypp-14.19.0/VERSION.cmake 2014-05-08 18:56:44.000000000 +0200 @@ -59,10 +59,10 @@ # See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "14") -SET(LIBZYPP_COMPATMINOR "17") -SET(LIBZYPP_MINOR "18") +SET(LIBZYPP_COMPATMINOR "19") +SET(LIBZYPP_MINOR "19") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 14.18.0 (17) +# LAST RELEASED: 14.19.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/cmake/modules/ZyppCommon.cmake new/libzypp-14.19.0/cmake/modules/ZyppCommon.cmake --- old/libzypp-14.18.0/cmake/modules/ZyppCommon.cmake 2013-03-20 09:29:29.000000000 +0100 +++ new/libzypp-14.19.0/cmake/modules/ZyppCommon.cmake 2014-05-08 09:32:44.000000000 +0200 @@ -117,7 +117,7 @@ SPECFILE() ADD_CUSTOM_TARGET( svncheck - COMMAND cd $(CMAKE_SOURCE_DIR) && LC_ALL=C git status | grep -q "nothing to commit .working directory clean." + COMMAND cd ${CMAKE_SOURCE_DIR} && LC_ALL=C git status | grep -q "nothing to commit .working directory clean." ) SET( AUTOBUILD_COMMAND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/libzypp.spec.cmake new/libzypp-14.19.0/libzypp.spec.cmake --- old/libzypp-14.18.0/libzypp.spec.cmake 2014-01-25 17:08:52.000000000 +0100 +++ new/libzypp-14.19.0/libzypp.spec.cmake 2014-05-05 09:40:44.000000000 +0200 @@ -60,6 +60,7 @@ %endif BuildRequires: gettext-devel BuildRequires: graphviz +BuildRequires: graphviz-gnome BuildRequires: libxml2-devel %if 0%{?suse_version} != 1110 # No libproxy on SLES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/package/libzypp.changes new/libzypp-14.19.0/package/libzypp.changes --- old/libzypp-14.18.0/package/libzypp.changes 2014-04-28 15:36:46.000000000 +0200 +++ new/libzypp-14.19.0/package/libzypp.changes 2014-05-08 18:56:44.000000000 +0200 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Thu May 8 18:54:25 CEST 2014 - [email protected] + +- KeyRingReport: New infoVerify callback showing the trusted key + that will be used for verification. +- version 14.19.0 (19) + +------------------------------------------------------------------- +Sun May 4 01:15:49 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu May 1 01:15:38 CEST 2014 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Mon Apr 28 15:34:44 CEST 2014 - [email protected] - Derive initial AutoInstalled file from history Files old/libzypp-14.18.0/po/zypp-po.tar.bz2 and new/libzypp-14.19.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/zypp/KeyRing.cc new/libzypp-14.19.0/zypp/KeyRing.cc --- old/libzypp-14.18.0/zypp/KeyRing.cc 2013-09-02 15:09:23.000000000 +0200 +++ new/libzypp-14.19.0/zypp/KeyRing.cc 2014-05-08 18:56:44.000000000 +0200 @@ -59,6 +59,9 @@ _keyRingDefaultAccept = value_r; } + void KeyRingReport::infoVerify( const std::string & file_r, const PublicKeyData & keyData_r, const KeyContext & keycontext ) + {} + bool KeyRingReport::askUserToAcceptUnsignedFile( const std::string & file, const KeyContext & keycontext ) { return _keyRingDefaultAccept.testFlag( KeyRing::ACCEPT_UNSIGNED_FILE ); } @@ -402,13 +405,15 @@ } } + if ( ! trustedKeyData ) // invalidated by previous import + trustedKeyData = publicKeyExists( id, trustedKeyRing() ); + report->infoVerify( filedesc, trustedKeyData, context ); + // it exists, is trusted, does it validates? if ( verifyFile( file, signature, trustedKeyRing() ) ) return true; else { - if ( ! trustedKeyData ) // invalidated by previous import - trustedKeyData = publicKeyExists( id, trustedKeyRing() ); return report->askUserToAcceptVerificationFailed( filedesc, exportKey( trustedKeyData, trustedKeyRing() ), context ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/zypp/KeyRing.h new/libzypp-14.19.0/zypp/KeyRing.h --- old/libzypp-14.18.0/zypp/KeyRing.h 2013-09-02 15:09:23.000000000 +0200 +++ new/libzypp-14.19.0/zypp/KeyRing.h 2014-05-08 18:56:44.000000000 +0200 @@ -76,6 +76,9 @@ */ virtual KeyTrust askUserToAcceptKey( const PublicKey &key, const KeyContext &keycontext = KeyContext() ); + /** Informal callback showing the trusted key that will be used for verification. */ + virtual void infoVerify( const std::string & file_r, const PublicKeyData & keyData_r, const KeyContext &keycontext = KeyContext() ); + virtual bool askUserToAcceptUnsignedFile( const std::string &file, const KeyContext &keycontext = KeyContext() ); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/zypp/Repository.cc new/libzypp-14.19.0/zypp/Repository.cc --- old/libzypp-14.18.0/zypp/Repository.cc 2014-04-15 17:04:45.000000000 +0200 +++ new/libzypp-14.19.0/zypp/Repository.cc 2014-05-08 18:56:44.000000000 +0200 @@ -65,6 +65,9 @@ std::string Repository::name() const { return info().name(); } + std::string Repository::label() const + { return info().label(); } + int Repository::satInternalPriority() const { NO_REPOSITORY_RETURN( INT_MIN ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/zypp/Repository.h new/libzypp-14.19.0/zypp/Repository.h --- old/libzypp-14.18.0/zypp/Repository.h 2014-04-04 14:32:12.000000000 +0200 +++ new/libzypp-14.19.0/zypp/Repository.h 2014-05-08 18:56:44.000000000 +0200 @@ -85,9 +85,12 @@ /** Label to display for this repo. */ std::string name() const; - /** User string */ + /** Alias or name, according to \ref ZConfig::repoLabelIsAlias */ + std::string label() const; + + /** User string: \ref label (alias or name) */ std::string asUserString() const - { return name(); } + { return label(); } public: /** Timestamp or arbitrary user supplied string. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-14.18.0/zypp/repo/RepoInfoBase.h new/libzypp-14.19.0/zypp/repo/RepoInfoBase.h --- old/libzypp-14.18.0/zypp/repo/RepoInfoBase.h 2014-01-24 11:28:53.000000000 +0100 +++ new/libzypp-14.19.0/zypp/repo/RepoInfoBase.h 2014-05-08 18:56:44.000000000 +0200 @@ -71,6 +71,10 @@ */ std::string label() const; + /** User string: \ref label (alias or name) */ + std::string asUserString() const + { return label(); } + /** * If enabled is false, then this repository must be ignored as if does * not exists, except when checking for duplicate alias. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
