compile in support for standalone (non-inetd started) mode.

bump PKGREVISION.

8 files changed, 72 insertions, 16 deletions

diff --git a/mail/popa3d/DESCR b/mail/popa3d/DESCR
index a7afca74e1c..40a4ad16362 100644
--- a/mail/popa3d/DESCR
+++ b/mail/popa3d/DESCR
@@ -9,7 +9,4 @@ the goals are:
 3. RFC compliance (slightly relaxed to work with real-world POP3 clients).
 4. Performance (limited by the more important goals, above).
 
-This package is installed to be run from inetd, which is sufficient 
-for normal usage. However, it is possible to build a stand-alone 
-version, should you need better performance. (This is currently not
-supported by the package system.)
+popa3d can be run from inetd, or as a stand-alone server.
diff --git a/mail/popa3d/MESSAGE b/mail/popa3d/MESSAGE
index 7931ea87d7d..2f2641dfdc0 100644
--- a/mail/popa3d/MESSAGE
+++ b/mail/popa3d/MESSAGE
@@ -1,11 +1,15 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:12 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2002/11/07 03:48:00 dillo Exp $
 
 In order to enable POP service, you should add the following line
 to your /etc/inetd.conf:
 
- pop3 stream tcp nowait root ${PREFIX}/libexec/popa3d popa3d
+ pop3 stream tcp nowait root ${PREFIX}/sbin/popa3d popa3d
 
 and send a HUP signal to inetd.
 
+Alternatively, if you want to run popa3d in standalone mode, you
+can add the following line to your /etc/rc.conf:
+
+ popa3d=YES
 ===========================================================================
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index cabdd52d9a5..f088c6bc18e 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2002/09/24 11:57:27 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/11/07 03:48:00 dillo Exp $
 #
 
 DISTNAME=	popa3d-0.5.9
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/ \
@@ -19,6 +20,8 @@ PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 
 USE_BUILDLINK2=	YES
 
+RCD_SCRIPTS=	popa3d
+
 FILES_SUBST+=	POPA3D_USER=${POPA3D_USER}
 FILES_SUBST+=	POPA3D_GROUP=${POPA3D_GROUP}
 
@@ -29,12 +32,13 @@ post-patch:
 		${MV} params.h.new params.h
 
 do-install:
-	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/libexec
+	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin
 	${INSTALL_DATA} -m 644 ${WRKSRC}/popa3d.8 ${PREFIX}/man/man8/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d
 	cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \
 		${PREFIX}/share/doc/popa3d
 	${INSTALL_DATA_DIR} ${PREFIX}/share/empty
 
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/PLIST b/mail/popa3d/PLIST
index 5f5913d459f..5476705719b 100644
--- a/mail/popa3d/PLIST
+++ b/mail/popa3d/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:47 seb Exp $
-libexec/popa3d
+@comment $NetBSD: PLIST,v 1.5 2002/11/07 03:48:00 dillo Exp $
 man/man8/popa3d.8
+sbin/popa3d
 share/doc/popa3d/DESIGN
 share/doc/popa3d/INSTALL
 share/doc/popa3d/LICENSE
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
index 4523a8f48de..6e483365766 100644
--- a/mail/popa3d/distinfo
+++ b/mail/popa3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/09/24 11:57:27 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/11/07 03:48:00 dillo Exp $
 
 SHA1 (popa3d-0.5.9.tar.gz) = edc84c81fbbb72a06ae41e7de7627e8a343ca056
 Size (popa3d-0.5.9.tar.gz) = 29033 bytes
-SHA1 (patch-aa) = a6d27e6c64c1ee328fb80230ab297c2f95d0a62a
-SHA1 (patch-ab) = 91735d0d3f4d9cf57d814aef260b73084816c6e2
+SHA1 (patch-aa) = 30b3f2d650f7192ad60c72fa35cfa326b3ba4084
+SHA1 (patch-ab) = 7f2e40b237275c031b6ea92f10157dd22c6d930e
diff --git a/mail/popa3d/files/popa3d.sh b/mail/popa3d/files/popa3d.sh
new file mode 100755
index 00000000000..7de153bc05b
--- /dev/null
+++ b/mail/popa3d/files/popa3d.sh
@@ -0,0 +1,25 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: popa3d.sh,v 1.1 2002/11/07 03:50:08 dillo Exp $
+#
+# PROVIDE: popa3d
+# REQUIRE: DAEMON LOGIN
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="popa3d"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+command_args="-D"		# _must_ start as daemon from rc.d;
+				# add more flags through ${${name}_flags}
+
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
+	run_rc_command "$1"
+else
+	echo -n ' ${name}'
+	${command} ${popa3d_flags} ${command_args}
+fi
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
index c27cb35e9d4..6ece860c816 100644
--- a/mail/popa3d/patches/patch-aa
+++ b/mail/popa3d/patches/patch-aa
@@ -1,7 +1,25 @@
-$NetBSD: patch-aa,v 1.7 2002/09/24 11:57:28 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/11/07 03:49:42 dillo Exp $
 
 --- params.h.orig	Sun Sep  8 11:49:24 2002
 +++ params.h
+@@ -13,7 +13,7 @@
+ /*
+  * Are we going to be a standalone server or start via an inetd clone?
+  */
+-#define POP_STANDALONE			0
++#define POP_STANDALONE			1
+ 
+ #if POP_STANDALONE
+ 
+@@ -38,7 +38,7 @@
+  * option is provided primarily as a way to meet conventions of certain
+  * systems where all services obey libwrap access controls.
+  */
+-#define DAEMON_LIBWRAP			0
++#define DAEMON_LIBWRAP			1
+ 
+ #if DAEMON_LIBWRAP
+ /*
 @@ -143,8 +143,8 @@
   *
   * Note that there's no built-in password aging support.
diff --git a/mail/popa3d/patches/patch-ab b/mail/popa3d/patches/patch-ab
index b9607a9edb0..51fb41075bd 100644
--- a/mail/popa3d/patches/patch-ab
+++ b/mail/popa3d/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2002/09/24 11:57:28 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2002/11/07 03:49:42 dillo Exp $
 
 --- Makefile.orig	Sun Oct 28 02:10:49 2001
 +++ Makefile
@@ -26,7 +26,15 @@ $NetBSD: patch-ab,v 1.5 2002/09/24 11:57:28 wiz Exp $
  # HP-UX trusted system
  #LIBS += -lsec
  # Solaris (POP_STANDALONE, POP_VIRTUAL)
-@@ -24,7 +24,7 @@ LIBS =
+@@ -17,14 +17,14 @@ LIBS =
+ # PAM
+ #LIBS += -lpam
+ # TCP wrappers
+-#LIBS += -lwrap
++LIBS += -lwrap
+ # libwrap may also want this
+ #LIBS += -lnsl
+ # OpenSSL (-DHAVE_OPENSSL)
  #LIBS += -lcrypto
  
  DESTDIR =