pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail Update exim from 4.44 to 4.51.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c549e50883b8
branches:  trunk
changeset: 493962:c549e50883b8
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue May 17 17:06:11 2005 +0000

description:
Update exim from 4.44 to 4.51.
The main change is the incorporation of the content scanning from
the exiscan patch. (There are over 650 lines of Changes)
Retire exim-exiscan
Update exim-html from 4.40 to 4.50

diffstat:

 mail/Makefile                   |    3 +-
 mail/exim-exiscan/DESCR         |   23 --------
 mail/exim-exiscan/Makefile      |   25 --------
 mail/exim-html/Makefile         |    9 ++-
 mail/exim-html/PLIST            |    6 +-
 mail/exim-html/distinfo         |    9 +-
 mail/exim-html/patches/patch-aa |    8 --
 mail/exim/Makefile              |  115 +++++++++++++++++++++++++++++++++++++--
 mail/exim/Makefile.common       |  113 ---------------------------------------
 mail/exim/distinfo              |   24 +++----
 mail/exim/patches/patch-aa      |   36 ++++++------
 mail/exim/patches/patch-ab      |    6 +-
 mail/exim/patches/patch-ac      |    8 +-
 mail/exim/patches/patch-ad      |    8 +-
 mail/exim/patches/patch-ae      |    8 +-
 mail/exim/patches/patch-af      |    6 +-
 mail/exim/patches/patch-ag      |   31 ----------
 17 files changed, 171 insertions(+), 267 deletions(-)

diffs (truncated from 691 to 300 lines):

diff -r 840fecc760cb -r c549e50883b8 mail/Makefile
--- a/mail/Makefile     Tue May 17 16:11:42 2005 +0000
+++ b/mail/Makefile     Tue May 17 17:06:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.263 2005/05/07 15:42:03 wiz Exp $
+# $NetBSD: Makefile,v 1.264 2005/05/17 17:06:11 abs Exp $
 #
 
 COMMENT=       Electronic mail utilities
@@ -42,7 +42,6 @@
 SUBDIR+=       evolution12
 SUBDIR+=       evolution14
 SUBDIR+=       exim
-SUBDIR+=       exim-exiscan
 SUBDIR+=       exim-html
 SUBDIR+=       exim3
 SUBDIR+=       exmh
diff -r 840fecc760cb -r c549e50883b8 mail/exim-exiscan/DESCR
--- a/mail/exim-exiscan/DESCR   Tue May 17 16:11:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-exim-exiscan adds email content scanning to the exim MTA.  It supports
-SpamAssassin, Brightmail Anti-Spam, third-party virus scanners, and SPF.
-It also provides a MIME ACL and also regular expression matching against
-headers, bodies, raw MIME parts and decoded MIME parts.
-
-Exim is a mail transport agent (MTA) developed at the University of Cambridge
-for use on Unix systems connected to the Internet. It is freely available
-under the terms of the GNU General Public Licence. In style it is similar to
-Smail 3, but its facilities are more extensive, and in particular it has
-options for verifying incoming sender and recipient addresses, for refusing
-mail from specified hosts, networks, or senders, and for controlling mail
-relaying.
-
-This build of exim has the following non-default features enabled:
-
-TRANSPORT_LMTP          SUPPORT_MAILDIR         SUPPORT_MAILSTORE
-SUPPORT_MBX             AUTH_CRAM_MD5           AUTH_PLAINTEXT
-AUTH_SPA                SUPPORT_TLS             USE_TCP_WRAPPERS
-HAVE_IPV6
-
-The following default feature is disabled:
-
-EXIM_MONITOR
diff -r 840fecc760cb -r c549e50883b8 mail/exim-exiscan/Makefile
--- a/mail/exim-exiscan/Makefile        Tue May 17 16:11:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2005/05/10 22:52:06 abs Exp $
-
-DISTNAME=      exim-${EXIM_VERSION}
-PKGNAME=       exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION}
-PKGREVISION=   2
-CATEGORIES=    mail net
-
-MAINTAINER=    abs%NetBSD.org@localhost
-HOMEPAGE=      http://duncanthrax.net/exiscan-acl/
-COMMENT=       The Exim mail transfer agent, with exiscan-acl patches
-
-CONFLICTS+=    exim-[0-9]*
-
-EXISCAN_VERSION=       28
-
-PATCH_SITES=           http://duncanthrax.net/exiscan-acl/
-PATCHFILES=            exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2
-PATCH_DIST_STRIP=      -p1
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/exim/distinfo
-PATCHDIR=      ${.CURDIR}/../../mail/exim/patches
-FILESDIR=      ${.CURDIR}/../../mail/exim/files
-PLIST_SRC=     ${.CURDIR}/../../mail/exim/PLIST
-
-.include "../../mail/exim/Makefile.common"
diff -r 840fecc760cb -r c549e50883b8 mail/exim-html/Makefile
--- a/mail/exim-html/Makefile   Tue May 17 16:11:42 2005 +0000
+++ b/mail/exim-html/Makefile   Tue May 17 17:06:11 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/10/07 17:29:16 abs Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/17 17:06:12 abs Exp $
 
-DISTNAME=      exim-html-4.40
+DISTNAME=      exim-html-4.50
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
                ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -11,7 +11,10 @@
 HOMEPAGE=      http://www.exim.org/
 COMMENT=       HTML documentation for the Exim mail transfer agent
 
-post-install:
+NO_CONFIGURE=
+NO_BUILD=
+
+do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/exim
        ${CP} -R ${WRKDIR}/${DISTNAME}/doc/html/* ${PREFIX}/share/doc/html/exim
 
diff -r 840fecc760cb -r c549e50883b8 mail/exim-html/PLIST
--- a/mail/exim-html/PLIST      Tue May 17 16:11:42 2005 +0000
+++ b/mail/exim-html/PLIST      Tue May 17 17:06:11 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/10/07 17:29:16 abs Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/05/17 17:06:12 abs Exp $
 share/doc/html/exim/C002.txt
 share/doc/html/exim/C006.txt
 share/doc/html/exim/C022.txt
@@ -11,6 +11,7 @@
 share/doc/html/exim/C047.txt
 share/doc/html/exim/C049.txt
 share/doc/html/exim/C050.txt
+share/doc/html/exim/C051.txt
 share/doc/html/exim/F001.txt
 share/doc/html/exim/F002.txt
 share/doc/html/exim/F003.txt
@@ -130,6 +131,9 @@
 share/doc/html/exim/spec_49.html
 share/doc/html/exim/spec_5.html
 share/doc/html/exim/spec_50.html
+share/doc/html/exim/spec_51.html
+share/doc/html/exim/spec_52.html
+share/doc/html/exim/spec_53.html
 share/doc/html/exim/spec_6.html
 share/doc/html/exim/spec_7.html
 share/doc/html/exim/spec_8.html
diff -r 840fecc760cb -r c549e50883b8 mail/exim-html/distinfo
--- a/mail/exim-html/distinfo   Tue May 17 16:11:42 2005 +0000
+++ b/mail/exim-html/distinfo   Tue May 17 17:06:11 2005 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/05/17 17:06:12 abs Exp $
 
-SHA1 (exim-html-4.40.tar.bz2) = 36409d64402c80abf3e7d8086e72aee56c0ccaf3
-RMD160 (exim-html-4.40.tar.bz2) = fce890ab8494e1c3c15f243cfb3a19911f24a062
-Size (exim-html-4.40.tar.bz2) = 542983 bytes
-SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52
+SHA1 (exim-html-4.50.tar.bz2) = c8990e95e9f28b47f76739e4e1d3c5814ffb102d
+RMD160 (exim-html-4.50.tar.bz2) = 99176ac24b86df062df66818f578c02d2e8354c7
+Size (exim-html-4.50.tar.bz2) = 581781 bytes
diff -r 840fecc760cb -r c549e50883b8 mail/exim-html/patches/patch-aa
--- a/mail/exim-html/patches/patch-aa   Tue May 17 16:11:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/07/11 13:23:08 ad Exp $
-
---- /dev/null  Tue Mar 13 03:03:39 2001
-+++ Makefile   Wed Jul 11 15:10:50 2001
-@@ -0,0 +1,3 @@
-+all:
-+
-+install:
diff -r 840fecc760cb -r c549e50883b8 mail/exim/Makefile
--- a/mail/exim/Makefile        Tue May 17 16:11:42 2005 +0000
+++ b/mail/exim/Makefile        Tue May 17 17:06:11 2005 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2005/05/10 22:52:06 abs Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/17 17:06:11 abs Exp $
 
-DISTNAME=      exim-${EXIM_VERSION}
-PKGREVISION=   3
+DISTNAME=      exim-4.51
 CATEGORIES=    mail net
+MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
+               ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
+               ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    abs%NetBSD.org@localhost
 HOMEPAGE=      http://www.exim.org/
@@ -10,7 +13,107 @@
 
 CONFLICTS+=    exim-exiscan-[0-9]*
 
-.include "Makefile.common"
+USE_PERL5=     yes
+USE_PKGINSTALL=        yes
+
+MAKE_ENV+=     SSLBASE=${SSLBASE:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS=    EXIM_USER EXIM_GROUP EXIM_DB EXIM_USE_LOOKUP_WHOSON
+
+PKG_GROUPS=    ${EXIM_GROUP}
+PKG_USERS=     ${EXIM_USER}:${EXIM_GROUP}::Exim\\ mail\\ server\\ user:/var/mail:/sbin/nologin
+
+PKG_SYSCONFSUBDIR?=    exim
+EXAMPLESDIR=           ${PREFIX}/share/examples/exim
+CONF_FILES=            ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
+CONF_FILES+=           ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
+MESSAGE_SUBST+=                EXAMPLESDIR="${EXAMPLESDIR}"
+PLIST_SUBST+=          DISTNAME="${DISTNAME}"
+
+RCD_SCRIPTS=           exim
+
+OWN_DIRS_PERMS=                /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+OWN_DIRS_PERMS+=       /var/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+
+# XXX: The following will be handled by buildlink3 at some point.
+CFLAGS+=               ${_STRIPFLAG_CC}
+
+# BDB_TYPE gets set to "db1" if USE_DB185=="yes"
+USE_DB185?=            no
+BDB_ACCEPTED?=         db1 db2 db3 db4
 
-# Note: The distinfo in this directory includes the exiscan-acl-4.22-10.patch
-# 'make mdi' or equivalent should be run from ../exim-exiscan-acl
+.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
+.  include "../../databases/gdbm/buildlink3.mk"
+EXIM_USE_DB_CONFIG=    USE_GDBM=yes
+EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
+EXIM_INCLUDE=          -I${PREFIX}/include
+.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
+.  include "../../mk/bdb.buildlink3.mk"
+EXIM_USE_DB_CONFIG=    USE_DB=yes      # the default
+.  if ${BDB_TYPE} == "db4"
+EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} ${BDB_LIBS}
+EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db4}
+.  elif ${BDB_TYPE} == "db3"
+EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} ${BDB_LIBS}
+EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db3}
+.  elif ${BDB_TYPE} == "db2"
+EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} ${BDB_LIBS}
+EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db2}
+.  else # using native
+EXIM_DBMLIB=           # empty so use defaults
+EXIM_USE_DB_CONFIG=    # empty so use defaults
+EXIM_INCLUDE=          -I/usr/${BUILDLINK_INCDIRS.db-native}
+.  endif
+.endif
+
+post-extract:
+       ${MKDIR} ${WRKSRC}/Local
+       ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
+       ${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
+
+pre-configure:
+       @${ECHO} LOOKUP_DSEARCH=yes >> ${WRKSRC}/Local/Makefile.pkgsrc
+       @${SED} -e 's:@PREFIX@:${PREFIX}:' \
+               -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
+               -e 's:@EXIM_USER@:${EXIM_USER}:' \
+               -e 's:@EXIM_GROUP@:${EXIM_GROUP}:' \
+               -e 's:@EXIM_USE_DB_CONFIG@:${EXIM_USE_DB_CONFIG}:' \
+               -e 's:@EXIM_DBMLIB@:${EXIM_DBMLIB}:' \
+               -e 's:@EXIM_INCLUDE@:${EXIM_INCLUDE}:' \
+               -e 's:@CHOWN@:${CHOWN}:' \
+               -e 's:@CHGRP@:${CHGRP}:' \
+               -e 's:@MV@:${MV}:' \
+               -e 's:@RM@:${RM}:' \
+               -e 's:@PERL5@:${PERL5}:' \
+           < ${WRKSRC}/Local/Makefile.pkgsrc \
+           > ${WRKSRC}/Local/Makefile
+       @${ECHO} WITH_CONTENT_SCAN=yes >> ${WRKSRC}/Local/Makefile
+       @${ECHO} WITH_OLD_DEMIME=yes >> ${WRKSRC}/Local/Makefile
+.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
+       @${ECHO} LOOKUP_WHOSON=yes >> ${WRKSRC}/Local/Makefile
+       @${ECHO} LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.whoson} -lwhoson >> ${WRKSRC}/Local/Makefile
+.endif
+       @${SED} -e 's:@PREFIX@:${PREFIX}:' \
+               -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
+           < ${WRKSRC}/Local/eximon.conf.pkgsrc \
+           > ${WRKSRC}/Local/eximon.conf
+
+post-build:
+       @${SED} -e 's:@PREFIX@:${PREFIX}:' \
+           ${FILESDIR}/mailer.conf.exim \
+           > ${WRKDIR}/mailer.conf
+
+post-install:
+       ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+       ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLESDIR}
+       ${INSTALL_DATA} ${WRKSRC}/doc/exim.8 ${PREFIX}/man/man8/exim.8
+
+.if defined(EXIM_USE_LOOKUP_WHOSON) && ${EXIM_USE_LOOKUP_WHOSON} == "YES"
+.  include "../../net/whoson/buildlink3.mk"
+.endif
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 840fecc760cb -r c549e50883b8 mail/exim/Makefile.common
--- a/mail/exim/Makefile.common Tue May 17 16:11:42 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/10 22:52:06 abs Exp $
-
-MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
-               ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
-               ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/
-
-USE_PERL5=     yes
-USE_PKGINSTALL=        yes
-
-MAKE_ENV+=     SSLBASE=${SSLBASE:Q}
-
-EXIM_VERSION=  4.44
-
-EXTRACT_SUFX=  .tar.bz2
-
-.include "../../mk/bsd.prefs.mk"
-



Home | Main Index | Thread Index | Old Index