From 945eeff0a039ce88ab6a91fe1320a9bd6e904077 Mon Sep 17 00:00:00 2001
From: ad <ad>
Date: Mon, 9 Dec 2002 11:38:04 +0000
Subject: Update top exim-4.10. Guts provided by dawszy at arhea.net in
 pkg/19230, with some additions by me. Those running exim are advised to
 update.

Highlights from ChangeLog

1. Added HAVE_SA_LEN=YES to the OS/Makefile-Darwin file.
3. The code for computing load averages was broken in 64-bit Solaris.
10. Tidies to code for calls to fork(); some failures not logged.
26. Fixed some problems with retrying address errors in remote deliveries.

Local changes (will make next release):

Undo the OS/Makefile-NetBSD split that made it into the main tree. This
causes all manner of breakage.
---
 mail/exim/Makefile              |  4 ++--
 mail/exim/PLIST                 |  5 ++---
 mail/exim/distinfo              |  9 +++++----
 mail/exim/files/exim_newaliases |  5 +++--
 mail/exim/patches/patch-ad      | 40 ++++++++++++++++++++++++++++++++++++++++
 mail/exim/patches/patch-ae      |  4 ++--
 6 files changed, 54 insertions(+), 13 deletions(-)
 create mode 100644 mail/exim/patches/patch-ad

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 1d92441c38b..446684a6257 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2002/10/25 12:18:15 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/12/09 11:38:04 ad Exp $
 
-DISTNAME=	exim-4.05
+DISTNAME=	exim-4.10
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
diff --git a/mail/exim/PLIST b/mail/exim/PLIST
index b88c5111093..471b3c0202a 100644
--- a/mail/exim/PLIST
+++ b/mail/exim/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/19 16:02:26 ad Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/09 11:38:04 ad Exp $
 etc/exim/configure.example
 etc/exim/mailer.conf.exim
 etc/rc.d/exim
 sbin/exicyclog
 sbin/exigrep
 sbin/exim
-sbin/exim-4.05-1
+sbin/${PKGNAME}-1
 sbin/exim_checkaccess
 sbin/exim_dbmbuild
 sbin/exim_dumpdb
@@ -17,5 +17,4 @@ sbin/eximstats
 sbin/exinext
 sbin/exiqsumm
 sbin/exiwhat
-@unexec ${RMDIR} /var/log/exim 2>/dev/null || true
 @dirrm etc/exim
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 72a5da67b17..417ff390321 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2002/10/25 12:18:15 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/12/09 11:38:04 ad Exp $
 
-SHA1 (exim-4.05.tar.bz2) = 118c89ab4a79151f66c788581bdd9ab877624a42
-Size (exim-4.05.tar.bz2) = 1048495 bytes
+SHA1 (exim-4.10.tar.bz2) = cd374dde11a24fd12aa1c0ff72270d876d9c180d
+Size (exim-4.10.tar.bz2) = 1037997 bytes
 SHA1 (patch-aa) = c892a73a1850a9ce53828e88ca9d646407aa0ff2
 SHA1 (patch-ab) = e5d6365e9a05a87a6e16fef69b6e6cc8ebac32ae
 SHA1 (patch-ac) = 6bb782eb07c724da82be3aefcdf9a4bf90906687
-SHA1 (patch-ae) = 6fe1508019093e409dd936d934913bc9f23c3125
+SHA1 (patch-ad) = 2e4fe6eec1772946c6ed615df56459abc0f2d06d
+SHA1 (patch-ae) = 18c0ad924a709abc5c2a7e334ce53cb3413d4d3b
diff --git a/mail/exim/files/exim_newaliases b/mail/exim/files/exim_newaliases
index 6d9edfbeca4..1855175cf67 100644
--- a/mail/exim/files/exim_newaliases
+++ b/mail/exim/files/exim_newaliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: exim_newaliases,v 1.3 2002/06/19 16:02:27 ad Exp $
+#	$NetBSD: exim_newaliases,v 1.4 2002/12/09 11:38:05 ad Exp $
 #
 if [ -f /etc/mail/aliases ]; then
 	ALIASDIR=/etc/mail
@@ -10,4 +10,5 @@ fi
 
 cd $ALIASDIR
 echo -n "$ALIASDIR/aliases: "
-@PREFIX@/sbin/exim_dbmbuild aliases aliases
+@PREFIX@/sbin/exim_dbmbuild aliases aliases.db
+
diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad
new file mode 100644
index 00000000000..94c9996fcd5
--- /dev/null
+++ b/mail/exim/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.3 2002/12/09 11:38:05 ad Exp $
+
+--- OS/Makefile-NetBSD~	Mon Jul 22 09:59:45 2002
++++ OS/Makefile-NetBSD	Mon Dec  9 11:22:09 2002
+@@ -1,15 +1,26 @@
+ # Exim: OS-specific make file for NetBSD (ELF binary format)
+-# Submitted by: Vadim Vygonets <vadik@cs.huji.ac.il>
+ 
+-# Include Makfile.NetBSD-a.out
++CHOWN_COMMAND=/usr/sbin/chown
++CFLAGS=-O2 -pipe
+ 
+-.if exists(OS/Makefile-NetBSD-a.out)
+-.include "OS/Makefile-NetBSD-a.out"
+-.elif exists(../OS/Makefile-NetBSD-a.out)
+-.include "../OS/Makefile-NetBSD-a.out"
+-.else
+-.include "Makefile.NetBSD-a.out, submit a bug report."
+-.endif
++HAVE_SA_LEN=YES
++HAVE_IPV6=YES
++LIBS=-lcrypt
++
++X11=/usr/X11R6
++XINCLUDE=-I$(X11)/include
++XLFLAGS=-L$(X11)/lib
++X11_LD_LIB=$(X11)/lib
++
++EXIWHAT_PS_ARG=-ax
++EXIWHAT_EGREP_ARG='/exim( |$$)'
++EXIWHAT_KILL_SIGNAL=-USR1
++
++# NetBSD always ships with Berkeley DB
++
++USE_DB=yes
++
++# End
+ 
+ # NetBSD ELF linker needs a -R flag.
+ XLFLAGS+=-Wl,-R$(X11)/lib/
diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae
index d21eb18d648..02b67c51ae6 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/19 16:02:27 ad Exp $
+$NetBSD: patch-ae,v 1.3 2002/12/09 11:38:06 ad Exp $
 
 --- src/configure.default.orig	Thu Jun 13 11:37:52 2002
 +++ src/configure.default	Thu Jun 13 11:38:06 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.2 2002/06/19 16:02:27 ad Exp $
    allow_fail
    allow_defer
 -  data = ${lookup{$local_part}lsearch{/etc/aliases}}
-+  data = ${lookup{$local_part}dbm{/etc/mail/aliases}}
++  data = ${lookup{$local_part}dbm{/etc/mail/aliases.db}}
  # user = exim
    file_transport = address_file
    pipe_transport = address_pipe
-- 
cgit v1.2.3