Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2015-12-13 09:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-10-28 17:18:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2015-12-13 09:35:47.000000000 +0100 @@ -1,0 +2,76 @@ +Sun Nov 22 01:13:29 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 19 01:16:03 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 19 01:13:40 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Nov 16 12:27:02 CET 2015 - [email protected] + +- createPot: Fix plural form detection (bsc#955053) +- version 15.19.7 (19) + +------------------------------------------------------------------- +Thu Nov 12 01:13:26 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Nov 8 01:13:11 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Nov 6 11:08:46 CET 2015 - [email protected] + +- Add testcase for uncached repo-variables. +- Fixed Japanese translations (bsc#949196) +- version 15.19.6 (19) + +------------------------------------------------------------------- +Fri Nov 6 10:56:44 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 5 01:15:12 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 5 01:13:24 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Nov 3 10:52:01 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Nov 3 10:51:43 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Oct 23 17:10:18 CEST 2015 - [email protected] + +- Fix broken product: <-> -release package relation (bnc#951782) +- version 15.19.5 (19) + +------------------------------------------------------------------- +Thu Oct 22 12:23:29 CEST 2015 - [email protected] + +- Use a uniform translation set for SLE and openSUSE (bnc#948924) +- fix Plugin-services not updating repo GPGCheck settings (bnc#951402) +- version 15.19.4 (19) + +------------------------------------------------------------------- Old: ---- libzypp-15.19.3.tar.bz2 New: ---- libzypp-15.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.MEukpR/_old 2015-12-13 09:35:48.000000000 +0100 +++ /var/tmp/diff_new_pack.MEukpR/_new 2015-12-13 09:35:48.000000000 +0100 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 15.19.3 +Version: 15.19.7 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management @@ -196,17 +196,13 @@ %endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -unset TRANSLATION_SET unset EXTRA_CMAKE_OPTIONS -# Same codebase, but SLES may use it's own translation set. -# suse_version -# 1110 SLES11 -# 1315-1319 SLES12 -%if 0%{?suse_version} == 1110 || ( 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1319 ) +# We are moving towards a uniform translation set for SLE and openSUSE. +# While separate SLE translations are still present, overlay them. +unset TRANSLATION_SET if [ -f ../po/sle-zypp-po.tar.bz2 ]; then export TRANSLATION_SET=sle-zypp fi -%endif # No libproxy on SLE11 %if 0%{?suse_version} == 1110 export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON" ++++++ libzypp-15.19.3.tar.bz2 -> libzypp-15.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/VERSION.cmake new/libzypp-15.19.7/VERSION.cmake --- old/libzypp-15.19.3/VERSION.cmake 2015-10-14 16:37:34.000000000 +0200 +++ new/libzypp-15.19.7/VERSION.cmake 2015-11-16 12:28:57.000000000 +0100 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "15") SET(LIBZYPP_COMPATMINOR "19") SET(LIBZYPP_MINOR "19") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "7") # -# LAST RELEASED: 15.19.3 (19) +# LAST RELEASED: 15.19.7 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/libzypp.spec.cmake new/libzypp-15.19.7/libzypp.spec.cmake --- old/libzypp-15.19.3/libzypp.spec.cmake 2015-10-07 13:13:08.000000000 +0200 +++ new/libzypp-15.19.7/libzypp.spec.cmake 2015-10-22 12:25:34.000000000 +0200 @@ -196,17 +196,13 @@ %endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -unset TRANSLATION_SET unset EXTRA_CMAKE_OPTIONS -# Same codebase, but SLES may use it's own translation set. -# suse_version -# 1110 SLES11 -# 1315-1319 SLES12 -%if 0%{?suse_version} == 1110 || ( 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1319 ) +# We are moving towards a uniform translation set for SLE and openSUSE. +# While separate SLE translations are still present, overlay them. +unset TRANSLATION_SET if [ -f ../po/sle-zypp-po.tar.bz2 ]; then export TRANSLATION_SET=sle-zypp fi -%endif # No libproxy on SLE11 %if 0%{?suse_version} == 1110 export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/package/libzypp.changes new/libzypp-15.19.7/package/libzypp.changes --- old/libzypp-15.19.3/package/libzypp.changes 2015-10-18 01:13:34.000000000 +0200 +++ new/libzypp-15.19.7/package/libzypp.changes 2015-11-22 01:18:34.000000000 +0100 @@ -1,4 +1,80 @@ ------------------------------------------------------------------- +Sun Nov 22 01:13:29 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 19 01:16:03 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 19 01:13:40 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Mon Nov 16 12:27:02 CET 2015 - [email protected] + +- createPot: Fix plural form detection (bsc#955053) +- version 15.19.7 (19) + +------------------------------------------------------------------- +Thu Nov 12 01:13:26 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Sun Nov 8 01:13:11 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Nov 6 11:08:46 CET 2015 - [email protected] + +- Add testcase for uncached repo-variables. +- Fixed Japanese translations (bsc#949196) +- version 15.19.6 (19) + +------------------------------------------------------------------- +Fri Nov 6 10:56:44 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 5 01:15:12 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Thu Nov 5 01:13:24 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Nov 3 10:52:01 CET 2015 - [email protected] + +- Update sle-zypp-po.tar.bz2 + +------------------------------------------------------------------- +Tue Nov 3 10:51:43 CET 2015 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- +Fri Oct 23 17:10:18 CEST 2015 - [email protected] + +- Fix broken product: <-> -release package relation (bnc#951782) +- version 15.19.5 (19) + +------------------------------------------------------------------- +Thu Oct 22 12:23:29 CEST 2015 - [email protected] + +- Use a uniform translation set for SLE and openSUSE (bnc#948924) +- fix Plugin-services not updating repo GPGCheck settings (bnc#951402) +- version 15.19.4 (19) + +------------------------------------------------------------------- Sun Oct 18 01:13:27 CEST 2015 - [email protected] - Update zypp-po.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/po/createPot new/libzypp-15.19.7/po/createPot --- old/libzypp-15.19.3/po/createPot 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.19.7/po/createPot 2015-11-16 12:28:57.000000000 +0100 @@ -10,4 +10,4 @@ -o -name "*.cc" \ -o -name "*.cpp"` #calling xgettext with the sourcefiles -xgettext -L C++ --boost -s --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux GmbH, Nuernberg" --package-name=libzypp --default-domain=libzypp --output="$POTFILE" $SRCFILES +xgettext -L C++ --boost -s --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --keyword=PL_:1,2 --foreign-user --copyright-holder="SuSE Linux GmbH, Nuernberg" --package-name=libzypp --default-domain=libzypp --output="$POTFILE" $SRCFILES Files old/libzypp-15.19.3/po/sle-zypp-po.tar.bz2 and new/libzypp-15.19.7/po/sle-zypp-po.tar.bz2 differ Files old/libzypp-15.19.3/po/zypp-po.tar.bz2 and new/libzypp-15.19.7/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/tests/repo/RepoVariables_test.cc new/libzypp-15.19.7/tests/repo/RepoVariables_test.cc --- old/libzypp-15.19.3/tests/repo/RepoVariables_test.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.19.7/tests/repo/RepoVariables_test.cc 2015-11-05 12:50:02.000000000 +0100 @@ -225,4 +225,12 @@ "http://site.org/update/13.2/?arch=i686";); } +BOOST_AUTO_TEST_CASE(uncached) +{ + ::setenv( "ZYPP_REPO_RELEASEVER", "13.2", 1 ); + repo::RepoVariablesStringReplacer replacer1; + BOOST_CHECK_EQUAL( replacer1("${releasever}"), "13.2" ); + ::setenv( "ZYPP_REPO_RELEASEVER", "13.3", 1 ); + BOOST_CHECK_EQUAL( replacer1("${releasever}"), "13.3" ); +} // vim: set ts=2 sts=2 sw=2 ai et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/PoolItem.cc new/libzypp-15.19.7/zypp/PoolItem.cc --- old/libzypp-15.19.3/zypp/PoolItem.cc 2015-08-10 16:28:29.000000000 +0200 +++ new/libzypp-15.19.7/zypp/PoolItem.cc 2015-10-23 17:13:34.000000000 +0200 @@ -158,6 +158,11 @@ PoolItem myBuddy( solv_r ); if ( myBuddy ) { + if ( myBuddy._pimpl->_buddy ) + { + ERR << *this << " would be buddy2 in " << myBuddy << endl; + return; + } myBuddy._pimpl->_buddy = -resolvable()->satSolvable().id(); _buddy = myBuddy.satSolvable().id(); DBG << *this << " has buddy " << myBuddy << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/Product.cc new/libzypp-15.19.7/zypp/Product.cc --- old/libzypp-15.19.3/zypp/Product.cc 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.19.7/zypp/Product.cc 2015-10-23 17:13:34.000000000 +0200 @@ -79,20 +79,29 @@ // Look for a provider of 'product(name) = version' of same // architecture and within the same repo. // - // bnc #497696: Update repos may have multiple release package versions - // providing the same product. As a workaround we link to the one with - // the highest version. + // Code12: Update repos may have multiple release package versions + // providing the same product. Prefer the one matching the buildtime, + // as the product buildtime is derived from the -release package. Capability identCap( str::form( "product(%s) = %s", name().c_str(), edition().c_str() ) ); sat::Solvable found; + bool foundBuildTime = false; sat::WhatProvides providers( identCap ); for_( it, providers.begin(), providers.end() ) { - if ( it->repository() == repository() - && it->arch() == arch() ) + if ( it->repository() == repository() && it->arch() == arch() ) { - if ( ! found || found.edition() < it->edition() ) - found = *it; + bool fitsBuildtime = ( it->buildtime() == buildtime() ); + if ( found ) + { + bool lowerEdition = ( it->edition() <= found.edition() ); + if ( ( foundBuildTime && ( !fitsBuildtime || lowerEdition ) ) + || ( !foundBuildTime && ( !fitsBuildtime && lowerEdition ) ) ) + continue; + } + found = *it; + if ( fitsBuildtime ) + foundBuildTime = true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/RepoInfo.cc new/libzypp-15.19.7/zypp/RepoInfo.cc --- old/libzypp-15.19.3/zypp/RepoInfo.cc 2015-07-30 16:24:29.000000000 +0200 +++ new/libzypp-15.19.7/zypp/RepoInfo.cc 2015-10-29 15:58:02.000000000 +0100 @@ -58,6 +58,7 @@ public: static const unsigned defaultPriority = 99; + static const unsigned noPriority = unsigned(-1); void setProbedType( const repo::RepoType & t ) const { @@ -258,6 +259,9 @@ unsigned RepoInfo::defaultPriority() { return Impl::defaultPriority; } + unsigned RepoInfo::noPriority() + { return Impl::noPriority; } + void RepoInfo::setPriority( unsigned newval_r ) { _pimpl->priority = newval_r ? newval_r : Impl::defaultPriority; } @@ -294,6 +298,12 @@ void RepoInfo::setPkgGpgCheck( TriBool value_r ) { _pimpl->_pkgGpgCheck = value_r; } + void RepoInfo::getRawGpgChecks( TriBool & g_r, TriBool & r_r, TriBool & p_r ) const + { + g_r = _pimpl->_gpgCheck; + r_r = _pimpl->_repoGpgCheck; + p_r = _pimpl->_pkgGpgCheck; + } TriBool RepoInfo::validRepoSignature() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/RepoInfo.h new/libzypp-15.19.7/zypp/RepoInfo.h --- old/libzypp-15.19.3/zypp/RepoInfo.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.19.7/zypp/RepoInfo.h 2015-10-29 15:42:03.000000000 +0100 @@ -85,6 +85,10 @@ */ static unsigned defaultPriority(); /** + * The least priority (<tt>unsigned(-1)</tt>). + */ + static unsigned noPriority(); + /** * Repository priority for solver. * Some number between \c 1 (highest priority) and \c 99 (\ref defaultPriority). */ @@ -425,6 +429,10 @@ class Impl; private: + friend class RepoManager; + /** Raw values for RepoManager */ + void getRawGpgChecks( TriBool & g_r, TriBool & r_r, TriBool & p_r ) const; + /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/RepoManager.cc new/libzypp-15.19.7/zypp/RepoManager.cc --- old/libzypp-15.19.3/zypp/RepoManager.cc 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.19.7/zypp/RepoManager.cc 2015-10-21 15:53:34.000000000 +0200 @@ -2247,6 +2247,27 @@ oldRepoModified = true; } + // changed gpg check settings? + // ATM only plugin services can set GPG values. + if ( service.type() == ServiceType::PLUGIN ) + { + TriBool ogpg[3]; // Gpg RepoGpg PkgGpg + TriBool ngpg[3]; + oldRepo->getRawGpgChecks( ogpg[0], ogpg[1], ogpg[2] ); + it-> getRawGpgChecks( ngpg[0], ngpg[1], ngpg[2] ); +#define Z_CHKGPG(I,N) \ + if ( ! sameTriboolState( ogpg[I], ngpg[I] ) ) \ + { \ + DBG << "Service repo " << it->alias() << " gets new "#N"Check " << ngpg[I] << endl; \ + oldRepo->set##N##Check( ngpg[I] ); \ + oldRepoModified = true; \ + } + Z_CHKGPG( 0, Gpg ); + Z_CHKGPG( 1, RepoGpg ); + Z_CHKGPG( 2, PkgGpg ); +#undef Z_CHKGPG + } + // save if modified: if ( oldRepoModified ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/TriBool.h new/libzypp-15.19.7/zypp/TriBool.h --- old/libzypp-15.19.3/zypp/TriBool.h 2015-07-06 11:06:37.000000000 +0200 +++ new/libzypp-15.19.7/zypp/TriBool.h 2015-10-21 15:53:34.000000000 +0200 @@ -65,6 +65,10 @@ /** \relates TriBool stream output */ inline std::ostream & operator<<(std::ostream & s, const tribool & obj) { return s << zypp::asString( obj ); } + + /** \relates TriBool whether 2 tribool have the same state (this is NOT ==) */ + inline bool sameTriboolState( tribool lhs, tribool rhs ) + { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( lhs == rhs ) ); } } } #endif // ZYPP_TRIBOOL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-15.19.3/zypp/base/String.h new/libzypp-15.19.7/zypp/base/String.h --- old/libzypp-15.19.3/zypp/base/String.h 2015-10-05 12:20:31.000000000 +0200 +++ new/libzypp-15.19.7/zypp/base/String.h 2015-10-29 15:42:03.000000000 +0100 @@ -346,6 +346,20 @@ inline std::string octstring( unsigned long long n, int w = 0 ) { return form( "%#0*llo", w, n ); } //@} + + /////////////////////////////////////////////////////////////////// + /** String representation of number as bit-string with leading '0's. */ + template <typename TInt> + std::string binstring( TInt val_r ) + { + constexpr unsigned bits = sizeof(TInt)*8; + std::string ret( bits, ' ' ); + TInt bit = 1; + for ( unsigned pos = bits; pos > 0; ) + { --pos; ret[pos] = ((val_r & bit)?'1':'0'); bit = bit<<1; } + return ret; + } + /////////////////////////////////////////////////////////////////// /** Parsing numbers from string. */
