[pkgsrc/trunk]: pkgsrc/mail/maildrop Add a check for whether maildrop is invo...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/408af0866205
branches:  trunk
changeset: 509999:408af0866205
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 21 19:50:51 2006 +0000

description:
Add a check for whether maildrop is invoked by courier or not before
doing courier-specific things, like accepting the values of certain
environment variables for things like location of the mail folder for
local delivery.  This addresses PR pkg/32369 in a way that still allows
for a future courier-mta package that just uses the maildrop package.

diffstat:

 mail/maildrop/Makefile         |   4 ++--
 mail/maildrop/distinfo         |   3 ++-
 mail/maildrop/patches/patch-ac |  28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r dd43443bf473 -r 408af0866205 mail/maildrop/Makefile
--- a/mail/maildrop/Makefile    Tue Mar 21 19:35:44 2006 +0000
+++ b/mail/maildrop/Makefile    Tue Mar 21 19:50:51 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/03/21 19:50:51 jlam Exp $
 
 DISTNAME=      maildrop-2.0.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=     security
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=   .tar.bz2
diff -r dd43443bf473 -r 408af0866205 mail/maildrop/distinfo
--- a/mail/maildrop/distinfo    Tue Mar 21 19:35:44 2006 +0000
+++ b/mail/maildrop/distinfo    Tue Mar 21 19:50:51 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/10/20 20:26:37 jlam Exp $
+$NetBSD: distinfo,v 1.10 2006/03/21 19:50:51 jlam Exp $
 
 SHA1 (maildrop-2.0.1.tar.bz2) = f9b69d7071c25def5af60893687c00ddb252d75e
 RMD160 (maildrop-2.0.1.tar.bz2) = c8f5e3b450bdf1d458a81dd54a9c9486d361ebd8
 Size (maildrop-2.0.1.tar.bz2) = 2105424 bytes
 SHA1 (patch-aa) = dc260a68f503af729981691010c6e699a8e398b2
 SHA1 (patch-ab) = c7d45179d712afd9e52dc1ef755f440ff11bb82b
+SHA1 (patch-ac) = 752cddcc61226c9c8baefb5ec45f4787b6923a9f
diff -r dd43443bf473 -r 408af0866205 mail/maildrop/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/maildrop/patches/patch-ac    Tue Mar 21 19:50:51 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2006/03/21 19:50:51 jlam Exp $
+
+--- maildrop/main.C.orig       2005-05-12 11:23:54.000000000 -0400
++++ maildrop/main.C
+@@ -616,6 +616,14 @@ Buffer    value;
+       {
+       const char *p;
+ 
++              /*
++               * To allow one maildrop to be used by both courier MTA
++               * and others, we require courier MTA to set COURIER_MTA
++               * in the environment before running maildrop.
++               */
++              if (getenv("COURIER_MTA"))
++              {       /* COURIER_MTA */
++
+               if ((p=getenv("HOME")) && *p)
+                       maildrop.init_home=p;
+ 
+@@ -640,6 +648,8 @@ Buffer     value;
+ 
+               if ((p=getenv("MAILDIRQUOTA")) && *p)
+                       maildrop.init_quota=p;
++
++              }       /* COURIER_MTA */
+       }
+ #endif
+