Update qpopper to 4.0.3 from 3.1.2. Here is brief new feature from

Release note.

4.0
           Supports TLS/SSL security.
           '-p' option now has value '4' to permit plain-text passwords
        under TLS/SSL.
           Now uses a cache file to retain spool index across sessions.
        This dramatically speeds up session start when no new mail has
        arrived.

           '-l' option added to specify TLS/SSL support.
           Lots of TLS/SSL options added.  See the Administrator's Guide
        for details.
           '-v' option added to report current version and exit.
           'make install' added.
           Lots of compile-time options now available at run-time.  See
        the Administrator's Guide for details.
           Integrated poppassd into build.

And here is changes from 4.0.

Changes from 4.0.2 to 4.0.3:
----------------------------
 1.  Don't call SSL_shutdown unless we tried to negotiate an
     SSL session.  (As suggested by Kenneth Porter.)
 2.  Fix buffer overflow (reported by Gustavo Viscaino).
 3.  Fixed empty password treated as empty command (patch
     submitted by Michael Smith and others).
 4.  Added patch by Carles Xavier Munyoz to fix erroneous
     scanning for \n in getline().
 5.  Fix from Arvin Schnell for warnings on 64-bit systems.
 6.  Added patch by Clifton Royston to change error message
     for nonauthfile and authfile tests.
 7.  Added 'uw-kludge' as synonym for 'uw-kluge'.


Changes from 4.0.1 to 4.0.2:
----------------------------
 1.  Added fix for XTND XMIT (sent in by Jacques Distler and
     others).
 2.  Fixed makefile problems with poppassd compile and install
     (sent in by Steven Champeon).
 3.  Increased maximum spool path length from 64 to 256.
 4.  Added more debug code when genpath() runs out of room.
 5.  Changed C++ style comments to C style in poppassd.c
 6.  Changed poppassd's UID check to be the same as Qpopper's
     (which is that if BLOCK_UID is defined we use that value,
     otherwise it defaults to 10).
 7.  Added poppassd expect strings for DEC True 64 (sent in by
     Andres Henckens).


Changes from 4.0.1b1 to 4.0.1 (final):
--------------------------------------
 1.  Fixed typo in popper/pop_init.c if DONT_CHECK_HASH_SPOOL_DIR
     defined.


Changes from 4.0 to 4.0.1b1:
----------------------------
 1.  Messages with lines longer than 512 characters are no longer
     garbled when sent to the client.
 2.  Added patches from Michael C Tiernan to fix makefile problems.

10 files changed, 211 insertions, 60 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 314fd3239b9..26ea01a75c4 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,51 +1,50 @@
-# $NetBSD: Makefile,v 1.27 2001/03/04 03:26:51 assar Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/10 15:08:40 taca Exp $
 #
 
-DISTNAME=		qpopper3.1.2
-PKGNAME=		qpopper-3.1.2
+DISTNAME=		qpopper${VERSION}
+PKGNAME=		qpopper-${VERSION}
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
 
 PATCH_SITES=		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=		qpopper3.1.2-ipv6-20001214.diff.gz
+PATCHFILES=		qpopper4.0.3-ipv6-20010504.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		mellon@fugue.com
-HOMEPAGE=		http://eudora.qualcomm.com/freeware/qpop.html
+HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's POP server for Eudora
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec \
-			--sysconfdir=${PREFIX}/etc --enable-apop \
-			--with-apop=/etc/apop.auth --with-apopuid=root
+VERSION=		4.0.3
 
-.include "../../mk/bsd.prefs.mk"
+.include "Makefile.common"
 
-.if defined(KERBEROS)
-USE_KERBEROS=		# defined
-CONFIGURE_ARGS+=	--enable-kerberos
+.if exists(/usr/sbin/user)
+USER_CMD=	/usr/sbin/user
+GROUP_CMD=	/usr/sbin/group
+.else
+DEPENDS+=	user>=20000313:../../sysutils/user
+USER_CMD=	${LOCALBASE}/sbin/user
+GROUP_CMD=	${LOCALBASE}/sbin/group
 .endif
 
-BUILD_DEFS+=		QPOPPER_SERVERMODE USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(QPOPPER_SERVERMODE)
-CONFIGURE_ARGS+=	--enable-servermode
-.endif
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
-.endif
-
-# popper makefile doesn't have an install target...
-do-install:
-	(cd ${WRKSRC}; \
-	 ${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec/qpopper; \
-	 ${INSTALL} -o root -c -g ${BINGRP} -m 4755 popper/popauth \
-		${PREFIX}/bin/qpopauth; \
-	 ${INSTALL_MAN} man/popper.8 ${PREFIX}/man/man8/qpopper.8; \
-	 ${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/qpopauth.8 ; \
-	 ${INSTALL_MAN} License.txt ${PREFIX}/share/doc/qpopper.License \
-	)
+pre-build:
+	${SED} 's"/usr/local/lib"${LOCALBASE}/libexec"' \
+		${WRKSRC}/man/popper.8 > ${WRKSRC}/man/popper.8.$$ && \
+	${MV} -f ${WRKSRC}/man/popper.8.$$ ${WRKSRC}/man/popper.8
+
+pre-install:
+	@${USER_CMD} info -e ${QPOPPER_USER} || \
+		${USER_CMD} add -g ${BINGRP} \
+			-d /nonexistent -s /sbin/nologin ${QPOPPER_USER}
+
+post-install:
+	@if [ -f ${DESTDIR}/etc/apop.auth.db ]; then \
+		${CHOWN} ${QPOPPER_USER} ${DESTDIR}/etc/apop.auth.db; \
+		${CHGRP} ${BINGRP} ${DESTDIR}/etc/apop.auth.db; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/License.txt ${LOCALBASE}/share/doc/qpopper.License
+	${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
+		 ${LOCALBASE}/share/examples
+	@${SETENV} PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
new file mode 100644
index 00000000000..6c2685bc16a
--- /dev/null
+++ b/mail/qpopper/Makefile.common
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2001/06/10 15:08:40 taca Exp $
+
+GNU_CONFIGURE=		yes
+USE_SSL=		yes
+CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
+			--sysconfdir=${LOCALBASE}/etc \
+			--enable-apop=/etc/apop.auth \
+			--with-popuid=${QPOPPER_USER} \
+			--enable-log-facility=LOG_${QPOPPER_FAC} \
+			--disable-update-abort --without-gdbm
+.if exists(${LOCALBASE}/include/openssl/ssl.h)
+CONFIGURE_ARGS+=	--with-openssl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--with-openssl=/usr
+.endif
+
+QPOPPER_USER?=		pop
+QPOPPER_FAC?=		LOCAL1
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(KERBEROS)
+USE_KERBEROS=		# defined
+CONFIGURE_ARGS+=	--enable-kerberos
+.endif
+
+BUILD_DEFS+=		QPOPPER_SERVERMODE USE_INET6
+
+.if defined(QPOPPER_SERVERMODE)
+CONFIGURE_ARGS+=	--enable-servermode
+.endif
+.if defined(USE_INET6) && ${USE_INET6} == YES
+CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
+.endif
+.if defined(QPOPPER_USER)
+.endif
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 526ca060deb..cf01c2a95c9 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:52:03 tron Exp $
+$NetBSD: distinfo,v 1.3 2001/06/10 15:08:40 taca Exp $
 
-SHA1 (qpopper3.1.2.tar.gz) = 10f0da1d760394fbfae874336ba6f5aab0369629
-Size (qpopper3.1.2.tar.gz) = 38 bytes
-SHA1 (qpopper3.1.2-ipv6-20001214.diff.gz) = 066193ca12aec172ac829b55d3559defedfafb92
-Size (qpopper3.1.2-ipv6-20001214.diff.gz) = 53 bytes
-SHA1 (patch-aa) = 482949d76519381077ce35a31487b061aa9bd5e1
-SHA1 (patch-ab) = 975d19be8a996e494017230d2b0d315297f82848
+SHA1 (qpopper4.0.3.tar.gz) = 67b343a57e10250c98eb87660e6d563be6c018cc
+Size (qpopper4.0.3.tar.gz) = 2326127 bytes
+SHA1 (qpopper4.0.3-ipv6-20010504.diff.gz) = cc74bffbd769a6589ee945916a33b17ea4d7873f
+Size (qpopper4.0.3-ipv6-20010504.diff.gz) = 21263 bytes
+SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
+SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
+SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
+SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34
+SHA1 (patch-am) = 50f1afde9771af17f77552254372374699caad73
diff --git a/mail/qpopper/patches/patch-aa b/mail/qpopper/patches/patch-aa
deleted file mode 100644
index 06fd3e5467e..00000000000
--- a/mail/qpopper/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/12/12 17:42:56 itojun Exp $
-
---- configure.orig	Wed Dec 13 02:25:38 2000
-+++ configure	Wed Dec 13 02:35:14 2000
-@@ -3524,7 +3524,7 @@
- LIBS="$ac_save_LIBS"
- 
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+if eval "test 0 = 1"; then
-   echo "$ac_t""yes" 1>&6
-   DBM_LIBS="-lgdbm";\
-                                   echo "$ac_t""found gdbm" 1>&6;\
diff --git a/mail/qpopper/patches/patch-ab b/mail/qpopper/patches/patch-ab
index 1d4e5b36454..73ad47dd1cc 100644
--- a/mail/qpopper/patches/patch-ab
+++ b/mail/qpopper/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2001/04/19 08:52:04 tron Exp $
+$NetBSD: patch-ab,v 1.8 2001/06/10 15:08:41 taca Exp $
 
---- popper/popauth.c.orig	Tue Sep 12 00:34:48 2000
-+++ popper/popauth.c	Thu Apr 19 10:46:18 2001
-@@ -158,7 +158,7 @@
+--- popper/popauth.c.orig	Wed Apr  4 09:23:41 2001
++++ popper/popauth.c
+@@ -168,7 +168,7 @@
  #define APOP_AUTH   1
      { "apopauth"  },
  #define POP_AUTH    2 
diff --git a/mail/qpopper/patches/patch-ae b/mail/qpopper/patches/patch-ae
new file mode 100644
index 00000000000..c787ff000de
--- /dev/null
+++ b/mail/qpopper/patches/patch-ae
@@ -0,0 +1,47 @@
+$NetBSD: patch-ae,v 1.11 2001/06/10 15:08:41 taca Exp $
+
+--- man/popauth.8.orig	Wed Apr  4 09:23:13 2001
++++ man/popauth.8
+@@ -7,11 +7,11 @@
+ .\" See License.txt file for terms and conditions for modification and
+ .\" redistribution.
+ .\"
+-.TH POPAUTH 8
++.TH QPOPAUTH 8
+ .SH NAME
+-popauth \-\- manipulate POP authorization DB
++qpopauth \-\- manipulate POP authorization DB
+ .SH SYNOPSIS
+-.B popauth
++.B qpopauth
+ [
+ .BI \-trace " tracefile"
+ ] [
+@@ -46,18 +46,18 @@
+ ]
+ 
+ .SH DESCRIPTION
+-The \fIpopauth\fR program allows POP subscribers to add or change the secret
++The \fIqpopauth\fR program allows POP subscribers to add or change the secret
+ values used to generate their authentication credentials, or to verify the
+ existance of their records.
+ 
+ In addition, the super\-user or master POP user can add, delete, or reset
+ credential data for a user, or list which records exist.  Only the
+-super\-user may initialize the database.  \fIpopauth\fR is useful only when
++super\-user may initialize the database.  \fIqpopauth\fR is useful only when
+ the APOP (or SCRAM) configuration option is defined.  See the INSTALL file
+ in the Qpopper distribution for more information.
+ 
+ Under normal usage,
+-\fIpopauth\fR prompts for a new secret,
++\fIqpopauth\fR prompts for a new secret,
+ just like the \fIpasswd\fR program.  It then updates the authorization DB.
+ 
+ With the
+@@ -89,4 +89,4 @@
+ .SH ACKNOWLEDGEMENTS
+ This program was derived from MH 6.8.3
+ .SH SEE ALSO
+-popper(8), poppassd(8)
++qpopper(8), poppassd(8)
diff --git a/mail/qpopper/patches/patch-ag b/mail/qpopper/patches/patch-ag
new file mode 100644
index 00000000000..f1ec682ff93
--- /dev/null
+++ b/mail/qpopper/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.8 2001/06/10 15:08:41 taca Exp $
+
+--- man/popper.8.orig	Wed Apr  4 09:23:13 2001
++++ man/popper.8
+@@ -19,7 +19,7 @@
+ .SH NAME
+ qpopper \-\- POP3 server (v4.0)
+ .SH SYNOPSIS
+-.B /usr/local/lib/popper
++.B /usr/local/lib/qpopper
+ [
+ .I [ address ]
+ .I [ ":" ]
+@@ -800,7 +803,7 @@
+ .PP
+ The server implements several extended commands.
+ .PP
+-XTND XMIT: Sends a mail message using /usr/lib/sendmail.
++XTND XMIT: Sends a mail message using /usr/sbin/sendmail.
+ .PP
+ XTND XLIST header [num]: Extracts and returns the specified header line
+ for the specified message number. If the "num" parameter is missing, 
diff --git a/mail/qpopper/patches/patch-al b/mail/qpopper/patches/patch-al
new file mode 100644
index 00000000000..f9b04278756
--- /dev/null
+++ b/mail/qpopper/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
+
+--- Makefile.in.orig	Mon Apr 23 07:59:14 2001
++++ Makefile.in
+@@ -58,10 +58,10 @@
+ 	cd ${popper_dir}  && ${MAKE} all
+ 
+ install:
+-	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8  ${mandir}/man8/
+-	echo "Installed man/popper.8 as ${mandir}/man8/popper.8"
+-	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
+-	echo "Installed man/popauth.8 as ${mandir}/man8/popauth.8"
++	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/qpopper.8
++	@echo "Installed man/popper.8 as ${mandir}/man8/qpopper.8"
++	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/qpopauth.8
++	@echo "Installed man/popauth.8 as ${mandir}/man8/qpopauth.8"
+ 	cd ${popper_dir}  && ${MAKE} install
+ 
+ clean:
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am
new file mode 100644
index 00000000000..2f3c3baf5f4
--- /dev/null
+++ b/mail/qpopper/patches/patch-am
@@ -0,0 +1,37 @@
+$NetBSD: patch-am,v 1.1 2001/06/10 15:08:41 taca Exp $
+
+--- popper/Makefile.in.orig	Mon Apr 23 07:59:15 2001
++++ popper/Makefile.in
+@@ -87,6 +87,8 @@
+ prefix          =   @prefix@
+ exec_prefix     =   @exec_prefix@
+ installdir      =   @sbindir@
++libexecdir	=   @libexecdir@
++sbindir		=   @sbindir@
+ 
+ popper_srcdir   =   ${top_srcdir}/popper
+ qd_srcdir       =   ${top_srcdir}/qd
+@@ -199,17 +201,17 @@
+ ${POPAUTHSRCS}:
+ 
+ install: popper ${pop_auth}
+-	${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
+-	echo "Installed popper as ${installdir}/popper"
++	${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
++	@echo "Installed popper as ${libexecdir}/qpopper"
+ 	if [ "x${poppassd}" != "x" ]; then \
+ 	    cd ${password_dir} && ${MAKE} $@ ;\
+ 	fi
+-	if [ "x${pop_auth}" != "x" ]; then \
++	@if [ "x${pop_auth}" != "x" ]; then \
+ 	    ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
+-	               ${installdir}/${pop_auth}; \
+-	    echo "Installed popauth as ${installdir}/${pop_auth} " \
++	               ${sbindir}/q${pop_auth}; \
++	    echo "Installed popauth as ${sbindir}/q${pop_auth} " \
+ 	         "with uid ${apop_uid}"; \
+-	    ${installdir}/${pop_auth} -init -safe; \
++	    ${sbindir}/q${pop_auth} -init -safe; \
+ 	fi
+ 
+ clean:
diff --git a/mail/qpopper/pkg/PLIST b/mail/qpopper/pkg/PLIST
index afc0f99f10b..e17f8042683 100644
--- a/mail/qpopper/pkg/PLIST
+++ b/mail/qpopper/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2000/08/18 20:37:28 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/06/10 15:08:41 taca Exp $
 libexec/qpopper
-bin/qpopauth
 man/man8/qpopper.8
 man/man8/qpopauth.8
+sbin/qpopauth
 share/doc/qpopper.License
+share/examples/qpopper.config