Optionally allow APOP only authentification mode

4 files changed, 91 insertions, 77 deletions

diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index b786fa9461e5..680e95e322dc 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.12 1996/07/05 06:12:45 asami Exp $
+# $Id: Makefile,v 1.13 1996/11/10 21:32:35 obrien Exp $
 #
 
 DISTNAME=	qpop2.2
@@ -14,6 +14,11 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pst@freebsd.org
 
+#
+# If APOP_ONLY variable present in the environment, popper builds
+# with APOP authentification only
+#
+
 NO_PACKAGE=	"Needs POP UID"
 WRKSRC=		${WRKDIR}/qpopper2.2
 
diff --git a/mail/popper/files/patch-aa b/mail/popper/files/patch-aa
index 9474c1e439cb..1f7b7b7b2bb7 100644
--- a/mail/popper/files/patch-aa
+++ b/mail/popper/files/patch-aa
@@ -1,78 +1,3 @@
-*** make.44bsd.orig	Thu May 30 09:37:44 1996
---- make.44bsd	Fri Dec  6 11:05:40 1996
-***************
-*** 3,10 ****
-  
-  #               Defines are described in the INSTALL document.
-  
-! PROG=popper popauth
-! MAN8=popper.8 popauth.8
-  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,12 ----
-  
-  #               Defines are described in the INSTALL document.
-  
-! SUBDIR=popauth
-! 
-! PROG=popper
-! MAN8=popper.8
-  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
-  
-! CFLAGS+=-DHAVE_PARAM_H 
-  
-  # if you want APOP support, uncomment the next line
-! #CFLAGS+=-DAPOP=\"/etc/pop.auth\" -DPOPUID=\"pop\"
-  
-  # if you want RPOP support, uncomment the next line
-! #CFLAGS+=-DRPOP
-  
-  # if you want to block POP access for anyone in /etc/ftpusers, uncomment
-! #CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
-  
-  .include <bsd.prog.mk>
-- 
---- 14,41 ----
-  	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c md5.c
-  #SRCS+=	flock.c mktemp.c
-  
-! PREFIX?=/usr/local
-! BINDIR=${PREFIX}/libexec
-! MANDIR=${PREFIX}/man/man
-  
-  #LDADD+= -lcrypt -lndbm
-  
-! CFLAGS+=-DHAVE_PARAM_H -DSETPROCTITLE
-! LDADD+=-lutil
-! 
-! .if exists(/usr/lib/libskey.a) && exists(/usr/lib/libmd.a)
-! DPADD+= ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
-! LDADD+= -lskey -lmd -lcrypt
-! CFLAGS+= -DSKEY
-! .endif
-  
-  # if you want APOP support, uncomment the next line
-! CFLAGS+=-DAPOP=\"${PREFIX}/etc/popper/pop.auth\" -DPOPUID=\"pop\"
-  
-  # if you want RPOP support, uncomment the next line
-! # CFLAGS+=-DRPOP
-  
-  # if you want to block POP access for anyone in /etc/ftpusers, uncomment
-! CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
-  
-  .include <bsd.prog.mk>
 *** pop_dropcopy.c	Sat Jun  8 14:44:01 1996
 --- pop_dropcopy.c	Sat Jun  8 14:50:46 1996
 ***************
diff --git a/mail/popper/files/patch-ae b/mail/popper/files/patch-ae
new file mode 100644
index 000000000000..896ba8d2c3f8
--- /dev/null
+++ b/mail/popper/files/patch-ae
@@ -0,0 +1,79 @@
+*** make.44bsd.orig	Thu May 30 04:37:44 1996
+--- make.44bsd	Wed Apr  2 05:30:47 1997
+***************
+*** 3,10 ****
+  
+  #               Defines are described in the INSTALL document.
+  
+! PROG=popper popauth
+! MAN8=popper.8 popauth.8
+  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,12 ----
+  
+  #               Defines are described in the INSTALL document.
+  
+! SUBDIR=popauth
+! 
+! PROG=popper
+! MAN8=popper.8
+  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
+  
+! CFLAGS+=-DHAVE_PARAM_H 
+  
+  # if you want APOP support, uncomment the next line
+! #CFLAGS+=-DAPOP=\"/etc/pop.auth\" -DPOPUID=\"pop\"
+  
+  # if you want RPOP support, uncomment the next line
+! #CFLAGS+=-DRPOP
+  
+  # if you want to block POP access for anyone in /etc/ftpusers, uncomment
+! #CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
+  
+  .include <bsd.prog.mk>
+- 
+--- 14,45 ----
+  	xtnd_xlst.c pop_uidl.c pop_rpop.c pop_apop.c md5.c
+  #SRCS+=	flock.c mktemp.c
+  
+! PREFIX?=/usr/local
+! BINDIR=${PREFIX}/libexec
+! MANDIR=${PREFIX}/man/man
+  
+  #LDADD+= -lcrypt -lndbm
+  
+! CFLAGS+=-DHAVE_PARAM_H -DSETPROCTITLE
+! LDADD+=-lutil
+! 
+! .if exists(/usr/lib/libskey.a) && exists(/usr/lib/libmd.a)
+! DPADD+= ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
+! LDADD+= -lskey -lmd -lcrypt
+! CFLAGS+= -DSKEY
+! .endif
+  
+  # if you want APOP support, uncomment the next line
+! CFLAGS+=-DAPOP=\"${PREFIX}/etc/popper/pop.auth\" -DPOPUID=\"pop\"
+! 
+! .if defined(APOP_ONLY)
+! CFLAGS+=-DAPOP_ONLY
+! .endif
+  
+  # if you want RPOP support, uncomment the next line
+! # CFLAGS+=-DRPOP
+  
+  # if you want to block POP access for anyone in /etc/ftpusers, uncomment
+! CFLAGS+=-DNONAUTHFILE=\"/etc/ftpusers\"
+  
+  .include <bsd.prog.mk>
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index b786fa9461e5..680e95e322dc 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.12 1996/07/05 06:12:45 asami Exp $
+# $Id: Makefile,v 1.13 1996/11/10 21:32:35 obrien Exp $
 #
 
 DISTNAME=	qpop2.2
@@ -14,6 +14,11 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pst@freebsd.org
 
+#
+# If APOP_ONLY variable present in the environment, popper builds
+# with APOP authentification only
+#
+
 NO_PACKAGE=	"Needs POP UID"
 WRKSRC=		${WRKDIR}/qpopper2.2