pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/courier-mta Update mail/courier-mta to 0.57.1. C...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7135d7e9faf5
branches:  trunk
changeset: 534280:7135d7e9faf5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Oct 15 15:37:13 2007 +0000

description:
Update mail/courier-mta to 0.57.1.  Changes from version 0.56.0 include:

* Major code cleanup.

* "User unknown" reports complete local address, including extensions.

* Only run courierfilters after all control files are closed.

* "opt BOFHHEADERLIMIT" replaces hardcoded limit of 100,000 bytes of
  headers per message.

* Reject <@domain.com> for a recipient's address.

* Tolerate newline-less responses from the filter.

* Document that sysexit 100 from .courier is a permanent failure.

* "courier show all" and "courier clear all" commands for managing
  backscatter suppression list.

diffstat:

 mail/courier-mta/DEINSTALL        |   8 +-
 mail/courier-mta/Makefile         |   8 +-
 mail/courier-mta/Makefile.common  |   5 +-
 mail/courier-mta/distinfo         |  36 +++++---------
 mail/courier-mta/patches/patch-aa |  25 ++++-----
 mail/courier-mta/patches/patch-ab |   8 +-
 mail/courier-mta/patches/patch-ac |  12 ++--
 mail/courier-mta/patches/patch-ad |   6 +-
 mail/courier-mta/patches/patch-af |   8 +-
 mail/courier-mta/patches/patch-ai |   6 +-
 mail/courier-mta/patches/patch-aj |  12 ++--
 mail/courier-mta/patches/patch-al |   6 +-
 mail/courier-mta/patches/patch-am |  19 -------
 mail/courier-mta/patches/patch-an |  99 ++++++++++++--------------------------
 mail/courier-mta/patches/patch-ao |  15 -----
 mail/courier-mta/patches/patch-ap |  30 -----------
 mail/courier-mta/patches/patch-aq |  32 ------------
 mail/courier-mta/patches/patch-ar |  12 ----
 mail/courier-mta/patches/patch-as |  21 --------
 mail/courier-mta/patches/patch-at |  22 --------
 mail/courier-mta/patches/patch-au |  38 --------------
 mail/courier-mta/patches/patch-av |  12 ----
 mail/courier-mta/patches/patch-aw |  33 -------------
 23 files changed, 97 insertions(+), 376 deletions(-)

diffs (truncated from 741 to 300 lines):

diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/DEINSTALL
--- a/mail/courier-mta/DEINSTALL        Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/DEINSTALL        Mon Oct 15 15:37:13 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2007/10/15 15:37:13 jlam Exp $
 
 case ${STAGE} in
 DEINSTALL)
@@ -87,7 +87,9 @@
                fi
        done
 
-       # Unconditionally remove temporary files.
-       ${RM} -rf @COURIER_STATEDIR@/tmp/*
+       # Unconditionally remove temporary files, but not directories
+       # which are part of the message queue.
+       #
+       ${RM} -f @COURIER_STATEDIR@/tmp/* 2>/dev/null
        ;;
 esac
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/Makefile Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/09/23 11:42:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/10/15 15:37:14 jlam Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   11
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -14,11 +13,12 @@
 HOMEPAGE=      http://www.courier-mta.org/
 
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=${COURIER_VERSION}nb3:../../net/couriertcpd
-DEPENDS+=      maildrop>=2.0.4:../../mail/maildrop
+DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
+DEPENDS+=      maildrop>=2.0.4nb2:../../mail/maildrop
 
 USE_TOOLS+=            gmake openssl:run perl:run
 USE_LANGUAGES=         c c++
+GCC_REQD+=             3.0     # need Standard C++ Library
 
 .include "Makefile.common"
 
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/Makefile.common
--- a/mail/courier-mta/Makefile.common  Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/Makefile.common  Mon Oct 15 15:37:13 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2007/08/10 17:57:03 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/10/15 15:37:14 jlam Exp $
 
-COURIER_VERSION=       0.56.0
+COURIER_VERSION=       0.57.1
+LICENSE=               gnu-gpl-v3
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/distinfo
--- a/mail/courier-mta/distinfo Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/distinfo Mon Oct 15 15:37:13 2007 +0000
@@ -1,26 +1,16 @@
-$NetBSD: distinfo,v 1.8 2007/09/23 11:42:44 jlam Exp $
+$NetBSD: distinfo,v 1.9 2007/10/15 15:37:14 jlam Exp $
 
-SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
-RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
-Size (courier-0.56.0.tar.bz2) = 7022057 bytes
-SHA1 (patch-aa) = 53b2fbf9414f3a853ec32006affdab66217ae85f
-SHA1 (patch-ab) = 42aa037beab3b57a2e470f1587274ef797b2a770
-SHA1 (patch-ac) = d220279beaff057b74bdf9b50a0c99f21afd7f7b
-SHA1 (patch-ad) = c0fcc00a60102782c315ac3e847b565adaa7b73d
+SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340
+RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2
+Size (courier-0.57.1.tar.bz2) = 7098660 bytes
+SHA1 (patch-aa) = 10e3bc04883578ea235d9631ee72ead707f92a68
+SHA1 (patch-ab) = e01fd7a1b3993b849c2495874f61c68a89384f9d
+SHA1 (patch-ac) = 7790248b02a333e11f1429c88e7428b7e0fedb8d
+SHA1 (patch-ad) = 0899aea066310909e4595974e5df69980a4db5d2
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
-SHA1 (patch-af) = 446b4db2e6e22461c243481bd5c39ffba68fd4b6
+SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
 SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
-SHA1 (patch-ai) = 5324b99ebc0492c77f67a8c627ceb3c3efa9d852
-SHA1 (patch-aj) = 0ec994bfb79ca133555a3d300f8a264648591e1b
-SHA1 (patch-al) = 8c37ddbb5e3c358ee0920adc27441e38b4efa143
-SHA1 (patch-am) = edab962fa9bf8979e6fc9d319f95840178c3a578
-SHA1 (patch-an) = f56cf08104e7006864fa0e8ce86dcf0e5dd66279
-SHA1 (patch-ao) = c859c61370fbc4a774456b629fb3f05ee1a32621
-SHA1 (patch-ap) = 8696818dc2994f8dbe523034ed1c713101693291
-SHA1 (patch-aq) = 054df1e1e05df3e14b3c531c5bd9768b9d2e34d7
-SHA1 (patch-ar) = ab2c3e40928933eced0856a7c378c908e8a4689d
-SHA1 (patch-as) = 08bd540d92a3ef9db533a92b48c653ed2a256f9b
-SHA1 (patch-at) = 7c93cabfe5b1164c6699111cd74e612af887881c
-SHA1 (patch-au) = 794fdd49f7994689e4e4ee809293d2e67d9bc4c2
-SHA1 (patch-av) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9
-SHA1 (patch-aw) = a777a767893642b8425c70e8a7a791d6e2c77eb7
+SHA1 (patch-ai) = a2172e61d38ccff3d877393bd968171e5fed124a
+SHA1 (patch-aj) = 5e3bcd5c8b0186dd048807deb6603102d05f1303
+SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
+SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-aa
--- a/mail/courier-mta/patches/patch-aa Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-aa Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
 
---- courier/Makefile.in.orig   2007-06-23 07:56:06.000000000 -0400
+--- courier/Makefile.in.orig   Sat Sep 29 14:57:58 2007
 +++ courier/Makefile.in
-@@ -50,18 +50,18 @@ build_triplet = @build@
+@@ -46,16 +46,16 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
@@ -22,12 +22,9 @@
 +sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \
 +      courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
        @EXTRASBIN@ $(am__empty)
--cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
-+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ 
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
-@@ -420,7 +420,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
+ cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
+ subdir = .
+@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
        uidgid.h configargs.h sort.h webmlmdhandlerslist.H
  RFCERRTXTIN = rfcerrheader.txt
  RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
@@ -36,7 +33,7 @@
  pkglibexecdir = $(libexecdir)/courier
  webmaildir = $(libexecdir)/courier/webmail
  webmail_SOURCES = 
-@@ -428,22 +428,19 @@ sqwebmaild_SOURCES = 
+@@ -441,22 +441,19 @@ sqwebmaild_SOURCES = 
  
  # Don't forget to change perms.sh.in, if webmailimagedir moves.
  webmailimagedir = $(datadir)/sqwebmail/images
@@ -65,7 +62,7 @@
  
  mlmdatadir = $(datadir)/couriermlm
  mlmdata_DATA = \
-@@ -499,7 +496,7 @@ mlmdata_DATA = \
+@@ -512,7 +509,7 @@ mlmdata_DATA = \
        webmlmsublist.tmpl.html \
        webmlm.tmpl.html
  
@@ -74,7 +71,7 @@
  cmdlibdir = @libexecdir@/courier
  
  # Subdirectories
-@@ -1652,6 +1649,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
+@@ -1673,6 +1670,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
  courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
        cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
  
@@ -87,7 +84,7 @@
  sort.h:
        echo '#define SORT "$(SORT)"' >sort.h
  
-@@ -1813,33 +1816,16 @@ install-exec-hook:
+@@ -1834,33 +1837,16 @@ install-exec-hook:
                $(localstatedir)/track\
                $(localstatedir)/msgs $(localstatedir)/msgq ; do \
                        $(mkinstalldirs) $(DESTDIR)$$d || :; done
@@ -123,7 +120,7 @@
        test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
                echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
        test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
-@@ -1851,10 +1837,6 @@ install-data-hook:
+@@ -1872,10 +1858,6 @@ install-data-hook:
        rm -f $(DESTDIR)$(bindir)/rmail
        $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
        -$(mkinstalldirs) $(DESTDIR)@mandir@/man8
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-ab
--- a/mail/courier-mta/patches/patch-ab Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-ab Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/08/10 17:57:04 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2007/10/15 15:37:14 jlam Exp $
 
---- courier/configure.orig     2007-06-23 07:56:05.000000000 -0400
+--- courier/configure.orig     Sat Sep 29 14:57:58 2007
 +++ courier/configure
-@@ -21745,9 +21745,9 @@ done
+@@ -22280,9 +22280,9 @@ done
  
  if test "$testmode" = "0"
  then
@@ -14,4 +14,4 @@
 +      INSTALL_DATA='${BSD_INSTALL_DATA}'
  fi
  
- ac_ext=cc
+ ac_ext=cpp
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-ac
--- a/mail/courier-mta/patches/patch-ac Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-ac Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
 
---- courier/doc/Makefile.in.orig       2007-05-12 23:03:54.000000000 -0400
+--- courier/doc/Makefile.in.orig       Sun Jul 22 01:32:34 2007
 +++ courier/doc/Makefile.in
-@@ -141,7 +141,7 @@ target_alias = @target_alias@
+@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@
  version = @version@
  htmldocdir = @datadir@/htmldoc
  CLEANFILES = permissions.dat
@@ -11,7 +11,7 @@
                draft-varshavchik-exdata-smtpext.txt \
                draft-varshavchik-verp-smtpext.txt \
                draft-varshavchik-security-smtpext.txt \
-@@ -179,66 +179,39 @@ htmlin = \
+@@ -189,66 +189,39 @@ htmlin = \
                courier.html \
                courierldapaliasd.html \
                couriermlm.html \
@@ -88,7 +88,7 @@
  
  BUILT_SOURCES = \
        aliaslookup.html aliaslookup.8 \
-@@ -265,7 +238,7 @@ BUILT_SOURCES = \
+@@ -275,7 +248,7 @@ BUILT_SOURCES = \
        webmlmd.html.in webmlmd.1.in
  
  EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
@@ -97,7 +97,7 @@
        $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
        $(man8dir)/makesmtpaccess-msa.8 \
        $(man8dir)/esmtpd-msa.8
-@@ -1139,8 +1112,7 @@ preline.1: preline.1.in
+@@ -1156,8 +1129,7 @@ preline.1: preline.1.in
  
  install-man-extra:
        cd $(DESTDIR)$(man8dir) ; \
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-ad
--- a/mail/courier-mta/patches/patch-ad Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-ad Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2007/08/10 17:57:04 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $
 
---- courier/filters/Makefile.in.orig   2007-02-25 23:21:06.000000000 -0500
+--- courier/filters/Makefile.in.orig   Sun Jul 22 01:32:33 2007
 +++ courier/filters/Makefile.in
-@@ -229,11 +229,12 @@ SUBDIRS = libfilter perlfilter
+@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter
  CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
        pidfile.h permissions.dat
  
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-af
--- a/mail/courier-mta/patches/patch-af Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-af Mon Oct 15 15:37:13 2007 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-af,v 1.2 2007/08/10 17:57:05 jlam Exp $
+$NetBSD: patch-af,v 1.3 2007/10/15 15:37:14 jlam Exp $
 
---- courier/filters/perlfilter/Makefile.in.orig        2007-02-25 23:21:34.000000000 -0500
+--- courier/filters/perlfilter/Makefile.in.orig        Sat Jul 21 20:31:15 2007
 +++ courier/filters/perlfilter/Makefile.in
-@@ -205,7 +205,8 @@ target_alias = @target_alias@
+@@ -207,7 +207,8 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
  BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
  CLEANFILES = $(BUILT_SOURCES) permissions.dat
 -filterbindir = $(libexecdir)/filters
 +pkglibexecdir = $(libexecdir)/courier
 +filterbindir = $(pkglibexecdir)/filters
+ filterbin_PROGRAMS = @perlfilter_prog@
  scriptdir = $(datadir)
  script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl
- filtersocketdir = $(localstatedir)/filters
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-ai
--- a/mail/courier-mta/patches/patch-ai Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-ai Mon Oct 15 15:37:13 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ai,v 1.2 2007/10/15 15:37:14 jlam Exp $
 
---- courier/module.local/local.c.orig  2004-10-23 22:02:38.000000000 -0400
+--- courier/module.local/local.c.orig  Sun Oct  7 16:37:52 2007
 +++ courier/module.local/local.c
-@@ -731,6 +731,8 @@ const char *quota;
+@@ -745,6 +745,8 @@ const char *quota;
                                        strlen(argv[7])), "SENDER="),
                                        argv[7]));
  
diff -r c0ec4056414d -r 7135d7e9faf5 mail/courier-mta/patches/patch-aj
--- a/mail/courier-mta/patches/patch-aj Mon Oct 15 15:37:09 2007 +0000
+++ b/mail/courier-mta/patches/patch-aj Mon Oct 15 15:37:13 2007 +0000
@@ -1,9 +1,9 @@



Home | Main Index | Thread Index | Old Index