Split patch. Add missing return. Fix cast away of value.

3 files changed, 44 insertions, 23 deletions

diff --git a/net/bsddip/distinfo b/net/bsddip/distinfo
index aa8ad870999..fccb6591099 100644
--- a/net/bsddip/distinfo
+++ b/net/bsddip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2006/06/30 16:17:27 tron Exp $
+$NetBSD: distinfo,v 1.2 2013/09/10 14:26:49 joerg Exp $
 
 SHA1 (bsddip-1.02.tar.Z) = f938ba32fcbb958c6a9632502d6728cb0a8bac4c
 RMD160 (bsddip-1.02.tar.Z) = 799b899cee5ef1b8a49c8a0929a2c4f0d17bcbab
 Size (bsddip-1.02.tar.Z) = 78191 bytes
-SHA1 (patch-aa) = 597aa71afc9cc8bcb38ad4be949d42630db0b840
-SHA1 (patch-ab) = 657e3dd81394df2d8789222776a14ce083a252b6
+SHA1 (patch-ab) = 63e5634844aba32e0f1467783743d1d6b97bf74a
 SHA1 (patch-ac) = 0bf7e78142ef21167475fd9af4071494054016e9
+SHA1 (patch-daemon.c) = f70a5313c4926f7bed62aebc15b43251c0bb2bff
diff --git a/net/bsddip/patches/patch-ab b/net/bsddip/patches/patch-ab
index 5e797ade33a..eae0956af06 100644
--- a/net/bsddip/patches/patch-ab
+++ b/net/bsddip/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
+$NetBSD: patch-ab,v 1.2 2013/09/10 14:26:49 joerg Exp $
 
---- tty.c.orig	Sat Jul  1 01:41:05 1995
-+++ tty.c	Sat Sep  9 08:37:14 1995
-@@ -140,9 +140,10 @@
+--- tty.c.orig	1995-06-30 23:41:05.000000000 +0000
++++ tty.c
+@@ -140,9 +140,10 @@ int  tty_nomesg ( void )
  int  tty_lock ( char *path, int mode )
  {
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
  
  
    if ( mode )					/* locking on ?		*/
-@@ -152,32 +153,71 @@
+@@ -152,32 +153,71 @@ int  tty_lock ( char *path, int mode )
        return 0;					/* standard input	*/
      }
  
@@ -103,7 +103,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
  
      /*
       *  Make sure UUCP owns the lockfile.  Required by some packages.
-@@ -215,7 +255,26 @@
+@@ -215,7 +255,26 @@ int  tty_lock ( char *path, int mode )
    return 0;
  }
  
@@ -130,7 +130,16 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
  
  /*
   *  Find a serial speed code in the table.
-@@ -965,7 +1024,6 @@
+@@ -482,7 +541,7 @@ int  tty_set_disc ( int disc )
+   }
+ 
+ 
+-  if ( ( disc == SLIPDISC ) )
++  if ( disc == SLIPDISC )
+   {
+ 
+     int	 tmp_unit = -1;
+@@ -965,7 +1024,6 @@ int  tty_open ( char *name )
    char	*sp;
    char	path [ MAXPATHLEN ];
  
@@ -138,7 +147,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
    /*
     *  Try opening the TTY device.
     */
-@@ -985,8 +1043,10 @@
+@@ -985,8 +1043,10 @@ int  tty_open ( char *name )
      else
        sp = name;
  
@@ -151,7 +160,7 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
      {
        (void) fprintf ( stderr, "DIP: tty: open(%s, RW): %s\n",
  						path, strerror ( errno ) );
-@@ -1118,10 +1178,4 @@
+@@ -1118,10 +1178,5 @@ int  tty_open ( char *name )
    {
      return 0 ;
    }
@@ -161,15 +170,5 @@ $NetBSD: patch-ab,v 1.1 2006/06/30 16:17:27 tron Exp $
 -   * OK, all done.  Lock this terminal line.
 -   */
 -  return tty_lock ( sp, 1 );
++  return 0;
  }
---- daemon.c.orig	Sat Jul  1 01:41:05 1995
-+++ daemon.c	Sat Sep  9 08:20:00 1995
-@@ -168,6 +168,8 @@
-     openlog ( "DIP", LOG_PID, LOG_DAEMON );
-   }
- 
-+  /* note the race condition here; ick! */
-+  tty_relock();
- 
-   (void) signal ( SIGALRM, sig_catcher );
-   (void) alarm ( mydip.timeout );
diff --git a/net/bsddip/patches/patch-daemon.c b/net/bsddip/patches/patch-daemon.c
new file mode 100644
index 00000000000..a333eea5149
--- /dev/null
+++ b/net/bsddip/patches/patch-daemon.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-daemon.c,v 1.1 2013/09/10 14:26:49 joerg Exp $
+
+--- daemon.c.orig	1995-06-30 23:41:05.000000000 +0000
++++ daemon.c
+@@ -126,7 +126,7 @@ void  dip_setup ( void )
+   /*
+    *  Fire up the protocol here. 
+    */
+-  (int) protosw [ mydip.protonr - 1 ].func ( );
++  (void) protosw [ mydip.protonr - 1 ].func ( );
+ 
+ 
+   /*
+@@ -168,6 +168,8 @@ int  dip_daemon ( void )
+     openlog ( "DIP", LOG_PID, LOG_DAEMON );
+   }
+ 
++  /* note the race condition here; ick! */
++  tty_relock();
+ 
+   (void) signal ( SIGALRM, sig_catcher );
+   (void) alarm ( mydip.timeout );