summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjlam <jlam>2007-08-27 22:33:19 +0000
committerjlam <jlam>2007-08-27 22:33:19 +0000
commit5538d428918f90a70de157ca6893584c2cab9203 (patch)
tree46238afa381bded81abc8d9f2935c5991b9b2f30 /mail
parentf8a7c3da622fc90ba9c1b38d8953e0c515b4855b (diff)
downloadpkgsrc-5538d428918f90a70de157ca6893584c2cab9203.tar.gz
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 (limited to 'mail')
-rw-r--r--mail/maildrop/Makefile3
-rw-r--r--mail/maildrop/distinfo4
-rw-r--r--mail/maildrop/patches/patch-ac11
3 files changed, 14 insertions, 4 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index e12a1f13640..88c18ca92b5 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -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 --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 1d996b0a58b..091bcb84fad 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -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 --git a/mail/maildrop/patches/patch-ac b/mail/maildrop/patches/patch-ac
index a91056e7f8d..caddf9aafbd 100644
--- a/mail/maildrop/patches/patch-ac
+++ b/mail/maildrop/patches/patch-ac
@@ -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;