From 5ff9e5c8930cae61673d554f0647d9212f40db7b Mon Sep 17 00:00:00 2001
From: cube <cube@pkgsrc.org>
Date: Thu, 23 Sep 2004 06:43:45 +0000
Subject: Resurrect support for making the daemon run as something else than
 "popa3d", and factor the resulting grep with the other one.

Bump PKGREVISION.

Based on patch by pancake at phreaker dot net in PR 27018.
---
 mail/popa3d/Makefile         | 13 +++++++------
 mail/popa3d/distinfo         |  4 ++--
 mail/popa3d/patches/patch-aa | 11 ++++++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index baf7ea205be..1cfb08d58d1 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/07/23 14:14:23 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/09/23 06:43:45 cube Exp $
 #
 
 DISTNAME=	popa3d-0.6.4.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/ \
@@ -27,11 +28,11 @@ RCD_SCRIPTS=	popa3d
 FILES_SUBST+=	POPA3D_USER=${POPA3D_USER}
 FILES_SUBST+=	POPA3D_GROUP=${POPA3D_GROUP}
 
-post-patch:
-	cd ${WRKSRC} && \
-		${SED} "s,/var/empty,${PREFIX}/share/empty," \
-			params.h > params.h.new && \
-		${MV} params.h.new params.h
+SUBST_CLASSES+=		params
+SUBST_STAGE.params=	post-patch
+SUBST_FILES.params=	params.h
+SUBST_SED.params=	-e 's,/var/empty,${PREFIX}/share/empty,'	\
+			-e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
 
 do-install:
 	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
index f163d3707b9..874e5a41574 100644
--- a/mail/popa3d/distinfo
+++ b/mail/popa3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2004/07/23 14:14:23 wiz Exp $
+$NetBSD: distinfo,v 1.16 2004/09/23 06:43:45 cube Exp $
 
 SHA1 (popa3d-0.6.4.1.tar.gz) = 0d664db4a1d9129cb03aca57112f39c302cb31d4
 Size (popa3d-0.6.4.1.tar.gz) = 32061 bytes
-SHA1 (patch-aa) = 672b3b4d7319a4af1580af2df955f380bcddbb45
+SHA1 (patch-aa) = 64fdf319d959c9632274e6c658f229048bec2485
 SHA1 (patch-ab) = 9ea78b98fa9279a147a20ca8fc5f938b98365d27
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
index 00cb58828e7..86763e48f9f 100644
--- a/mail/popa3d/patches/patch-aa
+++ b/mail/popa3d/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2003/04/15 08:28:19 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2004/09/23 06:43:45 cube Exp $
 
 --- params.h.orig	Sat Apr 12 16:16:01 2003
 +++ params.h
@@ -20,6 +20,15 @@ $NetBSD: patch-aa,v 1.9 2003/04/15 08:28:19 wiz Exp $
  
  #if DAEMON_LIBWRAP
  /*
+@@ -99,7 +99,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 @@
   *
   * Note that there's no built-in password aging support.
-- 
cgit v1.2.3