[packages/pure-ftpd] rel 2; oob fix from git

arekm arekm at pld-linux.org
Wed Jan 15 10:03:37 CET 2025


commit 3ef74a2ae8db2ea0a5ffe6425c71cce617e0360f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Jan 15 08:51:57 2025 +0100

    rel 2; oob fix from git

 oob.patch      | 23 +++++++++++++++++++++++
 pure-ftpd.spec |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 5caba4a..efa875c 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without	tls		# disable SSL/TLS support
 %bcond_without	cap		# disable capabilities
 
-%define	rel	1
+%define	rel	2
 Summary:	Small, fast and secure FTP server
 Summary(pl.UTF-8):	Mały, szybki i bezpieczny serwer FTP
 Name:		pure-ftpd
@@ -36,6 +36,7 @@ Patch5:		paths.patch
 Patch6:		%{name}-apparmor.patch
 Patch7:		%{name}-mysql-utf8.patch
 Patch8:		caps.patch
+Patch9:		oob.patch
 
 Patch11:        keep-spaces.patch
 URL:		http://www.pureftpd.org/
@@ -118,6 +119,7 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %patch11 -p1
 
diff --git a/oob.patch b/oob.patch
new file mode 100644
index 0000000..5ad30e6
--- /dev/null
+++ b/oob.patch
@@ -0,0 +1,23 @@
+commit 2bbe0f25c6b905044803649a29df5f765f940b91
+Author: Frank Denis <github at pureftpd.org>
+Date:   Fri Oct 25 10:20:24 2024 +0200
+
+    Fix code similar to the one fixed in 350d66fbbd6
+    
+    Noticed by @StayPirate, thanks!
+
+diff --git a/src/ls.c b/src/ls.c
+index 9063646..94150ad 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -972,8 +972,8 @@ void donlst(const char *base)
+ 
+     if (*base != 0 && chdir(base) != 0) {
+         if (*base++ == '-') {
+-            while (!isspace((unsigned char) *base++));
+-            while (isspace((unsigned char) *base++));
++            while (*base != 0 && !isspace((unsigned char) *base++));
++            while (*base != 0 && isspace((unsigned char) *base++));
+             if (*base != 0 && chdir(base) != 0) {
+                 addreply_noformat(550, MSG_STAT_FAILURE2);
+                 return;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pure-ftpd.git/commitdiff/3ef74a2ae8db2ea0a5ffe6425c71cce617e0360f



More information about the pld-cvs-commit mailing list