Update to 1.0.2.

Drop maintainership, I'm not using this any longer.

	Changes made between 1.0.1 and 1.0.2 (2006/05/23).

A couple of optimizations specific to x86-64 have been applied to the
included MD5 routines.


	Changes made between 1.0 and 1.0.1 (2006/03/07).

Use sysconf(_SC_CLK_TCK) instead of CLK_TCK when _SC_CLK_TCK is known to
be available or CLK_TCK is not.  This is needed for portability to glibc
2.3.90+ and possibly to other recent and future systems.

Use socklen_t where appropriate.

4 files changed, 22 insertions, 23 deletions

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index f5a89f5a544..45eda0e99ba 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2006/07/19 22:41:45 wiz Exp $
 #
 
-DISTNAME=	popa3d-1.0
+DISTNAME=	popa3d-1.0.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/ \
 		ftp://ftp.false.com/pub/security/popa3d/
 
-MAINTAINER=	wiz@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openwall.com/popa3d/
 COMMENT=	Secure, reliable, performant, and small pop3 server
 
@@ -23,7 +23,7 @@ FILES_SUBST+=	POPA3D_USER=${POPA3D_USER:Q}
 FILES_SUBST+=	POPA3D_GROUP=${POPA3D_GROUP:Q}
 
 SUBST_CLASSES+=		params
-SUBST_STAGE.params=	post-patch
+SUBST_STAGE.params=	pre-configure
 SUBST_FILES.params=	params.h
 SUBST_SED.params=	-e 's,/var/empty,${PREFIX}/share/empty,'	\
 			-e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
index 780f3746e38..0b9043e86d8 100644
--- a/mail/popa3d/distinfo
+++ b/mail/popa3d/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2005/05/31 17:46:45 wiz Exp $
+$NetBSD: distinfo,v 1.19 2006/07/19 22:41:45 wiz Exp $
 
-SHA1 (popa3d-1.0.tar.gz) = f2f69c75fde39af732cb879e486a1a32dc700343
-RMD160 (popa3d-1.0.tar.gz) = cb5f65d1cb26287caf83af54996bcc47ed16f233
-Size (popa3d-1.0.tar.gz) = 32586 bytes
-SHA1 (patch-aa) = 64fdf319d959c9632274e6c658f229048bec2485
-SHA1 (patch-ab) = 9ea78b98fa9279a147a20ca8fc5f938b98365d27
+SHA1 (popa3d-1.0.2.tar.gz) = 85779cfc657050352b3bcda5ca7f1dfe7ac4e92b
+RMD160 (popa3d-1.0.2.tar.gz) = 7cde1e5876b44644ded3ff2287c19ae7520ba409
+Size (popa3d-1.0.2.tar.gz) = 32848 bytes
+SHA1 (patch-aa) = bb4879169ae6ee60a46d19eb736497370021167c
+SHA1 (patch-ab) = 5a50a0f69324031c610fd1e47dda680e1408e8dd
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
index 86763e48f9f..5fc7c0a2ab8 100644
--- a/mail/popa3d/patches/patch-aa
+++ b/mail/popa3d/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2004/09/23 06:43:45 cube Exp $
+$NetBSD: patch-aa,v 1.11 2006/07/19 22:41:45 wiz Exp $
 
---- params.h.orig	Sat Apr 12 16:16:01 2003
+--- params.h.orig	2006-03-05 12:44:52.000000000 +0000
 +++ params.h
 @@ -13,7 +13,7 @@
  /*
@@ -20,16 +20,16 @@ $NetBSD: patch-aa,v 1.10 2004/09/23 06:43:45 cube Exp $
  
  #if DAEMON_LIBWRAP
  /*
-@@ -99,7 +99,7 @@
-  * A pseudo-user to run as before authentication. The user and its UID
+@@ -103,7 +103,7 @@
+  * A pseudo-user to run as before authentication.  The user and its UID
   * must not be used for any other purpose.
   */
 -#define POP_USER			POP_SERVER
 +#define POP_USER			@@POPA3D_USER@@
  
  /*
-  * An empty directory to chroot to before authentication. The directory
-@@ -144,8 +144,8 @@
+  * An empty directory to chroot to before authentication.  The directory
+@@ -154,8 +154,8 @@
   *
   * Note that there's no built-in password aging support.
   */
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.10 2004/09/23 06:43:45 cube Exp $
  #define AUTH_PAM			0
  #define AUTH_PAM_USERPASS		0
  #define USE_LIBPAM_USERPASS		0
-@@ -198,8 +198,8 @@
+@@ -208,8 +208,8 @@
   *
   * *BSDs use flock(2), others typically use fcntl(2).
   */
@@ -50,4 +50,4 @@ $NetBSD: patch-aa,v 1.10 2004/09/23 06:43:45 cube Exp $
 +#define LOCK_FLOCK			1
  
  /*
-  * How do we talk to syslogd? These should be fine for most systems.
+  * How do we talk to syslogd?  These should be fine for most systems.
diff --git a/mail/popa3d/patches/patch-ab b/mail/popa3d/patches/patch-ab
index 29cdf14e7be..0ca9341c9d1 100644
--- a/mail/popa3d/patches/patch-ab
+++ b/mail/popa3d/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.8 2003/12/07 19:18:17 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2006/07/19 22:41:45 wiz Exp $
 
---- Makefile.orig	Mon Nov 17 01:43:35 2003
+--- Makefile.orig	2006-03-05 10:36:20.000000000 +0000
 +++ Makefile
 @@ -1,30 +1,32 @@
 -CC = gcc
--LD = gcc
++#CC = gcc
+ LD = $(CC)
 -RM = rm -f
 -MKDIR = mkdir -p
 -INSTALL = install -c
 -CFLAGS = -Wall -O2 -fomit-frame-pointer
-+#CC = gcc
-+LD = $(CC)
 +#RM = rm -f
 +#MKDIR = mkdir -p
 +#INSTALL = install -c