Let this package build on post-POSIX getline() systems.

Also include the relevant (static) libraries, where necessary, to allow
link-editing.

5 files changed, 120 insertions, 4 deletions

diff --git a/security/srp_client/distinfo b/security/srp_client/distinfo
index 494b6cbcf6e..1e5e0cb72b6 100644
--- a/security/srp_client/distinfo
+++ b/security/srp_client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/06/23 08:25:30 minskim Exp $
+$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
@@ -24,5 +24,8 @@ SHA1 (patch-ar) = 81ae924913581f4198e6b63d453c7013691bc866
 SHA1 (patch-as) = b82c64d0e3bfe453b81767c23c07c1dc5841cd96
 SHA1 (patch-at) = 1663ffd586dd1725d59cbf183ccaf2ac9aeb8fa9
 SHA1 (patch-au) = c51a86bac05e36ad355948fdade15830e7ee69c2
-SHA1 (patch-av) = bd368355cbc00aeea3c5649a7a156a881e3b26c1
+SHA1 (patch-av) = b6e8f0c8ba73103c5635ac12b165eca2fc7552e0
 SHA1 (patch-aw) = 17674291767be7c1120c706e1f938e6669e69383
+SHA1 (patch-ax) = 553fe71fba3817340a9a00db9b85b300bc6a7451
+SHA1 (patch-ay) = 69632bc7cb1de773abacd0fe7a1fb6fc16840c62
+SHA1 (patch-az) = d5abdf1eac691ca1ed628cb45b43443a5af98209
diff --git a/security/srp_client/patches/patch-av b/security/srp_client/patches/patch-av
index 7b86cf6c499..a9ba8843eaa 100644
--- a/security/srp_client/patches/patch-av
+++ b/security/srp_client/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2006/05/09 19:24:24 joerg Exp $
+$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,7 +152,6 @@ static char *temp_auth_type;
+@@ -152,13 +152,12 @@
   * NOT to be used on this machine.
   * Commonly used to disallow uucp.
   */
@@ -10,3 +10,19 @@ $NetBSD: patch-av,v 1.1 2006/05/09 19:24:24 joerg Exp $
  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);
+ 	}
diff --git a/security/srp_client/patches/patch-ax b/security/srp_client/patches/patch-ax
new file mode 100644
index 00000000000..9e797f69342
--- /dev/null
+++ b/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
diff --git a/security/srp_client/patches/patch-ay b/security/srp_client/patches/patch-ay
new file mode 100644
index 00000000000..8e40d385589
--- /dev/null
+++ b/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;
+ 
diff --git a/security/srp_client/patches/patch-az b/security/srp_client/patches/patch-az
new file mode 100644
index 00000000000..b0e816de2ff
--- /dev/null
+++ b/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;
+