Update userppp to 001107nb1

        Fix compilation under gcc3: avoid trigraphs, comparison always
	true/false, and pass -fno-strict-aliasing

6 files changed, 61 insertions, 3 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 0c9b292a732..613ebee622c 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.2455 2003/06/08 09:55:28 abs Exp $
+$NetBSD: CHANGES,v 1.2456 2003/06/08 10:36:49 abs Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -2379,3 +2379,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Updated spamassassin to 2.55nb1 [heinz 2003-06-08]
 	Added gnuserv-3.12.6 [epg 2003-06-08]
 	Updated figlet to 2.2.1nb1 [abs 2003-06-08]
+	Updated userppp to 001107nb1 [abs 2003-06-08]
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index a226dda86a8..04c26ae2686 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/06/08 10:36:17 abs Exp $
 
 DISTNAME=		ppp-001107.src
 PKGNAME=		userppp-001107
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
 CATEGORIES=		net
 MASTER_SITES=		http://www.netbsd.org/~ad/
@@ -14,6 +15,8 @@ ONLY_FOR_PLATFORM=	NetBSD-*-*
 
 MANCOMPRESSED_IF_MANZ=	YES
 
+CFLAGS+=	-fno-strict-aliasing
+
 post-patch:
 	(cd ${WRKSRC};							\
 	for i in ppp/ppp.8 pppctl/pppctl.8; do \
diff --git a/net/userppp/distinfo b/net/userppp/distinfo
index 93d90e0ab0b..61ceee19321 100644
--- a/net/userppp/distinfo
+++ b/net/userppp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/12 11:28:06 agc Exp $
+$NetBSD: distinfo,v 1.4 2003/06/08 10:36:17 abs Exp $
 
 SHA1 (ppp-001107.src.tar.gz) = 3ba073a99f747579d8ffbe7f80b72a2af924eca2
 Size (ppp-001107.src.tar.gz) = 380594 bytes
@@ -13,3 +13,6 @@ SHA1 (patch-ah) = 1585999e4a7c023c0e3965549bb8889f7ca6edaf
 SHA1 (patch-ai) = 5a9a7ae565046bdbb454d22acce72f0b58b1de61
 SHA1 (patch-aj) = eed45b089d32e1caf5b3f87bfcd6474b9fd78d10
 SHA1 (patch-ak) = 7cbc3be878db839d27765289fc1750f5cde5d0e1
+SHA1 (patch-al) = cd2c5d710b356de80cd27df88e45bb4fb824a943
+SHA1 (patch-am) = 98afe1506ed01eac6f2790053368637553f83ced
+SHA1 (patch-an) = 1c4243df402c35160b6af9b481ace2e6ef5cf15c
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;