>Number:         19850
>Category:       pkg
>Synopsis:       exim 4.10 - 4.12 update
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 14 14:37:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dawid Szymański
>Release:        NetBSD 1.6
>Organization:


-- 
Dawid Szymański -> http://people.arhea.net/dawszy/ -> a.k.a DawS

W tej wiadomości wyraziłem swoje prywatne poglądy, które nie mają
nic wspólnego z moimi byłymi, obecnymi i przyszłymi pracodawcami.
>Environment:
	
	
System: NetBSD foo.arhea.net 1.6 NetBSD 1.6 (FOO) #0: Thu Nov 28 20:44:46 CET 2002 dawszy@foo.arhea.net:/usr/src/sys/arch/i386/compile/FOO i386
Architecture: i386
Machine: i386
>Description:
   Maybe I could become maintainer ?:) last two updates sent by me.
   List of 4.10 -> 4.12 changes is really long, and you can find whole in:
	EXIM_SRC/doc/ChangeLog
	Generally little fixes.
   Most important for end-non-hackers-users:
	- GnuTLS support added
	- SPA authentication added
	- Security problem posted on securityfocus solved
>How-To-Repeat:
   Remove patches/patch-ae
	Apply following patch

>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile	2002/12/09 11:38:04	1.31
+++ Makefile	2003/01/14 22:23:54
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.31 2002/12/09 11:38:04 ad Exp $
 
-DISTNAME=	exim-4.10
+DISTNAME=	exim-4.12
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	2002/12/09 11:38:04	1.4
+++ PLIST	2003/01/14 22:23:54
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 11:38:04 ad Exp $
+@comment $NetBSD$
 etc/exim/configure.example
 etc/exim/mailer.conf.exim
 etc/rc.d/exim
@@ -15,6 +15,7 @@
 sbin/exim_tidydb
 sbin/eximstats
 sbin/exinext
+sbin/exiqgrep
 sbin/exiqsumm
 sbin/exiwhat
 @dirrm etc/exim
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	2002/12/09 11:38:04	1.9
+++ distinfo	2003/01/14 22:23:54
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2002/12/09 11:38:04 ad Exp $
+$NetBSD$
 
-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-ad) = 2e4fe6eec1772946c6ed615df56459abc0f2d06d
-SHA1 (patch-ae) = 18c0ad924a709abc5c2a7e334ce53cb3413d4d3b
+SHA1 (exim-4.12.tar.bz2) = 87c5adfd4ff5e1512fb2b3d2d6cb32940508622c
+Size (exim-4.12.tar.bz2) = 1119254 bytes
+SHA1 (patch-aa) = 4eb237e1ce846575610517e500680ab72c318db1
+SHA1 (patch-ab) = ef16aaae1261fb514454a30ab2f5f30fb97447c7
+SHA1 (patch-ac) = 0c9eba16bace33404d7608348d330c3be963fe91
+SHA1 (patch-ad) = ab87a7e5f2fd97e690fbcac54ca000a0763cbf8d
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	2002/06/19 16:02:27	1.3
+++ patches/patch-aa	2003/01/14 22:23:54
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2002/06/19 16:02:27 ad Exp $
+$NetBSD$
 
---- scripts/exim_install.orig	Thu Jun 13 12:06:12 2002
-+++ scripts/exim_install	Thu Jun 13 12:07:28 2002
-@@ -42,6 +42,8 @@
- NO_SYMLINK=`sed -n         -e '/^ *NO_SYMLINK *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
- EXE=`sed -n                       -e '/^ *EXE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
+--- scripts/exim_install.orig	Wed Dec 18 11:28:00 2002
++++ scripts/exim_install
+@@ -63,6 +63,9 @@ NO_SYMLINK=`sed -n         -e '/^ *NO_SY
+ SYSTEM_ALIASES_FILE=`sed -n -e '/^ *SYSTEM_ALIASES_FILE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
+ EXE=`sed -n                                 -e '/^ *EXE *=/{s/^[^=]*= *//; s/ \{1,\}#.*//;s/ *$//;h;}' -e '${g;p;}' Makefile`
  
 +INST_CONFIGURE_FILE=$CONFIGURE_FILE.example
 +
- # Allow INST_xx to over-ride xx
- case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
- case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
++
+ # Set a default for SYSTEM_ALIASES_FILE
+ 
+ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; then
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/patches/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- patches/patch-ab	2002/10/25 12:18:16	1.6
+++ patches/patch-ab	2003/01/14 22:23:54
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
+$NetBSD$
 
---- Local/Makefile.netbsd.orig	Fri Oct 25 14:04:25 2002
+--- Local/Makefile.netbsd.orig	Tue Jan 14 15:08:22 2003
 +++ Local/Makefile.netbsd
 @@ -98,7 +98,9 @@
  # /usr/local/sbin. The installation script will try to create this directory,
@@ -14,15 +14,15 @@
  
  #------------------------------------------------------------------------------
 @@ -113,7 +115,7 @@ BIN_DIRECTORY=/usr/exim/bin
- # directories if they don't exist. It will also install a default run time
+ # directories if they don't exist. It will also install a default runtime
  # configuration if this file does not exist.
  
 -CONFIGURE_FILE=/usr/exim/configure
 +CONFIGURE_FILE=@PREFIX@/etc/exim/configure
  
- 
- #------------------------------------------------------------------------------
-@@ -126,7 +128,7 @@ CONFIGURE_FILE=/usr/exim/configure
+ # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
+ # In this case, Exim will use the first of them that exists when it is run.
+@@ -131,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged. These values are compiled into the binary.
  
@@ -31,7 +31,7 @@
  
  # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
  # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +209,7 @@ TRANSPORT_SMTP=yes
+@@ -212,7 +214,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -40,7 +40,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -216,9 +218,9 @@ TRANSPORT_SMTP=yes
+@@ -221,9 +223,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -53,7 +53,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -281,7 +283,7 @@ LOOKUP_LSEARCH=yes
+@@ -288,7 +290,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -62,7 +62,7 @@
  
  
  
-@@ -302,9 +304,9 @@ EXIM_MONITOR=eximon.bin
+@@ -309,9 +311,9 @@ EXIM_MONITOR=eximon.bin
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -75,18 +75,20 @@
  
  
  #------------------------------------------------------------------------------
-@@ -315,8 +317,8 @@ EXIM_MONITOR=eximon.bin
- # with TLS support. If you don't know what this is all about, leave these
- # settings commented out.
+@@ -323,10 +325,11 @@ EXIM_MONITOR=eximon.bin
+ # leave these settings commented out.
  
+ # This setting is required for any TLS support (either OpenSSL or GnuTLS)
 -# SUPPORT_TLS=yes
--# TLS_LIBS=-lssl -lcrypto
 +SUPPORT_TLS=yes
+ 
+ # Uncomment this setting if you are using OpenSSL
+ # TLS_LIBS=-lssl -lcrypto
 +TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
  
- # If you are running Exim as a server, note that just building it with TLS
- # support is not all you need to do. You also need to set up a suitable
-@@ -371,7 +373,7 @@ EXIM_MONITOR=eximon.bin
+ # Uncomment these settings if you are using GnuTLS
+ # USE_GNUTLS=yes
+@@ -390,7 +393,7 @@ EXIM_MONITOR=eximon.bin
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -95,7 +97,7 @@
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -467,14 +469,14 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -486,14 +489,14 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  
@@ -112,7 +114,7 @@
  
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -511,11 +513,11 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -542,11 +545,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -129,7 +131,7 @@
  
  
  #------------------------------------------------------------------------------
-@@ -695,7 +697,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -726,7 +729,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/patches/patch-ac,v
retrieving revision 1.4
diff -u -r1.4 patch-ac
--- patches/patch-ac	2002/06/19 16:02:27	1.4
+++ patches/patch-ac	2003/01/14 22:23:54
@@ -1,16 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2002/06/19 16:02:27 ad Exp $
+$NetBSD$
 
---- OS/Makefile-NetBSD-a.out.orig	Thu Apr 18 08:08:28 2002
-+++ OS/Makefile-NetBSD-a.out	Thu Jun 13 12:37:38 2002
-@@ -1,9 +1,10 @@
- # Exim: OS-specific make file for NetBSD (a.out binary format)
+--- OS/Makefile-NetBSD-a.out.orig	Wed Dec 18 11:27:59 2002
++++ OS/Makefile-NetBSD-a.out
+@@ -1,7 +1,7 @@
+ # Exim: OS-specific make file for NetBSD (a.out/COFF object format)
  
  CHOWN_COMMAND=/usr/sbin/chown
 -CFLAGS=-O
 +CFLAGS=-O2 -pipe
  
  HAVE_SA_LEN=YES
-+HAVE_IPV6=YES
- LIBS=-lcrypt
- 
- X11=/usr/X11R6
+ HAVE_IPV6=YES
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/mail/exim/patches/patch-ad,v
retrieving revision 1.3
diff -u -r1.3 patch-ad
--- patches/patch-ad	2002/12/09 11:38:05	1.3
+++ patches/patch-ad	2003/01/14 22:23:54
@@ -1,40 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2002/12/09 11:38:05 ad Exp $
+$NetBSD$
 
---- 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>
+--- OS/Makefile-NetBSD.orig	Wed Dec 18 11:27:59 2002
++++ OS/Makefile-NetBSD
+@@ -1,7 +1,7 @@
+ # Exim: OS-specific make file for NetBSD (ELF object format)
  
--# Include Makfile.NetBSD-a.out
-+CHOWN_COMMAND=/usr/sbin/chown
+ CHOWN_COMMAND=/usr/sbin/chown
+-CFLAGS=-O
 +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/
+ HAVE_SA_LEN=YES
+ HAVE_IPV6=YES
>Release-Note:
>Audit-Trail:
>Unformatted: