4 files changed, 89 insertions, 77 deletions

diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa
index 1f7b7b7b2bb7..be2892c8bd5d 100644
--- a/mail/popper/files/patch-aa
+++ b/mail/popper/files/patch-aa
@@ -1,5 +1,22 @@
-*** pop_dropcopy.c	Sat Jun  8 14:44:01 1996
---- pop_dropcopy.c	Sat Jun  8 14:50:46 1996
+*** pop_dropcopy.c.orig	Sat Mar 29 07:30:36 1997
+--- pop_dropcopy.c	Wed Apr 23 07:34:06 1997
+***************
+*** 54,60 ****
+  # define L_XTND SEEK_END
+  #endif
+  
+! #include "md5.h"
+  
+  /* This macro comes from Mark Crispin's c-client code */
+  
+--- 54,60 ----
+  # define L_XTND SEEK_END
+  #endif
+  
+! #include <md5.h>
+  
+  /* This macro comes from Mark Crispin's c-client code */
+  
 ***************
 *** 755,760 ****
 --- 755,761 ----
@@ -11,8 +28,8 @@
       long                    offset;                 /*  Old/New boundary */
       int                     nchar;                  /*  Bytes written/read */
 ***************
-*** 788,793 ****
---- 789,805 ----
+*** 794,799 ****
+--- 795,811 ----
       }
   #endif
   
@@ -31,8 +48,8 @@
        * write over existing files by limiting how much work we do while
        * running as root.
 ***************
-*** 801,806 ****
---- 813,831 ----
+*** 807,812 ****
+--- 819,837 ----
   	pwp->pw_gid = mybuf.st_gid;
   # endif
   #endif
@@ -52,32 +69,3 @@
   
       /* Now we run as the user. */
       (void) setgid((GID_T)pwp->pw_gid);
-*** popauth.c	Sun Jun  9 12:56:38 1996
---- popauth.c	Sun Jun  9 13:00:51 1996
-***************
-*** 36,43 ****
-  #include <sys/file.h>
-  #endif
-  
-! #ifdef BSDI
-! #define BSD44_DBM
-  #endif
-  
-  #ifdef NEED_STRERROR
---- 36,51 ----
-  #include <sys/file.h>
-  #endif
-  
-! #ifdef		HAVE_PARAM_H
-! #include <sys/param.h>
-! # if (defined(BSD) && (BSD >= 199103))
-! #  define	HAVE_UNISTD_H
-! #  define	HAVE_VSPRINTF
-! #  define	BIND43
-! # endif
-! # if (defined(BSD) && (BSD >= 199306))
-! #  define	BSD44_DBM
-! # endif
-  #endif
-  
-  #ifdef NEED_STRERROR
diff --git a/mail/popper/files/patch-ab b/mail/popper/files/patch-ab
index eb263112c509..8bb2bbdbbf12 100644
--- a/mail/popper/files/patch-ab
+++ b/mail/popper/files/patch-ab
@@ -1,3 +1,5 @@
+SKEY + pw_expire patches
+
 *** pop_pass.c.orig	Fri May 24 22:26:25 1996
 --- pop_pass.c	Tue Dec 10 23:52:23 1996
 ***************
@@ -68,11 +70,11 @@
   }
   
   #endif	/* AUTH */
-*** pop_user.c.orig	Fri May 24 22:26:47 1996
---- pop_user.c	Thu Dec  5 02:19:59 1996
+*** pop_user.c.orig	Sat Mar 29 07:30:36 1997
+--- pop_user.c	Wed Apr 23 07:03:37 1997
 ***************
-*** 117,122 ****
---- 117,134 ----
+*** 163,168 ****
+--- 163,180 ----
       }
   #endif /* APOP */
   
@@ -91,8 +93,8 @@
       /*  Tell the user that the password is required */
       return (pop_msg(p,POP_SUCCESS,"Password required for %s.",p->user));
   }
-*** popper.h.orig	Wed May 22 22:26:25 1996
---- popper.h	Thu Dec  5 02:00:27 1996
+*** popper.h.orig	Tue Apr  1 00:10:18 1997
+--- popper.h	Wed Apr 23 07:33:12 1997
 ***************
 *** 35,40 ****
 --- 35,43 ----
@@ -106,7 +108,7 @@
   
   #ifdef BSDI
 ***************
-*** 110,116 ****
+*** 114,120 ****
   # define POP_MAILDIR     "/var/mail"
   # define POP_DROP        "/var/mail/.%s.pop"
   # define POP_TMPDROP     "/var/mail/tmpXXXXXX"
@@ -114,7 +116,7 @@
   # define MAIL_COMMAND	 "/usr/sbin/sendmail"
   # define OSDONE
   #endif
---- 113,119 ----
+--- 117,123 ----
   # define POP_MAILDIR     "/var/mail"
   # define POP_DROP        "/var/mail/.%s.pop"
   # define POP_TMPDROP     "/var/mail/tmpXXXXXX"
@@ -123,8 +125,8 @@
   # define OSDONE
   #endif
 ***************
-*** 337,342 ****
---- 340,348 ----
+*** 353,358 ****
+--- 356,364 ----
   extern AUTH_DAT kdata;
   #endif /* KERBEROS */
   
diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae
index acc9a00b4566..18009bb1f7df 100644
--- a/mail/popper/files/patch-ae
+++ b/mail/popper/files/patch-ae
@@ -1,7 +1,7 @@
-*** make.44bsd.orig	Thu May 30 04:37:44 1996
---- make.44bsd	Wed Apr  2 05:30:47 1997
+*** make.44bsd.orig	Mon Mar 31 21:47:57 1997
+--- make.44bsd	Wed Apr 23 07:58:19 1997
 ***************
-*** 3,10 ****
+*** 3,32 ****
   
   #               Defines are described in the INSTALL document.
   
@@ -10,28 +10,14 @@
   SRCS=	pop_dele.c pop_dropcopy.c pop_get_command.c pop_get_subcommand.c \
   	pop_init.c pop_last.c pop_list.c pop_log.c pop_lower.c pop_msg.c \
   	pop_parse.c pop_pass.c pop_quit.c pop_rset.c pop_send.c pop_stat.c \
---- 3,14 ----
-  
-  #               Defines are described in the INSTALL document.
-  
-! SUBDIR=popauth
-! 
-! PROG=	popper
-! MAN8=	popper.8					# FreeBSD
-! MAN=	popper.8					# NetBSD/OpenBSD
+  	pop_updt.c pop_user.c pop_xtnd.c pop_xmit.c popper.c pop_bull.c \
+! 	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c md5.c pop_auth.c
+! #SRCS+=	flock.c mktemp.c
 ! 
-  SRCS=	pop_dele.c pop_dropcopy.c pop_get_command.c pop_get_subcommand.c \
-  	pop_init.c pop_last.c pop_list.c pop_log.c pop_lower.c pop_msg.c \
-  	pop_parse.c pop_pass.c pop_quit.c pop_rset.c pop_send.c pop_stat.c \
-***************
-*** 12,32 ****
-  	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c md5.c
-  #SRCS+=	flock.c mktemp.c
-  
 ! BINDIR=/usr/local/libexec
 ! MANDIR=/usr/local/man/man
   
-  #LDADD+= -lcrypt -lndbm
+! #LDADD+= -lcrypt -lndbm
   
 ! CFLAGS+=-DHAVE_PARAM_H 
   
@@ -39,32 +25,49 @@
 ! #CFLAGS+=-DAPOP=\"/etc/pop.auth\" -DPOPUID=\"pop\"
   
   # if you want RPOP support, uncomment the next line
-! #CFLAGS+=-DRPOP
+  #CFLAGS+=-DRPOP
   
   # if you want to block POP access for anyone in /etc/ftpusers, uncomment
 ! #CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
   
   .include <bsd.prog.mk>
 - 
---- 16,47 ----
-  	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c md5.c
-  #SRCS+=	flock.c mktemp.c
+--- 3,51 ----
+  
+  #               Defines are described in the INSTALL document.
+  
+! SUBDIR=popauth
+! 
+! PROG=	popper
+! MAN8=	popper.8					# FreeBSD
+! MAN=	popper.8					# NetBSD/OpenBSD
+! 
+  SRCS=	pop_dele.c pop_dropcopy.c pop_get_command.c pop_get_subcommand.c \
+  	pop_init.c pop_last.c pop_list.c pop_log.c pop_lower.c pop_msg.c \
+  	pop_parse.c pop_pass.c pop_quit.c pop_rset.c pop_send.c pop_stat.c \
+  	pop_updt.c pop_user.c pop_xtnd.c pop_xmit.c popper.c pop_bull.c \
+! 	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c pop_auth.c
+! #SRCS+= md5.c flock.c mktemp.c
   
 ! PREFIX?=/usr/local
 ! BINDIR=${PREFIX}/libexec
 ! MANDIR=${PREFIX}/man/man
-  
-  #LDADD+= -lcrypt -lndbm
-  
+! 
 ! CFLAGS+=-DHAVE_PARAM_H -DSETPROCTITLE
 ! LDADD+=-lutil
+! DPADD+=${LIBUTIL}
 ! 
+! .if !defined(APOP_ONLY)
 ! .if exists(/usr/lib/libskey.a) && exists(/usr/lib/libmd.a)
-! DPADD+= ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
-! LDADD+= -lskey -lmd -lcrypt
-! CFLAGS+= -DSKEY
+! DPADD+=${LIBSKEY}
+! LDADD+=-lskey
+! CFLAGS+=-DSKEY
+! .endif
 ! .endif
   
+! LDADD+=-lmd -lcrypt
+! DPADD+=${LIBMD} ${LIBCRYPT}
+  
   # if you want APOP support, uncomment the next line
 ! CFLAGS+=-DAPOP=\"${PREFIX}/etc/popper/pop.auth\" -DPOPUID=\"pop\"
 ! 
@@ -73,7 +76,7 @@
 ! .endif
   
   # if you want RPOP support, uncomment the next line
-! # CFLAGS+=-DRPOP
+  #CFLAGS+=-DRPOP
   
   # if you want to block POP access for anyone in /etc/ftpusers, uncomment
 ! CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
diff --git a/mail/popper/files/patch-ag b/mail/popper/files/patch-ag
new file mode 100644
index 000000000000..c7231fe9d930
--- /dev/null
+++ b/mail/popper/files/patch-ag
@@ -0,0 +1,19 @@
+*** pop_apop.c.bak	Sat Mar 29 07:30:36 1997
+--- pop_apop.c	Wed Apr 23 07:31:21 1997
+***************
+*** 34,40 ****
+  #endif
+  
+  #include "popper.h"
+! #include "md5.h"
+  
+  /*
+   * Obscure password so a cleartext search doesn't come up with
+--- 34,40 ----
+  #endif
+  
+  #include "popper.h"
+! #include <md5.h>
+  
+  /*
+   * Obscure password so a cleartext search doesn't come up with