2 files changed, 47 insertions, 10 deletions

diff --git a/mail/poppassd/files/patch-aa b/mail/poppassd/files/patch-aa
index c5daf0312edf..1ade77dca5b9 100644
--- a/mail/poppassd/files/patch-aa
+++ b/mail/poppassd/files/patch-aa
@@ -1,18 +1,29 @@
---- Makefile.orig	Mon Jul  7 15:20:49 2003
-+++ Makefile	Mon Jul  7 15:23:01 2003
-@@ -1,11 +1,11 @@
+--- Makefile.orig	Fri Dec  5 13:12:35 2003
++++ Makefile	Fri Dec  5 13:13:13 2003
+@@ -1,14 +1,14 @@
 -BINDIR = /usr/etc
 +BINDIR = ${PREFIX}/libexec
  LIBDIR = 
 -CFLAGS = -g
 -LFLAGS = -g
+-CCM = cc -Em
 +CFLAGS?= -O
 +LFLAGS?= ${LDFLAGS}
- CCM = cc -Em
++CCM = $(CC) -Em
  
  OBJECTS = poppassd.o
 -LIBS =
 +LIBS = -lcrypt -lutil
  
  poppassd: $(OBJECTS)
- 	cc -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
+-	cc -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
++	$(CC) -o poppassd $(LFLAGS) $(OBJECTS) $(LIBS)
+ 
+ install: poppassd
+ 	install -g bin -o root -m 500 poppassd $(BINDIR)
+@@ -17,4 +17,4 @@
+ 	rm -f *.o *~* core Makefile.new Makefile.bak poppassd
+ 
+ poppassd.o: poppassd.c
+-	cc -c $(CFLAGS) poppassd.c
++	$(CC) -c $(CFLAGS) poppassd.c
diff --git a/mail/poppassd/files/patch-ab b/mail/poppassd/files/patch-ab
index acf3d7f598e6..309563369eda 100644
--- a/mail/poppassd/files/patch-ab
+++ b/mail/poppassd/files/patch-ab
@@ -1,5 +1,5 @@
---- poppassd.c.orig	Mon Jul  7 15:15:03 2003
-+++ poppassd.c	Mon Jul  7 15:17:46 2003
+--- poppassd.c.orig	Fri Dec  5 13:14:06 2003
++++ poppassd.c	Fri Dec  5 13:15:49 2003
 @@ -13,11 +13,11 @@
   * 
   * Doesn't actually change any passwords itself.  It simply listens for
@@ -32,6 +32,15 @@
   * back to the client in the final 500 response, and a new version of the
   * code to find the next free pty, is by Norstad.
   *        
+@@ -125,7 +125,7 @@
+ #include <ctype.h>
+ #include <strings.h>
+ #include <errno.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <pwd.h>
+ #include <string.h>
+ #include <termios.h>
 @@ -145,8 +145,11 @@
  static char *P1[] =
     {"Old password:",
@@ -384,15 +393,32 @@
  /*
   * writestring()
   *
-@@ -485,8 +398,10 @@
+@@ -485,9 +398,11 @@
       }
  
       writestring(master, pswd);
 -
 +     sleep(2);
       if (!expect(master, P4, buf)) return FAILURE;
-+
-+     close(master);
  
++     close(master);
++
       return SUCCESS;
  }
+ 
+@@ -630,13 +545,11 @@
+    }
+ }
+ 
+-WriteToClient (fmt, va_alist)
+-char *fmt;
+-va_dcl
++WriteToClient (char *fmt, ...)
+ {
+ 	va_list ap;
+ 	
+-	va_start (ap);
++	va_start (ap, fmt);
+ 	vfprintf (stdout, fmt, ap);
+ 	fputs ("\r\n", stdout );
+ 	fflush (stdout);