LP64 printf format patches

4 files changed, 58 insertions, 2 deletions

diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index fa79ea6498f..f2ac1af473b 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2011/02/12 16:47:43 asau Exp $
+# $NetBSD: Makefile,v 1.19 2011/05/08 17:07:25 christos Exp $
 #
 
 DISTNAME=	pptpd-1.3.4
+PKGREVISION=1
 PKGNAME=	${DISTNAME:S/pptpd/poptop/}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poptop/}
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
index b0c991f8759..288d651e02d 100644
--- a/net/poptop/distinfo
+++ b/net/poptop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/02/12 16:47:43 asau Exp $
+$NetBSD: distinfo,v 1.11 2011/05/08 17:07:25 christos Exp $
 
 SHA1 (pptpd-1.3.4.tar.gz) = 3d1faf99055e420bafa96c96e8871a888c50b4e8
 RMD160 (pptpd-1.3.4.tar.gz) = 1c6c748bf9e81d223087998ee0cca821814d19f9
@@ -13,3 +13,5 @@ SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9
 SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581
 SHA1 (patch-ai) = c03b43e2d3c1df51df8ab030560a44949557046f
 SHA1 (patch-aj) = 40f9e760f1812d05fa5a641f7da1325d8dbf7072
+SHA1 (patch-ak) = 3d3135f3ad0596a5391e660352becd8447ecbf63
+SHA1 (patch-al) = 16751276f053b28c2554b79cd12d0a9a1f19667b
diff --git a/net/poptop/patches/patch-ak b/net/poptop/patches/patch-ak
new file mode 100644
index 00000000000..f44698382a9
--- /dev/null
+++ b/net/poptop/patches/patch-ak
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.1 2011/05/08 17:07:25 christos Exp $
+
+--- ctrlpacket.c.orig	2011-05-08 13:00:58.000000000 -0400
++++ ctrlpacket.c	2011-05-08 13:00:50.000000000 -0400
+@@ -146,7 +146,7 @@
+ 	} else {
+ 		/* debugging */
+ 		if (pptpctrl_debug) {
+-			syslog(LOG_DEBUG, "CTRL: I wrote %d bytes to the client.", packet_size);
++			syslog(LOG_DEBUG, "CTRL: I wrote %zu bytes to the client.", packet_size);
+ 			syslog(LOG_DEBUG, "CTRL: Sent packet to client");
+ 		}
+ 		return bytes_written;
+@@ -237,7 +237,7 @@
+ 						return(0);
+ 					memcpy(buffer, packet, bytes_ttl);
+ 				}
+-				syslog(LOG_ERR, "CTRL: Error reading ctrl packet length (bytes_ttl=%d): %s", bytes_ttl, strerror(errno));
++				syslog(LOG_ERR, "CTRL: Error reading ctrl packet length (bytes_ttl=%zd): %s", bytes_ttl, strerror(errno));
+ 				return -1;
+ 			}
+ 			/* FALLTHRU */
+@@ -291,7 +291,7 @@
+ 					return(0);
+ 				memcpy(buffer, packet, bytes_ttl);
+ 			}
+-			syslog(LOG_ERR, "CTRL: Error reading ctrl packet (bytes_ttl=%d,length=%d): %s", bytes_ttl, length, strerror(errno));
++			syslog(LOG_ERR, "CTRL: Error reading ctrl packet (bytes_ttl=%zd,length=%d): %s", bytes_ttl, length, strerror(errno));
+ 			return -1;
+ 		}
+ 		/* FALLTHRU */
diff --git a/net/poptop/patches/patch-al b/net/poptop/patches/patch-al
new file mode 100644
index 00000000000..24731230f28
--- /dev/null
+++ b/net/poptop/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2011/05/08 17:07:25 christos Exp $
+
+--- pptpgre.c.orig	2011-05-08 13:02:05.000000000 -0400
++++ pptpgre.c	2011-05-08 13:01:57.000000000 -0400
+@@ -136,7 +136,7 @@
+ 		 * network write failed.
+ 		 */
+ 		if ((status = read(fd, buffer, sizeof(buffer))) <= 0) {
+-			syslog(LOG_ERR, "GRE: read(fd=%d,buffer=%lx,len=%d) from PTY failed: status = %d error = %s%s",
++			syslog(LOG_ERR, "GRE: read(fd=%d,buffer=%lx,len=%zu) from PTY failed: status = %d error = %s%s",
+ 			       fd, (unsigned long) buffer, sizeof(buffer), 
+ 			       status, status ? strerror(errno) : "No error", 
+ 			       errno != EIO ? "" : ", usually caused by unexpected termination of pppd, check option syntax and pppd logs");
+@@ -344,7 +344,7 @@
+ 
+ 	dequeue_gre(cb, cl);
+ 	if ((status = read(fd, buffer, sizeof(buffer))) <= 0) {
+-		syslog(LOG_ERR, "GRE: read(fd=%d,buffer=%lx,len=%d) from network failed: status = %d error = %s",
++		syslog(LOG_ERR, "GRE: read(fd=%d,buffer=%lx,len=%zu) from network failed: status = %d error = %s",
+ 		       fd, (unsigned long) buffer, sizeof(buffer), status, status ? strerror(errno) : "No error");
+ 		stats.rx_errors++;
+ 		return -1;