sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (917ba34cf7aad0bd086f224fa66a43b979738a67)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (917ba34cf7aad0bd086f224fa66a43b979738a67)
- Date: Fri, 6 Jun 2025 21:53:41 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
ftp/curl/HISTORY | 3
ftp/curl/PRE_BUILD | 4 -
ftp/curl/patches/0001-ftp-pasv.patch | 120
+++++++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+), 1 deletion(-)
New commits:
commit 917ba34cf7aad0bd086f224fa66a43b979738a67
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
ftp/curl: added patch to fix --ftp-pasv option in 8.14.1
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index c2ad500..c77b09f 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2025-06-06 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/0001-ftp-pasv.patch: added to fix --ftp-pasv
option
+
2025-06-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 8.14.1, SECURITY_PATCH++, (CVE-2025-5399)
diff --git a/ftp/curl/PRE_BUILD b/ftp/curl/PRE_BUILD
index df257be..828a60a 100755
--- a/ftp/curl/PRE_BUILD
+++ b/ftp/curl/PRE_BUILD
@@ -3,4 +3,6 @@ cd "${SOURCE_DIRECTORY}" &&
if is_depends_enabled ${SPELL} nghttp3; then
patch -p1 < "${SPELL_DIRECTORY}/ngtcp2-openssl.patch"
-fi
+fi &&
+
+apply_patch_dir "patches"
diff --git a/ftp/curl/patches/0001-ftp-pasv.patch
b/ftp/curl/patches/0001-ftp-pasv.patch
new file mode 100644
index 0000000..80c5f70
--- /dev/null
+++ b/ftp/curl/patches/0001-ftp-pasv.patch
@@ -0,0 +1,120 @@
+From ab0b40722489019f36d1f34eec9d6e41a72c9e17 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan AT coneharvesters.com>
+Date: Fri, 6 Jun 2025 10:21:09 -0700
+Subject: [PATCH] tool_getparam: fix --ftp-pasv
+
+This boolean option was moved to the wrong handling function. Add a test
+to verify the option.
+
+Reported-by: fjaell on github
+Fixes #17545
+Closes #17547
+---
+ src/tool_getparam.c | 6 ++---
+ tests/data/Makefile.am | 2 +-
+ tests/data/test1547 | 59 ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 63 insertions(+), 4 deletions(-)
+ create mode 100644 tests/data/test1547
+
+diff --git a/src/tool_getparam.c b/src/tool_getparam.c
+index 51156e46b97e..3e561177acee 100644
+--- a/src/tool_getparam.c
++++ b/src/tool_getparam.c
+@@ -1900,6 +1900,9 @@ static ParameterError opt_bool(struct GlobalConfig
*global,
+ case C_SESSIONID: /* --sessionid */
+ config->disable_sessionid = !toggle;
+ break;
++ case C_FTP_PASV: /* --ftp-pasv */
++ tool_safefree(config->ftpport);
++ break;
+ case C_FTP_SSL_CONTROL: /* --ftp-ssl-control */
+ config->ftp_ssl_control = toggle;
+ break;
+@@ -2293,9 +2296,6 @@ static ParameterError opt_filestring(struct
GlobalConfig *global,
+ case C_URL: /* --url */
+ err = parse_url(global, config, nextarg);
+ break;
+- case C_FTP_PASV: /* --ftp-pasv */
+- tool_safefree(config->ftpport);
+- break;
+ case C_SOCKS5: /* --socks5 */
+ /* socks5 proxy to use, and resolves the name locally and passes on the
+ resolved address */
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index 1ef85cd3a2da..446674605835 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -203,7 +203,7 @@ test1508 test1509 test1510 test1511 test1512 test1513
test1514 test1515 \
+ test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \
+ test1524 test1525 test1526 test1527 test1528 test1529 test1530 test1531 \
+ test1532 test1533 test1534 test1535 test1536 test1537 test1538 test1539 \
+-test1540 test1541 test1542 test1543 test1544 test1545 test1546 \
++test1540 test1541 test1542 test1543 test1544 test1545 test1546 test1547 \
+ \
+ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \
+ test1558 test1559 test1560 test1561 test1562 test1563 test1564 test1565 \
+diff --git a/tests/data/test1547 b/tests/data/test1547
+new file mode 100644
+index 000000000000..244151a5abd1
+--- /dev/null
++++ b/tests/data/test1547
+@@ -0,0 +1,59 @@
++<testcase>
++# Based on test100 & test101
++<info>
++<keywords>
++FTP
++PASV
++LIST
++</keywords>
++</info>
++#
++# Server-side
++<reply>
++<data mode="text">
++total 20
++drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
++drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
++drwxr-xr-x 2 98 98 512 May 2 1996 curl-releases
++-r--r--r-- 1 0 1 35 Jul 16 1996 README
++lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
++dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
++drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
++dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
++drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
++dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
++</data>
++</reply>
++
++#
++# Client-side
++<client>
++<server>
++ftp
++</server>
++<name>
++FTP dir list PASV overriding PORT
++</name>
++<command>
++ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv
++</command>
++</client>
++
++#
++# Verify data after the test has been "shot"
++<verify>
++<strip>
++QUIT
++</strip>
++<protocol>
++USER anonymous
++PASS ftp AT example.com
++PWD
++CWD test-%TESTNUMBER
++EPSV
++TYPE A
++LIST
++QUIT
++</protocol>
++</verify>
++</testcase>
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (917ba34cf7aad0bd086f224fa66a43b979738a67), Pavel Vinogradov, 06/06/2025
Archive powered by MHonArc 2.6.24.