Control: tags 1124401 + pending Dear maintainer,
I've prepared an NMU for libreswan (versioned as 5.2-2.4) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for libreswan-5.2 libreswan-5.2 changelog | 7 ++ patches/0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch | 30 ++++++++++ patches/series | 1 3 files changed, 38 insertions(+) diff -Nru libreswan-5.2/debian/changelog libreswan-5.2/debian/changelog --- libreswan-5.2/debian/changelog 2025-12-02 23:05:39.000000000 +0200 +++ libreswan-5.2/debian/changelog 2026-01-15 22:39:49.000000000 +0200 @@ -1,3 +1,10 @@ +libreswan (5.2-2.4) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with recent curl. (Closes: #1124401) + + -- Adrian Bunk <[email protected]> Thu, 15 Jan 2026 22:39:49 +0200 + libreswan (5.2-2.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru libreswan-5.2/debian/patches/0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch libreswan-5.2/debian/patches/0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch --- libreswan-5.2/debian/patches/0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch 1970-01-01 02:00:00.000000000 +0200 +++ libreswan-5.2/debian/patches/0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch 2026-01-15 22:39:20.000000000 +0200 @@ -0,0 +1,30 @@ +From 592e82770bf9cab2bc1edee1b89fa4252cfba63f Mon Sep 17 00:00:00 2001 +From: Andrew Cagney <[email protected]> +Date: Tue, 24 Jun 2025 10:26:19 -0400 +Subject: building: pass 1L into curl_easy_setopt(CURLOPT_NOSIGNAL) + +should make curl 8.14.1 happy + +Internally the value is read from the stack using va_arg(long) + +see #2319 libreswan-5.2 doesn't compile with curl 8.14.1 +--- + programs/pluto/fetch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/programs/pluto/fetch.c b/programs/pluto/fetch.c +index 7d07fb084b..7fb1c59e5b 100644 +--- a/programs/pluto/fetch.c ++++ b/programs/pluto/fetch.c +@@ -117,7 +117,7 @@ static err_t fetch_curl(const char *url, chunk_t *blob, struct logger *logger) + CESO(CURLOPT_ERRORBUFFER, errorbuffer); + CESO(CURLOPT_CONNECTTIMEOUT, timeout); + CESO(CURLOPT_TIMEOUT, 2 * timeout); +- CESO(CURLOPT_NOSIGNAL, 1); /* work around for libcurl signal bug */ ++ CESO(CURLOPT_NOSIGNAL, 1L); /* work around for libcurl signal bug */ + + if (curl_iface != NULL) + CESO(CURLOPT_INTERFACE, curl_iface); +-- +2.47.3 + diff -Nru libreswan-5.2/debian/patches/series libreswan-5.2/debian/patches/series --- libreswan-5.2/debian/patches/series 2025-05-04 23:43:22.000000000 +0300 +++ libreswan-5.2/debian/patches/series 2026-01-15 22:39:48.000000000 +0200 @@ -1,3 +1,4 @@ 0001-do-not-use-git-version.patch 0002-debian-pam.d-pluto.patch 0004-Include-features.h-to-enable-NSPR-workaround-for-854.patch +0001-building-pass-1L-into-curl_easy_setopt-CURLOPT_NOSIG.patch
