 @@ -1,24 +1,25 @@
-$NetBSD: distinfo,v 1.9 2011/09/25 19:41:11 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/11/25 21:34:34 joerg 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) = 8d84156457fe4b9b1832bbcb98c2bfed51230ca8
+SHA1 (patch-ab) = fd0382bd007ea3be2be0983db8e78a865ceb0d20
 SHA1 (patch-ac) = 55f4bf4b57e1c42becb816ac4982620c42a5bf1a
 SHA1 (patch-ad) = e8c78c84b9ab58644d8e2e105416d5ef5b59fba4
 SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba
 SHA1 (patch-af) = c438c7ddaa223ae5bdb5b4fd11c5d6304eec4008
 SHA1 (patch-ag) = 8d93d4da055170a19336e127017dfe42501a0538
 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) = 653a76fba61b627668d98148825aa4f5b825aefa
+SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4
-SHA1 (patch-aq) = de93880d260d9fc499e1ee3ee1827f4845853af9
+SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229
 SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4
-SHA1 (patch-as) = 108b92c07e43556dd96d8f38c4d0657fd74ca106
+SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3
 SHA1 (patch-incoming_login.c) = 9ece373aee2ea8caa751752a5390decf390eef12

 @@ -1,29 +1,85 @@
-$NetBSD: patch-ab,v 1.3 2007/10/10 16:53:58 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2011/11/25 21:34:34 joerg Exp $
 --- common/ttio.c.orig	1997-02-21 23:06:09.000000000 +0000
-+++ common/ttio.c	2007-10-10 16:48:38.000000000 +0000
++++ common/ttio.c
-@@ -51,6 +51,7 @@ static char copyright[] =
+@@ -45,12 +45,15 @@ 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>
 +#include <util.h>
  static void dectl PROTO ((char *, int, char *, int, char *));
-@@ -73,6 +74,16 @@ int ttsetup (name)
+@@ -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;

 @@ -1,18 +1,23 @@
-$NetBSD: patch-ap,v 1.2 2007/10/10 16:53:59 rillig Exp $
+$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	2007-10-10 16:50:47.000000000 +0000
++++ outgoing/listen.c
-@@ -53,10 +53,12 @@ static char copyright[] =
+@@ -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;

 @@ -1,17 +1,22 @@
-$NetBSD: patch-aq,v 1.2 2007/10/10 16:53:59 rillig Exp $
+$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	2007-10-10 16:49:07.000000000 +0000
++++ incoming/connect.c
-@@ -53,10 +53,11 @@ static char copyright[] =
+@@ -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));

 @@ -1,13 +1,30 @@
-$NetBSD: patch-as,v 1.1 2007/10/10 16:53:59 rillig Exp $
+$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	2007-10-10 16:50:14.000000000 +0000
++++ outgoing/mpoold.c
-@@ -52,6 +52,8 @@ static char copyright[] =
+@@ -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 ();
+ }