pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update exim to 4.22. Too many changes to list since 4.10
details: https://anonhg.NetBSD.org/pkgsrc/rev/740fbea3a4bb
branches: trunk
changeset: 460653:740fbea3a4bb
user: abs <abs%pkgsrc.org@localhost>
date: Tue Sep 02 10:33:38 2003 +0000
description:
Update exim to 4.22. Too many changes to list since 4.10
Package changes include addition of Makefile.common (to be used by
Upcoming exim-exiscan-acl package), and exim.8
diffstat:
doc/CHANGES | 4 +-
mail/exim/MESSAGE | 4 +-
mail/exim/Makefile | 70 +-------------
mail/exim/Makefile.common | 69 ++++++++++++++
mail/exim/PLIST | 4 +-
mail/exim/distinfo | 18 ++-
mail/exim/files/exim.sh | 9 +-
mail/exim/files/exim_newaliases | 14 --
mail/exim/files/mailer.conf.exim | 4 +-
mail/exim/patches/patch-aa | 187 +++++++++++++++++++++++++++++++++-----
mail/exim/patches/patch-ab | 145 +----------------------------
mail/exim/patches/patch-ac | 17 +--
mail/exim/patches/patch-ad | 47 ++-------
mail/exim/patches/patch-ae | 42 ++++++--
14 files changed, 313 insertions(+), 321 deletions(-)
diffs (truncated from 766 to 300 lines):
diff -r e144af14d9ea -r 740fbea3a4bb doc/CHANGES
--- a/doc/CHANGES Tue Sep 02 10:20:27 2003 +0000
+++ b/doc/CHANGES Tue Sep 02 10:33:38 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3202 2003/09/02 10:21:21 agc Exp $
+$NetBSD: CHANGES,v 1.3203 2003/09/02 10:34:30 abs Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3472,3 +3472,5 @@
Updated nessus to 2.0.7 [frueauf 2003-09-02]
Updated rcs to 5.7nb2 [martti 2003-09-02]
Updated audit-packages to 1.18 [agc 2003-09-02]
+ Updated exim to 4.22 [abs 2003-09-02]
+
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/MESSAGE
--- a/mail/exim/MESSAGE Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/MESSAGE Tue Sep 02 10:33:38 2003 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/08/02 17:00:08 jmmv Exp $
+$NetBSD: MESSAGE,v 1.4 2003/09/02 10:33:38 abs Exp $
To use exim, you will need to perform the following steps manually; it is
inappropriate for this package to make the changes for you.
@@ -8,7 +8,7 @@
2. Edit ${PKG_SYSCONFDIR}/aliases to taste (or override it with the default
/etc/aliases system file).
3. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
- Copy ${EGDIR}/mailer.conf to /etc/mailer.conf.
+ Copy ${EXAMPLESDIR}/mailer.conf to /etc/mailer.conf.
4. Set 'sendmail=NO', 'exim=YES' and exim_flags to some sane value in
/etc/rc.conf (previously it was "-bd -q15m").
Copy ${PREFIX}/etc/rc.d/exim to /etc/rc.d.
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/Makefile
--- a/mail/exim/Makefile Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/Makefile Tue Sep 02 10:33:38 2003 +0000
@@ -1,72 +1,16 @@
-# $NetBSD: Makefile,v 1.37 2003/08/02 17:00:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/02 10:33:38 abs Exp $
-DISTNAME= exim-4.10
-PKGREVISION= 2
+DISTNAME= exim-${EXIM_VERSION}
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= ad%NetBSD.org@localhost
HOMEPAGE= http://www.exim.org/
COMMENT= The Exim mail transfer agent, a replacement for sendmail
-DEPENDS+= exim-user>=4.10nb1:../../mail/exim-user
-
-USE_PERL5= yes
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-
-MAKE_ENV+= SSLBASE=${SSLBASE:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= EXIM_GROUP EXIM_USER
-
-PKG_SYSCONFSUBDIR= exim
-EGDIR= ${PREFIX}/share/examples/exim
-CONF_FILES= ${EGDIR}/aliases ${PKG_SYSCONFDIR}/aliases
-CONF_FILES+= ${EGDIR}/configure ${PKG_SYSCONFDIR}/configure
-MESSAGE_SUBST+= EGDIR="${EGDIR}"
-
-RCD_SCRIPTS= exim
-
-OWN_DIRS_PERMS= /var/log/exim ${EXIM_USER} ${EXIM_GROUP} 750
-
-# XXX: The following will be handled by buildlink2 at some point.
-CFLAGS+= ${_STRIPFLAG_CC}
-
-pre-patch:
- ${MKDIR} ${WRKSRC}/Local
- ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd
+DEPENDS+= exim-user>=4.10nb1:../../mail/exim-user
+CONFLICTS+= exim-exiscan-[0-9]* exim-exiscan-acl-[0-9]*
-pre-configure:
- ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
- -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \
- -e 's:@EXIM_USER@:${EXIM_USER}:g' \
- -e 's:@EXIM_GROUP@:${EXIM_GROUP}:g' \
- < ${WRKSRC}/Local/Makefile.netbsd \
- > ${WRKSRC}/Local/Makefile
- ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
- -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \
- < ${WRKSRC}/src/configure.default \
- > ${WRKSRC}/src/configure.default.new
- ${MV} ${WRKSRC}/src/configure.default.new \
- ${WRKSRC}/src/configure.default
+.include "Makefile.common"
-post-build:
- ${SED} -e 's:@PREFIX@:${PREFIX}:' \
- ${FILESDIR}/exim_newaliases \
- > ${WRKDIR}/exim_newaliases
- ${SED} -e 's:@PREFIX@:${PREFIX}:' \
- ${FILESDIR}/mailer.conf.exim \
- > ${WRKDIR}/mailer.conf
-
-pre-install:
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
-
-.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
+# 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
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/exim/Makefile.common Tue Sep 02 10:33:38 2003 +0000
@@ -0,0 +1,69 @@
+# $NetBSD: Makefile.common,v 1.1 2003/09/02 10:33:38 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_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+
+MAKE_ENV+= SSLBASE=${SSLBASE:Q}
+
+EXIM_VERSION= 4.22
+
+WRKSRC= ${WRKDIR}/exim-${EXIM_VERSION}
+EXTRACT_SUFX= .tar.bz2
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS= EXIM_USER EXIM_GROUP
+
+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}"
+
+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 buildlink2 at some point.
+CFLAGS+= ${_STRIPFLAG_CC}
+
+pre-patch:
+ ${MKDIR} ${WRKSRC}/Local
+ ${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.pkgsrc
+ ${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf.pkgsrc
+
+pre-configure:
+ ${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:@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
+ ${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
+
+.include "../../security/openssl/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/PLIST
--- a/mail/exim/PLIST Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/PLIST Tue Sep 02 10:33:38 2003 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/08/02 17:00:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/02 10:33:38 abs Exp $
etc/rc.d/exim
+man/man8/exim.8
sbin/exicyclog
sbin/exigrep
sbin/exim
@@ -9,7 +10,6 @@
sbin/exim_dumpdb
sbin/exim_fixdb
sbin/exim_lock
-sbin/exim_newaliases
sbin/exim_tidydb
sbin/eximstats
sbin/exinext
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/distinfo
--- a/mail/exim/distinfo Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/distinfo Tue Sep 02 10:33:38 2003 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.11 2003/08/02 17:00:08 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2003/09/02 10:33:39 abs Exp $
-SHA1 (exim-4.10.tar.bz2) = cd374dde11a24fd12aa1c0ff72270d876d9c180d
-Size (exim-4.10.tar.bz2) = 1037997 bytes
-SHA1 (patch-aa) = 9ef7ef419781ad7fceb55fa346b4d0abd2c37bc1
-SHA1 (patch-ab) = 6fcddd0d315dd19fa3a45cb30043a36bdb1ded84
-SHA1 (patch-ac) = 6f514aa7e52c3ccca6db8e95d521a1c43f8f515f
-SHA1 (patch-ad) = ec9f2404a0aa9bf0663e2146f203c08bcaf0295d
-SHA1 (patch-ae) = 5ca61d792b9426e0ae2da71643ea53c0ddf9cc2d
+SHA1 (exim-4.22.tar.bz2) = aa4d67313cfa262135ec455134ecacab5449c937
+Size (exim-4.22.tar.bz2) = 1249633 bytes
+SHA1 (exiscan-acl-4.22-10.patch) = d61865278ade6af14dde2ac807d3b7b442a078fa
+Size (exiscan-acl-4.22-10.patch) = 286429 bytes
+SHA1 (patch-aa) = 48fbcd68cae6c5886d0b6aab7d9f058e9ff9258d
+SHA1 (patch-ab) = afccbaec6ece925f87384535e70da8dd79d8e978
+SHA1 (patch-ac) = 8f3bd109cf961dc72fa11bd738aa69995bebc929
+SHA1 (patch-ad) = ad4cc6c2b2db445504613c04affcd5fc7b012d35
+SHA1 (patch-ae) = f5809185329771a691a75677c352fb54405e525d
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/files/exim.sh
--- a/mail/exim/files/exim.sh Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/files/exim.sh Tue Sep 02 10:33:38 2003 +0000
@@ -1,18 +1,17 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: exim.sh,v 1.4 2003/08/02 17:00:09 jmmv Exp $
+# $NetBSD: exim.sh,v 1.5 2003/09/02 10:33:40 abs Exp $
#
# PROVIDE: mail
# REQUIRE: LOGIN
-#
. /etc/rc.subr
-name="exim"
-rcvar=$name
+name="exim"
+rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="@PKG_SYSCONFDIR@/configure"
-
+
load_rc_config $name
run_rc_command "$1"
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/files/exim_newaliases
--- a/mail/exim/files/exim_newaliases Tue Sep 02 10:20:27 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: exim_newaliases,v 1.4 2002/12/09 11:38:05 ad Exp $
-#
-if [ -f /etc/mail/aliases ]; then
- ALIASDIR=/etc/mail
-else
- ALIASDIR=/etc
-fi
-
-cd $ALIASDIR
-echo -n "$ALIASDIR/aliases: "
-@PREFIX@/sbin/exim_dbmbuild aliases aliases.db
-
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/files/mailer.conf.exim
--- a/mail/exim/files/mailer.conf.exim Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/files/mailer.conf.exim Tue Sep 02 10:33:38 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: mailer.conf.exim,v 1.1 1999/09/18 20:27:08 ad Exp $
+# $NetBSD: mailer.conf.exim,v 1.2 2003/09/02 10:33:41 abs Exp $
#
# Use "exim" as replacement for "sendmail".
#
sendmail @PREFIX@/sbin/exim
send-mail @PREFIX@/sbin/exim
mailq @PREFIX@/sbin/exim
-newaliases @PREFIX@/sbin/exim_newaliases
+newaliases @PREFIX@/sbin/exim
diff -r e144af14d9ea -r 740fbea3a4bb mail/exim/patches/patch-aa
--- a/mail/exim/patches/patch-aa Tue Sep 02 10:20:27 2003 +0000
+++ b/mail/exim/patches/patch-aa Tue Sep 02 10:33:38 2003 +0000
@@ -1,31 +1,162 @@
-$NetBSD: patch-aa,v 1.4 2003/08/02 17:00:10 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2003/09/02 10:33:41 abs Exp $
---- scripts/exim_install.orig 2002-07-22 10:59:47.000000000 +0200
-+++ scripts/exim_install
-@@ -42,6 +42,8 @@ INFO_DIRECTORY=`sed -n -e '/^ *INFO_DIRE
Home |
Main Index |
Thread Index |
Old Index