Fix compilation on alpha.

3 files changed, 51 insertions, 1 deletions

diff --git a/net/userppp/files/patch-sum b/net/userppp/files/patch-sum
index eeb95b1797c..fa163e13c7b 100644
--- a/net/userppp/files/patch-sum
+++ b/net/userppp/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/11/08 15:53:49 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/28 01:59:26 wiz Exp $
 
 MD5 (patch-aa) = 354ec23280a74ec5a34f32df68d02f5a
 MD5 (patch-ab) = 4e849b882fa232ea77efef54d0749f44
@@ -7,3 +7,5 @@ MD5 (patch-ad) = 68bb63d69846a116e2808b7a63abda05
 MD5 (patch-ae) = 601856884f45d9333f03ddc62fc1bd2c
 MD5 (patch-af) = bb164fb966afe3bd743645dd8ecf91e2
 MD5 (patch-ag) = d87f555eebb74cf100f75097377a83ea
+MD5 (patch-ah) = d8b895c88011951e3311dbdd78256460
+MD5 (patch-ai) = ef0131af5a44f8ab5ed8ad2d2de96feb
diff --git a/net/userppp/patches/patch-ah b/net/userppp/patches/patch-ah
new file mode 100644
index 00000000000..743158665fc
--- /dev/null
+++ b/net/userppp/patches/patch-ah
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.1 2000/12/28 01:59:26 wiz Exp $
+
+--- ppp/ip.c.orig	Tue Nov  7 06:45:44 2000
++++ ppp/ip.c
+@@ -656,8 +656,8 @@
+                "ESP: %s ---> ", inet_ntoa(pip->ip_src));
+       loglen += strlen(logbuf + loglen);
+       snprintf(logbuf + loglen, sizeof logbuf - loglen,
+-               "%s, spi %08x", inet_ntoa(pip->ip_dst),
+-               (u_int32_t) ptop);
++               "%s, spi %p", inet_ntoa(pip->ip_dst),
++               ptop);
+       loglen += strlen(logbuf + loglen);
+     }
+     break;
+@@ -668,8 +668,8 @@
+                "AH: %s ---> ", inet_ntoa(pip->ip_src));
+       loglen += strlen(logbuf + loglen);
+       snprintf(logbuf + loglen, sizeof logbuf - loglen,
+-               "%s, spi %08x", inet_ntoa(pip->ip_dst),
+-               (u_int32_t) (ptop + sizeof(u_int32_t)));
++               "%s, spi %p", inet_ntoa(pip->ip_dst),
++               (ptop + sizeof(u_int32_t)));
+       loglen += strlen(logbuf + loglen);
+     }
+     break;
diff --git a/net/userppp/patches/patch-ai b/net/userppp/patches/patch-ai
new file mode 100644
index 00000000000..7203cae9abc
--- /dev/null
+++ b/net/userppp/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2000/12/28 01:59:26 wiz Exp $
+
+--- ppp/atm.c.orig	Tue Nov  7 06:45:45 2000
++++ ppp/atm.c
+@@ -80,7 +80,7 @@
+ {
+   ssize_t ret = write(p->fd, v, n);
+   if (ret < 0) {
+-    log_Printf(LogDEBUG, "atm_Sendto(%d): %s\n", n, strerror(errno));
++    log_Printf(LogDEBUG, "atm_Sendto(%ld): %s\n", (long)n, strerror(errno));
+     return ret;
+   }
+   return ret;
+@@ -91,7 +91,7 @@
+ {
+     ssize_t ret = read(p->fd, (char*)v, n);
+     if (ret < 0) {
+-      log_Printf(LogDEBUG, "atm_Recvfrom(%d): %s\n", n, strerror(errno));
++      log_Printf(LogDEBUG, "atm_Recvfrom(%ld): %s\n", (long)n, strerror(errno));
+       return ret;
+     }
+     return ret;