diff options
author | pettai <pettai> | 2010-06-15 23:14:47 +0000 |
---|---|---|
committer | pettai <pettai> | 2010-06-15 23:14:47 +0000 |
commit | 7e78d370c2d5cbb450192953d72761a7a9f7ba78 (patch) | |
tree | d71d1dc81b70fa42d810608784967ca8334c24ba /mail | |
parent | 36aecfc21ec07ca59a62ac147310e30a0eff8341 (diff) | |
download | pkgsrc-7e78d370c2d5cbb450192953d72761a7a9f7ba78.tar.gz |
maildrop-2.5.0:
* maildrop/mailbot.c (main): Set close-on-exec bit on opened files.
* rfc2045/rfc2045reply.c (mkreply): Fix sender's name in the
reply salutation.
* rfc2045/reformime.sgml: Document the -c option to reformime.
* Big quota patch (with some changes).
(See the Changelog for the previous releases)
Based on patch(es) from PR pkg/42989 by Brian Candler
Diffstat (limited to 'mail')
-rw-r--r-- | mail/maildrop/Makefile | 7 | ||||
-rw-r--r-- | mail/maildrop/PLIST | 5 | ||||
-rw-r--r-- | mail/maildrop/distinfo | 15 | ||||
-rw-r--r-- | mail/maildrop/patches/patch-aa | 67 | ||||
-rw-r--r-- | mail/maildrop/patches/patch-ab | 8 | ||||
-rw-r--r-- | mail/maildrop/patches/patch-ac | 8 | ||||
-rw-r--r-- | mail/maildrop/patches/patch-ad | 14 |
7 files changed, 70 insertions, 54 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 4e7635f01c5..0c34b9930eb 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.49 2010/03/21 16:29:40 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2010/06/15 23:14:47 pettai Exp $ -DISTNAME= maildrop-2.0.4 -PKGREVISION= 3 +DISTNAME= maildrop-2.5.0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 @@ -12,7 +11,7 @@ HOMEPAGE= http://www.courier-mta.org/maildrop/ PKG_DESTDIR_SUPPORT= user-destdir -DEPENDS+= courier-maildir>=0.58.0:../../mail/courier-maildir +DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir USE_TOOLS+= gmake perl USE_TOOLS+= cat:run # used by makedat(1) diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST index ede69b9692c..af77934797d 100644 --- a/mail/maildrop/PLIST +++ b/mail/maildrop/PLIST @@ -1,12 +1,14 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:36 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/06/15 23:14:47 pettai Exp $ bin/lockmail bin/mailbot bin/maildrop +bin/makedatprog bin/makedat bin/makemime bin/reformail bin/reformime libexec/courier/makedatprog +libexec/courier/makedat man/man1/lockmail.1 man/man1/mailbot.1 man/man1/maildrop.1 @@ -17,7 +19,6 @@ man/man1/reformime.1 man/man7/maildropex.7 man/man7/maildropfilter.7 man/man7/maildropgdbm.7 -share/courier/makedat share/doc/courier/README.postfix share/doc/courier/lockmail.html share/doc/courier/mailbot.html diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index 091bcb84fad..e6e9613d920 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.13 2007/08/27 22:33:19 jlam Exp $ +$NetBSD: distinfo,v 1.14 2010/06/15 23:14:47 pettai 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) = b2f4f054b4fda15e110d7813d1e092660f018493 -SHA1 (patch-ad) = e3ce0e564df467d7af0266df0467b382cbc8c831 +SHA1 (maildrop-2.5.0.tar.bz2) = e09255dec179d796e55af008a8a536479aec55ac +RMD160 (maildrop-2.5.0.tar.bz2) = ad7880bace6e6e6135d9bc25aec7397d7ac96837 +Size (maildrop-2.5.0.tar.bz2) = 2413245 bytes +SHA1 (patch-aa) = 85956cf69abc361264a92ec1748cd3ef23b52089 +SHA1 (patch-ab) = 448fb6c46f05e634534c4a7c1547d54323b24dfa +SHA1 (patch-ac) = 2dbda2413f35808ce6805289f1a44be3dfa59ea3 diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa index 2fc9f4b7a06..3c532bf48f1 100644 --- a/mail/maildrop/patches/patch-aa +++ b/mail/maildrop/patches/patch-aa @@ -1,39 +1,70 @@ -$NetBSD: patch-aa,v 1.7 2007/08/10 17:57:09 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2010/06/15 23:14:47 pettai Exp $ ---- Makefile.in.orig 2007-04-22 11:24:04.000000000 -0400 -+++ Makefile.in -@@ -249,15 +249,12 @@ DELIVERQUOTAHTMLSOURCE = maildirquota.ht - @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE) - @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = - @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8 +--- Makefile.in.orig 2010-05-30 23:36:17.000000000 +0200 ++++ Makefile.in 2010-06-13 12:28:00.000000000 +0200 +@@ -294,16 +294,14 @@ + maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt + + scriptdir = $(pkgdatadir)/scripts +-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html +-DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE) +-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8 -MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \ - maildir.html \ ++DELIVERQUOTAHTMLSOURCE = ++DELIVERQUOTAHTML = ++DELIVERQUOTAMAN = +MAILDROPHTML = lockmail.html maildropex.html \ maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \ makemime.html reformail.html reformime.html -MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \ - maildir.5 \ -- maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 \ -- maildirquota.7 deliverquota.8 +MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \ -+ maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 + maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 EXTRA_LTLIBRARIES = librfc822.la librfc2045.la - @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3 -@@ -1084,11 +1081,12 @@ install-maildrop: +@@ -1140,12 +1138,8 @@ + # Create a soft link from bindir/deliverquota to libdir/bin/deliverquota + + install-deliverquota: +- $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota +- cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota + + uninstall-deliverquota: +- rm -f $(DESTDIR)$(bindir)/deliverquota + + install-data-local: install-man install-deliverquota install-maildrop + +@@ -1173,23 +1167,24 @@ $(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ done $(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail - $(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake $(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime $(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime -- $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog -- $(INSTALL_SCRIPT) makedat/makedat $(DESTDIR)$(bindir)/makedat -+ $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog -+ $(INSTALL_SCRIPT) makedat/makedat $(DESTDIR)$(datadir)/makedat -+ rm -f $(DESTDIR)$(bindir)/makedat -+ $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat + test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog ++ $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog ++ $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog + test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_SCRIPT) makedat/makedat $(DESTDIR)$(bindir)/makedat ++ $(INSTALL_SCRIPT) makedat/makedat $(DESTDIR)$(libexecdir)/makedat ++ $(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/makedat . maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail . maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail + uninstall-maildrop: +- for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \ ++ for f in maildrop mailbot reformail lockmail makemime reformime; do \ + rm -f $(DESTDIR)$(bindir)/$$f ; \ + done + test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- rm -f $(DESTDIR)$(bindir)/makedat ; \ +- rm -f $(DESTDIR)$(bindir)/makedatprog ++ rm -f $(DESTDIR)$(libexecdir)/makedat ; \ ++ rm -f $(DESTDIR)$(libexecdir)/makedatprog + + all-recursive: all-make-check + diff --git a/mail/maildrop/patches/patch-ab b/mail/maildrop/patches/patch-ab index 8ac611ca6af..13588379b47 100644 --- a/mail/maildrop/patches/patch-ab +++ b/mail/maildrop/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2010/06/15 23:14:47 pettai Exp $ --- maildrop/configure.orig 2007-04-22 11:24:25.000000000 -0400 +++ maildrop/configure -@@ -21562,7 +21562,7 @@ fi +@@ -19066,7 +19066,7 @@ fi test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $ then # # This version of maildrop is integrated into Courier mail server -@@ -21699,7 +21699,7 @@ SPOOLDIR="$DIR" +@@ -19203,7 +19203,7 @@ SPOOLDIR="$DIR" get_spooldir() { @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $ then MBOX_RESET_GID=1 SPOOLDIR="./Maildir" -@@ -21767,7 +21767,7 @@ if test "${with_default_maildrop+set}" = +@@ -19270,7 +19270,7 @@ if test "${with_default_maildrop+set}" = else # Courier defaults to ./Maildir diff --git a/mail/maildrop/patches/patch-ac b/mail/maildrop/patches/patch-ac index caddf9aafbd..8414332fc1c 100644 --- a/mail/maildrop/patches/patch-ac +++ b/mail/maildrop/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2010/06/15 23:14:47 pettai 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(); +@@ -575,7 +575,7 @@ uid_t my_u=getuid(); if (!found) { #if HAVE_COURIER @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $ #endif { my_pw=getpwuid(my_u); -@@ -628,6 +628,14 @@ Buffer value; +@@ -635,6 +635,14 @@ Buffer value; { const char *p; @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $ if ((p=getenv("HOME")) && *p) maildrop.init_home=p; -@@ -652,6 +660,8 @@ Buffer value; +@@ -659,6 +667,8 @@ Buffer value; if ((p=getenv("MAILDIRQUOTA")) && *p) maildrop.init_quota=p; diff --git a/mail/maildrop/patches/patch-ad b/mail/maildrop/patches/patch-ad deleted file mode 100644 index 4684d6e41b8..00000000000 --- a/mail/maildrop/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/08/10 17:57:09 jlam Exp $ - ---- configure.orig 2007-04-22 11:24:05.000000000 -0400 -+++ configure -@@ -20529,7 +20529,8 @@ esac - - - --if test "$maildirquota" = "1"; then -+# deliverquota is installed by pkgsrc/mail/courier-maildir. -+if false && test "$maildirquota" = "1"; then - INSTALL_DELIVERQUOTA_TRUE= - INSTALL_DELIVERQUOTA_FALSE='#' - else |