Import of pkgsrc-2013Q2

security/srp_client/DESCR

@@ -0,0 +1,8 @@
+SRP stands for the Secure Remote Password protocol, and it represents
+a new mechanism for performing secure password-based authentication
+and key exchange over any type of network. SRP offers both security
+and convenience improvements over authentication techniques currently
+in use.
+
+This package builds the entire source tree but only installs(/packages) the
+client side programs.

security/srp_client/Makefile

@@ -0,0 +1,65 @@
+# $NetBSD: Makefile,v 1.41 2013/06/17 11:46:28 joerg Exp $
+
+DISTNAME=		srp-1.4.4
+PKGNAME=		srp-client-1.4.4
+PKGREVISION=		2
+CATEGORIES=		security net
+MASTER_SITES=		ftp://ftp.zedz.net/pub/crypto/programs/srp/
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://srp.stanford.edu/
+COMMENT=		Client programs using Secure Remote Password protocol
+LICENSE=		srp_client-license
+
+RESTRICTED=		Licensor makes vague patent claims.
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+
+CRYPTO=			yes
+GNU_CONFIGURE=		yes
+
+CPPFLAGS+=		-Dunix=1
+#CPPFLAGS+=		-Dkrb_get_err_text=k_strerror
+
+CONFIGURE_ARGS+=	--with-srp --with-cast --enable-loginf
+
+.if exists(/usr/lib/libkrb.a)
+CONFIGURE_ARGS+=	--with-krb4
+
+.include "../../mk/bsd.prefs.mk"
+
+SED_PATTERN=	-e "s,include/kerberos,include/kerberosIV,"
+.if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == ""
+SED_PATTERN+=	-e "s,-ldes,-ldes -lroken -lcom_err -lcrypt,"
+.else
+SED_PATTERN+=	-e "s,-ldes,-ldes -lcom_err,"
+.endif
+
+post-patch:
+	for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in		\
+		telnet/configure.in telnet/configure;			\
+	do								\
+		cd ${WRKSRC} &&						\
+		${SED}  ${SED_PATTERN} $$FILE > $$FILE.patched &&	\
+		${MV} $$FILE.patched $$FILE;				\
+	done
+.endif
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/telnet/telnet/telnet \
+	    ${DESTDIR}${PREFIX}/bin/srptelnet
+	${INSTALL_DATA} ${WRKSRC}/telnet/telnet/telnet.1 \
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/srptelnet.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftp/ftp ${DESTDIR}${PREFIX}/bin/srpftp
+	${INSTALL_DATA} ${WRKSRC}/ftp/ftp/ftp.M ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/srpftp.1
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=	-Wno-error=return-type
+.endif
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

security/srp_client/PLIST

@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:51 zuntum Exp $
+bin/srpftp
+bin/srptelnet
+man/man1/srpftp.1
+man/man1/srptelnet.1

security/srp_client/distinfo

@@ -0,0 +1,31 @@
+$NetBSD: distinfo,v 1.10 2011/04/01 21:56:14 agc Exp $
+
+SHA1 (srp-1.4.4.tar.gz) = 56b8b3c29bee2b995b74acb5303dab326265f9b3
+RMD160 (srp-1.4.4.tar.gz) = b55cc6c8c0128d1ad49e4a553a696f59fcf838df
+Size (srp-1.4.4.tar.gz) = 1183636 bytes
+SHA1 (patch-aa) = fefb8a7540c3c7e91b6c407a463a39bef948e0c8
+SHA1 (patch-ab) = cba14830f3dcae42c814d9ccb19cbdb5464eabb0
+SHA1 (patch-ac) = e36400de37b9b8c7f641cdbe44a46253e65a081d
+SHA1 (patch-ad) = d9869838822ab8d43c10dd1d8242f9ee49f857d7
+SHA1 (patch-ae) = 0c7d48d8f6afaa1cf7173fcef76ca978a70a7e33
+SHA1 (patch-af) = 4a5d21b667f39cfba61478614f4497710463aa06
+SHA1 (patch-ag) = 81eff66b05d11a943e9b66b9e31904d612eca449
+SHA1 (patch-ah) = 914544e6a2ae6c07be03ac8c5c46f9d996e8f3a5
+SHA1 (patch-ai) = ea2f81385d83b36f12ff2a63fc8b9cc9aad68674
+SHA1 (patch-aj) = b35e5bd9978636beec36c3d0f96f677ca55284f7
+SHA1 (patch-ak) = 6d54c4826a9c58c779c6db13c31439fa95237dd7
+SHA1 (patch-al) = 175abe5a1d8c1f25927d9eac27137f33d3c000d4
+SHA1 (patch-am) = 5bd30758e27b9e64c08c2b8842c38ca527561184
+SHA1 (patch-an) = 421d3a81506430d28ee3e488857039db8da6e763
+SHA1 (patch-ao) = 9a94713f9e1b737b0d7fe5d249d2cb56e0290e1d
+SHA1 (patch-ap) = 8ae5263217a001e526c727aaee86fb0116382efc
+SHA1 (patch-aq) = 8e4ed900c6558b3fa1177579f06a74f8a813bb7a
+SHA1 (patch-ar) = 81ae924913581f4198e6b63d453c7013691bc866
+SHA1 (patch-as) = b82c64d0e3bfe453b81767c23c07c1dc5841cd96
+SHA1 (patch-at) = 1663ffd586dd1725d59cbf183ccaf2ac9aeb8fa9
+SHA1 (patch-au) = c51a86bac05e36ad355948fdade15830e7ee69c2
+SHA1 (patch-av) = b6e8f0c8ba73103c5635ac12b165eca2fc7552e0
+SHA1 (patch-aw) = 17674291767be7c1120c706e1f938e6669e69383
+SHA1 (patch-ax) = 553fe71fba3817340a9a00db9b85b300bc6a7451
+SHA1 (patch-ay) = 69632bc7cb1de773abacd0fe7a1fb6fc16840c62
+SHA1 (patch-az) = d5abdf1eac691ca1ed628cb45b43443a5af98209

security/srp_client/patches/patch-aa

@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $
+
+--- base/src/login.c.orig	Fri Dec 11 15:14:01 1998
++++ base/src/login.c	Fri Jun 18 06:56:49 1999
+@@ -34,6 +34,9 @@
+ 
+ #include "prototypes.h"
+ #include "defines.h"
++#if defined(unix)
++#include <sys/param.h>
++#endif
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <pwd.h>
+@@ -45,6 +48,8 @@
+ 
+ #if HAVE_LASTLOG_H
+ #include <lastlog.h>
++#elif (defined(BSD) && BSD >= 199306)
++#include <utmp.h>
+ #else
+ #include "lastlog_.h"
+ #endif
+@@ -75,7 +80,11 @@
+  * Needed for MkLinux DR1/2/2.1 - J.
+  */
+ #ifndef LASTLOG_FILE
++#if (defined(BSD) && BSD >= 199306)
++#define LASTLOG_FILE _PATH_LASTLOG
++#else
+ #define LASTLOG_FILE "/var/log/lastlog"
++#endif
+ #endif
+ 
+ char *host = "";

security/srp_client/patches/patch-ab

@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $
+
+--- base/libmisc/limits.c.orig	Wed Dec  9 20:43:21 1998
++++ base/libmisc/limits.c	Fri Jun 18 06:47:16 1999
+@@ -84,6 +84,8 @@
+ 	return 0;
+ }
+ 
++extern	struct utmp	*getutent();
++
+ /* Counts the number of user logins and check against the limit*/
+ static int
+ check_logins(name, maxlogins)

security/srp_client/patches/patch-ac

@@ -0,0 +1,100 @@
+$NetBSD: patch-ac,v 1.2 2004/09/08 14:30:00 markd Exp $
+
+Rename setmode (and clearmode for consistency) to avoid clash with unistd.h.
+
+--- telnet/telnet/commands.c.orig	1998-12-11 11:50:48.000000000 +1300
++++ telnet/telnet/commands.c
+@@ -64,11 +64,12 @@ static char sccsid[] = "@(#)commands.c	8
+ #include <fcntl.h>
+ #endif	/* CRAY */
+ 
++#include <unistd.h>	/* vfork() */
+ #include <signal.h>
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ 
+ #include <arpa/telnet.h>
+@@ -110,7 +111,8 @@ extern int isprefix();
+ extern char **genget();
+ extern int Ambiguous();
+ 
+-static call();
++typedef int (*intrtn_t) __P((int, char *[]));
++static call(intrtn_t, ...);
+ 
+ typedef struct {
+ 	char	*name;		/* command name */
+@@ -1156,13 +1158,13 @@ dolmmode(bit, on)
+ }
+ 
+     int
+-setmode(bit)
++setlmode(bit)
+ {
+     return dolmmode(bit, 1);
+ }
+ 
+     int
+-clearmode(bit)
++clearlmode(bit)
+ {
+     return dolmmode(bit, 0);
+ }
+@@ -1188,18 +1190,18 @@ static struct modelist ModeList[] = {
+ #endif
+     { "", "", 0 },
+     { "",	"These require the LINEMODE option to be enabled", 0 },
+-    { "isig",	"Enable signal trapping",	setmode, 1, MODE_TRAPSIG },
+-    { "+isig",	0,				setmode, 1, MODE_TRAPSIG },
+-    { "-isig",	"Disable signal trapping",	clearmode, 1, MODE_TRAPSIG },
+-    { "edit",	"Enable character editing",	setmode, 1, MODE_EDIT },
+-    { "+edit",	0,				setmode, 1, MODE_EDIT },
+-    { "-edit",	"Disable character editing",	clearmode, 1, MODE_EDIT },
+-    { "softtabs", "Enable tab expansion",	setmode, 1, MODE_SOFT_TAB },
+-    { "+softtabs", 0,				setmode, 1, MODE_SOFT_TAB },
+-    { "-softtabs", "Disable character editing",	clearmode, 1, MODE_SOFT_TAB },
+-    { "litecho", "Enable literal character echo", setmode, 1, MODE_LIT_ECHO },
+-    { "+litecho", 0,				setmode, 1, MODE_LIT_ECHO },
+-    { "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO },
++    { "isig",	"Enable signal trapping",	setlmode, 1, MODE_TRAPSIG },
++    { "+isig",	0,				setlmode, 1, MODE_TRAPSIG },
++    { "-isig",	"Disable signal trapping",	clearlmode, 1, MODE_TRAPSIG },
++    { "edit",	"Enable character editing",	setlmode, 1, MODE_EDIT },
++    { "+edit",	0,				setlmode, 1, MODE_EDIT },
++    { "-edit",	"Disable character editing",	clearlmode, 1, MODE_EDIT },
++    { "softtabs", "Enable tab expansion",	setlmode, 1, MODE_SOFT_TAB },
++    { "+softtabs", 0,				setlmode, 1, MODE_SOFT_TAB },
++    { "-softtabs", "Disable character editing",	clearlmode, 1, MODE_SOFT_TAB },
++    { "litecho", "Enable literal character echo", setlmode, 1, MODE_LIT_ECHO },
++    { "+litecho", 0,				setlmode, 1, MODE_LIT_ECHO },
++    { "-litecho", "Disable literal character echo", clearlmode, 1, MODE_LIT_ECHO },
+     { "help",	0,				modehelp, 0 },
+ #ifdef	KLUDGELINEMODE
+     { "kludgeline", 0,				dokludgemode, 1 },
+@@ -2607,19 +2609,14 @@ static Command cmdtab2[] = {
+  * Call routine with argc, argv set from args (terminated by 0).
+  */
+ 
+-    /*VARARGS1*/
+-    static
+-call(va_alist)
+-    va_dcl
++static int
++call(intrtn_t routine, ...)
+ {
+     va_list ap;
+-    typedef int (*intrtn_t)();
+-    intrtn_t routine;
+     char *args[100];
+     int argno = 0;
+ 
+-    va_start(ap);
+-    routine = (va_arg(ap, intrtn_t));
++    va_start(ap, routine);
+     while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ 	;
+     }

security/srp_client/patches/patch-ad

@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $
+
+--- ftp/ftp/pclose.c.orig	Wed Dec  9 20:43:25 1998
++++ ftp/ftp/pclose.c	Fri Jun 18 06:54:14 1999
+@@ -17,6 +17,8 @@
+ #include <sys/wait.h>
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
++#else
++#include <unistd.h>	/* vfork() */
+ #endif
+ #define sig_t my_sig_t
+ #define sigtype RETSIGTYPE

security/srp_client/patches/patch-ae

@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2007/06/23 08:25:30 minskim Exp $
+
+--- base/lib/shadow_.h.orig	1998-12-09 17:43:21.000000000 -0800
++++ base/lib/shadow_.h
+@@ -70,7 +70,6 @@ struct	spwd {
+ #if defined(__STDC__)
+ struct	spwd	*getspent (void);
+ struct	spwd	*getspnam (const char *);
+-struct	spwd	*sgetspent (const char *);
+ struct	spwd	*fgetspent (FILE *);
+ void	setspent (void);
+ void	endspent (void);

security/srp_client/patches/patch-af

@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2000/08/23 23:26:46 wiz Exp $
+
+--- telnet/libtelnet/enc-proto.h.orig	Thu Dec 10 02:44:43 1998
++++ telnet/libtelnet/enc-proto.h
+@@ -163,10 +163,4 @@
+ #define des_set_random_generator_seed des_random_seed
+ #endif
+ 
+-int  des_new_random_key P((Block));
+-void des_set_random_generator_seed P((Block));
+-int des_key_sched P((Block, Schedule));
+-void des_ecb_encrypt P((Block, Block, Schedule, int));
+-int  des_string_to_key P((char *, Block));
+-void des_fixup_key_parity P((Block));
+ #endif	/* ENCRYPTION */

security/srp_client/patches/patch-ag

@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.2 2002/01/20 01:30:37 wiz Exp $
+
+--- telnet/libtelnet/kerberos.c.orig	Thu Dec 10 02:44:43 1998
++++ telnet/libtelnet/kerberos.c
+@@ -75,10 +75,7 @@
+ #include "misc.h"
+ 
+ int kerberos4_cksum P((unsigned char *, int));
+-int krb_mk_req P((KTEXT, char *, char *, char *, u_long));
+-int krb_rd_req P((KTEXT, char *, char *, u_long, AUTH_DAT *, char *));
+ int krb_kntoln P((AUTH_DAT *, char *));
+-int krb_get_cred P((char *, char *, char *, CREDENTIALS *));
+ int krb_get_lrealm P((char *, int));
+ int kuserok P((AUTH_DAT *, char *));
+ 

security/srp_client/patches/patch-ah

@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/09/24 15:35:06 hubertf Exp $
+
+--- telnet/telnetd/sys_term.c.orig	Sun Sep 24 11:23:05 2000
++++ telnet/telnetd/sys_term.c
+@@ -1401,7 +1401,7 @@
+ 	char *autoname;
+ {
+ 	register int i;
+-#if defined(OSF) || defined(ultrix) || defined(__hpux)
++#if defined(OSF) || defined(ultrix) || defined(__hpux) || defined(__NetBSD__)
+ 	time_t time();
+ #else
+ 	long time();

security/srp_client/patches/patch-ai

@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2001/03/23 10:31:51 wiz Exp $
+
+--- telnet/libtelnet/encrypt.h.orig	Thu Dec 10 02:44:43 1998
++++ telnet/libtelnet/encrypt.h	Thu Mar 22 19:31:18 2001
+@@ -60,6 +60,11 @@
+ #define	DIR_DECRYPT		1
+ #define	DIR_ENCRYPT		2
+ 
++/* XXX: work around broken MIT kerberos4 headers on <=1.4.* */
++#ifdef _
++#undef _
++#endif
++
+ typedef	unsigned char Block[8];
+ typedef unsigned char *BlockT;
+ typedef struct { Block _; } Schedule[16];

security/srp_client/patches/patch-aj

@@ -0,0 +1,82 @@
+$NetBSD: patch-aj,v 1.3 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/utmp.c.orig	1998-12-10 14:43:22.000000000 +1300
++++ base/libmisc/utmp.c
+@@ -37,6 +37,12 @@
+ #include <utmpx.h>
+ #endif
+ 
++#if HAVE_UTMPX_H && defined(__NetBSD__)
++#undef HAVE_SETUTENT
++#undef HAVE_GETUTENT
++#undef HAVE_ENDUTENT
++#endif
++
+ #include <fcntl.h>
+ #include <stdio.h>
+ 
+@@ -93,6 +99,10 @@ checkutmp (picky)
+ #endif
+ #endif
+ 
++#ifdef LOGIN_PROCESS /* USG */
++	ut = NULL;
++#endif
++
+ #if HAVE_UTMPX_H
+ 	setutxent ();
+ #endif
+@@ -141,17 +151,21 @@ checkutmp (picky)
+ 		if (utx)
+ 			utxent = *utx;
+ #endif
++#if HAVE_GETUTENT
+ 		while ((ut = getutent()))
+ 			if (ut->ut_pid == pid)
+ 				break;
+ 
+ 		if (ut)
+ 			utent = *ut;
++#endif
+ 
+ #if HAVE_UTMPX_H
+ 		endutxent();
+ #endif
++#if HAVE_ENDUTENT
+ 		endutent();
++#endif
+ 
+ 		if (!ut) {
+  			puts(NO_UTENT);
+@@ -188,6 +202,7 @@ checkutmp (picky)
+ 		if (strncmp(line, "/dev/", 5) == 0)
+ 			line += 5;
+ 
++#if !defined(__NetBSD__)
+  		strncpy (utent.ut_line, line, sizeof utent.ut_line);
+ 		if ((ut = getutline(&utent)))
+  			strncpy(utent.ut_id, ut->ut_id, sizeof ut->ut_id);
+@@ -206,6 +221,7 @@ checkutmp (picky)
+ 		gettimeofday((struct timeval *) &utxent.ut_tv, NULL);
+ 		utent.ut_time = utxent.ut_tv.tv_sec;
+ #endif
++#endif /* !NetBSD */
+ 	}
+ #else	/* !USG */
+ 
+@@ -283,6 +299,7 @@ setutmp (name, line)
+ 			break;
+ 		}
+ 	}
++#if HAVE_GETUTENT
+ 	while (utmp = getutent ()) {
+ 		if (utmp->ut_pid == pid) {
+ 			found_utmp = 1;
+@@ -357,6 +374,7 @@ setutmp (name, line)
+ 
+ 	utxent = utxline;
+ 	utent = utline;
++#endif
+ 	
+ #else /* !SVR4 */
+ 	struct	utmp	utmp;

security/srp_client/patches/patch-ak

@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- libsrp/srptest.c.orig	2006-01-20 00:06:08.000000000 +0000
++++ libsrp/srptest.c
+@@ -20,13 +20,12 @@
+  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include "t_defines.h"
+ #include "t_pwd.h"
+ #include "t_sha.h"
+ 
+-extern int errno;
+-
+ main(argc, argv)
+      int argc;
+      char **argv;

security/srp_client/patches/patch-al

@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/lib/port.c.orig	2006-01-20 00:09:03.000000000 +0000
++++ base/lib/port.c
+@@ -38,8 +38,6 @@ RCSID("$Id: port.c,v 1.2 1997/05/01 23:1
+ #include "defines.h"
+ #include "port.h"
+ 
+-extern	int	errno;
+-
+ static	FILE	*ports;
+ 
+ /*

security/srp_client/patches/patch-am

@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/login_access.c.orig	2006-01-20 00:09:42.000000000 +0000
++++ base/libmisc/login_access.c
+@@ -42,7 +42,6 @@ RCSID("$Id: login_access.c,v 1.2 1997/05
+ #include <stdlib.h>
+ 
+ extern struct group *getgrnam();
+-extern int errno;
+ 
+ #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64)
+ #undef MAXHOSTNAMELEN

security/srp_client/patches/patch-an

@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/xmalloc.c.orig	2006-05-09 18:10:57.000000000 +0000
++++ base/libmisc/xmalloc.c
+@@ -16,8 +16,6 @@ RCSID("$Id: xmalloc.c,v 1.1.1.1 1996/08/
+ 
+ #include "defines.h"
+ 
+-extern char *malloc();
+-
+ char *
+ xmalloc(size)
+ 	unsigned size;

security/srp_client/patches/patch-ao

@@ -0,0 +1,20 @@
+$NetBSD: patch-ao,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/libmisc/chowntty.c.orig	2006-05-09 18:12:33.000000000 +0000
++++ base/libmisc/chowntty.c
+@@ -35,6 +35,7 @@ RCSID("$Id: chowntty.c,v 1.3 1997/05/01 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <grp.h>
+ 
+@@ -72,7 +73,6 @@ chown_tty(tty, info)
+ 	const char *tty;
+ 	const struct passwd *info;
+ {
+-	extern	int	errno;
+ 	char	buf[BUFSIZ];
+ 	char	*group;		/* TTY group name or number */
+ 	struct	group	*grent;

security/srp_client/patches/patch-ap

@@ -0,0 +1,21 @@
+$NetBSD: patch-ap,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- base/src/tconf.c.orig	2006-05-09 18:13:46.000000000 +0000
++++ base/src/tconf.c
+@@ -20,6 +20,7 @@
+  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <errno.h>
+ #include <unistd.h>	/* close getlogin */
+ #include <stdlib.h>	/* atexit exit */
+ #include <stdio.h>
+@@ -33,8 +34,6 @@
+ extern int  optind;
+ extern char *optarg;
+ 
+-extern int errno;
+-
+ struct pre_struct {
+   char * pre_mod;
+   char * pre_gen;

security/srp_client/patches/patch-aq

@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/libtelnet/read_password.c.orig	2006-05-09 18:56:06.000000000 +0000
++++ telnet/libtelnet/read_password.c
+@@ -52,6 +52,10 @@ static char sccsid[] = "@(#)read_passwor
+ 
+ #if	defined(RSA_ENCPWD) || defined(KRB4_ENCPWD) || defined(SRP)
+ 
++#if defined(__DragonFly__)
++#define USE_TERMIO 1
++#endif
++
+ #include <stdio.h>
+ #include <strings.h>
+ #include <sys/ioctl.h>

security/srp_client/patches/patch-ar

@@ -0,0 +1,24 @@
+$NetBSD: patch-ar,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/telnet/externs.h.orig	2006-05-09 18:56:33.000000000 +0000
++++ telnet/telnet/externs.h
+@@ -45,7 +45,7 @@
+ #endif
+ 
+ #ifndef	USE_TERMIO
+-# if BSD > 43 || defined(SYSV_TERMIO)
++# if BSD > 43 || defined(SYSV_TERMIO) || defined(__DragonFly__)
+ #  define USE_TERMIO
+ # endif
+ #endif
+@@ -100,10 +100,6 @@ typedef unsigned char cc_t;
+ 
+ #define	SUBBUFSIZE	576
+ 
+-#ifndef CRAY
+-extern int errno;		/* outside this world */
+-#endif /* !CRAY */
+-
+ #if	!defined(P)
+ # ifdef	__STDC__
+ #  define	P(x)	x

security/srp_client/patches/patch-as

@@ -0,0 +1,10 @@
+$NetBSD: patch-as,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- telnet/telnetd/telnetd.h.orig	2006-05-09 18:59:33.000000000 +0000
++++ telnet/telnetd/telnetd.h
+@@ -45,5 +45,4 @@
+ 
+ /* other external variables */
+ extern	char **environ;
+-extern	int errno;
+ 

security/srp_client/patches/patch-at

@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- ftp/ftp/ftp_var.h.orig	2006-05-09 19:00:49.000000000 +0000
++++ ftp/ftp/ftp_var.h
+@@ -131,7 +131,6 @@ extern char macbuf[4096];
+ 
+ extern	char *tail();
+ extern	char *remglob();
+-extern	int errno;
+ extern	char *mktemp();
+ 
+ #if (defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))) || defined(HAVE_STDARG_H)

security/srp_client/patches/patch-au

@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2006/05/09 19:24:24 joerg Exp $
+
+--- ftp/ftp/glob.c.orig	2006-05-09 19:03:06.000000000 +0000
++++ ftp/ftp/glob.c
+@@ -76,7 +76,6 @@ static	int tglob();
+ char	**ftpglob();
+ char	*globerr;
+ char	*home;
+-extern	int errno;
+ static	char *strspl(), *strend();
+ char	**copyblk();
+ 

security/srp_client/patches/patch-av

@@ -0,0 +1,28 @@
+$NetBSD: patch-av,v 1.2 2011/04/01 21:56:14 agc Exp $
+
+--- ftp/ftpd/ftpd.c.orig	2006-05-09 19:09:46.000000000 +0000
++++ ftp/ftpd/ftpd.c
+@@ -152,13 +152,12 @@
+  * NOT to be used on this machine.
+  * Commonly used to disallow uucp.
+  */
+-extern	int errno;
+ extern	char *crypt();
+ extern	char version[];
+ extern	char *home;		/* pointer to home directory for glob */
+ extern	FILE *ftpd_popen(), *fopen(), *freopen();
+ extern	int  ftpd_pclose(), fclose();
+-extern	char *getline();
++extern	char *srp_ftp_getline();
+ extern	char cbuf[];
+ extern	off_t restart_point;
+ 
+@@ -1800,7 +1799,7 @@
+ 	if (!transflag)
+ 		return;
+ 	cp = tmpline;
+-	if (getline(cp, sizeof(tmpline), stdin) == NULL) {
++	if (srp_ftp_getline(cp, sizeof(tmpline), stdin) == NULL) {
+ 		reply(221, "You could at least say goodbye.");
+ 		dologout(0);
+ 	}

security/srp_client/patches/patch-aw

@@ -0,0 +1,49 @@
+$NetBSD: patch-aw,v 1.1 2006/05/09 19:25:30 joerg Exp $
+
+--- telnet/configure.orig	1998-12-11 01:07:03.000000000 +0000
++++ telnet/configure
+@@ -2428,7 +2428,7 @@ case "${host}" in
+ EOF
+ 
+     ;;
+-  *bsd*)
++  *bsd* | dragonfly*)
+     cat >> confdefs.h <<EOF
+ #define DEFAULT_IM "\r\n${version_num}BSD UNIX (%h) (%t)\r\n\r\r\n\r"
+ EOF
+@@ -2539,7 +2539,7 @@ EOF
+ esac
+ 
+ case "${host}" in
+-  *bsd* | *unicos* | *reno* | *tahoe*)
++  *bsd* | *unicos* | *reno* | *tahoe* | dragonfly*)
+     cat >> confdefs.h <<\EOF
+ #define LINEMODE 1
+ EOF
+@@ -2566,7 +2566,7 @@ EOF
+ esac
+ 
+ case "${host}" in
+-  *bsd* | *reno* | *unicos6* | *sunos4* | *solaris2* | *linux* | *ultrix* | *irix* | *osf* | *hpux*)
++  *bsd* | *reno* | *unicos6* | *sunos4* | *solaris2* | *linux* | *ultrix* | *irix* | *osf* | *hpux* | dragonfly*)
+     cat >> confdefs.h <<\EOF
+ #define USE_TERMIO 1
+ EOF
+@@ -2612,7 +2612,7 @@ EOF
+ EOF
+ 
+     fi;;
+-  *bsd* | *reno* | *tahoe* | *solaris2* | *linux* | *hpux* | *dynix* | *osf* | *next*)
++  *bsd* | *reno* | *tahoe* | *solaris2* | *linux* | *hpux* | *dynix* | *osf* | *next* | dragonfly*)
+     if test "$enable_loginf" = "no"
+     then
+       cat >> confdefs.h <<\EOF
+@@ -2653,7 +2653,7 @@ EOF
+ EOF
+ 
+     ;;
+-  *bsd* | *reno* | *tahoe* | *unicos7-9* | *sunos4* | *solaris2* | *linux* | *dynix* | *osf* | *next* | *convex*)
++  *bsd* | *reno* | *tahoe* | *unicos7-9* | *sunos4* | *solaris2* | *linux* | *dynix* | *osf* | *next* | *convex* | dragonfly*)
+     ;;
+   *)
+     cat >> confdefs.h <<\EOF

security/srp_client/patches/patch-ax

@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2011/04/01 21:56:14 agc Exp $
+
+--- telnet/telnet/Makefile.in	2011/03/30 11:33:24	1.1
++++ telnet/telnet/Makefile.in	2011/03/30 11:33:56
+@@ -82,7 +82,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) 
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ ../../base/libmisc/libmisc.a ../../base/lib/libshadow.a
+ telnet_OBJECTS =  authenc.o commands.o main.o network.o ring.o sys_bsd.o \
+ telnet.o terminal.o tn3270.o utilities.o
+ telnet_DEPENDENCIES =  ../libtelnet/libtelnet.a

security/srp_client/patches/patch-ay

@@ -0,0 +1,42 @@
+$NetBSD: patch-ay,v 1.1 2011/04/01 21:56:14 agc Exp $
+
+--- ftp/ftpd/ftpcmd.y	2011/03/30 11:35:57	1.1
++++ ftp/ftpd/ftpcmd.y	2011/03/30 11:36:35
+@@ -909,10 +909,10 @@
+ #include <arpa/telnet.h>
+ 
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * srp_ftp_getline - a hacked up version of fgets to ignore TELNET escape codes.
+  */
+ char *
+-getline(s, n, iop)
++srp_ftp_getline(s, n, iop)
+ 	char *s;
+ 	register FILE *iop;
+ {
+@@ -1013,7 +1013,7 @@
+ 		*s = '\0';
+ 		return(s);
+ 	    }
+-	    if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n", 
++	    if (debug) syslog(LOG_DEBUG, "srp_ftp_getline got %d from %s <%s>\n", 
+ 			      len, cs, mic?"MIC":"ENC");
+ #ifdef SRP
+ 	if (strcmp(auth_type, "SRP") == 0)
+@@ -1142,13 +1142,13 @@
+ 		case CMD:
+ 			(void) signal(SIGALRM, toolong);
+ 			(void) alarm((unsigned) timeout);
+-			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++			if (srp_ftp_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ 				reply(221, "You could at least say goodbye.");
+ 				dologout(0);
+ 			}
+ 			(void) alarm(0);
+ 
+-			/* If getline() finds an error, the string is null */
++			/* If srp_ftp_getline() finds an error, the string is null */
+ 			if (*cbuf == '\0')
+ 				continue;
+ 

security/srp_client/patches/patch-az

@@ -0,0 +1,42 @@
+$NetBSD: patch-az,v 1.1 2011/04/01 21:56:14 agc Exp $
+
+--- ftp/ftpd/ftpcmd.c	2011/03/30 11:35:57	1.1
++++ ftp/ftpd/ftpcmd.c	2011/03/30 11:36:46
+@@ -1985,10 +1985,10 @@
+ #include <arpa/telnet.h>
+ 
+ /*
+- * getline - a hacked up version of fgets to ignore TELNET escape codes.
++ * srp_ftp_getline - a hacked up version of fgets to ignore TELNET escape codes.
+  */
+ char *
+-getline(s, n, iop)
++srp_ftp_getline(s, n, iop)
+ 	char *s;
+ 	register FILE *iop;
+ {
+@@ -2089,7 +2089,7 @@
+ 		*s = '\0';
+ 		return(s);
+ 	    }
+-	    if (debug) syslog(LOG_DEBUG, "getline got %d from %s <%s>\n", 
++	    if (debug) syslog(LOG_DEBUG, "srp_ftp_getline got %d from %s <%s>\n", 
+ 			      len, cs, mic?"MIC":"ENC");
+ #ifdef SRP
+ 	if (strcmp(auth_type, "SRP") == 0)
+@@ -2218,13 +2218,13 @@
+ 		case CMD:
+ 			(void) signal(SIGALRM, toolong);
+ 			(void) alarm((unsigned) timeout);
+-			if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
++			if (srp_ftp_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ 				reply(221, "You could at least say goodbye.");
+ 				dologout(0);
+ 			}
+ 			(void) alarm(0);
+ 
+-			/* If getline() finds an error, the string is null */
++			/* If srp_ftp_getline() finds an error, the string is null */
+ 			if (*cbuf == '\0')
+ 				continue;
+