From 0c6388f924d3df6facabbb7c0130b4c856f4b20f Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Wed, 25 Apr 2012 14:21:42 -0500
Subject: [PATCH] 1) With SETGID_MAIL enabled (only with dot locking), if the
 chgrp of    inc fails during install, don't attempt to
 chmod it.  This will    cause make install to fail, which
 is good in this case. 2) Added SETGID_MAIL= to the install
 by the test suite so that it    does not attempt the
 chgrp+chmod.  The test suite didn't need them. 3) Removed
 the SETGID_MAIL= from the test suite invocation in
 build_nmh. (cherry picked from commit
 721276218bc03d4b0d86306c9b2990fae6f07426)

---
 Makefile.am            |    2 +-
 docs/contrib/build_nmh |    2 +-
 test/common.sh.in      |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7817bfc..e68973d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -430,7 +430,7 @@ install-exec-hook:
 	ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	ln $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT)
 	if test x$(SETGID_MAIL) != x; then \
-		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT); \
+		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
 	fi
 
diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 55a61c2..344815d 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -300,7 +300,7 @@ if [ $status -eq 0 ]; then
 
   if [ $status -eq 0 ]; then
     [ $verbose -ge 1 ]  &&  echo testing . . .
-    checkoutput=`make $check SETGID_MAIL= 2>>$logfile`
+    checkoutput=`make $check 2>>$logfile`
     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
diff --git a/test/common.sh.in b/test/common.sh.in
index 84d08fc..126ce20 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -142,7 +142,8 @@ setup_test ()
   if [ -d ${MH_INST_DIR}${bindir} ]; then
     :
   else
-    (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} install) || exit 1
+    (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} SETGID_MAIL= install) ||
+      exit 1
   fi
 
   # clean old test data
-- 
1.7.10.4