diff options
author | pettai <pettai> | 2010-06-15 23:01:23 +0000 |
---|---|---|
committer | pettai <pettai> | 2010-06-15 23:01:23 +0000 |
commit | ecbbaa7f9e198fac9e25c5f7a999b3da6e89338a (patch) | |
tree | f304461ed202779574deca21604fa3b9f169f81f /mail/courier-mta/patches | |
parent | a0acd78f351ab12d10953b71a232bfa85699eb36 (diff) | |
download | pkgsrc-ecbbaa7f9e198fac9e25c5f7a999b3da6e89338a.tar.gz |
courier-0.65.0 et al:
* gpglib/list.c: Handle GnuPG 2 --with-colons output format changes.
* gpglib/mimegpgfork.c: GnuPG 2 wants --batch when specifying passphrase-fd.
* tcpd/configure.in: Check if explicit linking with libgpg-error is required.
* tcpd/libcouriergnutls.c (tls_connect): Fix bad call to
gnutls_server_name_set(). Affects Courier compiled with GnuTLS support.
* maildrop/mailbot.c (main): Set close-on-exec bit on opened files.
* courier/doc/courier.sgml: Move the SPF section to a separate refsect2
to work around misformatting by the manpage stylesheet.
* rfc2045/rfc2045reply.c (mkreply): Fix sender's name in the reply salutation.
* html/en-us/newmsg.html: Ditto.
* rfc2045/reformime.sgml: Document the -c option to reformime.
* imapd.c (main): Fix typo in alert message.
* Big quota patch (with some changes).
(See the Changelog(s) for previous releases)
Based on patch(es) from PR pkg/42989 by Brian Candler.
Diffstat (limited to 'mail/courier-mta/patches')
-rw-r--r-- | mail/courier-mta/patches/patch-aa | 17 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ab | 17 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ac | 17 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ad | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-af | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ah | 6 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-an | 10 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ax | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-ay | 4 | ||||
-rw-r--r-- | mail/courier-mta/patches/patch-az | 18 |
10 files changed, 36 insertions, 67 deletions
diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa index 6957c39bd85..1f1117c35fe 100644 --- a/mail/courier-mta/patches/patch-aa +++ b/mail/courier-mta/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $ --- courier/Makefile.in.orig 2007-11-23 22:26:43.000000000 -0500 +++ courier/Makefile.in -@@ -46,16 +46,16 @@ build_triplet = @build@ +@@ -47,16 +47,16 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \ @@ -24,16 +24,15 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ @EXTRASBIN@ $(am__empty) cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ subdir = . -@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s +@@ -477,29 +477,26 @@ 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 -extrapkglib = makedatprog courierpop3login pcpd +extrapkglib = - pkglibexecdir = $(libexecdir)/courier webmaildir = $(libexecdir)/courier/webmail webmail_SOURCES = -@@ -441,22 +441,19 @@ sqwebmaild_SOURCES = + sqwebmaild_SOURCES = # Don't forget to change perms.sh.in, if webmailimagedir moves. webmailimagedir = $(datadir)/sqwebmail/images @@ -62,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ mlmdatadir = $(datadir)/couriermlm mlmdata_DATA = \ -@@ -512,7 +509,7 @@ mlmdata_DATA = \ +@@ -555,7 +552,7 @@ mlmdata_DATA = \ webmlmsublist.tmpl.html \ webmlm.tmpl.html @@ -71,7 +70,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ cmdlibdir = @libexecdir@/courier # Subdirectories -@@ -1673,6 +1670,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ +@@ -1896,6 +1893,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$ courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT) cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT) @@ -84,7 +83,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ sort.h: echo '#define SORT "$(SORT)"' >sort.h -@@ -1828,39 +1831,21 @@ dist-hook: +@@ -2051,39 +2054,21 @@ dist-hook: install-exec-hook: for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \ @@ -126,7 +125,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $ test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \ echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \ -@@ -1872,10 +1857,6 @@ install-data-hook: +@@ -2095,10 +2080,6 @@ install-data-hook: rm -f $(DESTDIR)$(bindir)/rmail $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail -$(mkinstalldirs) $(DESTDIR)@mandir@/man8 diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab index 5b82665f3b4..fa783b67638 100644 --- a/mail/courier-mta/patches/patch-ab +++ b/mail/courier-mta/patches/patch-ab @@ -1,21 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2010/01/09 22:16:20 heinz Exp $ - - first hunk: make option "--without-ldapaliasd" work (see patch-az) +$NetBSD: patch-ab,v 1.6 2010/06/15 23:01:23 pettai Exp $ --- courier/configure.orig 2007-11-24 03:26:42.000000000 +0000 +++ courier/configure -@@ -21071,7 +21071,9 @@ LIBS="$saveLIBS" - - # Check whether --with-ldapaliasd was given. - if test "${with_ldapaliasd+set}" = set; then -- withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes" -+ withval=$with_ldapaliasd; ldapaliasd="$withval" -+else -+ ldapaliasd="yes" - fi - - -@@ -22366,9 +22368,9 @@ done +@@ -18398,9 +18398,9 @@ done if test "$testmode" = "0" then diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac index c3f3ca585a5..6e607aea42b 100644 --- a/mail/courier-mta/patches/patch-ac +++ b/mail/courier-mta/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2010/06/15 23:01:23 pettai Exp $ --- courier/doc/Makefile.in.orig 2007-11-17 19:48:53.000000000 -0500 +++ courier/doc/Makefile.in -@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@ +@@ -169,7 +169,7 @@ top_srcdir = @top_srcdir@ version = @version@ htmldocdir = @datadir@/htmldoc CLEANFILES = permissions.dat @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $ draft-varshavchik-exdata-smtpext.txt \ draft-varshavchik-verp-smtpext.txt \ draft-varshavchik-security-smtpext.txt \ -@@ -189,66 +189,38 @@ htmlin = \ +@@ -207,67 +189,38 @@ htmlin = \ courier.html \ courierldapaliasd.html \ couriermlm.html \ @@ -63,7 +63,8 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $ -man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \ - mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \ - makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \ -- dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 webmlmd.1 +- dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 \ +- webmlmd.1 - -man5 = dot-courier.5 maildir.5 -man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \ @@ -83,21 +84,21 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $ - mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \ + mkesmtpdcert.8 \ makealiases.8 makepercentrelay.8 makesmtpaccess.8 \ -- pop3d.8 submit.8 imapd.8 +- pop3d.8 pop3d-ssl.8 submit.8 imapd.8 + submit.8 BUILT_SOURCES = \ aliaslookup.html aliaslookup.8 \ -@@ -275,7 +247,7 @@ BUILT_SOURCES = \ +@@ -294,7 +265,7 @@ BUILT_SOURCES = \ webmlmd.html.in webmlmd.1.in - EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) + EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) dotforward.1 pop3d-ssl.8 -man_LINKS = $(man8dir)/courierpop3login.8 \ +man_LINKS = \ $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \ $(man8dir)/makesmtpaccess-msa.8 \ $(man8dir)/esmtpd-msa.8 -@@ -1156,8 +1128,7 @@ preline.1: preline.1.in +@@ -1215,8 +1186,7 @@ preline.1: preline.1.in install-man-extra: cd $(DESTDIR)$(man8dir) ; \ diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad index ab90ca304f6..ebb711f3d41 100644 --- a/mail/courier-mta/patches/patch-ad +++ b/mail/courier-mta/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2010/06/15 23:01:23 pettai Exp $ --- courier/filters/Makefile.in.orig 2007-11-17 19:49:01.000000000 -0500 +++ courier/filters/Makefile.in -@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter +@@ -283,11 +283,12 @@ SUBDIRS = libfilter perlfilter CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \ pidfile.h permissions.dat @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $ filtersocketdir = $(localstatedir)/filters allfiltersocketdir = $(localstatedir)/allfilters filterconfdir = $(sysconfdir)/filters -@@ -931,16 +932,12 @@ install-exec-hook: +@@ -1083,16 +1084,12 @@ install-exec-hook: install-data-hook: -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir) -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir) diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af index f69f6e572df..dfbb65a6496 100644 --- a/mail/courier-mta/patches/patch-af +++ b/mail/courier-mta/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2007/10/15 15:37:14 jlam Exp $ +$NetBSD: patch-af,v 1.4 2010/06/15 23:01:23 pettai Exp $ --- courier/filters/perlfilter/Makefile.in.orig Sat Jul 21 20:31:15 2007 +++ courier/filters/perlfilter/Makefile.in -@@ -207,7 +207,8 @@ top_srcdir = @top_srcdir@ +@@ -234,7 +234,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 diff --git a/mail/courier-mta/patches/patch-ah b/mail/courier-mta/patches/patch-ah index c09df25f681..042dec94035 100644 --- a/mail/courier-mta/patches/patch-ah +++ b/mail/courier-mta/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $ +$NetBSD: patch-ah,v 1.3 2010/06/15 23:01:23 pettai Exp $ --- courier/module.local/deliver.c.orig 2006-05-28 11:29:52.000000000 -0400 +++ courier/module.local/deliver.c -@@ -635,7 +635,7 @@ static int docommand(const char *extensi +@@ -649,7 +649,7 @@ static int docommand(const char *extensi const char *defaultmail, int recursion_level) { @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $ const char *p; const char *hostp; pid_t pid; -@@ -727,7 +727,9 @@ const char *shell=getenv("SHELL"); +@@ -741,7 +741,9 @@ const char *shell=getenv("SHELL"); envs[17]=courier_malloc(strlen(shell) +sizeof("SHELL=")); strcat(strcpy(envs[17], "SHELL="), shell); diff --git a/mail/courier-mta/patches/patch-an b/mail/courier-mta/patches/patch-an index 1dab76af2f7..c77ee5360cb 100644 --- a/mail/courier-mta/patches/patch-an +++ b/mail/courier-mta/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $ +$NetBSD: patch-an,v 1.4 2010/06/15 23:01:23 pettai Exp $ --- courier/webmlmd.C.orig Thu Jul 5 01:47:38 2007 +++ courier/webmlmd.C @@ -10,11 +10,10 @@ $NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $ #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> -@@ -40,6 +41,39 @@ - #include <fstream> +@@ -41,6 +42,39 @@ #include <sstream> #include <map> -+ + +#if defined(__FreeBSD_version) && (__FreeBSD_version < 500029) +#include <cwchar> +namespace std { @@ -47,6 +46,7 @@ $NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $ + }; +} +#endif - ++ #include "cmlm.h" #include "cmlmcmdmisc.h" + #include "webmlmd.H" diff --git a/mail/courier-mta/patches/patch-ax b/mail/courier-mta/patches/patch-ax index c71e668dd4b..e98f002ffd9 100644 --- a/mail/courier-mta/patches/patch-ax +++ b/mail/courier-mta/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.1 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ax,v 1.2 2010/06/15 23:01:23 pettai Exp $ --- courier/module.esmtp/Makefile.in.orig 2007-11-17 19:49:38.000000000 -0500 +++ courier/module.esmtp/Makefile.in -@@ -870,17 +870,11 @@ install-data-local: +@@ -955,17 +955,11 @@ install-data-local: test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) $(moduledir)/courieresmtpd $(DESTDIR)$(sbindir)/courieresmtpd -$(mkinstalldirs) $(DESTDIR)$(bindir) test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr diff --git a/mail/courier-mta/patches/patch-ay b/mail/courier-mta/patches/patch-ay index 87ee4933a81..b12d9679f24 100644 --- a/mail/courier-mta/patches/patch-ay +++ b/mail/courier-mta/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.1 2008/02/19 18:45:24 jlam Exp $ +$NetBSD: patch-ay,v 1.2 2010/06/15 23:01:23 pettai Exp $ --- webadmin/Makefile.in.orig 2007-11-17 19:53:34.000000000 -0500 +++ webadmin/Makefile.in -@@ -603,9 +603,6 @@ uninstall-am: uninstall-webadminDATA uni +@@ -679,9 +679,6 @@ uninstall-am: uninstall-webadminDATA uni install-exec-hook: diff --git a/mail/courier-mta/patches/patch-az b/mail/courier-mta/patches/patch-az deleted file mode 100644 index 7ae71be8d1e..00000000000 --- a/mail/courier-mta/patches/patch-az +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-az,v 1.1 2010/01/09 22:16:20 heinz Exp $ - - wrong syntax prevents valid ACTION-IF-NOT-GIVEN, so "--without-ldapaliasd" - cannot work. - Reported upstream in http://sourceforge.net/mailarchive/message.php?msg_name=20100109205111.GB703%40silence.h.kh-22.de - ---- courier/configure.in.orig 2007-11-24 03:25:52.000000000 +0000 -+++ courier/configure.in -@@ -267,7 +267,8 @@ AC_CHECK_FUNC(ldap_search_st, HAVE_LDAP= - LIBS="$saveLIBS" - - AC_ARG_WITH(ldapaliasd, [ --without-ldapaliasd ], -- ldapaliasd="$withval"; ldapaliasd="yes") -+ ldapaliasd="$withval", -+ ldapaliasd="yes") - - if test "$ldapaliasd" = "no" - then |