From c43edd97e50fb24657b9fcbe1a2d1492a8151713 Mon Sep 17 00:00:00 2001
From: Wes Peters <wes@FreeBSD.org>
Date: Thu, 23 Dec 2004 19:26:28 +0000
Subject: [PATCH] Make the MIMEDefang spool directory group-searchable so
 associated virus scanners can be run as different users.

Submitted by:	"Rob MacGregor" <freebsd.macgregor@blueyonder.co.uk>
---
 mail/mimedefang/files/patch-Makefile.in | 19 ++++++++++++++++---
 mail/mimedefang/pkg-install             |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in
index de2f407cde74..3a9c7bf5e4c0 100644
--- a/mail/mimedefang/files/patch-Makefile.in
+++ b/mail/mimedefang/files/patch-Makefile.in
@@ -1,7 +1,20 @@
 --- Makefile.in.orig	Mon Aug  9 11:32:55 2004
-+++ Makefile.in	Fri Oct 15 22:48:43 2004
-@@ -199,9 +199,8 @@
- 	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
++++ Makefile.in	Thu Dec 23 11:22:02 2004
+@@ -182,7 +182,7 @@
+ 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
+ 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ > /dev/null 2>&1 || true; \
+ 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true; \
+-		chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || exit 1; \
++		chmod 710 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || exit 1; \
+ 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ > /dev/null 2>&1 || true; \
+ 		chown "$(DEFANGUSER)" $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true; \
+ 		chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || exit 1; \
+@@ -196,12 +196,11 @@
+ 	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man5 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man5
+ 	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man7 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man7
+ 	-mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8
+-	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
++	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 710 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true
  
 -	if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
diff --git a/mail/mimedefang/pkg-install b/mail/mimedefang/pkg-install
index 3e3a74824db9..cba9d7b6800e 100644
--- a/mail/mimedefang/pkg-install
+++ b/mail/mimedefang/pkg-install
@@ -15,7 +15,7 @@ POST-INSTALL)
 	if [ ! -d ${SPOOLDIR} ]; then
 		mkdir -p ${SPOOLDIR}
 		chown ${MAILUSER}:${MAILUSER} ${SPOOLDIR}
-		chmod 700 ${SPOOLDIR}
+		chmod 710 ${SPOOLDIR}
 	fi
 	if [ ! -d ${QUARANTINEDIR} ]; then
 		mkdir -p ${QUARANTINEDIR}