[pkgsrc/trunk]: pkgsrc/mail/maildrop Fix breakage when maildrop is invoked by...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba56273740dc
branches:  trunk
changeset: 532667:ba56273740dc
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Aug 27 22:33:19 2007 +0000

description:
Fix breakage when maildrop is invoked by the user in "delivery mode"
without an explicity "-d" option.  Maildrop was breaking because it
was not properly finding the user's home directory (in order to locate
~/.maildroprc).  This breakage occurred sometime shortly before maildrop
was updated to 2.0.2 when I tried to make a single maildrop package
usable by both courier-mta and other mailers.

This fixes PR pkg/34275 by Greg Kerr.

Bump the PKGREVISION to 1.

diffstat:

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

diffs (48 lines):

diff -r 7d12c4dd024e -r ba56273740dc mail/maildrop/Makefile
--- a/mail/maildrop/Makefile    Mon Aug 27 21:51:22 2007 +0000
+++ b/mail/maildrop/Makefile    Mon Aug 27 22:33:19 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/08/10 17:57:09 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2007/08/27 22:33:19 jlam Exp $
 
 DISTNAME=      maildrop-2.0.4
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 7d12c4dd024e -r ba56273740dc mail/maildrop/distinfo
--- a/mail/maildrop/distinfo    Mon Aug 27 21:51:22 2007 +0000
+++ b/mail/maildrop/distinfo    Mon Aug 27 22:33:19 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2007/08/10 17:57:09 jlam Exp $
+$NetBSD: distinfo,v 1.13 2007/08/27 22:33:19 jlam Exp $
 
 SHA1 (maildrop-2.0.4.tar.bz2) = df2755c1d0e00d19506b0659e59bf5d4756cce17
 RMD160 (maildrop-2.0.4.tar.bz2) = 9c0a349879cc0791ad01e5bae04b680de3a7a606
 Size (maildrop-2.0.4.tar.bz2) = 2286125 bytes
 SHA1 (patch-aa) = 294f05cf64f8ada8b18f6e555a93149850d93933
 SHA1 (patch-ab) = c863a21be30ee0808c6bc4cafd9a8775015a727e
-SHA1 (patch-ac) = c206b268d3cc1234f27c8ec133bd5251cc132930
+SHA1 (patch-ac) = b2f4f054b4fda15e110d7813d1e092660f018493
 SHA1 (patch-ad) = e3ce0e564df467d7af0266df0467b382cbc8c831
diff -r 7d12c4dd024e -r ba56273740dc mail/maildrop/patches/patch-ac
--- a/mail/maildrop/patches/patch-ac    Mon Aug 27 21:51:22 2007 +0000
+++ b/mail/maildrop/patches/patch-ac    Mon Aug 27 22:33:19 2007 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2007/08/10 17:57:09 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $
 
 --- maildrop/main.C.orig       2006-10-01 20:03:37.000000000 -0400
 +++ maildrop/main.C
+@@ -576,7 +576,7 @@ uid_t      my_u=getuid();
+       if (!found)
+       {
+ #if HAVE_COURIER
+-              if (!deliverymode)
++              if (!deliverymode || !getenv("COURIER_MTA"))
+ #endif
+               {
+                       my_pw=getpwuid(my_u);
 @@ -628,6 +628,14 @@ Buffer    value;
        {
        const char *p;