Date: Tue, 15 Apr 2003 15:24:57 +0200 From: Oliver Eikemeier <eikemeier@fillmore-labs.com> To: FreeBSD-gnats-submit@freebsd.org Cc: sheldonh@FreeBSD.org Subject: [PATCH] port mail/exim bug fixes, support for db4.1 Message-ID: <E195QQj-0006lj-VV@mx1.fillmore-labs.com>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Oliver Eikemeier >Organization: Fillmore Labs - http://www.fillmore-labs.com >Confidential: no >Synopsis: [PATCH] port mail/exim bug fixes, support for db4.1 >Severity: non-critical >Priority: medium >Category: ports >Class: update >Release: FreeBSD 4.8-STABLE i386 >Environment: System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 14:21:01 CEST 2003 root@nuuk.fillmore-labs.com:/usr/obj/usr/src/sys/FILLMORE-LABS i386 >Description: Two bugs have been discovered in the exim 4.14 distribution and are fixed by the author. Sheldon Hearn (the ports maintainer) is away till May 12th, see <http://www.exim.org/pipermail/exim-users/Week-of-Mon-20030407/052312.html>; Somebody care to volunteer to commit these patches? - support for db4.1 - fix for bug in check_dir_size <http://www.exim.org/pipermail/exim-users/Week-of-Mon-20030414/052510.html>; - fix for bug in address rewriting <http://www.exim.org/pipermail/exim-users/Week-of-Mon-20030414/052511.html>; - speling of plantext bug fix >Fix: cd /usr/ports/mail patch < ~/exim-db41.patch patch < ~/exim-fixes.patch find exim \( -name '*.orig' -o -empty \) -delete --- exim-db41.patch begins here --- --- exim/Makefile.orig Thu Apr 10 02:05:58 2003 +++ exim/Makefile Fri Apr 11 21:07:25 2003 @@ -75,8 +75,8 @@ #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 @@ 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},' --- exim-db41.patch ends here --- --- exim-fixes.patch begins here --- diff -Nur exim/Makefile.orig exim/Makefile --- exim/Makefile.orig Tue Apr 15 14:43:59 2003 +++ exim/Makefile Tue Apr 15 14:55:21 2003 @@ -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/ \ diff -Nur exim/files/patch-src::auths::plaintext.c.orig exim/files/patch-src::auths::plaintext.c --- exim/files/patch-src::auths::plaintext.c.orig Thu Jan 1 01:00:00 1970 +++ exim/files/patch-src::auths::plaintext.c Wed Apr 9 20:44:05 2003 @@ -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 -Nur exim/files/patch-src::auths::plantext.c.orig exim/files/patch-src::auths::plantext.c --- exim/files/patch-src::auths::plantext.c.orig Wed Apr 9 20:44:05 2003 +++ exim/files/patch-src::auths::plantext.c Thu Jan 1 01:00:00 1970 @@ -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 -Nur exim/files/patch-src::rewrite.c.orig exim/files/patch-src::rewrite.c --- exim/files/patch-src::rewrite.c.orig Thu Jan 1 01:00:00 1970 +++ exim/files/patch-src::rewrite.c Tue Apr 15 14:49:13 2003 @@ -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 -Nur exim/files/patch-src::transports::appendfile.c.orig exim/files/patch-src::transports::appendfile.c --- exim/files/patch-src::transports::appendfile.c.orig Thu Jan 1 01:00:00 1970 +++ exim/files/patch-src::transports::appendfile.c Tue Apr 15 14:47:07 2003 @@ -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) --- exim-fixes.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E195QQj-0006lj-VV>