Fix some format string bugs and make pppoe-server use our libc md5

implementation. The md5 included in this pkg is severly broken on 64bit
machines.

3 files changed, 68 insertions, 6 deletions

diff --git a/net/rp-pppoe/distinfo b/net/rp-pppoe/distinfo
index 7e69ad76e2a..d5687503964 100644
--- a/net/rp-pppoe/distinfo
+++ b/net/rp-pppoe/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/10/07 13:26:37 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/12/07 18:35:50 martin Exp $
 
 SHA1 (rp-pppoe-3.3.tar.gz) = cae019911821a493e1da414a03e5ee597980156c
 Size (rp-pppoe-3.3.tar.gz) = 171480 bytes
-SHA1 (patch-aa) = 57b6fa072ec0a73ce5f83b0a8d42c4596c8de864
+SHA1 (patch-aa) = 680b6b0c507f8c512949a7acbf005f4cfc7cb779
 SHA1 (patch-ab) = 4a16b96d6b2069fab9efb42c856b71af14f672f1
 SHA1 (patch-ac) = 2c76eded4e98fb3564a70dd136f4c66fe41a165f
 SHA1 (patch-ad) = b56e4e664902f0e3518678ac3b1e3c66c602a956
+SHA1 (patch-ae) = 5fa68935a3dc116a26062730cc00e56399575bd6
diff --git a/net/rp-pppoe/patches/patch-aa b/net/rp-pppoe/patches/patch-aa
index 1c6bc4cca8c..240494e298f 100644
--- a/net/rp-pppoe/patches/patch-aa
+++ b/net/rp-pppoe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2001/10/07 13:26:38 tron Exp $
+$NetBSD: patch-aa,v 1.7 2001/12/07 18:35:51 martin Exp $
 
 --- Makefile.in.orig	Fri Sep 14 21:18:53 2001
-+++ Makefile.in	Sun Oct  7 14:14:39 2001
++++ Makefile.in	Fri Dec  7 19:26:39 2001
 @@ -20,7 +20,7 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -11,7 +11,28 @@ $NetBSD: patch-aa,v 1.6 2001/10/07 13:26:38 tron Exp $
  install=@INSTALL@
  install_dir=@INSTALL@ -d
  sbindir=@sbindir@
-@@ -139,7 +139,7 @@
+@@ -64,8 +64,8 @@
+ pppoe-sniff: pppoe-sniff.o if.o common.o debug.o
+ 	@CC@ -o pppoe-sniff pppoe-sniff.o if.o common.o debug.o
+ 
+-pppoe-server: pppoe-server.o if.o debug.o common.o md5.o @PPPOE_SERVER_DEPS@
+-	@CC@ -o pppoe-server pppoe-server.o if.o debug.o common.o md5.o $(PPPOE_SERVER_LIBS)
++pppoe-server: pppoe-server.o if.o debug.o common.o @PPPOE_SERVER_DEPS@
++	@CC@ -o pppoe-server pppoe-server.o if.o debug.o common.o $(PPPOE_SERVER_LIBS)
+ 
+ pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
+ 	@CC@ -o pppoe pppoe.o if.o debug.o common.o ppp.o discovery.o
+@@ -82,9 +82,6 @@
+ ppp.o: ppp.c pppoe.h
+ 	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o ppp.o ppp.c
+ 
+-md5.o: md5.c md5.h
+-	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o md5.o md5.c
+-
+ pppoe-server.o: pppoe-server.c pppoe.h
+ 	@CC@ $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-server.o pppoe-server.c
+ 
+@@ -139,7 +136,7 @@
  	$(install) -m 755 ../scripts/adsl-setup $(RPM_INSTALL_ROOT)$(sbindir)
  	-mkdir -p $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../doc/CHANGES $(RPM_INSTALL_ROOT)$(docdir)
@@ -20,7 +41,7 @@ $NetBSD: patch-aa,v 1.6 2001/10/07 13:26:38 tron Exp $
  	$(install) -m 644 ../doc/HOW-TO-CONNECT $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../doc/LICENSE $(RPM_INSTALL_ROOT)$(docdir)
  	$(install) -m 644 ../README $(RPM_INSTALL_ROOT)$(docdir)
-@@ -158,39 +158,39 @@
+@@ -158,39 +155,39 @@
  	$(install) -m 644 ../man/adsl-setup.8 $(RPM_INSTALL_ROOT)$(mandir)/man8
  	-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5
  	$(install) -m 644 ../man/pppoe.conf.5 $(RPM_INSTALL_ROOT)$(mandir)/man5
diff --git a/net/rp-pppoe/patches/patch-ae b/net/rp-pppoe/patches/patch-ae
new file mode 100644
index 00000000000..3bc6cbceb6c
--- /dev/null
+++ b/net/rp-pppoe/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2001/12/07 18:35:51 martin Exp $
+
+--- pppoe-server.c.orig	Fri Sep 14 21:18:53 2001
++++ pppoe-server.c	Fri Dec  7 19:24:14 2001
+@@ -25,7 +25,7 @@
+ #define _BSD_SOURCE 1 /* for gethostname */
+ 
+ #include "pppoe-server.h"
+-#include "md5.h"
++#include <md5.h>
+ 
+ #ifdef HAVE_SYSLOG_H
+ #include <syslog.h>
+@@ -1249,7 +1249,7 @@
+     if (addressPoolFname) {
+ 	NumSessionSlots = parseAddressPool(addressPoolFname, 0);
+ 	if (CheckPoolSyntax) {
+-	    printf("%d\n", NumSessionSlots);
++	    printf("%d\n", (int)NumSessionSlots);
+ 	    exit(0);
+ 	}
+     }
+@@ -1674,7 +1674,7 @@
+     }
+     if (PassUnitOptionToPPPD) {
+ 	argv[c++] = "unit";
+-	sprintf(buffer, "%d", ntohs(session->sess) - 1 - SessOffset);
++	sprintf(buffer, "%d", ntohs(session->sess) - 1 - (int)SessOffset);
+ 	argv[c++] = buffer;
+     }
+     argv[c++] = NULL;
+@@ -1747,7 +1747,7 @@
+     argv[c++] = "default-asyncmap";
+     if (PassUnitOptionToPPPD) {
+ 	argv[c++] = "unit";
+-	sprintf(buffer, "%d", ntohs(session->sess) - 1 - SessOffset);
++	sprintf(buffer, "%d", ntohs(session->sess) - 1 - (int)SessOffset);
+ 	argv[c++] = buffer;
+     }
+     argv[c++] = NULL;