Import of pkgsrc-2013Q2

comms/modemd/DESCR

@@ -0,0 +1,4 @@
+The modemd package includes a replacement getty called modemd
+that is designed to handle modems and offer many features not
+present in standard gettys, and a modem daemon, mpoold, that
+allows processes to share local and remote modems in pools.

comms/modemd/Makefile

@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.22 2012/10/03 11:24:42 asau Exp $
+
+DISTNAME=	modemd-970221
+PKGNAME=	modemd-19970221
+PKGREVISION=	1
+CATEGORIES=	comms
+MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+COMMENT=	Replacement getty for dialup ttys and a modem server
+
+USE_TOOLS+=	nroff
+
+MAKE_JOBS_SAFE=		no
+
+MANCOMPRESSED_IF_MANZ=	yes
+
+MAKE_ENV+=	LIBS=${LIBS:Q}
+USE_BSD_MAKEFILE=	yes
+
+INSTALLATION_DIRS=	${PKGMANDIR}/cat5 ${PKGMANDIR}/man5 \
+			${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 \
+			sbin share/examples/modemd
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "SunOS"
+LIBS+=		-lutil
+.endif
+
+LIBS.SunOS+=	-lsocket -lnsl
+CFLAGS.SunOS+=	-DFILIO_H -DNO_STRING_H -DNTELOPTS=40
+
+.include "../../mk/bsd.pkg.mk"

comms/modemd/PLIST

@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:38:41 joerg Exp $
+sbin/modemd
+sbin/mpoold
+man/man8/modemd.8
+man/man8/mpoold.8
+man/cat8/modemd.0
+man/cat8/mpoold.0
+man/man5/modemcap.5
+man/cat5/modemcap.0
+share/examples/modemd/modemcap

comms/modemd/distinfo

@@ -0,0 +1,29 @@
+$NetBSD: distinfo,v 1.12 2012/02/16 17:32:45 hans Exp $
+
+SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
+RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
+Size (modemd-970221.tar.gz) = 56093 bytes
+SHA1 (patch-aa) = 093d70c98c5fa21f3c5fff8dc5092ca0afa365ef
+SHA1 (patch-ab) = 711b600d5dfa11e859f6af1124aaa18224b37ad3
+SHA1 (patch-ac) = fe3898ea85204631e31c49a8872855c0e7c09e9d
+SHA1 (patch-ad) = f18d3ffe0658ef2709eb28d342b31361b86b1b0b
+SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba
+SHA1 (patch-af) = c438c7ddaa223ae5bdb5b4fd11c5d6304eec4008
+SHA1 (patch-ag) = 3505bf5b749288de673970ea95ab3196669feca9
+SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
+SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
+SHA1 (patch-aj) = 2837ce9ac377aa6b4f7a8c96f63ff80fcdee9b17
+SHA1 (patch-ak) = 0d60a615020abad77dae56d783667e49112593e5
+SHA1 (patch-al) = 0c24d9ea8ef1d5bc0dc56de7f2d07a7e39062693
+SHA1 (patch-am) = d740f41abf89f760431f32ca7ffa25bf1b3bd4e1
+SHA1 (patch-an) = 3369e7dc8db3f837bc4f71ec72e6f7882462c2a7
+SHA1 (patch-ao) = 64271c0955600d1ad9bc7f4c74273a537d33f71c
+SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4
+SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229
+SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4
+SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3
+SHA1 (patch-cf_sunos4.h) = efe0b9c58ad20247cbc313c1569f9d0be8901d14
+SHA1 (patch-incoming_login.c) = 62784076e0ac1e23e2e7a6f8c248f3e1fa6b6293
+SHA1 (patch-outgoing_tn.c) = 133c714eb6d33912f6edfcd12034b3155707d701
+SHA1 (patch-outgoing_tnstate.c) = da65871a0397c13e1cd345c1832e3cfbe188f629
+SHA1 (patch-outgoing_tnutil.c) = ef8b3f32a6e491d6fa56ba3a8f8c4ee64a368cc9

comms/modemd/patches/patch-aa

@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2002/11/20 07:01:06 jlam Exp $
+
+--- common/Makefile.orig	Mon Sep  9 17:11:06 1996
++++ common/Makefile
+@@ -3,8 +3,13 @@ SRCS = mcap.c errwarn.c ttio.c lock.c at
+ LIB=modemd
+ # Don't need a profiled library...
+ NOPROFILE=
++NOPIC=
+ 
+-CFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include
++CPPFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include
++
++install:
++
++libinstall:
+ 
+ .include "../Makefile.inc"
+ .include <bsd.lib.mk>

comms/modemd/patches/patch-ab

@@ -0,0 +1,89 @@
+$NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
+
+--- common/ttio.c.orig	1997-02-21 23:06:09.000000000 +0000
++++ common/ttio.c
+@@ -45,12 +45,19 @@ static char copyright[] =
+ #include "osdep.h"
+ #include "cdefs.h"
+ #include "global.h"
++#include <ctype.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include "mcap.h"
+ #include "ttio.h"
+ #include <pwd.h>
++#include <stdlib.h>
++#ifndef __sun
++#include <util.h>
++#else
++#include <sys/file.h>
++#endif
+ 
+ static void dectl PROTO ((char *, int, char *, int, char *));
+ 
+@@ -73,6 +76,16 @@ int ttsetup (name)
+     {
+       if (chown (nbuf, pw -> pw_uid, pw -> pw_gid) < 0)
+ 	warn ("Can't set owner on %s: %m", nbuf);
++#ifdef __NetBSD__
++      if (chmod (nbuf, 0600) < 0)
++        warn ("Can't set mode on %s: %m", nbuf);
++      revoke(nbuf);
++      if (ttyaction(nbuf, "modemd", "root"))
++        warn ("Can't ttyaction %s: %m", nbuf);
++
++      /* delay open so DTR stays down long enough to be detected */
++      usleep(100);
++#endif
+     }
+ 
+   /* Open the terminal device. */
+@@ -131,20 +144,19 @@ int ttsetup (name)
+   return fd;
+ }
+ 
+-void ttnormal (fd)
++void ttnormal (int fd)
+ {
+   NORMAL_TTY (ts);
+   PUT_TTY_STATE (fd, ts);
+ }
+ 
+-void tthupcl (fd)
++void tthupcl (int fd)
+ {
+   HUPCL_TTY (ts);
+   PUT_TTY_STATE (fd, ts);
+ }
+ 
+-void redirect_std (fd)
+-     int fd;
++void redirect_std (int fd)
+ {
+   int i;
+ 
+@@ -203,10 +215,8 @@ static int tteof = 0;
+ 
+ /* Match the specified string with input from the specified tty.
+    Return nonzero if input matches, zero if not. */
+-ttmatch (ANSI_DECL (int) tty, ANSI_DECL (int) timeout, VA_DOTDOTDOT)
+-     KandR (int tty;)
+-     KandR (int timeout;)
+-     va_dcl
++int
++ttmatch (int tty, int timeout, ...)
+ {
+   TIME entry, now, to;
+   int cur, curmatch, next;
+@@ -316,9 +326,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL 
+ }
+ 
+ /* Read a connect speed from standard in... */
+-ttread_connect_speed (tty, timeout)
+-     int tty;
+-     int timeout;
++int ttread_connect_speed (int tty, int timeout)
+ {
+   TIME entry, now, to;
+   int status;

comms/modemd/patches/patch-ac

@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.4 2012/02/16 17:32:45 hans Exp $
+
+--- incoming/ppp.c.orig	1996-09-10 00:35:12.000000000 +0000
++++ incoming/ppp.c	2007-10-10 16:49:36.000000000 +0000
+@@ -46,8 +46,8 @@ static char copyright[] =
+ #include "mcap.h"
+ #include <sys/time.h>
+ #include <signal.h>
+-
+-#define EOF -1
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ void ppp_detect (tty, ttyName)
+      int tty;
+@@ -79,7 +79,7 @@ void ppp_detect (tty, ttyName)
+ 	modemcap.luser = "ppp";
+ 	modemcap.program = modemcap.ppp_prog;
+ 	modemcap.logstderr = 1;
+-	setlogin (ttyName);
++	SETLOGIN (ttyName);
+ 	return;
+       }
+     else
+@@ -125,7 +125,7 @@ void ppp_detect (tty, ttyName)
+ 	    if (!lbuf)
+ 	      error ("Can't allocate space for login string.\n");
+ 	    strcpy (lbuf, modemcap.program);
+-	    strcat (lbuf, " ");
++	    strcat (lbuf, " -- ");
+ 	    strcat (lbuf, (char *)ibuf);
+ 	    modemcap.program = lbuf;
+ 	    return;

comms/modemd/patches/patch-ad

@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2012/02/16 17:32:45 hans Exp $
+
+--- incoming/Makefile.orig	Tue Sep 10 03:08:00 1996
++++ incoming/Makefile	Tue Mar  3 17:19:06 1998
+@@ -5,7 +5,7 @@
+ 
+ LIBDIR = ${.OBJDIR:S/incoming/common/g}
+ DPADD = ${LIBDIR}/libmodemd.a
+-LDADD = ${DPADD}
++LDADD = ${DPADD} ${LIBS}
+ 
+ CFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include
+ 

comms/modemd/patches/patch-ae

@@ -0,0 +1,31 @@
+$NetBSD: patch-ae,v 1.3 2000/03/09 02:28:05 wiz Exp $
+
+--- incoming/modemd.8.orig	Mon Sep  9 09:02:45 1996
++++ incoming/modemd.8	Thu Mar  9 03:11:23 2000
+@@ -16,7 +16,9 @@
+ modem.  Each instance of
+ .Xr modemd 8
+ initializes its modem to a known
+-state, and then waits either for the modem to report that the
++state, runs ttyaction(3) on the line with the action
++``modemd'', user ``root''
++and then waits either for the modem to report that the
+ telephone line to which it is attached is ringing, or for some process
+ which understands uucico-style tty locking to take the modem for its
+ own use.
+@@ -255,13 +257,13 @@
+ line.
+ .El
+ .Sh FILES
+-.Bl -tag -width /var/spool/uucp/LCK..\fIttyname\fR -compact
++.Bl -tag -width /var/spool/lock/LCK..\fIttyname\fR -compact
+ .It Pa /etc/modemcap
+ definitions which control the operation of
+ .Xr modemd 8
+ and
+ .Xr mpoold 8 .
+-.It Pa /var/spool/uucp/LCK..\fIttyname\fR
++.It Pa /var/spool/lock/LCK..\fIttyname\fR
+ lock files compatible with 
+ .Xr uucico 8 .
+ .It Pa /dev

comms/modemd/patches/patch-af

@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.2 1998/08/07 10:36:45 agc Exp $
+
+--- modemcap/Makefile.orig	Tue Sep 10 03:08:00 1996
++++ modemcap/Makefile	Tue Mar  3 17:21:39 1998
+@@ -1,6 +1,9 @@
+ MAN5=modemcap.0
+ MAN=modemcap.5
+ 
++FILES=modemcap
++FILESDIR=$(LOCALBASE)/share/examples/modemd
++
+ .SUFFIXES: .8 .7 .6 .5 .4 .3 .2 .1 .0 .ps
+ 
+ .8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
+@@ -9,9 +12,7 @@
+ all: ${MAN5}
+ 
+ .include "../Makefile.inc"
+-.include <bsd.man.mk>
+-
+-install: maninstall
++.include <bsd.prog.mk>
+ 
+ clean:
+ 	rm ${MAN5}

comms/modemd/patches/patch-ag

@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2012/02/16 17:32:45 hans Exp $
+
+--- outgoing/Makefile.orig	Tue Sep 10 03:08:00 1996
++++ outgoing/Makefile	Tue Mar  3 17:19:07 1998
+@@ -8,7 +8,7 @@
+ CFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include
+ 
+ DPADD = ${LIBDIR}/libmodemd.a
+-LDADD = ${DPADD}
++LDADD = ${DPADD} ${LIBS}
+ 
+ .include "../Makefile.inc"
+ .include <bsd.prog.mk>

comms/modemd/patches/patch-ah

@@ -0,0 +1,32 @@
+$NetBSD: patch-ah,v 1.3 2000/03/09 02:28:05 wiz Exp $
+
+--- outgoing/mpoold.8.orig	Tue Sep 10 02:27:44 1996
++++ outgoing/mpoold.8	Thu Mar  9 03:12:11 2000
+@@ -40,6 +40,11 @@
+ .Xr getty 8
+ or similar programs, since it would be easy for an unscrupulous user
+ to set up a trojan horse to answer the modem and collect passwords.
++.Sh BUGS
++.Xr mpoold 8
++should not run
++.Xr ttyaction 3
++on the tty with action ``modemd'', user ``root'', but it does anyway.
+ .Sh DIAGNOSTICS
+ See the documentation for
+ .Xr Mpoold 8
+@@ -53,13 +58,13 @@
+ and
+ .Xr mpoold 8.
+ .Sh FILES
+-.Bl -tag -width /var/spool/uucp/LCK..\fIttyname\fR -compact
++.Bl -tag -width /var/spool/lock/LCK..\fIttyname\fR -compact
+ .It Pa /etc/modemcap
+ definitions which control the operation of
+ .Xr mpoold 8
+ and
+ .Xr mpoold 8 .
+-.It Pa /var/spool/uucp/LCK..\fIttyname\fR
++.It Pa /var/spool/lock/LCK..\fIttyname\fR
+ lock files compatible with 
+ .Xr uucico 8 .
+ .It Pa /dev

comms/modemd/patches/patch-ai

@@ -0,0 +1,9 @@
+$NetBSD: patch-ai,v 1.2 1998/08/07 10:36:46 agc Exp $
+
+--- Makefile.inc.orig	Tue Sep 10 02:21:46 1996
++++ Makefile.inc	Thu Mar 19 22:12:34 1998
+@@ -1 +1,3 @@
+-BINDIR?= /usr/sbin
++BINDIR= $(LOCALBASE)/sbin
++MANDIR= $(LOCALBASE)/man
++MANINSTALL?= catinstall maninstall

comms/modemd/patches/patch-aj

@@ -0,0 +1,18 @@
+$NetBSD: patch-aj,v 1.5 2011/09/25 19:41:11 joerg Exp $
+
+--- common/mcap.c.orig	1997-02-21 23:05:16.000000000 +0000
++++ common/mcap.c
+@@ -44,10 +44,13 @@ static char copyright[] =
+ #include "osdep.h"
+ #include "cdefs.h"
+ #include "global.h"
++#include <ctype.h>
+ #include <stdio.h>
+ #include "mcap.h"
+ 
+ static void enter_modemcap PROTO ((char *));
++#include <stdlib.h>
++
+ static void parse_mcstring PROTO ((char *, struct modemcap *));
+ static void read_mcap PROTO ((void));
+ static void parse_modemcap PROTO ((char *, struct modemcap *));

comms/modemd/patches/patch-ak

@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.5 2010/12/30 09:02:52 obache Exp $
+
+--- common/atparse.c.orig	1996-04-30 07:02:36.000000000 +0000
++++ common/atparse.c
+@@ -45,6 +45,7 @@ static char copyright[] =
+ #include "cdefs.h"
+ #include "global.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ /* Convert a string of AT commands into a vector of pointers to individual
+    commands.  */

comms/modemd/patches/patch-al

@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.5 2010/12/30 09:02:52 obache Exp $
+
+--- incoming/modemd.c.orig	1996-09-10 00:34:58.000000000 +0000
++++ incoming/modemd.c
+@@ -48,6 +48,7 @@ static char copyright[] =
+ #include <syslog.h>
+ #include <pwd.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ static char *ttyName;
+ static char progName [1024];

comms/modemd/patches/patch-am

@@ -0,0 +1,9 @@
+$NetBSD: patch-am,v 1.1 2000/03/09 02:28:05 wiz Exp $
+
+--- cf/netbsd.h.orig	Sat Feb 22 00:06:26 1997
++++ cf/netbsd.h	Thu Mar  9 03:09:11 2000
+@@ -76,3 +76,4 @@
+ 
+ #define _PATH_MPOOL_PID	"/var/run/mpoold.pid"
+ #define _PATH_LOGIN	"/usr/bin/login"
++#define _PATH_TTYLOCK	"/var/spool/lock/LCK..%s"

comms/modemd/patches/patch-an

@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2006/01/12 17:13:58 joerg Exp $
+
+--- include/osdep.h.orig	2006-01-12 16:54:08.000000000 +0000
++++ include/osdep.h
+@@ -48,6 +48,6 @@
+ #include "cf/netbsd.h"
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include "cf/freebsd.h"
+ #endif

comms/modemd/patches/patch-ao

@@ -0,0 +1,10 @@
+$NetBSD: patch-ao,v 1.1 2006/01/12 17:13:58 joerg Exp $
+
+--- include/tnext.h.orig	2006-01-12 16:55:40.000000000 +0000
++++ include/tnext.h
+@@ -199,5 +199,4 @@ extern struct clocks {
+ 
+ /* other external variables */
+ extern	char **environ;
+-extern	int errno;
+ 

comms/modemd/patches/patch-ap

@@ -0,0 +1,23 @@
+$NetBSD: patch-ap,v 1.3 2011/11/25 21:34:34 joerg Exp $
+
+--- outgoing/listen.c.orig	1996-04-30 07:02:48.000000000 +0000
++++ outgoing/listen.c
+@@ -49,14 +49,17 @@ static char copyright[] =
+ #include <sys/fcntl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <netdb.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ void listener (port, addr, forkp)
+      int port;

comms/modemd/patches/patch-aq

@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.3 2011/11/25 21:34:34 joerg Exp $
+
+--- incoming/connect.c.orig	1996-04-30 07:02:43.000000000 +0000
++++ incoming/connect.c
+@@ -49,14 +49,16 @@ static char copyright[] =
+ #include <sys/fcntl.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <netdb.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
++#include <stdlib.h>
+ 
+ static void pump PROTO ((int, int));
+ 

comms/modemd/patches/patch-ar

@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.2 2011/09/25 19:41:11 joerg Exp $
+
+--- common/errwarn.c.orig	1996-09-10 00:12:34.000000000 +0000
++++ common/errwarn.c	2007-10-10 16:48:18.000000000 +0000
+@@ -46,6 +46,8 @@ static char copyright[] =
+ #include "global.h"
+ #include <syslog.h>
+ #include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ static void do_percentm PROTO ((char *obuf, char *ibuf));
+ 

comms/modemd/patches/patch-as

@@ -0,0 +1,30 @@
+$NetBSD: patch-as,v 1.2 2011/11/25 21:34:34 joerg Exp $
+
+--- outgoing/mpoold.c.orig	1996-04-30 07:02:48.000000000 +0000
++++ outgoing/mpoold.c
+@@ -50,11 +50,16 @@ static char copyright[] =
+ #include <syslog.h>
+ #include <pwd.h>
+ #include <netdb.h>
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
++#include <stdio.h>
++#include <stdlib.h>
+ 
+ static void usage PROTO ((void));
+ 
++void telnet(char *, int, int);
++
+ char **Argv;
+ 
+ int main (argc, argv, envp)
+@@ -220,7 +225,7 @@ int modemConnect(lastmodem)
+ 
+ /* Clean up loose ends before exiting... */
+ 
+-void cleanup ()
++void cleanup (void)
+ {
+   ttunlock ();
+ }

comms/modemd/patches/patch-cf_sunos4.h

@@ -0,0 +1,55 @@
+$NetBSD: patch-cf_sunos4.h,v 1.1 2012/02/16 17:32:45 hans Exp $
+
+--- cf/sunos4.h.orig	1997-02-22 00:06:27.000000000 +0100
++++ cf/sunos4.h	2012-01-26 18:21:36.676350683 +0100
+@@ -70,7 +70,6 @@
+ #define _PATH_UTMP      "/etc/utmp"
+ #define _PATH_WTMP      "/var/adm/wtmp"
+ #define _PATH_LASTLOG   "/var/adm/lastlog"
+-#define _PATH_MPOOL_PID	"/etc/mpoold.pid"
+ 
+ #define UT_NAMESIZE     8
+ #define UT_LINESIZE     8
+@@ -115,6 +114,28 @@
+ 		  (warn ("%d baud not supported: using 38400", speed),	\
+ 		   B38400))))))))))))))))
+ 
++#define NORMAL_TTY(ts)					\
++  ((ts.c_iflag |= ICRNL | IMAXBEL | BRKINT),		\
++   (ts.c_oflag |= OPOST | ONLCR),			\
++   (ts.c_cflag = (ts.c_cflag & ~CLOCAL) | HUPCL),	\
++   (ts.c_lflag |= (ICANON | ISIG | IEXTEN | ECHO | 	\
++		    ECHOE | ECHOKE | ECHOCTL | PENDIN)),\
++   (ts.c_cc [VEOF] = 4),	/* Control D */		\
++   (ts.c_cc [VEOL] = _POSIX_VDISABLE),			\
++   (ts.c_cc [VEOL2] = _POSIX_VDISABLE),			\
++   (ts.c_cc [VERASE] = 127),	/* Delete */		\
++   (ts.c_cc [VWERASE] = 23),	/* Control W */		\
++   (ts.c_cc [VKILL] = 21),	/* Control U */		\
++   (ts.c_cc [VREPRINT] = 18),	/* Control R */		\
++   (ts.c_cc [VINTR] = 3),	/* Control C */		\
++   (ts.c_cc [VQUIT] = 28),	/* Control \ */		\
++   (ts.c_cc [VSUSP] = 26),	/* Control Z */		\
++   (ts.c_cc [VDSUSP] = 6),	/* Control F */		\
++   (ts.c_cc [VSTART] = 17),	/* Control Q */		\
++   (ts.c_cc [VSTOP] = 19),	/* Control S */		\
++   (ts.c_cc [VLNEXT] = 22),	/* Control V */		\
++   (ts.c_cc [VDISCARD] = _POSIX_VDISABLE))
++
+ #define SET_TX_SPEED(ts, speed)						\
+   (ts.c_cflag = (ts.c_cflag & ~CBAUD) |					\
+    CVT_BAUD (speed))
+@@ -133,8 +154,9 @@
+ #define	_PATH_TTYLOCK	"/var/spool/locks/LCK..%s"
+ 
+ /* Varargs stuff... */
+-#include <varargs.h>
+-#define VA_DOTDOTDOT va_alist
+-#define VA_start(list, last) va_start (list)
++#include <stdarg.h>
++#define VA_DOTDOTDOT ...
++#define va_dcl
++#define VA_start(list, last) va_start (list, last)
+ 
+-#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
++#define _PATH_MPOOL_PID	"/var/run/mpoold.pid"

comms/modemd/patches/patch-incoming_login.c

@@ -0,0 +1,22 @@
+$NetBSD: patch-incoming_login.c,v 1.2 2012/02/16 17:32:45 hans Exp $
+
+--- incoming/login.c.orig	2011-11-25 20:00:14.000000000 +0000
++++ incoming/login.c
+@@ -47,6 +47,7 @@ static char copyright[] =
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <syslog.h>
++#include <stdlib.h>
+ #include "mcap.h"
+ #include "ttio.h"
+ 
+@@ -70,7 +71,9 @@ void do_login (name, ttyName)
+   /* At this point, we have carrier, so it's time to log the login... */
+   strncpy (utRec.ut_line, ttyName, UT_LINESIZE);
+   strncpy (utRec.ut_name, name, UT_NAMESIZE);
++#ifndef __sun
+   utRec.ut_host [0] = 0;
++#endif
+ 
+   loginout ();
+ }

comms/modemd/patches/patch-outgoing_tn.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-outgoing_tn.c,v 1.1 2011/12/19 13:25:22 wiz Exp $
+
+Add missing header files (for cleanup()).
+
+--- outgoing/tn.c.orig	1996-09-10 00:58:34.000000000 +0000
++++ outgoing/tn.c
+@@ -49,6 +49,8 @@ static char sccsid[] = "@(#)telnetd.c	8.
+ 
+ #include "tndefs.h"
+ #include "tnext.h"
++#include "cdefs.h"
++#include "global.h"
+ 
+ int	secflag;
+ char	tty_dev[16];

comms/modemd/patches/patch-outgoing_tnstate.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-outgoing_tnstate.c,v 1.1 2011/12/19 13:25:22 wiz Exp $
+
+Add missing header files (for cleanup()).
+
+--- outgoing/tnstate.c.orig	1996-04-30 07:02:49.000000000 +0000
++++ outgoing/tnstate.c
+@@ -40,6 +40,8 @@ static char sccsid[] = "@(#)state.c	8.1 
+ 
+ #include "tndefs.h"
+ #include "tnext.h"
++#include "cdefs.h"
++#include "global.h"
+ 
+ unsigned char	doopt[] = { IAC, DO, '%', 'c', 0 };
+ unsigned char	dont[] = { IAC, DONT, '%', 'c', 0 };

comms/modemd/patches/patch-outgoing_tnutil.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-outgoing_tnutil.c,v 1.1 2011/12/19 13:25:22 wiz Exp $
+
+Add missing header files (for cleanup()).
+
+--- outgoing/tnutil.c.orig	1996-04-30 07:02:50.000000000 +0000
++++ outgoing/tnutil.c
+@@ -41,6 +41,8 @@ static char sccsid[] = "@(#)utility.c	8.
+ #define PRINTOPTIONS
+ #include "tndefs.h"
+ #include "tnext.h"
++#include "cdefs.h"
++#include "global.h"
+ 
+ /*
+  * utility functions performing io related tasks