From 5d02e9010e662e12f718174a184f478974481a08 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 23 Sep 2003 10:42:09 +0000
Subject: Use vsnprintf instead of vsprintf in one place where user supplies
 part of the string. Bump PKGREVISION.

---
 net/wu-ftpd/Makefile         |  4 ++--
 net/wu-ftpd/distinfo         |  4 ++--
 net/wu-ftpd/patches/patch-ai | 23 ++++++++++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'net/wu-ftpd')

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index b1b52e3814e..563d3becb1d 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/09/05 09:09:25 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/23 10:42:09 wiz Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 
 DISTNAME=	wu-ftpd-2.6.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
 		ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
diff --git a/net/wu-ftpd/distinfo b/net/wu-ftpd/distinfo
index 0c222104306..7d8285ebb36 100644
--- a/net/wu-ftpd/distinfo
+++ b/net/wu-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/09/05 09:09:25 wiz Exp $
+$NetBSD: distinfo,v 1.9 2003/09/23 10:42:09 wiz Exp $
 
 SHA1 (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = e39112bd8a67f189b6a8da8dd81ceb00a910e271
 Size (wu-ftpd/wu-ftpd-2.6.2.tar.gz) = 354784 bytes
@@ -12,4 +12,4 @@ SHA1 (patch-ac) = b5f6142045bb092e7dc6b1420d17c15d594d9350
 SHA1 (patch-ad) = 3aafdad6da3ae50272d78c605f3bc2285b0ea085
 SHA1 (patch-af) = 6f9fe289ea5af19ba4c85f63109e8e47e5b21bca
 SHA1 (patch-ag) = 59cc211f4770e5e447b2cd9ca7bd5ab3dc07fc3d
-SHA1 (patch-ai) = 4e4582f39b39a726a5326824c48e0df69ff3cf4d
+SHA1 (patch-ai) = 2c866946d003fe474c74a2c1b90b87953bd99902
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index e747fa5c3db..51479800c02 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
+$NetBSD: patch-ai,v 1.8 2003/09/23 10:42:11 wiz Exp $
 
---- src/ftpd.c.orig	Mon Jun 26 21:52:06 2000
-+++ src/ftpd.c	Mon Jun 26 21:52:06 2000
+--- src/ftpd.c.orig	Tue Sep 23 12:34:51 2003
++++ src/ftpd.c
 @@ -75,6 +75,7 @@
  #include <grp.h>
  #endif
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
  
  #ifdef HAVE_SYS_SYSLOG_H
  #include <sys/syslog.h>
-@@ -2296,7 +2300,8 @@
+@@ -2370,7 +2374,8 @@ void end_login(void)
      (void) seteuid((uid_t) 0);
      if (logged_in)
  	if (wtmp_logging)
@@ -30,7 +30,7 @@ $NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
      pw = NULL;
  #ifdef AFS_AUTH
      ktc_ForgetAllTokens();
-@@ -2785,7 +2790,8 @@
+@@ -2869,7 +2874,8 @@ void pass(char *passwd)
  #ifdef DEBUG
  	syslog(LOG_DEBUG, "about to call wtmp");
  #endif
@@ -40,7 +40,7 @@ $NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
      }
      logged_in = 1;
  
-@@ -5317,7 +5323,9 @@
+@@ -5459,7 +5465,9 @@ void reply(int n, char *fmt,...)
  		*p = '\0';
  
  	    /* send a line...(note that this overrides dolreplies!) */
@@ -50,7 +50,7 @@ $NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
  
  	    if (p)
  		ptr = p + 1;	/* set to the next line... (\0 is handled in the while) */
-@@ -5941,6 +5949,8 @@
+@@ -6083,6 +6091,8 @@ void dologout(int status)
  	(void) seteuid((uid_t) 0);
  	if (wtmp_logging)
  	    wu_logwtmp(ttyline, pw->pw_name, remotehost, 0);
@@ -59,3 +59,12 @@ $NetBSD: patch-ai,v 1.7 2000/06/26 20:09:35 rh Exp $
      }
      if (logging)
  	syslog(LOG_INFO, "FTP session closed");
+@@ -7378,7 +7388,7 @@ int SockPrintf(FILE *sockfp, char *forma
+     char buf[32768];
+ 
+     va_start(ap, format);
+-    vsprintf(buf, format, ap);
++    vsnprintf(buf, sizeof(buf), format, ap);
+     va_end(ap);
+     return SockWrite(buf, 1, strlen(buf), sockfp);
+ }
-- 
cgit v1.2.3