import libsolv-0.7.16-2.el8

.gitignore

@@ -1 +1 @@
-SOURCES/libsolv-0.7.11.tar.gz
+SOURCES/libsolv-0.7.16.tar.gz

.libsolv.metadata

@@ -1 +1 @@
-8b76afedf65264789edf51b34042e6d923dbeb9f SOURCES/libsolv-0.7.11.tar.gz
+6adefba167c60bbb282bed453bd1b9966311f91d SOURCES/libsolv-0.7.16.tar.gz

SOURCES/0001-Add-support-for-computing-hashes-using-OpenSSL.patch

@@ -1,20 +1,22 @@
-From 9839a88e4fda23b46015170b201c98da7bcdd55e Mon Sep 17 00:00:00 2001
+From 11eab76046e2df31248d358ab85bdbcf366d2c78 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
+From: Nicola Sella <nsella@redhat.com>
-Date: Fri, 25 Oct 2019 14:33:22 +0200
+Date: Wed, 11 Nov 2020 14:52:14 +0100
-Subject: [PATCH 1/2] Add support for computing hashes using OpenSSL
+Subject: [PATCH 1/1] Add support for computing hashes using OpenSSL
 
 It adds WITH_OPENSSL build option.
 If it is ON, OpenSSL will be used instead of internal implementation
 of computing hashes (MD5, SHA1, SHA224, SHA256, SHA384, SHA512).
+
+Rebase of https://github.com/openSUSE/libsolv/commit/9839a88e4fda23b46015170b201c98da7bcdd55e
 ---
- CMakeLists.txt       | 11 ++++++++++-
+ CMakeLists.txt       | 13 +++++++++++--
  src/CMakeLists.txt   | 16 +++++++++++-----
  src/chksum.c         | 32 ++++++++++++++++++++++++++++++++
  tools/CMakeLists.txt |  2 +-
- 4 files changed, 54 insertions(+), 7 deletions(-)
+ 4 files changed, 55 insertions(+), 8 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1ada004..83727358 100644
+index 3541f496..e73dc552 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -40,6 +40,7 @@ OPTION (ENABLE_ZCHUNK_COMPRESSION "Build with zchunk compression support?" OFF)
@@ -25,7 +27,7 @@ index c1ada004..83727358 100644
  
  include (GNUInstallDirs)
  message (STATUS "Libraries will be installed in ${CMAKE_INSTALL_FULL_LIBDIR}")
-@@ -161,6 +162,11 @@ INCLUDE_DIRECTORIES (${EXPAT_INCLUDE_DIRS})
+@@ -164,6 +165,11 @@ INCLUDE_DIRECTORIES (${EXPAT_INCLUDE_DIRS})
  ENDIF (WITH_LIBXML2 )
  ENDIF (ENABLE_RPMMD OR ENABLE_SUSEREPO OR ENABLE_APPDATA OR ENABLE_COMPS OR ENABLE_HELIXREPO OR ENABLE_MDKREPO)
  
@@ -37,16 +39,18 @@ index c1ada004..83727358 100644
  IF (ENABLE_ZLIB_COMPRESSION)
  FIND_PACKAGE (ZLIB REQUIRED)
  INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-@@ -281,7 +287,7 @@ ENDIF (${CMAKE_MAJOR_VERSION} GREATER 2)
+@@ -288,8 +294,8 @@ ENDIF (${CMAKE_MAJOR_VERSION} GREATER 2)
+ 
  # should create config.h with #cmakedefine instead...
  FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
-   HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS HAVE_RPMDBNEXTITERATORHEADERBLOB HAVE_RPMDBFSTAT
+-  HAVE_RPM_DB_H HAVE_RPMDBNEXTITERATORHEADERBLOB HAVE_RPMDBFSTAT
 -  WITH_LIBXML2 WITHOUT_COOKIEOPEN)
++  HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS HAVE_RPMDBNEXTITERATORHEADERBLOB HAVE_RPMDBFSTAT
 +  WITH_LIBXML2 WITHOUT_COOKIEOPEN WITH_OPENSSL)
    IF(${VAR})
      ADD_DEFINITIONS (-D${VAR}=1)
      SET (SWIG_FLAGS ${SWIG_FLAGS} -D${VAR})
-@@ -418,6 +424,9 @@ ENDIF (ENABLE_ZSTD_COMPRESSION)
+@@ -426,6 +432,9 @@ ENDIF (ENABLE_ZSTD_COMPRESSION)
  IF (WITH_SYSTEM_ZCHUNK)
  SET (SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES} ${ZCHUNK_LIBRARIES})
  ENDIF (WITH_SYSTEM_ZCHUNK)
@@ -57,7 +61,7 @@ index c1ada004..83727358 100644
  SET (SYSTEM_LIBRARIES ${RPMDB_LIBRARY} ${SYSTEM_LIBRARIES})
  ENDIF (ENABLE_RPMDB)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6abb3adb..d356c7d6 100644
+index bbf30bac..ece870ee 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -18,9 +18,8 @@ SET (libsolv_SRCS
@@ -85,17 +89,17 @@ index 6abb3adb..d356c7d6 100644
  ENDIF (HAVE_LINKER_VERSION_SCRIPT)
  
  IF (DISABLE_SHARED)
--ADD_LIBRARY (libsolv STATIC ${libsolv_SRCS})
+-    ADD_LIBRARY (libsolv STATIC ${libsolv_SRCS})
 +  ADD_LIBRARY (libsolv STATIC ${libsolv_SRCS})
  ELSE (DISABLE_SHARED)
--ADD_LIBRARY (libsolv SHARED ${libsolv_SRCS})
+-    ADD_LIBRARY (libsolv SHARED ${libsolv_SRCS})
 +  ADD_LIBRARY (libsolv SHARED ${libsolv_SRCS})
 +  IF (WITH_OPENSSL)
 +    TARGET_LINK_LIBRARIES (libsolv ${OPENSSL_CRYPTO_LIBRARY})
 +  ENDIF (WITH_OPENSSL)
  ENDIF (DISABLE_SHARED)
  
- SET_TARGET_PROPERTIES(libsolv PROPERTIES OUTPUT_NAME "solv")
+ IF (WIN32)
 diff --git a/src/chksum.c b/src/chksum.c
 index 1f8ab471..9189b744 100644
 --- a/src/chksum.c
@@ -157,33 +161,5 @@ index f19030eb..d477e195 100644
  ADD_EXECUTABLE (mergesolv mergesolv.c )
  TARGET_LINK_LIBRARIES (mergesolv toolstuff libsolvext libsolv ${SYSTEM_LIBRARIES})
 -- 
-2.26.0
+2.26.2
-
-
-From 2c2f43ccefae0892698b313afa870cce5e2a38c8 Mon Sep 17 00:00:00 2001
-From: Jaroslav Rohel <jrohel@redhat.com>
-Date: Tue, 9 Apr 2019 10:20:16 +0200
-Subject: [PATCH 2/2] Use OpenSSL for computing hashes by default
-
-It simplifies backporting to downstream, because
-it does not need to change the .spec file for using OpenSSL.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83727358..a2c313f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,7 @@ OPTION (ENABLE_ZCHUNK_COMPRESSION "Build with zchunk compression support?" OFF)
- OPTION (WITH_SYSTEM_ZCHUNK "Use system zchunk library?" OFF)
- OPTION (WITH_LIBXML2  "Build with libxml2 instead of libexpat?" OFF)
- OPTION (WITHOUT_COOKIEOPEN "Disable the use of stdio cookie opens?" OFF)
--OPTION (WITH_OPENSSL "Use OpenSSL instead of internal implementation of hashes?" OFF)
-+OPTION (WITH_OPENSSL "Use OpenSSL instead of internal implementation of hashes?" ON)
- 
- include (GNUInstallDirs)
- message (STATUS "Libraries will be installed in ${CMAKE_INSTALL_FULL_LIBDIR}")
--- 
-2.26.0
 

SPECS/libsolv.spec

@@ -34,15 +34,16 @@
 %bcond_without arch_repo
 # For handling deb + rpm at the same time
 %bcond_without multi_semantics
+%bcond_without zstd
 %endif
 
 #global commitnum 2901
 #global commit 47fbaa2a0892866d30ec0e1b4c885532d0aca7b8
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
+#global shortcommit %%(c=%%{commit}; echo ${c:0:7})
 
 Name:           lib%{libname}
-Version:        0.7.11
+Version:        0.7.16
-Release:        1%{?commit:.git.%{commitnum}.%{?shortcommit}}%{?dist}
+Release:        2%{?commit:.git.%{commitnum}.%{?shortcommit}}%{?dist}
 Summary:        Package dependency solver
 
 License:        BSD
@@ -53,7 +54,7 @@ Source:         %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 %endif
 # https://bugzilla.redhat.com/show_bug.cgi?id=1630300
-Patch1:         0001-Backport-OpenSSL-for-hashes.patch
+Patch1:         0001-Add-support-for-computing-hashes-using-OpenSSL.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -68,6 +69,8 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  xz-devel
 # -DENABLE_BZIP2_COMPRESSION=ON
 BuildRequires:  bzip2-devel
+# -DENABLE_ZSTD_COMPRESSION=ON
+BuildRequires:  libzstd-devel
 
 %description
 A free package dependency solver using a satisfiability algorithm. The
@@ -180,6 +183,7 @@ Python 3 version.
   -DWITH_OPENSSL=ON                             \
   -DENABLE_LZMA_COMPRESSION=ON                  \
   -DENABLE_BZIP2_COMPRESSION=ON                 \
+  -DENABLE_ZSTD_COMPRESSION=ON                  \
   %{?with_helix_repo:-DENABLE_HELIXREPO=ON}     \
   %{?with_suse_repo:-DENABLE_SUSEREPO=ON}       \
   %{?with_debian_repo:-DENABLE_DEBIAN=ON}       \
@@ -295,6 +299,39 @@ Python 3 version.
 %endif
 
 %changelog
+* Thu Jan 14 2021 Nicola Sella <nsella@redhat.com> - 0.7.16-2
+- Enable zstd compression in libsolv
+
+* Wed Nov 11 2020 Nicola Sella <nsella@redhat.com> - 0.7.16-1
+- Update to 0.7.16
+- selected bug fixes:
+  * make testcase_mangle_repo_names deal correctly with freed repos
+  [bnc#1177238]
+  * fix add_complex_recommends() selecting conflicted packages in
+    rare cases leading to crashes
+  * improve choicerule generation so that package updates are
+    prefered in more cases
+  * fix deduceq2addedmap clearing bits outside of the map
+  * conda: feature depriorization and fix startswith implementation
+  * Fix solvable swapping messing up idarrays
+  * fix ruleinfo of complex dependencies returning the wrong origin
+  * fix solv_zchunk decoding error if large chunks are used
+    [bnc#1159314]
+- new features
+  * new testcase_mangle_repo_names() function
+  * new solv_fmemopen() function
+  * Enable zstd compression support for sle15 and sle15-sp2
+  * Support blacklisted packages in solver_findproblemrule()
+    [bnc#1172135]
+  * Support rules with multiple negative literals in choice rule
+    generation
+  * build with -DENABLE_RPMDB_LIBRPM=1 on SUSE to support
+    multiple rpm database backends
+  * added two new function to make libzypp independent of the rpm
+    database format
+  * support conda constrains dependencies
+
+
 * Mon Apr 06 2020 Ales Matej <amatej@redhat.org> - 0.7.11-1
 - Update to 0.7.11
 - selected bug fixes: