-diff -r -N -u ppp-2.4.0.orig/configure ppp-2.4.0/configure
---- ppp-2.4.0.orig/configure Mon Apr 24 03:41:40 2000
-+++ ppp-2.4.0/configure Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/configure ppp-2.4.0b4/configure
+--- ppp-2.4.0b4.org/configure Sun Feb 11 11:05:09 2001
++++ ppp-2.4.0b4/configure Sun Feb 11 11:06:03 2001
@@ -131,7 +131,7 @@
makext=$orig_makext
fi
rm -f $dir/Makefile
if [ -f $dir/Makefile.$makext ]; then
ln -s Makefile.$makext $dir/Makefile
-diff -r -N -u ppp-2.4.0.orig/linux/Makefile.top ppp-2.4.0/linux/Makefile.top
---- ppp-2.4.0.orig/linux/Makefile.top Mon Apr 17 06:39:26 2000
-+++ ppp-2.4.0/linux/Makefile.top Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/linux/Makefile.top ppp-2.4.0b4/linux/Makefile.top
+--- ppp-2.4.0b4.org/linux/Makefile.top Sun Feb 11 11:05:07 2001
++++ ppp-2.4.0b4/linux/Makefile.top Sun Feb 11 11:06:03 2001
@@ -4,6 +4,7 @@
BINDIR = $(DESTDIR)/usr/sbin
- MANDIR = $(DESTDIR)/usr/man
+ MANDIR = $(DESTDIR)/usr/share/man
ETCDIR = $(DESTDIR)/etc/ppp
+LIBDIR = $(DESTDIR)/usr/lib/pppd
dist-clean: clean
rm -f Makefile `find . -name Makefile -print`
-diff -r -N -u ppp-2.4.0.orig/pppd/demand.c ppp-2.4.0/pppd/demand.c
---- ppp-2.4.0.orig/pppd/demand.c Sat Apr 15 04:56:30 2000
-+++ ppp-2.4.0/pppd/demand.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/demand.c ppp-2.4.0b4/pppd/demand.c
+--- ppp-2.4.0b4.org/pppd/demand.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/demand.c Sun Feb 11 11:06:04 2001
@@ -85,8 +85,8 @@
flush_flag = 0;
fcs = PPP_INITFCS;
#ifdef PPP_FILTER
set_filters(&pass_filter, &active_filter);
-diff -r -N -u ppp-2.4.0.orig/pppd/lcp.c ppp-2.4.0/pppd/lcp.c
---- ppp-2.4.0.orig/pppd/lcp.c Sat Apr 29 08:32:09 2000
-+++ ppp-2.4.0/pppd/lcp.c Sun Aug 6 11:30:56 2000
+diff -urN ppp-2.4.0b4.org/pppd/lcp.c ppp-2.4.0b4/pppd/lcp.c
+--- ppp-2.4.0b4.org/pppd/lcp.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/lcp.c Sun Feb 11 11:06:04 2001
@@ -130,6 +130,28 @@
{NULL}
};
peer_mru[f->unit] = PPP_MRU;
}
-diff -r -N -u ppp-2.4.0.orig/pppd/main.c ppp-2.4.0/pppd/main.c
---- ppp-2.4.0.orig/pppd/main.c Thu Jul 6 07:17:02 2000
-+++ ppp-2.4.0/pppd/main.c Thu Oct 12 16:56:07 2000
+diff -urN ppp-2.4.0b4.org/pppd/main.c ppp-2.4.0b4/pppd/main.c
+--- ppp-2.4.0b4.org/pppd/main.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/main.c Sun Feb 11 11:06:04 2001
@@ -99,6 +99,14 @@
int (*holdoff_hook) __P((void)) = NULL;
int (*new_phase_hook) __P((int)) = NULL;
/* Don't pass handles to the PPP device, even by accident. */
new_fd = open (_PATH_DEVNULL, O_RDWR);
-diff -r -N -u ppp-2.4.0.orig/pppd/options.c ppp-2.4.0/pppd/options.c
---- ppp-2.4.0.orig/pppd/options.c Mon Jul 31 21:38:30 2000
-+++ ppp-2.4.0/pppd/options.c Sun Aug 6 11:42:56 2000
+diff -urN ppp-2.4.0b4.org/pppd/options.c ppp-2.4.0b4/pppd/options.c
+--- ppp-2.4.0b4.org/pppd/options.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/options.c Sun Feb 11 11:06:04 2001
@@ -118,9 +118,8 @@
/*
* Prototypes
* usage - print out a message telling how to use the program.
*/
static void
-@@ -1279,84 +1298,28 @@
+@@ -1289,84 +1308,28 @@
}
/*
* setipaddr - Set the IP address
*/
-@@ -1422,6 +1385,27 @@
+@@ -1432,6 +1395,27 @@
seen_remote = 1;
}
return 1;
}
-diff -r -N -u ppp-2.4.0.orig/pppd/pathnames.h ppp-2.4.0/pppd/pathnames.h
---- ppp-2.4.0.orig/pppd/pathnames.h Tue Apr 4 03:06:52 2000
-+++ ppp-2.4.0/pppd/pathnames.h Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/pathnames.h ppp-2.4.0b4/pppd/pathnames.h
+--- ppp-2.4.0b4.org/pppd/pathnames.h Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/pathnames.h Sun Feb 11 11:06:04 2001
@@ -18,6 +18,10 @@
#define _ROOT_PATH
#endif
#ifdef __STDC__
#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN "pppd.tdb"
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/Makefile.linux ppp-2.4.0/pppd/plugins/Makefile.linux
---- ppp-2.4.0.orig/pppd/plugins/Makefile.linux Sun Nov 14 23:08:24 1999
-+++ ppp-2.4.0/pppd/plugins/Makefile.linux Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/Makefile.linux ppp-2.4.0b4/pppd/plugins/Makefile.linux
+--- ppp-2.4.0b4.org/pppd/plugins/Makefile.linux Sun Feb 11 11:05:07 2001
++++ ppp-2.4.0b4/pppd/plugins/Makefile.linux Sun Feb 11 11:06:04 2001
@@ -1,11 +1,30 @@
CC = gcc
-CFLAGS = -g -O2 -I.. -I../../include
+depend:
+ $(CPP) -M $(CFLAGS) $(PLUGINSRCS) >.depend
\ No newline at end of file
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/Makefile.sol2 ppp-2.4.0/pppd/plugins/Makefile.sol2
---- ppp-2.4.0.orig/pppd/plugins/Makefile.sol2 Tue Nov 16 22:49:27 1999
-+++ ppp-2.4.0/pppd/plugins/Makefile.sol2 Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/Makefile.sol2 ppp-2.4.0b4/pppd/plugins/Makefile.sol2
+--- ppp-2.4.0b4.org/pppd/plugins/Makefile.sol2 Sun Feb 11 11:05:07 2001
++++ ppp-2.4.0b4/pppd/plugins/Makefile.sol2 Sun Feb 11 11:06:04 2001
@@ -6,7 +6,7 @@
include ../../svr4/Makedefs
LDFLAGS = -G
all: minconn.so
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/Makefile.linux ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux
---- ppp-2.4.0.orig/pppd/plugins/pppoe/Makefile.linux Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/Makefile.linux Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/Makefile.linux ppp-2.4.0b4/pppd/plugins/pppoe/Makefile.linux
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/Makefile.linux Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/Makefile.linux Sun Feb 11 11:06:04 2001
@@ -0,0 +1,48 @@
+CC = gcc
+CFLAGS = -g -I.. -I../.. -I../../../include -D_linux_=1 -fPIC
+
+depend:
+ $(CPP) -M $(CFLAGS) $(PLUGINSRCS) >.depend
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/libpppoe.c ppp-2.4.0/pppd/plugins/pppoe/libpppoe.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/libpppoe.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/libpppoe.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/libpppoe.c ppp-2.4.0b4/pppd/plugins/pppoe/libpppoe.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/libpppoe.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/libpppoe.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,631 @@
+/* PPPoE support library "libpppoe"
+ *
+ }
+ return pt;
+}
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppd_utils.c ppp-2.4.0/pppd/plugins/pppoe/pppd_utils.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppd_utils.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppd_utils.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppd_utils.c ppp-2.4.0b4/pppd/plugins/pppoe/pppd_utils.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppd_utils.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppd_utils.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,162 @@
+/* PPPoE support library "libpppoe"
+ *
+ return 1;
+}
+
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe.c ppp-2.4.0/pppd/plugins/pppoe/pppoe.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoe.c Thu Oct 12 16:56:23 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoe.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoe.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,385 @@
+/* pppoe.c - pppd plugin to implement PPPoE protocol.
+ *
+}
+
+
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe.h ppp-2.4.0/pppd/plugins/pppoe/pppoe.h
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe.h Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoe.h Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe.h ppp-2.4.0b4/pppd/plugins/pppoe/pppoe.h
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe.h Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoe.h Sun Feb 11 11:06:04 2001
@@ -0,0 +1,273 @@
+/* PPPoE support library "libpppoe"
+ *
+
+
+#endif
-Binary files ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe.so and ppp-2.4.0/pppd/plugins/pppoe/pppoe.so differ
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_client.c ppp-2.4.0/pppd/plugins/pppoe/pppoe_client.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_client.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoe_client.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_client.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_client.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_client.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_client.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,232 @@
+/* PPPoE support library "libpppoe"
+ *
+ return ses->fd;
+}
+
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_relay.c ppp-2.4.0/pppd/plugins/pppoe/pppoe_relay.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_relay.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoe_relay.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_relay.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_relay.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_relay.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_relay.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,260 @@
+/* PPPoE support library "libpppoe"
+ *
+ ses->rcv_pads = relay_rcv_pads;
+ ses->rcv_padt = relay_rcv_padt;
+}
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_server.c ppp-2.4.0/pppd/plugins/pppoe/pppoe_server.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoe_server.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoe_server.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_server.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_server.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoe_server.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoe_server.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,143 @@
+/* PPPoE support library "libpppoe"
+ *
+}
+
+
-Binary files ppp-2.4.0.orig/pppd/plugins/pppoe/pppoed and ppp-2.4.0/pppd/plugins/pppoe/pppoed differ
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoed.c ppp-2.4.0/pppd/plugins/pppoe/pppoed.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoed.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoed.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoed.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoed.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoed.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoed.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,283 @@
+/* PPPoE support library "libpppoe"
+ *
+ exit(0);
+
+}
-Binary files ppp-2.4.0.orig/pppd/plugins/pppoe/pppoefwd and ppp-2.4.0/pppd/plugins/pppoe/pppoefwd differ
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoefwd.c ppp-2.4.0/pppd/plugins/pppoe/pppoefwd.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoefwd.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoefwd.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoefwd.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoefwd.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoefwd.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoefwd.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,61 @@
+#include "pppoe.h"
+
+
+
+}
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/pppoehash.c ppp-2.4.0/pppd/plugins/pppoe/pppoehash.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/pppoehash.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/pppoehash.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoehash.c ppp-2.4.0b4/pppd/plugins/pppoe/pppoehash.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/pppoehash.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/pppoehash.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,91 @@
+/* PPPoE support library "libpppoe"
+ *
+ return ret;
+}
+
-diff -r -N -u ppp-2.4.0.orig/pppd/plugins/pppoe/utils.c ppp-2.4.0/pppd/plugins/pppoe/utils.c
---- ppp-2.4.0.orig/pppd/plugins/pppoe/utils.c Wed Dec 31 19:00:00 1969
-+++ ppp-2.4.0/pppd/plugins/pppoe/utils.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/plugins/pppoe/utils.c ppp-2.4.0b4/pppd/plugins/pppoe/utils.c
+--- ppp-2.4.0b4.org/pppd/plugins/pppoe/utils.c Thu Jan 1 01:00:00 1970
++++ ppp-2.4.0b4/pppd/plugins/pppoe/utils.c Sun Feb 11 11:06:04 2001
@@ -0,0 +1,667 @@
+
+/*
+ syslog (LOG_INFO, "Exit.");
+ exit (status);
+}
-diff -r -N -u ppp-2.4.0.orig/pppd/pppd.h ppp-2.4.0/pppd/pppd.h
---- ppp-2.4.0.orig/pppd/pppd.h Thu Jul 6 07:17:03 2000
-+++ ppp-2.4.0/pppd/pppd.h Mon Aug 7 08:49:03 2000
+diff -urN ppp-2.4.0b4.org/pppd/pppd.h ppp-2.4.0b4/pppd/pppd.h
+--- ppp-2.4.0b4.org/pppd/pppd.h Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/pppd.h Sun Feb 11 11:06:04 2001
@@ -175,6 +175,7 @@
extern char *progname; /* Name of this program */
extern int redirect_stderr;/* Connector's stderr should go to file */
int ccp_test __P((int, u_char *, int, int));
/* Test support for compression scheme */
void ccp_flags_set __P((int, int, int));
-@@ -513,7 +513,7 @@
+@@ -511,7 +511,7 @@
int privileged));
/* Parse options from an options file */
int options_from_user __P((void)); /* Parse options from user's .ppprc */
int options_from_list __P((struct wordlist *, int privileged));
/* Parse options from a wordlist */
int getword __P((FILE *f, char *word, int *newlinep, char *filename));
-@@ -524,6 +524,8 @@
+@@ -522,6 +522,8 @@
/* Simplified number_option for decimal ints */
void add_options __P((option_t *)); /* Add extra options */
int parse_dotted_ip __P((char *, u_int32_t *));
/*
* This structure is used to store information about certain
-@@ -558,6 +560,25 @@
+@@ -556,6 +558,25 @@
extern void (*ip_up_hook) __P((void));
extern void (*ip_down_hook) __P((void));
extern void (*ip_choose_hook) __P((u_int32_t *));
/*
* Inline versions of get/put char/short/long.
-diff -r -N -u ppp-2.4.0.orig/pppd/sys-linux.c ppp-2.4.0/pppd/sys-linux.c
---- ppp-2.4.0.orig/pppd/sys-linux.c Wed Jul 26 00:17:12 2000
-+++ ppp-2.4.0/pppd/sys-linux.c Sun Aug 6 11:56:40 2000
-@@ -142,7 +142,7 @@
+diff -urN ppp-2.4.0b4.org/pppd/sys-linux.c ppp-2.4.0b4/pppd/sys-linux.c
+--- ppp-2.4.0b4.org/pppd/sys-linux.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/sys-linux.c Sun Feb 11 11:07:24 2001
+@@ -137,7 +137,7 @@
static int restore_term = 0; /* 1 => we've munged the terminal */
static struct termios inittermios; /* Initial TTY termios */
static char loop_name[20];
static unsigned char inbuf[512]; /* buffer for chars read from loopback */
-@@ -186,6 +186,14 @@
+@@ -181,6 +181,14 @@
extern u_char inpacket_buf[]; /* borrowed from main.c */
/*
* SET_SA_FAMILY - set the sa_family field of a struct sockaddr,
* if it exists.
-@@ -357,51 +365,65 @@
+@@ -352,51 +360,65 @@
return (1);
}
error("Couldn't get channel number: %m");
goto err;
}
-@@ -445,8 +467,8 @@
+@@ -440,8 +462,8 @@
/*
* Old-style driver: find out which interface we were given.
*/
- if (ioctl(tty_fd, PPPIOCGUNIT, &x) < 0) {
+ set_ppp_fd (dev_fd);
+ if (ioctl(dev_fd, PPPIOCGUNIT, &x) < 0) {
- if (ok_error (errno))
- goto err;
- fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno);
-@@ -459,9 +481,9 @@
+ if ( ! ok_error (errno))
+ fatal("ioctl(PPPIOCGUNIT): %m(%d)", errno);
+ }
+@@ -453,9 +475,9 @@
/*
* Fetch the initial file flags and reset blocking mode on the file.
*/
if ( ! ok_error (errno))
warn("Couldn't set device to non-blocking mode: %m");
}
-@@ -474,9 +496,10 @@
+@@ -468,9 +490,10 @@
*/
if (!looped)
set_kdebugflag (kdebugflag);
SYSDEBUG ((LOG_NOTICE, "Using version %d.%d.%d of PPP driver",
driver_version, driver_modification, driver_patch));
-@@ -486,28 +509,49 @@
+@@ -480,28 +503,49 @@
err_close:
close(fd);
err:
if (ioctl(tty_fd, TIOCSETD, &tty_disc) < 0) {
if ( ! ok_error (errno))
error("ioctl(TIOCSETD, N_TTY): %m");
-diff -r -N -u ppp-2.4.0.orig/pppd/sys-sunos4.c ppp-2.4.0/pppd/sys-sunos4.c
---- ppp-2.4.0.orig/pppd/sys-sunos4.c Wed Dec 22 20:38:19 1999
-+++ ppp-2.4.0/pppd/sys-sunos4.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/sys-sunos4.c ppp-2.4.0b4/pppd/sys-sunos4.c
+--- ppp-2.4.0b4.org/pppd/sys-sunos4.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/sys-sunos4.c Sun Feb 11 11:06:05 2001
@@ -238,6 +238,15 @@
return stat("/dev/ppp", &buf) >= 0;
}
/*
* establish_ppp - Turn the serial port into a ppp interface.
*/
-diff -r -N -u ppp-2.4.0.orig/pppd/sys-svr4.c ppp-2.4.0/pppd/sys-svr4.c
---- ppp-2.4.0.orig/pppd/sys-svr4.c Thu Apr 13 06:42:06 2000
-+++ ppp-2.4.0/pppd/sys-svr4.c Sun Aug 6 11:39:28 2000
+diff -urN ppp-2.4.0b4.org/pppd/sys-svr4.c ppp-2.4.0b4/pppd/sys-svr4.c
+--- ppp-2.4.0b4.org/pppd/sys-svr4.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/sys-svr4.c Sun Feb 11 11:06:05 2001
@@ -871,6 +871,14 @@
}
* establish_ppp - Turn the serial port into a ppp interface.
*/
int
-diff -r -N -u ppp-2.4.0.orig/pppd/tty.c ppp-2.4.0/pppd/tty.c
---- ppp-2.4.0.orig/pppd/tty.c Mon Jul 24 10:58:15 2000
-+++ ppp-2.4.0/pppd/tty.c Thu Oct 12 16:53:13 2000
+diff -urN ppp-2.4.0b4.org/pppd/tty.c ppp-2.4.0b4/pppd/tty.c
+--- ppp-2.4.0b4.org/pppd/tty.c Sun Feb 11 11:05:08 2001
++++ ppp-2.4.0b4/pppd/tty.c Sun Feb 11 11:06:05 2001
@@ -46,6 +46,7 @@
#include <arpa/inet.h>
}
-diff -r -N -u ppp-2.4.0.orig/sunos4/Makefile ppp-2.4.0/sunos4/Makefile
---- ppp-2.4.0.orig/sunos4/Makefile Tue Mar 24 22:09:35 1998
-+++ ppp-2.4.0/sunos4/Makefile Wed Dec 31 19:00:00 1969
-@@ -1,57 +0,0 @@
--#
--# Makefile for STREAMS modules for SunOS 4.
--#
--# $Id$
--#
--
--include Makedefs
--
--LD = /usr/bin/ld # make sure we don't get gnu ld
--
--# Defining __$(ARCH)__ is for gcc's broken version of sun/vddrv.h.
--ARCH = `/bin/arch -k`
--DEFINES= -DKERNEL -D_KERNEL -DSUNOS4 -D$(ARCH) -D__$(ARCH)__ \
-- -DDEBUG -DNO_DLPI -DSNIT_SUPPORT
--CFLAGS= $(DEFINES) -I../include $(COPTS)
--
--MODULES= ppp_mod.o ppp_ahdl_mod.o ppp_comp_mod.o if_ppp_mod.o
--
--all: $(MODULES)
--
--ppp_mod.o: ppp.o ppp_vdcmd.o
-- $(LD) -r -o ppp_mod.o ppp.o ppp_vdcmd.o
--
--ppp_ahdl_mod.o: ppp_ahdlc.o ppp_ahdlc_vdcmd.o
-- $(LD) -r -o ppp_ahdl_mod.o ppp_ahdlc.o ppp_ahdlc_vdcmd.o
--
--COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
-- ppp_comp_vdcmd.o
--ppp_comp_mod.o: $(COMP_OBJS)
-- $(LD) -r -o $@ $(COMP_OBJS)
--
--if_ppp.o: ../modules/if_ppp.c
-- $(CC) $(CFLAGS) -c $?
--bsd-comp.o: ../modules/bsd-comp.c
-- $(CC) $(CFLAGS) -c $?
--deflate.o: ../modules/deflate.c
-- $(CC) $(CFLAGS) -c $?
--ppp.o: ../modules/ppp.c
-- $(CC) $(CFLAGS) -c $?
--ppp_ahdlc.o: ../modules/ppp_ahdlc.c
-- $(CC) $(CFLAGS) -c $?
--ppp_comp.o: ../modules/ppp_comp.c
-- $(CC) $(CFLAGS) -c $?
--vjcompress.o: ../modules/vjcompress.c
-- $(CC) $(CFLAGS) -c $?
--zlib.o: ../common/zlib.c
-- $(CC) $(CFLAGS) -c $?
--
--if_ppp_mod.o: if_ppp.o if_ppp_vdcmd.o
-- $(LD) -r -o if_ppp_mod.o if_ppp.o if_ppp_vdcmd.o
--
--install: all
-- $(INSTALL) $(MODULES) $(BINDIR)
-- ./ppp.INSTALL
--
--clean:
-- rm -f ppp ppp_comp ppp_ahdl *.o *~ core
projects / packages / ppp.git / commitdiff