diff mbox series

[10/15] libsolv: upgrade 0.7.37 -> 0.7.39

Message ID 20260619083305.3505156-10-alex.kanavin@gmail.com
State New
Headers show
Series [01/15] gn: upgrade to latest revision | expand

Commit Message

Alexander Kanavin June 19, 2026, 8:32 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Drop a patch as upstream solved the issue separately by moving the
data to the heap.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...0001-compress_buf-fix-musl-segfaults.patch | 41 -------------------
 .../{libsolv_0.7.37.bb => libsolv_0.7.39.bb}  |  3 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch
 rename meta/recipes-extended/libsolv/{libsolv_0.7.37.bb => libsolv_0.7.39.bb} (92%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch b/meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch
deleted file mode 100644
index c2734eb676..0000000000
--- a/meta/recipes-extended/libsolv/libsolv/0001-compress_buf-fix-musl-segfaults.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From 847fb663583fd01121313d1ec0e9ceab240c9143 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <adam.duskett@amarulasolutions.com>
-Date: Thu, 26 Mar 2026 12:11:42 +0100
-Subject: [PATCH] compress_buf: fix musl segfaults
-
-By default, musl has a stack size of 128K, while the compress_buf
-method uses 256KB of stack space!
-
-The easiest course of action is to add `static thread_local`
-to htab and hnext.
-
-Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/612]
-
-Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
----
- src/repopage.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/repopage.c b/src/repopage.c
-index 77c7fcc7..470e4f34 100644
---- a/src/repopage.c
-+++ b/src/repopage.c
-@@ -29,6 +29,7 @@
- #include <assert.h>
- #include <fcntl.h>
- #include <time.h>
-+#include <threads.h>
- 
- #ifdef _WIN32
-   #include <windows.h>
-@@ -100,8 +101,8 @@ compress_buf(const unsigned char *in, unsigned int in_len,
-   unsigned int oo = 0;		/* out-offset */
-   unsigned int io = 0;		/* in-offset */
- #define HS (65536)
--  Ref htab[HS];
--  Ref hnext[BLOCK_SIZE];
-+  static thread_local Ref htab[HS];
-+  static thread_local Ref hnext[BLOCK_SIZE];
-   unsigned int litofs = 0;
-   memset(htab, -1, sizeof (htab));
-   memset(hnext, -1, sizeof (hnext));
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.37.bb b/meta/recipes-extended/libsolv/libsolv_0.7.39.bb
similarity index 92%
rename from meta/recipes-extended/libsolv/libsolv_0.7.37.bb
rename to meta/recipes-extended/libsolv/libsolv_0.7.39.bb
index 1a95d1d11d..48fa03eb70 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.37.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.39.bb
@@ -9,11 +9,10 @@  LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "expat zlib zstd"
 
 SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https;tag=${PV} \
-           file://0001-compress_buf-fix-musl-segfaults.patch \
            file://run-ptest \
 "
 
-SRCREV = "806c0513cd0799a37802f483710cfbdcc6d16b5f"
+SRCREV = "2f58c6f86edd978d6bdbd87dce9c85388e9b9dcc"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"