commit: 8af1e95b3b4ddf47e5300fd8a4c37888d9e1b8f2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 04:42:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 04:42:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af1e95b
sys-apps/portage: backport fix for emerge-webrsync w/ curl Signed-off-by: Sam James <sam <AT> gentoo.org> ...sync-restore-the-missing-option-arg-for-c.patch | 40 ++++++++++++++++++++++ ...-3.0.69.3.ebuild => portage-3.0.69.3-r1.ebuild} | 4 +++ 2 files changed, 44 insertions(+) diff --git a/sys-apps/portage/files/0001-emerge-webrsync-restore-the-missing-option-arg-for-c.patch b/sys-apps/portage/files/0001-emerge-webrsync-restore-the-missing-option-arg-for-c.patch new file mode 100644 index 000000000000..3dfe086566bc --- /dev/null +++ b/sys-apps/portage/files/0001-emerge-webrsync-restore-the-missing-option-arg-for-c.patch @@ -0,0 +1,40 @@ +From b876d9b1c9ce58b8ba2440cf61bca7555a0dfb9b Mon Sep 17 00:00:00 2001 +Message-ID: <b876d9b1c9ce58b8ba2440cf61bca7555a0dfb9b.1761453668.git....@gentoo.org> +From: Kerin Millar <[email protected]> +Date: Sun, 26 Oct 2025 02:46:02 +0000 +Subject: [PATCH] emerge-webrsync: restore the missing option-arg for curl + --continue-at + +The curl(1) user-agent supports a --continue-at option, which requires +an option-argument. Where the option-argument is <hyphen-dash>, curl +will automatically try to determine how to resume a transfer. Further, +emerge-webrsync forcibly injects the option if it detects that the value +of FETCHCOMMAND specifies a curl command. + +However, the option-argument was unintentionally removed during a bout +of re-factoring and (otherwise unrelated) bug fixing. This went +unnoticed until now because wget is more commonly used. Restore it. + +Fixes: f3af8263ce544750a9e9a155b1264d07a86677d4 +Signed-off-by: Kerin Millar <[email protected]> +Signed-off-by: Sam James <[email protected]> +--- + bin/emerge-webrsync | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync +index 53a3a12715..cca63ebb35 100755 +--- a/bin/emerge-webrsync ++++ b/bin/emerge-webrsync +@@ -217,7 +217,7 @@ get_fetchcommand() { + fi + ;; + curl) +- opts="--continue-at -f -S" ++ opts="--continue-at - -f -S" + if (( opt[quiet] )); then + opts+=" -s" + fi +-- +2.51.1 + diff --git a/sys-apps/portage/portage-3.0.69.3.ebuild b/sys-apps/portage/portage-3.0.69.3-r1.ebuild similarity index 98% rename from sys-apps/portage/portage-3.0.69.3.ebuild rename to sys-apps/portage/portage-3.0.69.3-r1.ebuild index c779d8c70057..699bd5e19994 100644 --- a/sys-apps/portage/portage-3.0.69.3.ebuild +++ b/sys-apps/portage/portage-3.0.69.3-r1.ebuild @@ -90,6 +90,10 @@ PDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/0001-emerge-webrsync-restore-the-missing-option-arg-for-c.patch +) + pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
