From 5789fe7074b322159fd6feec8d8966e71bc7e141 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Aug 09 2020 02:05:08 +0000
Subject: Update to 17.24.1 (#1817137)


---

diff --git a/0001-Fix-template-with-C-linkage-build-error.patch b/0001-Fix-template-with-C-linkage-build-error.patch
new file mode 100644
index 0000000..e6c337e
--- /dev/null
+++ b/0001-Fix-template-with-C-linkage-build-error.patch
@@ -0,0 +1,28 @@
+From e469af1f6bae235e422755a990e3711c3263d41b Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Sun, 19 Jul 2020 13:47:20 +0100
+Subject: [PATCH] Fix template with C linkage build error
+
+---
+ zypp/parser/xml/libxmlfwd.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/zypp/parser/xml/libxmlfwd.h b/zypp/parser/xml/libxmlfwd.h
+index 00df261b7..4e60e5088 100644
+--- a/zypp/parser/xml/libxmlfwd.h
++++ b/zypp/parser/xml/libxmlfwd.h
+@@ -12,11 +12,8 @@
+ #ifndef ZYPP_PARSER_XML_LIBXMLFWD_H
+ #define ZYPP_PARSER_XML_LIBXMLFWD_H
+ 
+-extern "C"
+-{
+ #include <libxml/xmlreader.h>
+ #include <libxml/xmlerror.h>
+-}
+ 
+ #include <iosfwd>
+ 
+-- 
+2.26.2
+
diff --git a/0001-Just-collect-details-for-the-signatures-found-fixes-.patch b/0001-Just-collect-details-for-the-signatures-found-fixes-.patch
new file mode 100644
index 0000000..e0510b5
--- /dev/null
+++ b/0001-Just-collect-details-for-the-signatures-found-fixes-.patch
@@ -0,0 +1,25 @@
+From 684365c91e5d9cbda38c2fed069b5e45d156c408 Mon Sep 17 00:00:00 2001
+From: Michael Andres <ma@suse.de>
+Date: Wed, 22 Jul 2020 11:47:19 +0200
+Subject: [PATCH] Just collect details for the signatures found (fixes #229)
+
+---
+ zypp/target/rpm/RpmDb.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
+index 1a231fdac..001dafbef 100644
+--- a/zypp/target/rpm/RpmDb.cc
++++ b/zypp/target/rpm/RpmDb.cc
+@@ -1221,6 +1221,8 @@ namespace
+       { lineres = RpmDb::CHK_NOTFOUND; }
+       else if ( line.find( ": NOTRUSTED" ) != std::string::npos )
+       { lineres = RpmDb::CHK_NOTTRUSTED; }
++      else if ( line.find( ": NOTFOUND" ) != std::string::npos )
++      { continue; } // just collect details for signatures found (#229)
+ 
+       ++count[lineres];
+       detail_r.push_back( RpmDb::CheckPackageDetail::value_type( lineres, std::move(line) ) );
+-- 
+2.26.2
+
diff --git a/libzypp.spec b/libzypp.spec
index 6198b68..5d07118 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -1,3 +1,6 @@
+# Force out of source build
+%undefine __cmake_in_source_build
+
 %global min_libsolv_ver 0.7.11
 
 # Small macro to define (Build)Requires for solv tools
@@ -7,14 +10,20 @@ Requires:       %{_bindir}/%{1}
 # End macro
 
 Name:           libzypp
-Version:        17.23.5
-Release:        3%{?dist}
+Version:        17.24.1
+Release:        1%{?dist}
 Summary:        A package management library
 
 License:        GPLv2+
 URL:            https://en.opensuse.org/Portal:Libzypp
 Source0:        https://github.com/openSUSE/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Backports from upstream
+## Fix signature checks with rpm 4.16.x
+Patch0001:      0001-Just-collect-details-for-the-signatures-found-fixes-.patch
+## Fix libxml2 link error
+Patch0002:      0001-Fix-template-with-C-linkage-build-error.patch
+
 # Fedora specific patches
 ## Fix include paths for fcgi headers
 Patch1001:      libzypp-17.23.1-fix-fcgi-header-paths.patch
@@ -124,7 +133,7 @@ find -type f -exec sed -i -e "s|/usr/lib/zypp|%{_libexecdir}/zypp|g" {} ';'
 find -type f -exec sed -i -e "s|\${CMAKE_INSTALL_PREFIX}/lib/zypp|\${CMAKE_INSTALL_PREFIX}/libexec/zypp|g" {} ';'
 
 %build
-%cmake . -B"%{_vpath_builddir}" \
+%cmake \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DDOC_INSTALL_DIR=%{_docdir} \
          -DENABLE_BUILD_DOCS=ON \
@@ -132,10 +141,10 @@ find -type f -exec sed -i -e "s|\${CMAKE_INSTALL_PREFIX}/lib/zypp|\${CMAKE_INSTA
          -DENABLE_BUILD_TRANS=ON \
          -DENABLE_ZCHUNK_COMPRESSION=ON
 
-%make_build -C %{_vpath_builddir}
+%cmake_build
 
 %install
-%make_install -C %{_vpath_builddir}
+%cmake_install
 %find_lang zypp
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -164,7 +173,7 @@ rm %{buildroot}%{_sysconfdir}/zypp/needreboot
 
 %check
 pushd %{_vpath_builddir}/tests
-# Tests need to be compiled first
+# Tests need to be compiled first and cannot be run in parallel
 LD_LIBRARY_PATH=%{buildroot}%{_libdir}:${LD_LIBRARY_PATH} ctest -VV --output-on-failure .
 popd
 
@@ -220,6 +229,9 @@ end
 
 
 %changelog
+* Sat Aug 08 2020 Neal Gompa <ngompa13@gmail.com> - 17.24.1-1
+- Update to 17.24.1 (#1817137)
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 17.23.5-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index f0cb34b..2bbd1f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libzypp-17.23.5.tar.gz) = 0ebcecb3b8574d10c2537f9ec2454c83a15f6a30bb5ad16ac382b8c69c6dc813c4fee680f78cd785fac1cd682313917905cd1483bf2856760975b7c2027d8a6f
+SHA512 (libzypp-17.24.1.tar.gz) = fbf2cf138a50f3fdf620a1f8c8c292f5dd58078d9e61d5238fa64f1f2790d60108ae92e6990c0d1100458cdceb9e34bac15d6232e39e4e58d01f177f2399cb7d