--- ./tty.c.orig	2003-02-11 17:09:46.000000000 -0800
+++ ./tty.c	2003-02-11 17:11:55.000000000 -0800
@@ -146,7 +146,7 @@
 
 	if (mode == 1) {	/* lock */
 		strcpy( nam, path);
-		pid = dev_lock( nam);
+		pid = lock_dev( nam);
 		if ( pid == -1 ) {
 			syslog( LOG_ERR, "DIP: tty: lock: (%s): %s\n", nam, strerror(errno));
 			fprintf( stderr, "DIP: tty: lock: (%s): %s\n", nam, strerror(errno));
@@ -159,7 +159,7 @@
 		}
 		return 0;
 	} else if (mode == 2) { /* re-acquire a lock after a fork() */
-		pid = dev_relock( nam, 0);
+		pid = relock_dev( nam, 0);
 		if ( pid == -1 ) {
 			syslog( LOG_ERR, "DIP: tty: relock: (%s): %s\n", nam, strerror(errno));
 			fprintf( stderr, "DIP: tty: relock: (%s): %s\n", nam, strerror(errno));
@@ -172,7 +172,7 @@
 		}
 		return 0;
 	} else {	/* unlock */
-		pid = dev_unlock( nam, 0);
+		pid = unlock_dev( nam, 0);
 		if ( pid == -1 ) {
 			syslog( LOG_ERR, "DIP: tty: unlock: (%s): %s\n", nam, strerror(errno));
 			fprintf( stderr, "DIP: tty: unlock: (%s): %s\n", nam, strerror(errno));
--- ./Makefile.orig	2003-02-11 17:09:45.000000000 -0800
+++ ./Makefile	2003-02-11 17:11:55.000000000 -0800
@@ -59,7 +59,7 @@
 # If you wish, add -g flag to the next line
 #CFLAGS	= -DLINUX $(SKEYDEF) $(SECUREID) -pipe -O6 -Wall -m486
 CFLAGS = -g $(SKEYDEF) $(SECUREID) -pipe -O6 -Wall -DFSSTND \
-	-DHAVE_LIBLOCKDEV
+	-DHAVE_LIBLOCKDEV -Iliblockdev-0.9/src
 
 ###	-I/usr/src/linux/include
 
@@ -89,7 +89,7 @@
 OBJS	= main.o config.o daemon.o tty.o attach.o term.o \
 	  modem.o command.o login.o
 
-LIBS	= -llockdev 
+LIBS	= liblockdev-0.9/liblockdev.a
 
 PROTOS	= slip.o ppp.o termp.o
 
--- ./modem.c.orig	2003-02-11 17:09:46.000000000 -0800
+++ ./modem.c	2003-02-11 17:11:55.000000000 -0800
@@ -286,7 +286,8 @@
 	(void) sleep(2);
 
 	/* Hang up the modem. */
-	return(mdm_chatseq(AT_HANG, chat, 5));
+/*	return(mdm_chatseq(AT_HANG, chat, 5)); */
+	return(mdm_chatseq(AT_HANG, NULL, 5));
   }
   return(-1);
 }
--- ./version.h.orig	2003-02-11 17:09:46.000000000 -0800
+++ ./version.h	2003-02-11 17:11:55.000000000 -0800
@@ -1 +1 @@
-# define DEBVER	"3.3.7p-4 (debian)"
+# define SLKVER	"3.3.7p"
--- ./ppp.c.orig	2003-02-11 17:09:46.000000000 -0800
+++ ./ppp.c	2003-02-11 17:11:55.000000000 -0800
@@ -32,7 +32,9 @@
 do_ppp(struct dip *dip)
 {
   int stat;
+#if 0
   char string[255];
+#endif
 
   (void) strcpy((char *) dip->protocol, "PPP");
 
--- ./attach.c.orig	2003-02-11 17:09:45.000000000 -0800
+++ ./attach.c	2003-02-11 17:11:55.000000000 -0800
@@ -239,7 +239,7 @@
 	continue;
       mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr;
       if(opt_v == 1)
-	syslog(LOG_DEBUG, "proxy arp: interface addr %s mask %lx",
+	syslog(LOG_DEBUG, "proxy arp: interface addr %s mask %x",
 	       ip_ntoa(ina), ntohl(mask));
       if (((ipaddr ^ ina) & mask) != 0)
 	continue;
--- ./main.c.orig	2003-02-11 17:09:46.000000000 -0800
+++ ./main.c	2003-02-11 17:12:44.000000000 -0800
@@ -381,8 +381,7 @@
   openlog("dip", LOG_PID, LOG_DAEMON);
   
   printf("DIP: Dialup IP Protocol Driver version %s\n", VERSION);
-  printf("Written by Fred N. van Kempen, MicroWalt Corporation.\n");
-  printf("Debian version %s.\n\n", DEBVER);
+  printf("Written by Fred N. van Kempen, MicroWalt Corporation.\n\n");
 
   /* Are we called to kill off a DIP process? */
   if (opt_k == 1) {
--- ./command.c.orig	2003-02-11 17:09:45.000000000 -0800
+++ ./command.c	2003-02-11 17:11:55.000000000 -0800
@@ -2582,7 +2582,6 @@
 	switch (c) {
 	case ESC_ESC: c = ESC; break;
 	case ESC_END: c = END; break;
-	default: /* bad escape */
 	}
       }
       else if (c == END)