diff options
| -rw-r--r-- | doc/CHANGES | 5 | ||||
| -rw-r--r-- | mail/exim-exiscan/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim/Makefile.common | 4 | ||||
| -rw-r--r-- | mail/exim/distinfo | 21 | ||||
| -rw-r--r-- | mail/exim/patches/patch-aa | 18 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ab | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ac | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ad | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ae | 4 | ||||
| -rw-r--r-- | mail/exim/patches/patch-af | 31 |
10 files changed, 35 insertions, 64 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index f9b9c5f58bb..2b389883746 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.7014 2004/08/27 10:10:50 tron Exp $ +$NetBSD: CHANGES,v 1.7015 2004/08/27 10:47:51 abs Exp $ Changes to the packages collection and infrastructure in 2004: @@ -4065,3 +4065,6 @@ Changes to the packages collection and infrastructure in 2004: Added ipw-firmware-1.0 [lukem 2004-08-27] Updated xosd to 2.2.10 [adam 2004-08-27] Updated wmbiff to 0.4.25 [tron 2004-08-27] + Updated exim to 4.42 [abs 2004-08-27] + Updated exim-exiscan to 4.42_27 [abs 2004-08-27] + diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile index 7b4ccf964ab..2c5e9c1c50e 100644 --- a/mail/exim-exiscan/Makefile +++ b/mail/exim-exiscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/08/13 15:10:48 abs Exp $ +# $NetBSD: Makefile,v 1.14 2004/08/27 10:46:52 abs Exp $ DISTNAME= exim-${EXIM_VERSION} PKGNAME= exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION} @@ -10,7 +10,7 @@ COMMENT= The Exim mail transfer agent, with exiscan-acl patches CONFLICTS+= exim-[0-9]* -EXISCAN_VERSION=22 +EXISCAN_VERSION=27 PATCH_SITES= http://duncanthrax.net/exiscan-acl/ PATCHFILES= exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2 diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common index 5141e8ae3bb..6dd9524ddff 100644 --- a/mail/exim/Makefile.common +++ b/mail/exim/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/08/27 06:29:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/08/27 10:46:52 abs Exp $ MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ @@ -10,7 +10,7 @@ USE_PKGINSTALL= yes MAKE_ENV+= SSLBASE=${SSLBASE:Q} -EXIM_VERSION= 4.34 +EXIM_VERSION= 4.42 EXTRACT_SUFX= .tar.bz2 diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 8282508875c..fbc0d6d513e 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.19 2004/06/06 22:10:51 abs Exp $ +$NetBSD: distinfo,v 1.20 2004/08/27 10:46:52 abs Exp $ -SHA1 (exim-4.34.tar.bz2) = ed77428c4dfa4718c1bd4ddb5de2d99d37cec2de -Size (exim-4.34.tar.bz2) = 1328742 bytes -SHA1 (exiscan-acl-4.34-22.patch.bz2) = 30134a680d0bb863b8d7241cefbd838582f3d671 -Size (exiscan-acl-4.34-22.patch.bz2) = 76947 bytes -SHA1 (patch-aa) = 07ce41a5ee3a29c29a05ad556f5fef53a5a2285b -SHA1 (patch-ab) = 5134367d16c56ad7c2820393e102a9aad73511c8 -SHA1 (patch-ac) = 48160bf4ef4379f4b4ce5dafeb33c85ddcfde65c -SHA1 (patch-ad) = 6323899062b33ec34610fd93dfc181cdc9d7f369 -SHA1 (patch-ae) = b806857f4fa0c9d4c3603e8ee5f9c4419e643956 -SHA1 (patch-af) = 483fe63aa9c6b524ab61a53a20968e5a7fa3d095 +SHA1 (exim-4.42.tar.bz2) = 54e9ccd295cd30994761acf3ecbb335517507e0d +Size (exim-4.42.tar.bz2) = 1360728 bytes +SHA1 (exiscan-acl-4.42-27.patch.bz2) = 7783a4202bbefaed1576d2b6d538c7e582ae76da +Size (exiscan-acl-4.42-27.patch.bz2) = 83039 bytes +SHA1 (patch-aa) = 56747e91fc9065bb564bc65f12633d52a6fff385 +SHA1 (patch-ab) = efdbfd11ade8b7b6ab6a5b0511a1322abbc4c3d7 +SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106 +SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a +SHA1 (patch-ae) = d65205adf8c2ae8a874825e68c163014c13d1628 diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa index 803a23ffb13..812612b25a5 100644 --- a/mail/exim/patches/patch-aa +++ b/mail/exim/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ +$NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ ---- Local/Makefile.pkgsrc.orig 2004-06-03 13:36:01.871153448 -0700 +--- Local/Makefile.pkgsrc.orig 2004-08-27 11:35:33.000000000 +0100 +++ Local/Makefile.pkgsrc @@ -98,7 +98,7 @@ # /usr/local/sbin. The installation script will try to create this directory, @@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ -@@ -386,9 +386,9 @@ FIXED_NEVER_USERS=root +@@ -406,9 +406,9 @@ FIXED_NEVER_USERS=root # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ #------------------------------------------------------------------------------ -@@ -466,10 +466,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -486,10 +486,11 @@ HEADERS_CHARSET="ISO-8859-1" # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) @@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -533,7 +534,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -553,7 +554,7 @@ HEADERS_CHARSET="ISO-8859-1" # %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: @@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ # 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 -@@ -663,7 +664,8 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -683,7 +684,8 @@ ZCAT_COMMAND=/usr/bin/zcat # this setting. See the manual section entitled "Use of tcpwrappers" in the # chapter on building and installing Exim. # @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ # # You may well also have to specify a local "include" file and an additional # library for TCP wrappers, so you probably need something like this: -@@ -719,11 +721,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -739,11 +741,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. @@ -132,7 +132,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ #------------------------------------------------------------------------------ -@@ -917,7 +919,7 @@ TMPDIR="/tmp" +@@ -937,7 +939,7 @@ TMPDIR="/tmp" # (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: @@ -141,7 +141,7 @@ $NetBSD: patch-aa,v 1.9 2004/06/04 00:10:34 reed Exp $ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -@@ -953,3 +955,7 @@ TMPDIR="/tmp" +@@ -973,3 +975,7 @@ TMPDIR="/tmp" # SUPPORT_MOVE_FROZEN_MESSAGES=yes # End of EDITME for Exim 4. diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab index 57a21b6a8ac..61b816e426f 100644 --- a/mail/exim/patches/patch-ab +++ b/mail/exim/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.10 2004/05/07 17:47:32 abs Exp $ +$NetBSD: patch-ab,v 1.11 2004/08/27 10:46:52 abs Exp $ ---- OS/Makefile-Default.orig Wed May 5 11:08:35 2004 +--- OS/Makefile-Default.orig 2004-08-26 15:09:59.000000000 +0100 +++ OS/Makefile-Default @@ -69,7 +69,7 @@ PERL_COMMAND=/usr/bin/perl diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac index 126ace02032..6761c969e3b 100644 --- a/mail/exim/patches/patch-ac +++ b/mail/exim/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.7 2004/05/07 17:47:32 abs Exp $ +$NetBSD: patch-ac,v 1.8 2004/08/27 10:46:52 abs Exp $ ---- OS/Makefile-NetBSD-a.out.orig Wed May 5 11:08:35 2004 +--- OS/Makefile-NetBSD-a.out.orig 2004-08-26 15:09:59.000000000 +0100 +++ OS/Makefile-NetBSD-a.out @@ -1,7 +1,7 @@ # Exim: OS-specific make file for NetBSD (a.out/COFF object format) diff --git a/mail/exim/patches/patch-ad b/mail/exim/patches/patch-ad index 2f199f33be8..dd260f6d30a 100644 --- a/mail/exim/patches/patch-ad +++ b/mail/exim/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.6 2004/05/07 17:47:32 abs Exp $ +$NetBSD: patch-ad,v 1.7 2004/08/27 10:46:52 abs Exp $ ---- OS/Makefile-NetBSD.orig Wed May 5 11:08:35 2004 +--- OS/Makefile-NetBSD.orig 2004-08-26 15:09:59.000000000 +0100 +++ OS/Makefile-NetBSD @@ -1,7 +1,7 @@ # Exim: OS-specific make file for NetBSD (ELF object format) diff --git a/mail/exim/patches/patch-ae b/mail/exim/patches/patch-ae index 745284a68c9..23b27ce66ad 100644 --- a/mail/exim/patches/patch-ae +++ b/mail/exim/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.6 2004/05/07 17:47:32 abs Exp $ +$NetBSD: patch-ae,v 1.7 2004/08/27 10:46:52 abs Exp $ ---- scripts/exim_install.orig Wed May 5 11:08:35 2004 +--- scripts/exim_install.orig 2004-08-26 15:09:59.000000000 +0100 +++ scripts/exim_install @@ -79,6 +79,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t SYSTEM_ALIASES_FILE=/etc/aliases diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af deleted file mode 100644 index c1bdb0dae6f..00000000000 --- a/mail/exim/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.2 2004/05/07 17:47:32 abs Exp $ - ---- src/daemon.c.orig Wed May 5 11:08:35 2004 -+++ src/daemon.c -@@ -756,6 +756,7 @@ daemon_go(void) - { - int *listen_sockets = NULL; - int listen_socket_count = 0; -+int fd; - ip_address_item *addresses = NULL; - - /* If any debugging options are set, turn on the D_pid bit so that all -@@ -1082,9 +1083,17 @@ if (background_daemon) - { - log_close_all(); /* Just in case anything was logged earlier */ - search_tidyup(); /* Just in case any were used in reading the config. */ -- close(0); /* Get rid of stdin/stdout/stderr */ -+ /* Get rid of stdin/stdout/stderr -+ close(0); - close(1); - close(2); -+ */ -+ /* Instead of closing, dup them to /dev/null */ -+ fd= open( "/dev/null", O_RDWR ); -+ dup2( fd, 0 ); -+ dup2( fd, 1 ); -+ dup2( fd, 2 ); -+ if( fd > 2 ) close( fd ); - log_stderr = NULL; /* So no attempt to copy paniclog output */ - - /* If the parent process of this one has pid == 1, we are re-initializing the |