[Midnightbsd-cvs] src [6908] trunk: tftp with ssl

[laffer1 at midnightbsd.org]

Revision: 6908
          http://svnweb.midnightbsd.org/src/?rev=6908
Author:   laffer1
Date:     2014-10-31 19:12:35 -0400 (Fri, 31 Oct 2014)
Log Message:
-----------
tftp with ssl

Modified Paths:
--------------
    trunk/UPDATING
    trunk/contrib/tnftp/tnftp.h
    trunk/usr.bin/ftp/Makefile

Modified: trunk/UPDATING
===================================================================
--- trunk/UPDATING	2014-10-31 23:00:43 UTC (rev 6907)
+++ trunk/UPDATING	2014-10-31 23:12:35 UTC (rev 6908)
@@ -1,5 +1,9 @@
 Updating Information for MidnightBSD users.
 
+20141031:
+	tnftp 20141031 fixes a security vulnerability with tnftp,
+	CVE-2014-8517. 
+
 20141028:
 	OpenSSL 0.9.8zc
 

Modified: trunk/contrib/tnftp/tnftp.h
===================================================================
--- trunk/contrib/tnftp/tnftp.h	2014-10-31 23:00:43 UTC (rev 6907)
+++ trunk/contrib/tnftp/tnftp.h	2014-10-31 23:12:35 UTC (rev 6908)
@@ -5,6 +5,8 @@
 
 #include "tnftp_config.h"
 
+#include <sys/uio.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <ctype.h>

Modified: trunk/usr.bin/ftp/Makefile
===================================================================
--- trunk/usr.bin/ftp/Makefile	2014-10-31 23:00:43 UTC (rev 6907)
+++ trunk/usr.bin/ftp/Makefile	2014-10-31 23:12:35 UTC (rev 6908)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/usr.bin/ftp/Makefile,v 1.3 2012/12/31 08:08:11 laffer1 Exp $
+# $MidnightBSD$
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
@@ -19,9 +19,17 @@
 CFLAGS+= -DINET6
 .endif
 
+.if ${MK_OPENSSL} != "no"
+CFLAGS+=        -DWITH_SSL
+DPADD=          ${LIBSSL} ${LIBCRYPTO}
+LDADD=          -lssl -lcrypto
+SRCS+=		ssl.c
+.endif
+
+
 CFLAGS+= -I${.CURDIR} -I${TNFTP}
-LDADD=	-ledit -ltermcap -lutil
-DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
+LDADD+=	-ledit -ltermcap -lutil
+DPADD+=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
 
 WARNS?=	2