From 6e31ae8aa242e4b4a87b6b9b110cd42a155bb6bd679bdf45a54f0a5b722afc69 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 29 Jul 2022 11:01:35 +0000 Subject: [PATCH 1/7] Update to last successful build e8467bcc53e9707feda24e534454d90aba7480ee Use std::bind where possible and avoid mixing std:: and boost:: OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2481 --- libzypp-17.31.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index 81fb4ae..e607408 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bc1e0f1c1630a2cb185e5129c9c7475ea491dcbde21767255dc686d1d221ea7 -size 5491666 +oid sha256:f7d657886447fb7f980c6aa0f21f8d8f2e4c993f7f589a28531d7c57dab3a1d7 +size 5489464 From 202dd50271de090665c7b3801cf790350fd94a63a130bc904b4d76df383f6617 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 1 Aug 2022 11:12:34 +0000 Subject: [PATCH 2/7] Update to last successful build 3c1c53c17b218bb0cc715a33a29a1663155a3b73 Work around libyui/libyui#78 on code 15.4 and older OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2482 --- libzypp-17.31.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index e607408..b87cdec 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7d657886447fb7f980c6aa0f21f8d8f2e4c993f7f589a28531d7c57dab3a1d7 -size 5489464 +oid sha256:d38d5191e7109f206f8fbb26189baf741b2a5e3497c9b61dc1e6b1fb24a69db8 +size 5490079 From e5bf4fa7149474f71727c8c0ef692f3a582827e1d3871ef00900d0bcecdc4800 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 24 Aug 2022 13:45:21 +0000 Subject: [PATCH 3/7] Update to last successful build 33ffaaad282f70fe8eed34c706274b398965f023 OPTION( ENABLE_DEVTOOL_REPOMIRROR "Devtool: build repomirror?" OFF ) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2483 --- libzypp-17.31.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index b87cdec..77f19fd 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d38d5191e7109f206f8fbb26189baf741b2a5e3497c9b61dc1e6b1fb24a69db8 -size 5490079 +oid sha256:a87fd5e314c8bc5922ea4b9ccda214bdcf7b62fc8d00a1cfe0db8a204748d4f9 +size 5490210 From 2f14703b77fe536f4c1729c3fb9a4f493ef0cd95d8ee2e795b1d4e9a147aa50e Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 25 Aug 2022 15:09:47 +0000 Subject: [PATCH 4/7] Update to last successful build 61f378407c8a3e458524466e300f116aab8d5b41 Log backtrace on SIGABRT too OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2484 --- libzypp-17.31.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index 77f19fd..8f14e03 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a87fd5e314c8bc5922ea4b9ccda214bdcf7b62fc8d00a1cfe0db8a204748d4f9 -size 5490210 +oid sha256:abdc62872cf60c9814c895d4b80ac0266c3f36b68ef57f8ebb84d944a831777b +size 5491120 From 014a2f7225413a25a543bd330d0d3fd6b1bcdfd4b3f8a4f53059bca090fc0889 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 30 Aug 2022 07:24:10 +0000 Subject: [PATCH 5/7] Update to last successful build f252eb5fae87e77aaa0408796945a831f0b6d528 Translated using Weblate (Macedonian) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2485 --- libzypp-17.31.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index 8f14e03..9fb2419 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abdc62872cf60c9814c895d4b80ac0266c3f36b68ef57f8ebb84d944a831777b -size 5491120 +oid sha256:d54863c526c8aedd0300fb40475b8d0a3cc1866bf084146ad15c87b8aa64440f +size 5490444 From 707296034f6f3d204edd72d935a4f364f211715f8c37b0057af1cd7572a18ee3 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Wed, 31 Aug 2022 09:56:16 +0000 Subject: [PATCH 6/7] Update to last successful build d2cd1341430c39d03e69f4576cc1f937d9e7f30f UsrEtc: Store logrotate files in %{_distconfdir} if defined (fixes #402) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2486 --- libzypp-17.31.0.tar.bz2 | 4 +- libzypp.spec | 86 ++++++++++++----------------------------- 2 files changed, 27 insertions(+), 63 deletions(-) diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 index 9fb2419..aeb3a12 100644 --- a/libzypp-17.31.0.tar.bz2 +++ b/libzypp-17.31.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d54863c526c8aedd0300fb40475b8d0a3cc1866bf084146ad15c87b8aa64440f -size 5490444 +oid sha256:9c7bf6f428aad92d77f187f2e44d0f1dbfe2dfda9e97e3e1d485757940b2f9e7 +size 5490613 diff --git a/libzypp.spec b/libzypp.spec index 727fdc0..4f8e976 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -314,74 +314,34 @@ cd .. # Create filelist with translations %{find_lang} zypp +%if %{defined _distconfdir} +# Move logratate files form /etc/logrotate.d to /usr/etc/logrotate.d +mkdir -p %{buildroot}/%{_distconfdir}/logrotate.d +mv %{buildroot}/%{_sysconfdir}/logrotate.d/zypp-history.lr %{buildroot}%{_distconfdir}/logrotate.d +%endif + %check pushd build/tests LD_LIBRARY_PATH="$(pwd)/../zypp:$LD_LIBRARY_PATH" ctest --output-on-failure . popd -%post -/sbin/ldconfig -if [ -f /var/cache/zypp/zypp.db ]; then rm /var/cache/zypp/zypp.db; fi +%if %{defined _distconfdir} +%pre +# Prepare for migration to /usr/etc; save any old .rpmsave +for i in logrotate.d/zypp-history.lr; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done +%endif -# convert old lock file to new -# TODO make this a separate file? -# TODO run the sript only when updating form pre-11.0 libzypp versions -LOCKSFILE=%{_sysconfdir}/zypp/locks -OLDLOCKSFILE=%{_sysconfdir}/zypp/locks.old +%if %{defined _distconfdir} +%posttrans +# Migration to /usr/etc, restore just created .rpmsave +for i in logrotate.d/zypp-history.lr; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif -is_old(){ - # if no such file, exit with false (1 in bash) - test -f ${LOCKSFILE} || return 1 - TEMP_FILE=`mktemp` - cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE} - if [ -s ${TEMP_FILE} ] - then - RES=0 - else - RES=1 - fi - rm -f ${TEMP_FILE} - return ${RES} -} - -append_new_lock(){ - case "$#" in - 1 ) - echo " -solvable_name: $1 -match_type: glob -" >> ${LOCKSFILE} -;; - 2 ) #TODO version - echo " -solvable_name: $1 -match_type: glob -Version: $2 -" >> ${LOCKSFILE} -;; - 3 ) #TODO version - echo " -solvable_name: $1 -match_type: glob -Version: $2 $3 -" >> ${LOCKSFILE} - ;; -esac -} - -die() { - echo $1 - exit 1 -} - -if is_old ${LOCKSFILE} - then - mv -f ${LOCKSFILE} ${OLDLOCKSFILE} || die "cannot backup old locks" - cat ${OLDLOCKSFILE}| sed "/^\#.*/d"| while read line - do - append_new_lock $line - done -fi +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -406,7 +366,11 @@ fi %dir %{_sysconfdir}/zypp/credentials.d %config(noreplace) %{_sysconfdir}/zypp/zypp.conf %config(noreplace) %{_sysconfdir}/zypp/systemCheck +%if %{defined _distconfdir} +%{_distconfdir}/logrotate.d/zypp-history.lr +%else %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr +%endif %dir %{_var}/lib/zypp %if "%{_libexecdir}" != "%{_prefix}/lib" %dir %{_libexecdir}/zypp From 7e9f350c5c5c403e97f8a6313cb1457f4940fc5749888a352d897f7b6cbb2911 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 2 Sep 2022 15:31:11 +0000 Subject: [PATCH 7/7] Update to last successful build 95c6cec23761e380f4b15b93219b6218a59e44cd changes 17.31.1 (22) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2487 --- libzypp-17.31.0.tar.bz2 | 3 --- libzypp-17.31.1.tar.bz2 | 3 +++ libzypp.changes | 15 +++++++++++++++ libzypp.spec | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 libzypp-17.31.0.tar.bz2 create mode 100644 libzypp-17.31.1.tar.bz2 diff --git a/libzypp-17.31.0.tar.bz2 b/libzypp-17.31.0.tar.bz2 deleted file mode 100644 index aeb3a12..0000000 --- a/libzypp-17.31.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c7bf6f428aad92d77f187f2e44d0f1dbfe2dfda9e97e3e1d485757940b2f9e7 -size 5490613 diff --git a/libzypp-17.31.1.tar.bz2 b/libzypp-17.31.1.tar.bz2 new file mode 100644 index 0000000..6574a4a --- /dev/null +++ b/libzypp-17.31.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6b6b13fa3e2d9378f05834a08122675aeba89ef7bee814895d7ba8a8efb8d9 +size 5490344 diff --git a/libzypp.changes b/libzypp.changes index 4f63c3f..d02ac5b 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Sep 2 16:38:42 CEST 2022 - ma@suse.de + +- UsrEtc: Store logrotate files in %{_distconfdir} if defined + (fixes #402) +- Log backtrace on SIGABRT too. +- Need to explicitly enable building experimental code. Otherwise + an old Notcurses++ package which happens to be present in the + buildenv breaks the build (fixes #412). +- Work around libyui/libyui#78 on code 15.4 and older. +- Stop using std::*ary_function; deprecated and removed in c++17. +- Don't expose header files which use types not available in + c++11. In 15.3 and older, YAST and PK compile with -std=c++11. +- version 17.31.1 (22) + ------------------------------------------------------------------- Tue Jul 19 16:03:01 CEST 2022 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index 4f8e976..0769a22 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -43,7 +43,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.31.0 +Version: 17.31.1 Release: 0 License: GPL-2.0-or-later URL: https://github.com/openSUSE/libzypp