From 58871ae7460ea7793ba06aafd416c11bf8feddce Mon Sep 17 00:00:00 2001 From: sheldonh Date: Mon, 12 May 2003 09:44:02 +0000 Subject: * Distribution site fixes and cleanups. * Add support for db41. * Fix bug in check_dir_size. * Fix obscure bug in address rewriting. * Rename patch-src::auths::plantext.c to ...::plaintext.c, without a repo-copy. * Fix for unqualified redirection addresses prefixed with '\'. Bump PORTREVISION accordingly. PR: ports/50984, ports/51279, ports/51300 Submitted by: Oliver Eikemeier --- mail/exim/Makefile | 14 +++++++++----- mail/exim/files/patch-src::auths::plaintext.c | 11 +++++++++++ mail/exim/files/patch-src::auths::plantext.c | 11 ----------- mail/exim/files/patch-src::rda.c | 11 +++++++++++ mail/exim/files/patch-src::rewrite.c | 11 +++++++++++ mail/exim/files/patch-src::transports::appendfile.c | 13 +++++++++++++ 6 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 mail/exim/files/patch-src::auths::plaintext.c delete mode 100644 mail/exim/files/patch-src::auths::plantext.c create mode 100644 mail/exim/files/patch-src::rda.c create mode 100644 mail/exim/files/patch-src::rewrite.c create mode 100644 mail/exim/files/patch-src::transports::appendfile.c (limited to 'mail') diff --git a/mail/exim/Makefile b/mail/exim/Makefile index aff8ca389001..994703120877 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -7,7 +7,7 @@ PORTNAME= exim PORTVERSION= ${EXIM_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ http://www.exim.org/ftp/exim4/ \ @@ -30,7 +30,7 @@ MAN8= exim.8 EXIM_VERSION= 4.14 EXIM_DOCVERSION= 4.10 -EXISCAN_VERSION= 4.14-26 +EXISCAN_VERSION= ${EXIM_VERSION}-26 PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" @@ -75,8 +75,8 @@ POSTGRESQL_PORT?= databases/postgresql7 #WITH_OPENLDAP21= yes # DB_LIB_VERSION is the version of the Berkeley DB library to use, and -# may be 1, which corresponds to version 1.85 in the base system, or 4 -# which depends on the databases/db4 port. +# may be 1, which corresponds to version 1.85 in the base system, 4 or +# 41 which depends on the databases/db4 or databases/db41 port. DB_LIB_VERSION?=1 # The following options may be defined to turn off support for various @@ -200,8 +200,12 @@ SEDLIST+= -e 's,^DBMLIB=,\#DBMLIB=,' DB_LIBS= -L${LOCALBASE}/lib -ldb4 DB_INCLUDES= -I${LOCALBASE}/include/db4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +.elif (${DB_LIB_VERSION} == 41) +DB_LIBS= -L${LOCALBASE}/lib -ldb41 +DB_INCLUDES= -I${LOCALBASE}/include/db41 +LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .else -.error DB_LIB_VERSION must be either 1 or 4 +.error DB_LIB_VERSION must be either 1, 4 or 41 .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},' diff --git a/mail/exim/files/patch-src::auths::plaintext.c b/mail/exim/files/patch-src::auths::plaintext.c new file mode 100644 index 000000000000..4beccd085242 --- /dev/null +++ b/mail/exim/files/patch-src::auths::plaintext.c @@ -0,0 +1,11 @@ +--- src/auths/plaintext.c.orig Tue Apr 1 14:53:33 2003 ++++ src/auths/plaintext.c Tue Apr 1 14:53:40 2003 +@@ -93,7 +93,7 @@ + if (Ustrcmp(data, "=") == 0) + { + expand_nstring[++expand_nmax] = US""; +- expand_nstring[expand_nmax] = 0; ++ expand_nlength[expand_nmax] = 0; + } + else + { diff --git a/mail/exim/files/patch-src::auths::plantext.c b/mail/exim/files/patch-src::auths::plantext.c deleted file mode 100644 index 4beccd085242..000000000000 --- a/mail/exim/files/patch-src::auths::plantext.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/auths/plaintext.c.orig Tue Apr 1 14:53:33 2003 -+++ src/auths/plaintext.c Tue Apr 1 14:53:40 2003 -@@ -93,7 +93,7 @@ - if (Ustrcmp(data, "=") == 0) - { - expand_nstring[++expand_nmax] = US""; -- expand_nstring[expand_nmax] = 0; -+ expand_nlength[expand_nmax] = 0; - } - else - { diff --git a/mail/exim/files/patch-src::rda.c b/mail/exim/files/patch-src::rda.c new file mode 100644 index 000000000000..68024128ad7c --- /dev/null +++ b/mail/exim/files/patch-src::rda.c @@ -0,0 +1,11 @@ +--- src/rda.c.orig Tue Mar 11 13:20:22 2003 ++++ src/rda.c Tue Apr 22 13:53:10 2003 +@@ -376,7 +376,7 @@ + options, /* specials that are allowed */ + generated, /* where to hang them */ + error, /* for errors */ +- qualify_domain_recipient, /* to qualify \name */ ++ deliver_domain, /* to qualify \name */ + include_directory, /* restrain to directory */ + eblockp); /* for skipped syntax errors */ + } diff --git a/mail/exim/files/patch-src::rewrite.c b/mail/exim/files/patch-src::rewrite.c new file mode 100644 index 000000000000..6a3d31cecb83 --- /dev/null +++ b/mail/exim/files/patch-src::rewrite.c @@ -0,0 +1,11 @@ +--- src/rewrite.c.orig Tue Mar 11 13:20:22 2003 ++++ src/rewrite.c Tue Apr 15 14:48:37 2003 +@@ -261,7 +261,7 @@ + while (*p2 == ' ') p2++; + pf2 = parse_fix_phrase(p2, Ustrlen(p2), buff2, sizeof(buff2)); + +- start = Ustrlen(buff1) + start + new - p1; ++ start = Ustrlen(pf1) + start + new - p1; + end = start + Ustrlen(newparsed); + new = string_sprintf("%s%.*s%s", pf1, p2 - p1, p1, pf2); + } diff --git a/mail/exim/files/patch-src::transports::appendfile.c b/mail/exim/files/patch-src::transports::appendfile.c new file mode 100644 index 000000000000..9316d277fc6b --- /dev/null +++ b/mail/exim/files/patch-src::transports::appendfile.c @@ -0,0 +1,13 @@ +--- src/transports/appendfile.c.orig Tue Mar 11 13:20:23 2003 ++++ src/transports/appendfile.c Tue Apr 15 14:46:18 2003 +@@ -702,7 +702,9 @@ + if (pcre_exec(regex, NULL, CS name, Ustrlen(name), 0, 0, ovector,6) >= 2) + { + int size; +- Ustrncpy(buffer, name + ovector[2], ovector[3] - ovector[2]); ++ int n = ovector[3] - ovector[2]; ++ Ustrncpy(buffer, name + ovector[2], n); ++ buffer[n] = 0; + size = Uatoi(buffer); + sum += size; + DEBUG(D_transport) -- cgit ='01b357a506cd6d95a1a56dcbc60d1f8c71bbf64e'/>
Commit message (Expand)AuthorAgeFilesLines
* Support stagebapt2014-01-051-16/+7
* Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-201-0/+1
* - Make ports use the libc provided iconv implementation on 10-CURRENTmadpilot2013-09-051-1/+1
* - Use USES=gmakesunpoet2013-08-211-1/+1
* - Update to 4.20 (4.20.100.526)sunpoet2012-10-072-11/+12
* - Update to 4.20 Beta 1sunpoet2012-05-152-5/+4
* - Respect STRIPsunpoet2012-05-151-0/+1
* - Add OPTIONS OPENSSL_AES: use OpenSSL implementation of AES instead of bundledsunpoet2012-04-254-1/+127
* - Update to 4.10sunpoet2012-02-192-11/+12
* - Respect CXX/CXXFLAGSsunpoet2012-01-081-0/+3
* - Update to 4.10 Beta 3sunpoet2012-01-062-4/+4
* - Take maintainershipsunpoet2011-08-301-1/+1
* Remove myself from MAINTAINERache2011-08-301-1/+1
* Upgrade to 4.00ache2011-03-102-8/+5
* Upgrade to 4.00 beta 6ache2011-02-102-4/+4
* Upgrade to 4.00 beta 4ache2011-01-192-5/+4
* Update to 3.93ache2010-03-232-5/+5
* Update to 3.91ache2010-01-282-6/+6
* Upgrade to 3.90 releaseache2009-09-052-5/+5
* Update to 3.90 beta 4ache2009-07-212-5/+5
* Revert MASTER_SITES back to http://www.rarlab.com/rar/ache2008-10-201-1/+1
* Upgrade to 3.80ache2008-10-192-6/+6
* Upgrade to 3.80 beta 2ache2008-06-232-5/+5
* Upgrade to 3.80 beta 1ache2008-06-152-6/+6
* - Add unrar-iconv (new slave port, as zh-unrar) to CONFLICTS.alepulver2008-02-171-1/+1
* Upgrade to unrar src 3.7.8ache2007-09-222-5/+5
* Upgrade to 3.71 beta 1ache2007-09-082-5/+5
* - Add master_site_rar and use it in rar, unrar and libunrar portssat2007-06-191-9/+1
* Increase MASTER_SITES numberache2007-06-181-1/+4
* Upgrade to 3.70ache2007-05-312-5/+5
* Upgrade to 3.70 beta 7ache2007-04-272-5/+5
* Use CONFLICTS?=ache2007-03-281-1/+1
* Upgrade to 3.70 beta 4ache2007-03-242-5/+5
* Add CONFLICTS with zh-unrar-*ache2007-02-091-0/+1
* Upgrade to 3.70 beta 3ache2007-02-092-5/+5
* Upgrade to 3.60 finalache2006-08-172-7/+7
* Upgrade to 3.60 beta 7ache2006-08-112-5/+5
* Respect DESTDIR, remove plistache2006-08-112-5/+4
* Update to 3.60 beta 6ache2006-07-132-5/+5
* Upgrade to 3.60 beta 4ache2006-05-272-5/+5
* Upgrade to 3.60 beta 3ache2006-05-212-5/+5
* SHA256ifyedwin2006-01-221-0/+1
* Update to 3.54ache2005-10-122-4/+4
* Upgrade to 3.5.3ache2005-08-282-5/+10
* Portlint(1)krion2004-12-061-3/+3
* Allow MAINTAINER overrideache2004-10-211-1/+1
* Update to 3.4.3ache2004-10-152-5/+4
* prepare for upcoming slave portijliao2004-08-021-1/+1
* Add size data, approved by maintainers.trevor2004-03-211-0/+1
* Add %%PORTDOCS%% prefixache2004-02-101-3/+3
* Bump PORTREVISION on all ports that depend on gettext to aid with upgrading.marcus2004-02-041-0/+1
* Obey CXX againache2004-01-291-1/+1
* Upgrade to 3.30ache2004-01-262-4/+4
* Upgrade to 3.30 beta 4ache2004-01-102-3/+3
* portlint (fix whitespace)kris2003-10-271-6/+6
* Cosmetic fix: use %%DOCSDIR%% macro.osa2003-10-211-3/+3
* Back out PORTEPOCH decrementingache2003-08-181-2/+1
* Bump PORTREVISION, not PORTEPOCHache2003-08-181-1/+2
* Upgrade to 3.2.3 (fix for new gcc)ache2003-08-163-21/+3
* Fix build with gcc 3.3.1fjoe2003-08-121-0/+18
* Upgrade to 3.20ache2003-05-202-4/+4
* Clear moonlight beckons.ade2003-03-072-1/+1
* Upgrade to 3.11ache2003-01-182-3/+5
* Upgrade to 3.10ache2003-01-022-6/+5
* Upgrade to 3.10 beta 1ache2002-10-233-15/+4
* Define wchar properlyache2002-08-271-10/+10