From 4d289de7e87c7fb2263ec731ae6e404550716e5c Mon Sep 17 00:00:00 2001
From: plunky <plunky>
Date: Mon, 26 Nov 2007 08:27:24 +0000
Subject: set permissions on the fifo when we make the fifo rather than using
 SPECIAL_PERMS because ordering seems to be an issue

---
 mail/nullmailer/INSTALL  | 9 +++++++--
 mail/nullmailer/Makefile | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/nullmailer/INSTALL b/mail/nullmailer/INSTALL
index a403115d18a..6539f0b0ea7 100644
--- a/mail/nullmailer/INSTALL
+++ b/mail/nullmailer/INSTALL
@@ -1,10 +1,15 @@
-# $NetBSD: INSTALL,v 1.1 2005/08/20 02:20:45 schmonz Exp $
+# $NetBSD: INSTALL,v 1.2 2007/11/26 08:27:24 plunky Exp $
 
 VARBASE=@VARBASE@
+NULLMAILER_USER=@NULLMAILER_USER@
+NULLMAILER_GROUP=@NULLMAILER_GROUP@
+
+TRIGGER=${VARBASE}/spool/nullmailer/trigger
 
 case "${STAGE}" in
 
 POST-INSTALL)
-	mkfifo ${VARBASE}/spool/nullmailer/trigger
+	mkfifo -m 0600 ${TRIGGER} &&					\
+	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} ${TRIGGER}
 	;;
 esac
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index f95b53273bd..7aeea20d383 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/07/04 20:54:45 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/11/26 08:27:24 plunky Exp $
 
 DISTNAME=		nullmailer-1.03
 CATEGORIES=		mail
@@ -44,8 +44,6 @@ SPECIAL_PERMS+=		libexec/nullmailer/mailq			\
 			${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
 SPECIAL_PERMS+=		libexec/nullmailer/nullmailer-queue		\
 			${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
-SPECIAL_PERMS+=		${VARBASE}/spool/nullmailer/trigger		\
-			${NULLMAILER_USER} ${NULLMAILER_GROUP} 0600
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
-- 
cgit v1.2.3