diff options
author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2003-05-12 09:44:02 +0000 |
---|---|---|
committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2003-05-12 09:44:02 +0000 |
commit | b37e1c66323e75f51b55a5a3f53973fc9abae903 (patch) | |
tree | 276bde9eec9d55d95ab46a92d0c98d9945edbf24 | |
parent | make the browser plugin usable (diff) |
* 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 <eikemeier@fillmore-labs.com>
Notes
Notes:
svn path=/head/; revision=80819
-rw-r--r-- | mail/exim/Makefile | 14 | ||||
-rw-r--r-- | mail/exim/files/patch-src::auths::plaintext.c (renamed from mail/exim/files/patch-src::auths::plantext.c) | 0 | ||||
-rw-r--r-- | mail/exim/files/patch-src::rda.c | 11 | ||||
-rw-r--r-- | mail/exim/files/patch-src::rewrite.c | 11 | ||||
-rw-r--r-- | mail/exim/files/patch-src::transports::appendfile.c | 13 |
5 files changed, 44 insertions, 5 deletions
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::plantext.c b/mail/exim/files/patch-src::auths::plaintext.c index 4beccd085242..4beccd085242 100644 --- a/mail/exim/files/patch-src::auths::plantext.c +++ b/mail/exim/files/patch-src::auths::plaintext.c 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) |