Commit fe738c1f authored by kende's avatar kende

[libzypp] Upgrade to 17.9.0. Fixes JB#40313

parent 839c3712
[submodule "upstream"]
path = upstream
url = https://github.com/openSUSE/libzypp.git
url = https://git.sailfishos.org/mirror/libzypp.git
......@@ -8,12 +8,12 @@ diff --git a/zypp/repo/PackageProvider.cc b/zypp/repo/PackageProvider.cc
index 0557284..251160b 100644
--- a/zypp/repo/PackageProvider.cc
+++ b/zypp/repo/PackageProvider.cc
@@ -552,6 +552,8 @@
// build the package and put it into the cache
Pathname destination( _package->repoInfo().packagesPath() / _package->repoInfo().path() / _package->location().filename() );
@@ -613,6 +613,8 @@ namespace zypp
// Build the package
Pathname cachedest( _package->repoInfo().packagesPath() / _package->repoInfo().path() / _package->location().filename() );
Pathname builddest( cachedest.extend( ".drpm" ) );
+ // ensure that the destination directory exists
+ filesystem::assert_dir( destination.dirname() );
if ( ! applydeltarpm::provide( delta, destination,
+ filesystem::assert_dir( builddest.dirname() );
if ( ! applydeltarpm::provide( delta, builddest,
bind( &RpmPackageProvider::progressDeltaApply, this, _1 ) ) )
......@@ -9,10 +9,10 @@ diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index d9e0c9a..c39b872 100644
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -564,6 +564,10 @@
@@ -639,6 +639,10 @@ namespace zypp
return std::string();
}
+ if(!ctx->setHomedir(generalKeyRing())) {
+ ZYPP_THROW(KeyRingException(_("General keyring not found")));
+ }
......
......@@ -2,7 +2,7 @@ Name: libzypp
License: GPLv2+
Group: System/Packages
Summary: Package, Patch, Pattern, and Product Management
Version: 17.3.1
Version: 17.9.0
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
......@@ -16,7 +16,7 @@ Patch7: 0007-Set-GPG-homedir-when-reading-signatures.patch
BuildRequires: cmake
BuildRequires: openssl-devel
# Need boost > 1.53 for string_ref utility
BuildRequires: boost-devel >= 1.53.0
BuildRequires: boost-devel >= 1.53.0
BuildRequires: doxygen
BuildRequires: gcc-c++ >= 4.6
BuildRequires: gettext-devel
......@@ -221,6 +221,7 @@ fi
%{_datadir}/zypp
%{_bindir}/*
%{_libdir}/libzypp*so.*
%exclude %{_sysconfdir}/zypp/needreboot
%files devel
%defattr(-,root,root,-)
......
upstream @ 4eda4ec1
Subproject commit 02d707dd8acb2fa773f6e066c4e19580a7121e0d
Subproject commit 4eda4ec1aa46514f24cf7f6c0f0111cc2ab944ba
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment