From 74a41d3b9b72da76c835e5b5c08a7bf16395b837 Mon Sep 17 00:00:00 2001 From: cube Date: Sun, 11 Jan 2004 14:21:27 +0000 Subject: Make this compile with gcc3. Also, do not try to remove ${LOCALBASE}/lkm at deinstall time in case there are other LKMs installed. --- net/ppp-mppe/PLIST | 4 +- net/ppp-mppe/distinfo | 6 +- net/ppp-mppe/patches/patch-ab | 240 +++++++++++++++++++++++++++++++++++++++--- net/ppp-mppe/patches/patch-bp | 10 +- 4 files changed, 238 insertions(+), 22 deletions(-) (limited to 'net/ppp-mppe') diff --git a/net/ppp-mppe/PLIST b/net/ppp-mppe/PLIST index 6ceaaf7b8d3..220dec3bb75 100644 --- a/net/ppp-mppe/PLIST +++ b/net/ppp-mppe/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/19 15:12:11 kim Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/01/11 14:21:27 cube Exp $ sbin/chat sbin/pppd sbin/pppstats lkm/mppe.o -@dirrm lkm +@unexec ${RMDIR} %D/lkm 2>/dev/null || ${TRUE} diff --git a/net/ppp-mppe/distinfo b/net/ppp-mppe/distinfo index a85fb9ae3e6..eafdc75715f 100644 --- a/net/ppp-mppe/distinfo +++ b/net/ppp-mppe/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/12/01 15:07:03 cube Exp $ +$NetBSD: distinfo,v 1.5 2004/01/11 14:21:27 cube Exp $ SHA1 (ppp-2.3.9.tar.gz) = ef5ef4686f6738193ec88972902f9a5a6fb8f5dd Size (ppp-2.3.9.tar.gz) = 768540 bytes SHA1 (patch-aa) = 847bd9cc39f47a7c76e5b6d28ecf1b9a08a7032d -SHA1 (patch-ab) = 8f9008515d5facc61d1b3137e260163b813b5158 +SHA1 (patch-ab) = 6c89f17cbd775df3f4c3627fa6ab989939f82726 SHA1 (patch-ac) = 22c4393a8c9b72ca5d34f209feb3f8c291246024 SHA1 (patch-ad) = 438d301ab43d547ad197316062166a25d8ba51e7 SHA1 (patch-ae) = 368a272502faf166b533bc6476bacf172b7065b3 @@ -38,7 +38,7 @@ SHA1 (patch-bl) = f1d1b9802e81bfcd541c245fee3fdf1be61b75a4 SHA1 (patch-bm) = a0369319b33ee30a4256059d2e46a420cf6977e1 SHA1 (patch-bn) = 3d4d4efc069cd804af85ca81e626981121ec4d3e SHA1 (patch-bo) = 9c1da2b0ef646195525dc105496259ad1d280910 -SHA1 (patch-bp) = c606c83604b588e1574cdb96f035768df50aca53 +SHA1 (patch-bp) = b809b0f4a50c1eddfe01a733eeaa8d708ce5184c SHA1 (patch-bq) = 2e0ea29dcba6571a764f8c1d9019d5e9fa9ff8e0 SHA1 (patch-br) = 3db283aba2c4f41db05cc5b327383cb5f381a7b7 SHA1 (patch-bs) = 41cfdbf71044e7f1988f26b56ee35f9501ff054f diff --git a/net/ppp-mppe/patches/patch-ab b/net/ppp-mppe/patches/patch-ab index 070b05e4a43..9bf6c42d76a 100644 --- a/net/ppp-mppe/patches/patch-ab +++ b/net/ppp-mppe/patches/patch-ab @@ -1,10 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +$NetBSD: patch-ab,v 1.2 2004/01/11 14:21:27 cube Exp $ -Index: chat/chat.c -diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 ---- chat/chat.c:1.1.1.5 Tue Aug 24 19:50:04 1999 -+++ chat/chat.c Tue Aug 24 20:15:00 1999 -@@ -144,18 +150,6 @@ +--- chat/chat.c.orig 1999-08-13 08:46:09.000000000 +0200 ++++ chat/chat.c +@@ -144,18 +144,6 @@ extern char *sys_errlist[]; "unknown error") #endif @@ -23,7 +21,16 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 char *program_name; #define MAX_ABORTS 50 -@@ -269,12 +263,12 @@ +@@ -208,7 +196,7 @@ int say_next = 0, hup_next = 0; + void *dup_mem __P((void *b, size_t c)); + void *copy_of __P((char *s)); + void usage __P((void)); +-void logf __P((const char *fmt, ...)); ++void logit __P((const char *fmt, ...)); + void fatal __P((int code, const char *fmt, ...)); + SIGTYPE sigalrm __P((int signo)); + SIGTYPE sigint __P((int signo)); +@@ -269,12 +257,12 @@ main(argc, argv) char **argv; { int option; @@ -38,7 +45,7 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 switch (option) { case 'e': ++echo; -@@ -297,25 +291,24 @@ +@@ -297,25 +285,24 @@ main(argc, argv) break; case 'f': @@ -70,7 +77,7 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 report_fp = fopen (report_file, "a"); if (report_fp != NULL) { if (verbose) -@@ -327,15 +320,15 @@ +@@ -327,15 +314,15 @@ main(argc, argv) break; case 'T': @@ -90,7 +97,7 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 else usage(); break; -@@ -345,6 +338,8 @@ +@@ -345,6 +332,8 @@ main(argc, argv) break; } } @@ -99,7 +106,7 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 /* * Default the report file to the stderr location */ -@@ -367,17 +362,15 @@ +@@ -367,17 +356,15 @@ main(argc, argv) init(); if (chat_file != NULL) { @@ -122,7 +129,25 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 } } -@@ -590,7 +583,7 @@ +@@ -471,7 +458,7 @@ char line[1024]; + /* + * Send a message to syslog and/or stderr. + */ +-void logf __V((const char *fmt, ...)) ++void logit __V((const char *fmt, ...)) + { + va_list args; + +@@ -534,7 +521,7 @@ int signo; + fatal(2, "Can't set file mode flags on stdin: %m"); + + if (verbose) +- logf("alarm"); ++ logit("alarm"); + } + + void unalarm() +@@ -590,7 +577,7 @@ void set_tty_parameters() have_tty_parameters = 1; t.c_iflag |= IGNBRK | ISTRIP | IGNPAR; @@ -131,3 +156,194 @@ diff -u chat/chat.c:1.1.1.5 chat/chat.c:1.18 t.c_lflag = 0; t.c_cc[VERASE] = t.c_cc[VKILL] = 0; +@@ -941,9 +928,9 @@ char *s; + * The expectation did not occur. This is terminal. + */ + if (fail_reason) +- logf("Failed (%s)", fail_reason); ++ logit("Failed (%s)", fail_reason); + else +- logf("Failed"); ++ logit("Failed"); + terminate(exit_code); + } + +@@ -1019,7 +1006,7 @@ register char *s; + abort_string[n_aborts++] = s1; + + if (verbose) +- logf("abort on (%v)", s); ++ logit("abort on (%v)", s); + return; + } + +@@ -1045,7 +1032,7 @@ register char *s; + pack++; + n_aborts--; + if (verbose) +- logf("clear abort on (%v)", s); ++ logit("clear abort on (%v)", s); + } + } + free(s1); +@@ -1069,7 +1056,7 @@ register char *s; + report_string[n_reports++] = s1; + + if (verbose) +- logf("report (%v)", s); ++ logit("report (%v)", s); + return; + } + +@@ -1094,7 +1081,7 @@ register char *s; + pack++; + n_reports--; + if (verbose) +- logf("clear report (%v)", s); ++ logit("clear report (%v)", s); + } + } + free(s1); +@@ -1112,7 +1099,7 @@ register char *s; + timeout = DEFAULT_CHAT_TIMEOUT; + + if (verbose) +- logf("timeout set to %d seconds", timeout); ++ logit("timeout set to %d seconds", timeout); + + return; + } +@@ -1175,7 +1162,7 @@ int get_char() + return ((int)c & 0x7F); + + default: +- logf("warning: read() on stdin returned %d", status); ++ logit("warning: read() on stdin returned %d", status); + + case -1: + if ((status = fcntl(0, F_GETFL, 0)) == -1) +@@ -1203,7 +1190,7 @@ int c; + return (0); + + default: +- logf("warning: write() on stdout returned %d", status); ++ logit("warning: write() on stdout returned %d", status); + + case -1: + if ((status = fcntl(0, F_GETFL, 0)) == -1) +@@ -1225,9 +1212,9 @@ int c; + + if (verbose) { + if (errno == EINTR || errno == EWOULDBLOCK) +- logf(" -- write timed out"); ++ logit(" -- write timed out"); + else +- logf(" -- write failed: %m"); ++ logit(" -- write failed: %m"); + } + return (0); + } +@@ -1242,9 +1229,9 @@ register char *s; + + if (verbose) { + if (quiet) +- logf("send (??????)"); ++ logit("send (??????)"); + else +- logf("send (%v)", s); ++ logit("send (%v)", s); + } + + alarm(timeout); alarmed = 0; +@@ -1331,17 +1318,17 @@ register char *string; + minlen = (len > sizeof(fail_buffer)? len: sizeof(fail_buffer)) - 1; + + if (verbose) +- logf("expect (%v)", string); ++ logit("expect (%v)", string); + + if (len > STR_LEN) { +- logf("expect string is too long"); ++ logit("expect string is too long"); + exit_code = 1; + return 0; + } + + if (len == 0) { + if (verbose) +- logf("got it"); ++ logit("got it"); + return (1); + } + +@@ -1355,16 +1342,16 @@ register char *string; + echo_stderr(c); + if (verbose && c == '\n') { + if (s == logged) +- logf(""); /* blank line */ ++ logit(""); /* blank line */ + else +- logf("%0.*v", s - logged, logged); ++ logit("%0.*v", s - logged, logged); + logged = s + 1; + } + + *s++ = c; + + if (verbose && s >= logged + 80) { +- logf("%0.*v", s - logged, logged); ++ logit("%0.*v", s - logged, logged); + logged = s; + } + +@@ -1409,8 +1396,8 @@ register char *string; + strncmp(s - len, string, len) == 0) { + if (verbose) { + if (s > logged) +- logf("%0.*v", s - logged, logged); +- logf(" -- got it\n"); ++ logit("%0.*v", s - logged, logged); ++ logit(" -- got it\n"); + } + + alarm(0); +@@ -1423,8 +1410,8 @@ register char *string; + strncmp(s - abort_len, abort_string[n], abort_len) == 0) { + if (verbose) { + if (s > logged) +- logf("%0.*v", s - logged, logged); +- logf(" -- failed"); ++ logit("%0.*v", s - logged, logged); ++ logit(" -- failed"); + } + + alarm(0); +@@ -1437,7 +1424,7 @@ register char *string; + + if (s >= end) { + if (logged < s - minlen) { +- logf("%0.*v", s - logged, logged); ++ logit("%0.*v", s - logged, logged); + logged = s; + } + s -= minlen; +@@ -1447,16 +1434,16 @@ register char *string; + } + + if (alarmed && verbose) +- logf("warning: alarm synchronization problem"); ++ logit("warning: alarm synchronization problem"); + } + + alarm(0); + + if (verbose && printed) { + if (alarmed) +- logf(" -- read timed out"); ++ logit(" -- read timed out"); + else +- logf(" -- read failed: %m"); ++ logit(" -- read failed: %m"); + } + + exit_code = 3; diff --git a/net/ppp-mppe/patches/patch-bp b/net/ppp-mppe/patches/patch-bp index 3c3cfb5e255..bbc2c44b9fe 100644 --- a/net/ppp-mppe/patches/patch-bp +++ b/net/ppp-mppe/patches/patch-bp @@ -1,16 +1,16 @@ -$NetBSD: patch-bp,v 1.1.1.1 1999/10/08 04:34:43 dbj Exp $ +$NetBSD: patch-bp,v 1.2 2004/01/11 14:21:27 cube Exp $ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ pppd/mppe.h Tue Jun 22 18:44:01 1999 +--- pppd/mppe.h.orig 2004-01-11 15:09:06.000000000 +0100 ++++ pppd/mppe.h @@ -0,0 +1,63 @@ +#ifndef __MPPE_INCLUDE__ + +#ifndef CI_MPPE +#define CI_MPPE 18 /* config. option for MPPE */ -+#endif CI_MPPE ++#endif /* CI_MPPE */ +#ifndef CILEN_MPPE +#define CILEN_MPPE 6 /* length of config. option */ -+#endif CILEN_MPPE ++#endif /* CILEN_MPPE */ + +typedef struct mppe_state { + int us_unit; /* Interface unit number */ -- cgit v1.2.3