commit: 9cdb541ebc99e6b83b12b5e202328b1d70632413 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Sep 30 20:02:23 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Sep 30 20:05:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdb541e
sys-apps/systemd: fix curl warnings Closes: https://bugs.gentoo.org/963528 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../systemd/files/systemd-258-curl-warnings.patch | 38 ++++++++++++++++++++++ sys-apps/systemd/systemd-258-r1.ebuild | 1 + 2 files changed, 39 insertions(+) diff --git a/sys-apps/systemd/files/systemd-258-curl-warnings.patch b/sys-apps/systemd/files/systemd-258-curl-warnings.patch new file mode 100644 index 000000000000..1b190b4dff20 --- /dev/null +++ b/sys-apps/systemd/files/systemd-258-curl-warnings.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/963528 + +From 1403faeb152e24ef74230891cc6bf1875292324f Mon Sep 17 00:00:00 2001 +From: Daan De Meyer <[email protected]> +Date: Fri, 19 Sep 2025 11:29:36 +0200 +Subject: [PATCH] tree-wide: Fix two curl warnings + +--- + src/import/pull-job.c | 2 +- + src/journal-remote/journal-upload.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/import/pull-job.c b/src/import/pull-job.c +index a0b0ef54061b9..b457c39ed1800 100644 +--- a/src/import/pull-job.c ++++ b/src/import/pull-job.c +@@ -759,7 +759,7 @@ int pull_job_begin(PullJob *j) { + if (curl_easy_setopt(j->curl, CURLOPT_XFERINFODATA, j) != CURLE_OK) + return -EIO; + +- if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0) != CURLE_OK) ++ if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0L) != CURLE_OK) + return -EIO; + + r = curl_glue_add(j->glue, j->curl); +diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c +index d669d27274f6a..05f0dad038449 100644 +--- a/src/journal-remote/journal-upload.c ++++ b/src/journal-remote/journal-upload.c +@@ -308,7 +308,7 @@ int start_upload(Uploader *u, + } + + if (STRPTR_IN_SET(arg_trust, "-", "all")) +- easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0, ++ easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L, + LOG_ERR, return -EUCLEAN); + else if (arg_trust || startswith(u->url, "https://";)) + easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE, diff --git a/sys-apps/systemd/systemd-258-r1.ebuild b/sys-apps/systemd/systemd-258-r1.ebuild index 41f00eafb531..448bbe2d954c 100644 --- a/sys-apps/systemd/systemd-258-r1.ebuild +++ b/sys-apps/systemd/systemd-258-r1.ebuild @@ -280,6 +280,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/systemd-258-shared-add-missing-alloc-util.patch" "${FILESDIR}/systemd-258-resolve-undo-change-to-return-code.patch" + "${FILESDIR}/systemd-258-curl-warnings.patch" ) if ! use vanilla; then
