Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2023-10-27 22:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Fri Oct 27 22:27:31 2023 rev:482 rq:1120332 version:17.31.23 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2023-10-13 23:15:08.220029263 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new.17445/libzypp.changes 2023-10-27 22:27:45.922573028 +0200 @@ -1,0 +2,7 @@ +Wed Oct 25 16:03:51 CEST 2023 - m...@suse.de + +- Stop using boost version 1 timer library (fixes #489, + bsc#1215294) +- version 17.31.23 (22) + +------------------------------------------------------------------- Old: ---- libzypp-17.31.22.tar.bz2 New: ---- libzypp-17.31.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.pH7nbi/_old 2023-10-27 22:27:46.754603543 +0200 +++ /var/tmp/diff_new_pack.pH7nbi/_new 2023-10-27 22:27:46.754603543 +0200 @@ -42,7 +42,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.31.22 +Version: 17.31.23 Release: 0 License: GPL-2.0-or-later URL: https://github.com/openSUSE/libzypp ++++++ libzypp-17.31.22.tar.bz2 -> libzypp-17.31.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.22/VERSION.cmake new/libzypp-17.31.23/VERSION.cmake --- old/libzypp-17.31.22/VERSION.cmake 2023-10-12 14:31:31.000000000 +0200 +++ new/libzypp-17.31.23/VERSION.cmake 2023-10-25 16:10:07.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") SET(LIBZYPP_MINOR "31") -SET(LIBZYPP_PATCH "22") +SET(LIBZYPP_PATCH "23") # -# LAST RELEASED: 17.31.22 (22) +# LAST RELEASED: 17.31.23 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.22/package/libzypp.changes new/libzypp-17.31.23/package/libzypp.changes --- old/libzypp-17.31.22/package/libzypp.changes 2023-10-13 10:50:38.000000000 +0200 +++ new/libzypp-17.31.23/package/libzypp.changes 2023-10-25 16:10:07.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 25 16:03:51 CEST 2023 - m...@suse.de + +- Stop using boost version 1 timer library (fixes #489, + bsc#1215294) +- version 17.31.23 (22) + +------------------------------------------------------------------- Thu Oct 12 14:26:36 CEST 2023 - m...@suse.de - Preliminary disable 'rpm --runposttrans' usage for chrooted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.22/po/sv.po new/libzypp-17.31.23/po/sv.po --- old/libzypp-17.31.22/po/sv.po 2023-09-21 12:00:09.000000000 +0200 +++ new/libzypp-17.31.23/po/sv.po 2023-10-18 20:20:07.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: zypp.sv\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-09-21 11:50+0200\n" -"PO-Revision-Date: 2023-09-09 06:15+0000\n" +"PO-Revision-Date: 2023-10-18 18:15+0000\n" "Last-Translator: Luna Jernberg <bit...@opensuse.org>\n" "Language-Team: Swedish <https://l10n.opensuse.org/projects/libzypp/master/sv/"; ">\n" @@ -4744,19 +4744,19 @@ #. Translator: progress bar label #: zypp/target/RpmPostTransCollector.cc:194 msgid "Running post-transaction scripts" -msgstr "" +msgstr "Kör efter transaktionsskript" #. Translator: progress bar label; %1% is a script identifier like '%posttrans(mypackage-2-0.noarch)' #: zypp/target/RpmPostTransCollector.cc:196 #, boost-format msgid "Running %1% script" -msgstr "" +msgstr "Kör %1% skript" #. Translator: headline; %1% is a script identifier like '%posttrans(mypackage-2-0.noarch)' #: zypp/target/RpmPostTransCollector.cc:198 #, boost-format msgid "%1% script output:" -msgstr "" +msgstr "%1% skriptutdata:" #: zypp/target/TargetException.cc:27 msgid "Installation has been aborted as directed." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.22/tools/DownloadFiles.cc new/libzypp-17.31.23/tools/DownloadFiles.cc --- old/libzypp-17.31.22/tools/DownloadFiles.cc 2023-07-28 12:30:10.000000000 +0200 +++ new/libzypp-17.31.23/tools/DownloadFiles.cc 2023-10-25 16:00:08.000000000 +0200 @@ -14,7 +14,6 @@ #include <yaml-cpp/yaml.h> #include <boost/program_options.hpp> -#include <boost/progress.hpp> #include <iostream> namespace po = boost::program_options; @@ -25,6 +24,28 @@ zypp::ByteCount _dlSize; }; +// #489, bsc#1215294: Stop using boost version 1 timer library +// https://www.boost.org/doc/libs/1_83_0/libs/timer/doc/original_timer.html +// A simple handcrafted substitute for <boost/progress.hpp> progress_display +struct PCBar { + PCBar() { + std::cout << std::endl; + std::cout << "0% 10 20 30 40 50 60 70 80 90 100%" << std::endl; + std::cout << "|----|----|----|----|----|----|----|----|----|----|" << std::endl; + } + ~PCBar() { + std::cout << std::endl; + } + void set( int pcval_r ) { + if ( pcval_r <= 0 ) + std::cout << "\033[2K\r" << std::flush; + else if ( pcval_r < 100 ) + std::cout << "\033[2K\r" << std::string( 1+pcval_r/2, '*' ) << std::flush; + else + std::cout << "\033[2K\r" << std::string( 51, '*' ) << std::flush; + } +}; + // progress for downloading a file struct DownloadProgressReportReceiver : public zypp::callback::ReceiveReport<zypp::media::DownloadProgressReport> { @@ -37,15 +58,12 @@ { assert(!_display); std::cout << "Starting download of: " << uri << " to " << localfile << std::endl; - _display = std::make_unique<boost::progress_display>( 100 ); + _display = std::make_unique<PCBar>(); } virtual bool progress(int value, const zypp::Url & uri, double drate_avg, double drate_now) { - auto increase = value - _display->count(); - if ( increase > 0 && ( increase + _display->count() ) <= _display->expected_count() ) { - (*_display) += increase; - } + _display->set( value ); return true; } @@ -64,7 +82,7 @@ } private: - std::unique_ptr<boost::progress_display> _display; + std::unique_ptr<PCBar> _display; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.22/zypp-core/ExternalProgram.h new/libzypp-17.31.23/zypp-core/ExternalProgram.h --- old/libzypp-17.31.22/zypp-core/ExternalProgram.h 2023-07-19 11:53:07.000000000 +0200 +++ new/libzypp-17.31.23/zypp-core/ExternalProgram.h 2023-10-23 17:24:46.000000000 +0200 @@ -151,6 +151,7 @@ ~ExternalProgram(); +#ifdef __cpp_lib_optional // YAST/PK explicitly use c++11 until 15-SP3 /*! * Wait a certain timeout for the programm to complete, if \a timeout * is not set this will wait forever, 0 will check if the process is still @@ -160,6 +161,7 @@ * \returns true if the process has exited in time */ bool waitForExit ( std::optional<uint64_t> timeout = {} ); +#endif /** Wait for the progamm to complete. */ int close();
