From a93372c814cc8ef8dce2d836aece0042ba5dafe3 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Aug 03 2012 10:03:43 +0000 Subject: Extend the input line buffer and the argument storage buffer --- diff --git a/ftp.spec b/ftp.spec index 539faae..4de32d7 100644 --- a/ftp.spec +++ b/ftp.spec @@ -1,7 +1,7 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client Name: ftp Version: 0.17 -Release: 57%{?dist} +Release: 58%{?dist} License: BSD with advertising Group: Applications/Internet Source0: ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.gz @@ -34,6 +34,7 @@ Patch25: netkit-ftp-0.17-chkmalloc.patch Patch26: netkit-ftp-0.17-man.patch Patch27: netkit-ftp-0.17-acct_ovl.patch Patch28: netkit-ftp-0.17-remove-nested-include.patch +Patch29: netkit-ftp-0.17-linelen.patch BuildRequires: glibc-devel, readline-devel, ncurses-devel @@ -75,6 +76,7 @@ file transfers. %patch26 -p1 -b .man %patch27 -p1 -b .acct_ovl %patch28 -p1 +%patch29 -p1 -b .linelen %build sh configure --with-c-compiler=gcc --enable-ipv6 @@ -107,6 +109,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man5/netrc.* %changelog +* Fri Aug 03 2012 Jan Synáček - 0.17-58 +- Extend the input line buffer and the argument storage buffer + * Fri Jul 20 2012 Jan Synáček - 0.17-57 - Remove nested include (fix compilation in rawhide) diff --git a/netkit-ftp-0.17-linelen.patch b/netkit-ftp-0.17-linelen.patch new file mode 100644 index 0000000..f077f6a --- /dev/null +++ b/netkit-ftp-0.17-linelen.patch @@ -0,0 +1,22 @@ +--- netkit-ftp-0.17-dist/ftp/ftp_var.h 2012-08-01 14:25:10.627248809 +0200 ++++ netkit-ftp-0.17-new/ftp/ftp_var.h 2012-08-01 14:29:51.756774406 +0200 +@@ -42,6 +42,7 @@ + + #include + #include ++#include + #define NTRANS_MAX 64 + + /* +@@ -108,9 +109,9 @@ Extern int ftp_port; /* htons'd port num + + Extern sigjmp_buf toplevel; /* non-local goto stuff for cmd scanner */ + +-Extern char line[200]; /* input line buffer */ ++Extern char line[PATH_MAX + 200]; /* input line buffer */ + Extern char *stringbase; /* current scan point in line buffer */ +-Extern char argbuf[200]; /* argument storage buffer */ ++Extern char argbuf[PATH_MAX + 200]; /* argument storage buffer */ + Extern char *argbase; /* current storage point in arg buffer */ + Extern int cpend; /* flag: if != 0, then pending server reply */ + Extern int mflag; /* flag: if != 0, then active multi command */