Update popa3d to 0.4.9.1.

Changes:
PAM authentication (obviously not enabled)
Choice for fcntl(2) and/or flock(2) locking.
Virtual domain support hooks (in beta, not enabled in package)
Relaxed BSD-compatible license for most source files.
Various bug and portability fixes.

6 files changed, 42 insertions, 36 deletions

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 025e87d25ce..95c3a0a0a7d 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,17 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2001/05/29 12:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/07/21 17:16:12 wiz Exp $
 #
 
-DISTNAME=	popa3d-0.4
-PKGNAME=	popa3d-0.4nb1
+DISTNAME=	popa3d-0.4.9.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/ \
 		ftp://ftp.false.com/pub/security/popa3d/
 
-PATCHFILES=	popa3d-0.4-gnu-md5-alignment.diff.gz
-PATCH_SITES=	${MASTER_SITES}
-PATCH_DIST_ARGS=	-d ${WRKDIR} -s
-
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.openwall.com/popa3d/
 COMMENT=	secure, reliable, performant, and small pop3 server
@@ -40,7 +35,7 @@ do-install:
 	${INSTALL_PROGRAM} -o popa3d -g popa3d -m 700 ${WRKSRC}/popa3d \
 		${PREFIX}/libexec
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d
-	cd ${WRKSRC} && ${INSTALL_DATA} COPYING DESIGN INSTALL \
+	cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \
 		${PREFIX}/share/doc/popa3d
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
index 96a14eac51f..4eb166b5d83 100644
--- a/mail/popa3d/distinfo
+++ b/mail/popa3d/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:10:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/21 17:16:12 wiz Exp $
 
-SHA1 (popa3d-0.4.tar.gz) = 47df1be78048b68b6ce7b552cccd76579d576710
-Size (popa3d-0.4.tar.gz) = 29805 bytes
-SHA1 (popa3d-0.4-gnu-md5-alignment.diff.gz) = 4a7d266436c045f1ffb3485067b9d8e3076d1863
-Size (popa3d-0.4-gnu-md5-alignment.diff.gz) = 591 bytes
-SHA1 (patch-aa) = f6826a1e81b7cb73ddf99ce87e00e1e40d6035a9
-SHA1 (patch-ab) = f328a373fbe2fb39632326a65839f7e32f843d04
+SHA1 (popa3d-0.4.9.1.tar.gz) = 304346cfb060986917178a09c6519e6fed7b521b
+Size (popa3d-0.4.9.1.tar.gz) = 24652 bytes
+SHA1 (patch-aa) = 4769189d40bcdea796771fa1486dda82ce6c0981
+SHA1 (patch-ab) = 36950fa4f55b6136ecc17fdf698dd28f383fb71d
+SHA1 (patch-ac) = 49f3bc3dd9a3240907e5fcf1933785b91f5a8a37
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
index 48b6b0c8b6d..b0a1e7c3749 100644
--- a/mail/popa3d/patches/patch-aa
+++ b/mail/popa3d/patches/patch-aa
@@ -1,22 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2000/04/03 02:12:28 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2001/07/21 17:16:13 wiz Exp $
 
---- params.h.orig	Tue Feb  1 07:16:24 2000
-+++ params.h	Mon Apr  3 04:08:21 2000
-@@ -62,7 +62,7 @@
-  * Do we have shadow passwords? (Not for *BSD.)
-  * Note: password aging is not supported.
+--- params.h.orig	Sun May 20 07:00:31 2001
++++ params.h
+@@ -107,8 +107,8 @@
+  *
+  * Note that there's no built-in password aging support.
   */
+-#define AUTH_PASSWD			0
 -#define AUTH_SHADOW			1
++#define AUTH_PASSWD			1
 +#define AUTH_SHADOW			0
+ #define AUTH_PAM			0
+ #define AUTH_PAM_USERPASS		0
  
- /*
-  * A salt used to waste some CPU time on dummy crypt(3) calls and make
-@@ -81,7 +81,7 @@
+@@ -141,7 +141,7 @@
   * Your mail spool directory. Note: only local (non-NFS) mode 775 mail
   * spools are currently supported.
   */
 -#define MAIL_SPOOL_PATH			"/var/spool/mail"
 +#define MAIL_SPOOL_PATH			"/var/mail"
  
- /*
-  * How do we talk to syslogd? These should be fine for most systems.
+ #endif
+ 
diff --git a/mail/popa3d/patches/patch-ab b/mail/popa3d/patches/patch-ab
index 90b9578ee1f..5ba09854f00 100644
--- a/mail/popa3d/patches/patch-ab
+++ b/mail/popa3d/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/02 01:32:28 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/21 17:16:13 wiz Exp $
 
---- Makefile.orig	Tue Feb  1 04:56:46 2000
-+++ Makefile	Sun Apr  2 00:29:25 2000
-@@ -1,9 +1,11 @@
+--- Makefile.orig	Sun May 20 07:00:13 2001
++++ Makefile
+@@ -1,8 +1,8 @@
 -CC = gcc
 -LD = gcc
 -RM = rm -f
@@ -14,8 +14,5 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/04/02 01:32:28 wiz Exp $
 +CFLAGS += -c -Wall -O2 -fomit-frame-pointer
 +LDFLAGS += -s -lcrypt
  #LDFLAGS = -s -lcrypt
-+
-+all: popa3d
+ #LDFLAGS = -s -lcrypt -lpam
  
- PROJ = popa3d
- OBJS = md5/md5.o \
diff --git a/mail/popa3d/patches/patch-ac b/mail/popa3d/patches/patch-ac
new file mode 100644
index 00000000000..c926f901b20
--- /dev/null
+++ b/mail/popa3d/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/07/21 17:16:13 wiz Exp $
+
+--- auth_passwd.c.orig	Wed May 16 17:39:21 2001
++++ auth_passwd.c
+@@ -6,7 +6,7 @@
+ 
+ #if AUTH_PASSWD && !VIRTUAL_ONLY
+ 
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 4
+ #define _XOPEN_SOURCE_EXTENDED
+ #define _XOPEN_VERSION 4
+ #define _XPG4_2
diff --git a/mail/popa3d/pkg/PLIST b/mail/popa3d/pkg/PLIST
index 0eea578ebfa..226046b5726 100644
--- a/mail/popa3d/pkg/PLIST
+++ b/mail/popa3d/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/04/02 01:32:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/21 17:16:13 wiz Exp $
 libexec/popa3d
-share/doc/popa3d/COPYING
 share/doc/popa3d/DESIGN
 share/doc/popa3d/INSTALL
+share/doc/popa3d/LICENSE