Re: [ptxdist] [APPLIED] libsolv: version bump 0.7.35 -> 0.7.40

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 5e9996f5c31f83efe905bf82ccd313a222605e1b.

Michael

[sent from post-receive hook]

On Fri, 13 Nov 2026 09:39:11 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> Also rework the HACK patch into a proper adding a corresponding option
> to hopefully get it upstream.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20261023160413.3896365-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libsolv-0.7.35/0001-HACK-don-t-use-zlib.patch b/patches/libsolv-0.7.35/0001-HACK-don-t-use-zlib.patch
> deleted file mode 100644
> index fbe3666cfb4b..000000000000
> --- a/patches/libsolv-0.7.35/0001-HACK-don-t-use-zlib.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Mon, 20 Oct 2025 18:06:48 +0200
> -Subject: [PATCH] HACK: don't use zlib
> -
> -It's only used in libsolvext and we don't use that at all.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - CMakeLists.txt | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 5ba5ed51b14b..c63f85f6360c 100644
> ---- a/CMakeLists.txt
> -+++ b/CMakeLists.txt
> -@@ -144,7 +144,7 @@ IF (${have_system} STRGREATER xx)
> -     MESSAGE (FATAL_ERROR "Can only compile for one system type.")
> - ENDIF (${have_system} STRGREATER xx)
> - 
> --SET (ENABLE_ZLIB_COMPRESSION ON)
> -+SET (ENABLE_ZLIB_COMPRESSION OFF)
> - IF (ENABLE_ARCHREPO OR ENABLE_DEBIAN)
> - SET (ENABLE_LZMA_COMPRESSION ON)
> - ENDIF (ENABLE_ARCHREPO OR ENABLE_DEBIAN)
> diff --git a/patches/libsolv-0.7.35/series b/patches/libsolv-0.7.35/series
> deleted file mode 100644
> index fdaf0fdd406a..000000000000
> --- a/patches/libsolv-0.7.35/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-HACK-don-t-use-zlib.patch
> -# a8c19c6f95d1be85fb6176ec0af317ed  - git-ptx-patches magic
> diff --git a/patches/libsolv-0.7.40/0001-Make-ENABLE_ZLIB_COMPRESSION-an-option.patch b/patches/libsolv-0.7.40/0001-Make-ENABLE_ZLIB_COMPRESSION-an-option.patch
> new file mode 100644
> index 000000000000..e2ef41f2d488
> --- /dev/null
> +++ b/patches/libsolv-0.7.40/0001-Make-ENABLE_ZLIB_COMPRESSION-an-option.patch
> @@ -0,0 +1,38 @@
> +From: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@pengutronix.de>
> +Date: Fri, 23 Oct 2026 17:24:09 +0200
> +Subject: [PATCH] Make ENABLE_ZLIB_COMPRESSION an option
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +While other compression libraries have a dedicated option, the zlib
> +compression doesn't have an option and is unconditionally set to be
> +enabled. As already relevant conditional logic exists to disable zlib,
> +make it an option to allow the user to disable it.
> +
> +Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/639]
> +Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> +---
> + CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 5ba5ed51b14b..62578f3554ff 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -37,6 +37,7 @@ OPTION (MULTI_SEMANTICS "Build with support for multiple distribution types?" OF
> + 
> + OPTION (ENABLE_LZMA_COMPRESSION "Build with lzma/xz compression support?" OFF)
> + OPTION (ENABLE_BZIP2_COMPRESSION "Build with bzip2 compression support?" OFF)
> ++OPTION (ENABLE_ZLIB_COMPRESSION "Build with zlib compression support?" ON)
> + OPTION (ENABLE_ZSTD_COMPRESSION "Build with zstd compression support?" OFF)
> + OPTION (ENABLE_ZCHUNK_COMPRESSION "Build with zchunk compression support?" OFF)
> + OPTION (WITH_SYSTEM_ZCHUNK "Use system zchunk library?" OFF)
> +@@ -144,7 +145,6 @@ IF (${have_system} STRGREATER xx)
> +     MESSAGE (FATAL_ERROR "Can only compile for one system type.")
> + ENDIF (${have_system} STRGREATER xx)
> + 
> +-SET (ENABLE_ZLIB_COMPRESSION ON)
> + IF (ENABLE_ARCHREPO OR ENABLE_DEBIAN)
> + SET (ENABLE_LZMA_COMPRESSION ON)
> + ENDIF (ENABLE_ARCHREPO OR ENABLE_DEBIAN)
> diff --git a/patches/libsolv-0.7.40/series b/patches/libsolv-0.7.40/series
> new file mode 100644
> index 000000000000..1ba921f3b95a
> --- /dev/null
> +++ b/patches/libsolv-0.7.40/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Make-ENABLE_ZLIB_COMPRESSION-an-option.patch
> +# e570144c80222bd90a570495f0b4d4c4  - git-ptx-patches magic
> diff --git a/rules/libsolv.make b/rules/libsolv.make
> index 85a7187a8041..e8f7d04cf1a8 100644
> --- a/rules/libsolv.make
> +++ b/rules/libsolv.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOLV) += libsolv
>  #
>  # Paths and names
>  #
> -LIBSOLV_VERSION	:= 0.7.35
> -LIBSOLV_SHA256	:= e6ef552846f908beb3bbf6ca718b6dd431bd8a281086d82af9a6d2a3ba919be5
> +LIBSOLV_VERSION	:= 0.7.40
> +LIBSOLV_SHA256	:= 30f529ad39d23bdc284b81ea3ed29679162011fc5fb9392635db0b4d1c8e3511
>  LIBSOLV		:= libsolv-$(LIBSOLV_VERSION)
>  LIBSOLV_SUFFIX	:= tar.gz
>  LIBSOLV_URL	:= https://github.com/openSUSE/libsolv/archive/refs/tags/$(LIBSOLV_VERSION).$(LIBSOLV_SUFFIX)
> @@ -64,6 +64,7 @@ LIBSOLV_CONF_OPT	:= \
>  	-DENABLE_SUSEREPO=OFF \
>  	-DENABLE_TCL=OFF \
>  	-DENABLE_ZCHUNK_COMPRESSION=OFF \
> +	-DENABLE_ZLIB_COMPRESSION=OFF \
>  	-DENABLE_ZSTD_COMPRESSION=OFF \
>  	-DMULTI_SEMANTICS=ON \
>  	-DUSE_VENDORDIRS=OFF \