diff options
| author | jlam <jlam> | 2006-03-21 19:50:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-21 19:50:51 +0000 |
| commit | 209160ef0dbb1df97dd7922b618cb0469ad07ad6 (patch) | |
| tree | 1c824c86af209eac5664a1a4400189c176daaaa3 /mail | |
| parent | f2fd1886b7c3416ad7372a19ff302159b4a4e242 (diff) | |
| download | pkgsrc-209160ef0dbb1df97dd7922b618cb0469ad07ad6.tar.gz | |
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 (limited to 'mail')
| -rw-r--r-- | mail/maildrop/Makefile | 4 | ||||
| -rw-r--r-- | mail/maildrop/distinfo | 3 | ||||
| -rw-r--r-- | mail/maildrop/patches/patch-ac | 28 |
3 files changed, 32 insertions, 3 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 5c052261fd7..f10c69d83f8 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -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 --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index 430dc77f611..d700b2e4ed5 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -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 --git a/mail/maildrop/patches/patch-ac b/mail/maildrop/patches/patch-ac new file mode 100644 index 00000000000..c24ac876b40 --- /dev/null +++ b/mail/maildrop/patches/patch-ac @@ -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 + |