rpms/ftp/devel netkit-ftp-0.17-fdleak.patch, NONE, 1.1 netkit-ftp-0.17-size.patch, NONE, 1.1 ftp.spec, 1.41, 1.42

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/ftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27364

Modified Files:
	ftp.spec 
Added Files:
	netkit-ftp-0.17-fdleak.patch netkit-ftp-0.17-size.patch 
Log Message:
feature: for cmd size is switching to TYPE_I automatized
bug: ftp leaks socket fds when it fails to open a file (#315241)


netkit-ftp-0.17-fdleak.patch:

--- NEW FILE netkit-ftp-0.17-fdleak.patch ---
diff -up netkit-ftp-0.17/ftp/cmds.c.old netkit-ftp-0.17/ftp/cmds.c
--- netkit-ftp-0.17/ftp/cmds.c.old	2007-10-17 16:28:57.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c	2007-10-17 16:33:41.000000000 +0200
@@ -764,6 +764,7 @@ usage:
 
 	recvrequest("RETR", argv[2], argv[1], modestr,
 		    argv[1] != oldargv1 || argv[2] != oldargv2);
+	(void) close(data), data = -1;
 	restart_point = 0;
 	return (0);
 }

netkit-ftp-0.17-size.patch:

--- NEW FILE netkit-ftp-0.17-size.patch ---
diff -up netkit-ftp-0.17/ftp/cmds.c.size netkit-ftp-0.17/ftp/cmds.c
--- netkit-ftp-0.17/ftp/cmds.c.size	2007-10-10 14:17:18.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c	2007-10-10 14:17:18.000000000 +0200
@@ -1650,6 +1650,8 @@ quote1(const char *initial, int argc, ch
 	register int i, len;
 	char buf[BUFSIZ];		/* must be >= sizeof(line) */
 
+	if (strncmp(argv[1],"size",4) == 0)
+	    changetype(TYPE_I, 1);
 	(void) strcpy(buf, initial);
 	if (argc > 1) {
 		len = strlen(buf);


Index: ftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ftp.spec	24 Aug 2007 07:10:45 -0000	1.41
+++ ftp.spec	22 Oct 2007 08:11:17 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client
 Name: ftp
 Version: 0.17
-Release: 42%{?dist}
+Release: 43%{?dist}
 License: BSD with advertising
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.gz
@@ -24,6 +24,8 @@
 Patch16: netkit-ftp-0.17-nodebug.patch
 Patch17: netkit-ftp-0.17-stamp.patch
 Patch18: netkit-ftp-0.17-sigseg.patch
+Patch19: netkit-ftp-0.17-size.patch
+Patch20: netkit-ftp-0.17-fdleak.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glibc-devel, readline-devel, ncurses-devel
@@ -56,6 +58,8 @@
 %patch16 -p1 -b .nodebug
 %patch17 -p1 -b .stamp
 %patch18 -p1 -b .sigseg
+%patch19 -p1 -b .size
+%patch20 -p1 -b .fdleak
 
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
@@ -89,6 +93,11 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Mon Oct 22 2007 Marcela Maslanova <mmaslano at redhat.com> - 0.17-43
+- feature: for cmd size is switching to TYPE_I automatized
+- bug: ftp leaks socket fds when it fails to open a file (#315241)
+- rhbz#306191
+
 * Fri Aug 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 0.17-42
 - rebuilt (for mass rebuild)
 - license tag checked