Backport 8.12.1 to gardenlinux 1443

* gardenlinux 1443 uses openssl 3.1, but debian introduces dependency to openssl 3.2 with latest 8.12 patch * with-openssl-quic introduced in 3.2, see: https://github.com/openssl/openssl/blob/master/README-QUIC.md#using-openssl-with-quic
gardenlinux · Feb 17, 2025 · 94d859e · 94d859e
1 parent c73b36e
commit 94d859e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/debian_fixes/disable-quic-for-backport-using-openssl-3.1.patch b/debian_fixes/disable-quic-for-backport-using-openssl-3.1.patch
@@ -0,0 +1,14 @@
+diff --color -Naur a/debian/rules b/debian/rules
+--- a/debian/rules	2025-02-17 11:59:14
++++ b/debian/rules	2025-02-17 12:01:19
+@@ -55,8 +55,8 @@
+ 	autoreconf -fi && \
+ 	cp ../../ltmain.sh . && \
+ 	dh_auto_configure ${CONFIGURE_ARGS} --with-openssl \
+-		--with-openssl-quic \
+-		--with-nghttp3
++		--without-ngtcp2 \
++		--without-nghttp3
+ endif
+ ifeq ($(filter pkg.curl.no-gnutls,$(DEB_BUILD_PROFILES)),)
+ 	mkdir -p debian/build-gnutls
diff --git a/debian_fixes/series b/debian_fixes/series
@@ -0,0 +1 @@
+disable-quic-for-backport-using-openssl-3.1.patch
diff --git a/prepare_source b/prepare_source
@@ -27,4 +27,6 @@ mv "$dir/src/debian/libcurl3t64-gnutls.lintian-overrides" "$dir/src/debian/libcu
 sed -i "s/libcurl3t64-gnutls/libcurl3-gnutls/" "$dir/src/debian/libcurl3-gnutls.lintian-overrides"
 sed -i "s/libcurl3t64-gnutls/libcurl3-gnutls/" "$dir/src/debian/libcurl3-gnutls.symbols"
 
+apply_patches debian_fixes
+
 version_suffix=gl0~bp1443
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		disable-quic-for-backport-using-openssl-3.1.patch