diff options
| author | abs <abs@pkgsrc.org> | 2003-06-08 10:36:17 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-06-08 10:36:17 +0000 |
| commit | 8a5cc9768e93b3f3242959b9b104db6a7a8cddf5 (patch) | |
| tree | 670a9ef6423199473732bbc4416d9354de34bec8 /net/userppp/patches | |
| parent | 3ca8d4178aa7be150ee64bc83f2a490b33c5f0d9 (diff) | |
| download | pkgsrc-8a5cc9768e93b3f3242959b9b104db6a7a8cddf5.tar.gz | |
Update userppp to 001107nb1
Fix compilation under gcc3: avoid trigraphs, comparison always
true/false, and pass -fno-strict-aliasing
Diffstat (limited to 'net/userppp/patches')
| -rw-r--r-- | net/userppp/patches/patch-al | 13 | ||||
| -rw-r--r-- | net/userppp/patches/patch-am | 13 | ||||
| -rw-r--r-- | net/userppp/patches/patch-an | 25 |
3 files changed, 51 insertions, 0 deletions
diff --git a/net/userppp/patches/patch-al b/net/userppp/patches/patch-al new file mode 100644 index 00000000000..e2c902cb77e --- /dev/null +++ b/net/userppp/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2003/06/08 10:36:18 abs Exp $ + +--- libhack/alias_nbt.c.orig Sun Jun 8 11:08:07 2003 ++++ libhack/alias_nbt.c +@@ -102,7 +102,7 @@ static void PrintRcode( u_char rcode ) + case CFT_ERR: + printf("\nName in conflict error.\n"); + default: +- printf("\n???=%0x\n", rcode ); ++ printf("\n??? = %0x\n", rcode ); + + } + } diff --git a/net/userppp/patches/patch-am b/net/userppp/patches/patch-am new file mode 100644 index 00000000000..19ff4b3bd99 --- /dev/null +++ b/net/userppp/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2003/06/08 10:36:18 abs Exp $ + +--- ppp/cbcp.c.orig Sun Jun 8 11:23:58 2003 ++++ ppp/cbcp.c +@@ -560,7 +560,7 @@ cbcp_CheckResponse(struct cbcp *cbcp, st + } + return CBCP_ACTION_DOWN; + } +- log_Printf(LogPHASE, "Internal CBCP error - agreed on %d ??!?\n", ++ log_Printf(LogPHASE, "Internal CBCP error - agreed on %d ?!?\n", + (int)cbcp->fsm.type); + return CBCP_ACTION_DOWN; + } else if (data->type == CBCP_NONUM && cbcp->fsm.type == CBCP_CLIENTNUM) { diff --git a/net/userppp/patches/patch-an b/net/userppp/patches/patch-an new file mode 100644 index 00000000000..11eb48a4a4b --- /dev/null +++ b/net/userppp/patches/patch-an @@ -0,0 +1,25 @@ +$NetBSD: patch-an,v 1.1 2003/06/08 10:36:18 abs Exp $ + +--- ppp/ipcp.c.orig Sun Jun 8 11:29:03 2003 ++++ ppp/ipcp.c +@@ -1194,8 +1194,7 @@ IpcpDecodeConfig(struct fsm *fp, u_char + break; + case 6: /* RFC1332 */ + if (ntohs(pcomp->proto) == PROTO_VJCOMP) { +- if (pcomp->slots <= MAX_VJ_STATES +- && pcomp->slots >= MIN_VJ_STATES) { ++ if (pcomp->slots >= MIN_VJ_STATES) { + /* Ok, we can do that */ + ipcp->peer_compproto = compproto; + ipcp->heis1172 = 0; +@@ -1230,9 +1229,7 @@ IpcpDecodeConfig(struct fsm *fp, u_char + + case MODE_NAK: + if (ntohs(pcomp->proto) == PROTO_VJCOMP) { +- if (pcomp->slots > MAX_VJ_STATES) +- pcomp->slots = MAX_VJ_STATES; +- else if (pcomp->slots < MIN_VJ_STATES) ++ if (pcomp->slots < MIN_VJ_STATES) + pcomp->slots = MIN_VJ_STATES; + compproto = (ntohs(pcomp->proto) << 16) + (pcomp->slots << 8) + + pcomp->compcid; |