public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/libsolv] f45: 0.7.41 bump
Date: Mon, 26 Oct 2026 11:16:51 GMT [thread overview]
Message-ID: <179301341124.1.14537900416468739379.rpms-libsolv-e7e3ae552f04@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/libsolv
Branch : f45
Commit : e7e3ae552f04e3cc1ec77cd018a42c6a5938d422
Author : Petr Písař <ppisar@redhat.com>
Date : 2026-10-26T12:16:03+01:00
Stats : +7/-326 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/libsolv/c/e7e3ae552f04e3cc1ec77cd018a42c6a5938d422?branch=f45
Log:
0.7.41 bump
---
diff --git a/.gitignore b/.gitignore
index 34ed324..3a6e9c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@
/libsolv-0.7.38.tar.gz
/libsolv-0.7.39.tar.gz
/libsolv-0.7.40.tar.gz
+/libsolv-0.7.41.tar.gz
diff --git a/0004-Add-support-for-computing-hashes-using-OpenSSL-3.1.0.patch b/0004-Add-support-for-computing-hashes-using-OpenSSL-3.1.0.patch
deleted file mode 100644
index 1a773bd..0000000
--- a/0004-Add-support-for-computing-hashes-using-OpenSSL-3.1.0.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 0caae1b210514a4d9058276104c24e351521ba28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 17 Jun 2026 13:42:12 +0200
-Subject: [PATCH] Add support for computing hashes using OpenSSL >= 3.1.0
-
-It adds WITH_OPENSSL build option, defaulting to OFF. If it is ON,
-OpenSSL will be used for computing hashes (MD5, SHA1, SHA224, SHA256,
-SHA384, SHA512) instead of the internal implementation.
-
-This patch intentionally uses OpenSSL API which has not been
-deprecated in OpenSSL 3 and 4. It calls these functions added in these
-OpenSSL version:
-
- EVP_MD_CTX_dup() since 3.1.0
- EVP_DigestInit_ex2() since 3.0.0
- EVP_MD_CTX_new() since 1.1.0
- EVP_sha512() since 1.1.0
- EVP_DigestFinal_ex() since 1.0.0
-
-The EVP_MD_CTX_dup() could be trivialy reimplemented, but since
-3.0.0 users can easily upgrade to 3.1.0, I set a minimal required
-OpenSSL version to 3.1.0.
-
-This patch is based on Jaroslav Rohel <jrohel@redhat.com> and Jonathan
-Wright <jonathan@almalinux.org> work
-<https://github.com/openSUSE/libsolv/pull/598> which used the
-deprecated OpenSSL API.
----
- CMakeLists.txt | 8 ++-
- libsolv.pc.in | 1 +
- src/CMakeLists.txt | 13 ++++-
- src/chksum.c | 4 --
- src/chksum_openssl.c | 119 +++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 139 insertions(+), 6 deletions(-)
- create mode 100644 src/chksum_openssl.c
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ba5ed51..ef377eb0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,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 (ENABLE_STATIC_TOOLS "Link the tools against the static version of the libraries?" OFF)
- OPTION (ENABLE_STATIC_BINDINGS "Link the bindings against the static version of the libraries?" OFF)
-@@ -173,6 +174,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)
-
-+IF (WITH_OPENSSL)
-+FIND_PACKAGE (OpenSSL 3.1.0 REQUIRED)
-+SET (PKGCONFIG_PRIVATE_DEPS "libcrypto")
-+ENDIF(WITH_OPENSSL)
-+
- IF (ENABLE_ZLIB_COMPRESSION)
- FIND_PACKAGE (ZLIB REQUIRED)
- INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-@@ -293,7 +299,7 @@ check_linker_flag("-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/libsolv.ver" HAV
- # should create config.h with #cmakedefine instead...
- FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
- HAVE_RPM_DB_H HAVE_RPMDBNEXTITERATORHEADERBLOB HAVE_RPMDBFSTAT
-- WITH_LIBXML2 WITHOUT_COOKIEOPEN)
-+ WITH_LIBXML2 WITHOUT_COOKIEOPEN WITH_OPENSSL)
- IF(${VAR})
- ADD_DEFINITIONS (-D${VAR}=1)
- SET (SWIG_FLAGS ${SWIG_FLAGS} -D${VAR})
-diff --git a/libsolv.pc.in b/libsolv.pc.in
-index 766146c5..ab6d3248 100644
---- a/libsolv.pc.in
-+++ b/libsolv.pc.in
-@@ -4,5 +4,6 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: libsolv
- Description: Library for solving packages
- Version: @VERSION@
-+Requires.private: @PKGCONFIG_PRIVATE_DEPS@
- Libs: -L${libdir} -lsolv
- Cflags: -I${includedir}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66ff8b5c..c6a12e2c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -19,7 +19,7 @@ SET (libsolv_SRCS
- solver.c solverdebug.c repo_solv.c repo_write.c evr.c
- queue.c repo.c repodata.c repopage.c util.c policy.c solvable.c
- transaction.c order.c rules.c problems.c linkedpkg.c cplxdeps.c
-- chksum.c chksum_impl.c md5.c sha1.c sha2.c solvversion.c selection.c
-+ chksum.c solvversion.c selection.c
- fileprovides.c diskusage.c suse.c solver_util.c cleandeps.c
- userinstalled.c filelistfilter.c decision.c)
-
-@@ -35,6 +35,12 @@ IF (ENABLE_CONDA)
- SET (libsolv_HEADERS ${libsolv_HEADERS} conda.h)
- ENDIF (ENABLE_CONDA)
-
-+IF (WITH_OPENSSL)
-+ SET (libsolv_SRCS ${libsolv_SRCS} chksum_openssl.c)
-+ELSE()
-+ SET (libsolv_SRCS ${libsolv_SRCS} chksum_impl.c md5.c sha1.c sha2.c)
-+ENDIF (WITH_OPENSSL)
-+
- IF (MULTI_SEMANTICS)
- SET (libsolv_SRCS ${libsolv_SRCS} apk.c)
- ENDIF (MULTI_SEMANTICS)
-@@ -58,6 +64,11 @@ ELSE (DISABLE_SHARED)
- ADD_LIBRARY (libsolv SHARED ${libsolv_SRCS})
- ENDIF (DISABLE_SHARED)
-
-+IF (WITH_OPENSSL)
-+ TARGET_INCLUDE_DIRECTORIES (libsolv PRIVATE ${OPENSSL_INCLUDE_DIR})
-+ TARGET_LINK_LIBRARIES (libsolv PRIVATE ${OPENSSL_CRYPTO_LIBRARY})
-+ENDIF (WITH_OPENSSL)
-+
- IF (WIN32)
- IF (DISABLE_SHARED)
- TARGET_COMPILE_DEFINITIONS(libsolv PUBLIC SOLV_STATIC_LIB)
-diff --git a/src/chksum.c b/src/chksum.c
-index a7eacdb6..2891b260 100644
---- a/src/chksum.c
-+++ b/src/chksum.c
-@@ -18,10 +18,6 @@
- #include "util.h"
- #include "chksum.h"
-
--#include "md5.h"
--#include "sha1.h"
--#include "sha2.h"
--
- #ifdef _WIN32
- #include "strfncs.h"
- #endif
-diff --git a/src/chksum_openssl.c b/src/chksum_openssl.c
-new file mode 100644
-index 00000000..e332e634
---- /dev/null
-+++ b/src/chksum_openssl.c
-@@ -0,0 +1,119 @@
-+/*
-+ * Copyright (c) 2026, SUSE LLC
-+ *
-+ * This program is licensed under the BSD license, read LICENSE.BSD
-+ * for further information
-+ */
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <openssl/evp.h>
-+
-+#include "pool.h"
-+#include "util.h"
-+#include "chksum.h"
-+
-+/* keep in sync with chksum.c */
-+struct s_Chksum {
-+ Id type;
-+ void *(*impl)(struct s_Chksum *, int op);
-+ unsigned char result[SOLV_CHKSUM_MAXLEN];
-+ EVP_MD_CTX *context;
-+ int update_failed;
-+};
-+
-+static void *
-+solv_chksum_impl(Chksum *chk, int op)
-+{
-+ if (op == SOLV_CHKSUMP_IMPL_CLONE) {
-+ Chksum *clone = solv_memdup(chk, sizeof(*chk));
-+ if (!(clone->context = EVP_MD_CTX_dup(chk->context))) {
-+ solv_free(clone);
-+ return 0;
-+ }
-+ return clone;
-+ }
-+ else if (op == SOLV_CHKSUMP_IMPL_FINALIZE)
-+ {
-+ unsigned int chk_size;
-+ chk->update_failed |= !EVP_DigestFinal_ex(chk->context, chk->result, &chk_size);
-+ EVP_MD_CTX_free(chk->context);
-+ chk->impl = 0;
-+ if (chk->update_failed)
-+ return 0;
-+ else
-+ return chk->result + chk_size;
-+ }
-+ else if (op == SOLV_CHKSUMP_IMPL_FREE)
-+ {
-+ EVP_MD_CTX_free(chk->context);
-+ chk->impl = 0;
-+ return 0;
-+ }
-+ else {
-+ return 0;
-+ }
-+}
-+
-+Chksum *
-+solv_chksum_create(Id type)
-+{
-+ Chksum *chk;
-+ const EVP_MD *evp_type;
-+
-+ chk = solv_calloc(1, sizeof(*chk));
-+ chk->type = type;
-+ chk->impl = solv_chksum_impl;
-+
-+ if (!(chk->context = EVP_MD_CTX_new())) {
-+ solv_free(chk);
-+ return 0;
-+ }
-+
-+ switch(type)
-+ {
-+ case REPOKEY_TYPE_MD5:
-+ evp_type = EVP_md5();
-+ break;
-+ case REPOKEY_TYPE_SHA1:
-+ evp_type = EVP_sha1();
-+ break;
-+ case REPOKEY_TYPE_SHA224:
-+ evp_type = EVP_sha224();
-+ break;
-+ case REPOKEY_TYPE_SHA256:
-+ evp_type = EVP_sha256();
-+ break;
-+ case REPOKEY_TYPE_SHA384:
-+ evp_type = EVP_sha384();
-+ break;
-+ case REPOKEY_TYPE_SHA512:
-+ evp_type = EVP_sha512();
-+ break;
-+ default:
-+ evp_type = 0;
-+ break;
-+ }
-+ if (evp_type && EVP_DigestInit_ex2(chk->context, evp_type, NULL))
-+ return chk;
-+
-+ EVP_MD_CTX_free(chk->context);
-+ solv_free(chk);
-+ return 0;
-+}
-+
-+void
-+solv_chksum_add(Chksum *chk, const void *data, int len)
-+{
-+ if (!chk)
-+ return;
-+ if (!chk->impl)
-+ return;
-+ if (len < 0 || len > SIZE_MAX) {
-+ chk->update_failed = 1;
-+ return;
-+ }
-+ if (!EVP_DigestUpdate(chk->context, data, (size_t)len))
-+ chk->update_failed = 1;
-+}
-+
---
-2.54.0
-
diff --git a/0005-repo_rpmdb.c-Use-TAG_SHA256HEADER-if-no-TAG_SHA1HEAD.patch b/0005-repo_rpmdb.c-Use-TAG_SHA256HEADER-if-no-TAG_SHA1HEAD.patch
deleted file mode 100644
index df4c015..0000000
--- a/0005-repo_rpmdb.c-Use-TAG_SHA256HEADER-if-no-TAG_SHA1HEAD.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 840b8dcdd68efc90ebc43d0798372f83cd5eb48e Mon Sep 17 00:00:00 2001
-From: Evan Goode <mail@evangoo.de>
-Date: Fri, 9 Oct 2026 16:52:15 -0400
-Subject: [PATCH] repo_rpmdb.c: Use TAG_SHA256HEADER if no TAG_SHA1HEADER
-
-Unlike RPM's V4 package format [1], RPM's V6 format [2] does not
-guarantee the presence of the SHA1 tag. Only SHA256 and SHA3_256 are
-guaranteed.
-
-If there is no SHA1 header, libsolv should fall back to reading the
-SHA256 header in rpmhead2solv and repo_add_rpm. This way, we do not
-change behavior for existing RPM V4 packages which may contain both a
-SHA1 and SHA256 header.
-
-[1] https://rpm-software-management.github.io/rpm/manual/format_v4.html
-[2] https://rpm-software-management.github.io/rpm/manual/format_v6.html
----
- ext/repo_rpmdb.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
-index 28b6e94d..8e3e35bb 100644
---- a/ext/repo_rpmdb.c
-+++ b/ext/repo_rpmdb.c
-@@ -1246,6 +1246,12 @@ rpmhead2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhe
- repodata_set_checksum(data, handle, SOLVABLE_HDRID, REPOKEY_TYPE_SHA1, str);
- else if (str && strlen(str) == 64)
- repodata_set_checksum(data, handle, SOLVABLE_HDRID, REPOKEY_TYPE_SHA256, str);
-+ else
-+ {
-+ str = headstring(rpmhead, TAG_SHA256HEADER);
-+ if (str && strlen(str) == 64)
-+ repodata_set_checksum(data, handle, SOLVABLE_HDRID, REPOKEY_TYPE_SHA256, str);
-+ }
- }
- u32 = headint32(rpmhead, TAG_BUILDTIME);
- if (u32)
-@@ -2064,6 +2070,15 @@ repo_add_rpm(Repo *repo, const char *rpm, int flags)
- if (solv_hex2bin(&str, hdrid, 32) == 32)
- hdridtype = REPOKEY_TYPE_SHA256;
- }
-+ else
-+ {
-+ str = headstring(state.rpmhead, TAG_SHA256HEADER);
-+ if (str && strlen(str) == 64)
-+ {
-+ if (solv_hex2bin(&str, hdrid, 32) == 32)
-+ hdridtype = REPOKEY_TYPE_SHA256;
-+ }
-+ }
- }
- }
- else
---
-2.55.0
-
diff --git a/libsolv.spec b/libsolv.spec
index f43d9dd..394e955 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -28,8 +28,8 @@
%define __cmake_switch(b:) %[%{expand:%%{?with_%{-b*}}} ? "ON" : "OFF"]
Name: lib%{libname}
-Version: 0.7.40
-Release: 3%{?dist}
+Version: 0.7.41
+Release: 1%{?dist}
Summary: Package dependency solver
# LICENSE.BSD: BSD-3-Clause text
@@ -63,12 +63,6 @@ Patch: 0002-Add-INSTALLER-to-Python-metadata.patch
# Fix a buffer overflow when decompressing solv pages (CVE-2026-48864),
# rejected by upstream, <https://github.com/openSUSE/libsolv/pull/622>.
Patch: 0003-Fix-a-buffer-overflow-when-decompressing-solv-pages.patch
-# Compute hashes with OpenSSL, in upstream after 0.7.40,
-# <https://github.com/openSUSE/libsolv/pull/627>.
-Patch: 0004-Add-support-for-computing-hashes-using-OpenSSL-3.1.0.patch
-# Use TAG_SHA256HEADER if no TAG_SHA1HEADER, merged upstream,
-# <https://github.com/openSUSE/libsolv/pull/636>.
-Patch: 0005-repo_rpmdb.c-Use-TAG_SHA256HEADER-if-no-TAG_SHA1HEAD.patch
BuildRequires: cmake >= 3.5
BuildRequires: gcc-c++
@@ -320,6 +314,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%endif
%changelog
+* Mon Oct 26 2026 Petr Pisar <ppisar@redhat.com> - 0.7.41-1
+- 0.7.41 bump
+
* Mon Oct 12 2026 Evan Goode <egoode@redhat.com> - 0.7.40-2
- Patch: Use TAG_SHA256HEADER if no TAG_SHA1HEADER
diff --git a/sources b/sources
index 41b6956..8fe646b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libsolv-0.7.40.tar.gz) = ade2e3037487f5a65272346b98f8968d422c8516118059dab297ec6846799956d1cbb1923d9cd52e04ee54533777ae272071d09ae32d721f441af1ee9d983199
+SHA512 (libsolv-0.7.41.tar.gz) = 60f5ebcfe85381e79fb560d2f3250002a5bbb79eb416650290b36189eb3c544eb2b8ab40b47aad8138623e269137a3844c4749d288ca98c0df287a561fa43317
reply other threads:[~2026-10-26 11:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179301341124.1.14537900416468739379.rpms-libsolv-e7e3ae552f04@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox