diff options
| -rw-r--r-- | doc/CHANGES | 6 | ||||
| -rw-r--r-- | mail/exim-exiscan/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim-html/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim-html/PLIST | 6 | ||||
| -rw-r--r-- | mail/exim-html/distinfo | 6 | ||||
| -rw-r--r-- | mail/exim/Makefile.common | 4 | ||||
| -rw-r--r-- | mail/exim/distinfo | 12 | ||||
| -rw-r--r-- | mail/exim/patches/patch-aa | 21 |
8 files changed, 35 insertions, 28 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 9e4a7426361..68a06d148be 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.7372 2004/10/07 16:17:18 jmmv Exp $ +$NetBSD: CHANGES,v 1.7373 2004/10/07 17:30:05 abs Exp $ Changes to the packages collection and infrastructure in 2004: @@ -4572,3 +4572,7 @@ Changes to the packages collection and infrastructure in 2004: Updated tuxpaint-stamps to 2004.10.03 [wiz 2004-10-07] Added tuxpaint-config to 0.0.5 [wiz 2004-10-07] Updated epiphany to 1.4.3 [jmmv 2004-10-07] + Updated exim to 4.43 [abs 2004-10-07] + Updated exim-exiscan to 4.43_28 [abs 2004-10-07] + Updated exim-html to 4.40 [abs 2004-10-07] + diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile index 2c5e9c1c50e..b16edc968d4 100644 --- a/mail/exim-exiscan/Makefile +++ b/mail/exim-exiscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/08/27 10:46:52 abs Exp $ +# $NetBSD: Makefile,v 1.15 2004/10/07 17:29:16 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=27 +EXISCAN_VERSION=28 PATCH_SITES= http://duncanthrax.net/exiscan-acl/ PATCHFILES= exiscan-acl-${EXIM_VERSION}-${EXISCAN_VERSION}.patch.bz2 diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile index 136f31fc43e..70be59922e5 100644 --- a/mail/exim-html/Makefile +++ b/mail/exim-html/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2004/05/07 18:12:58 abs Exp $ +# $NetBSD: Makefile,v 1.9 2004/10/07 17:29:16 abs Exp $ -DISTNAME= exim-html-4.30 +DISTNAME= exim-html-4.40 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-html/PLIST b/mail/exim-html/PLIST index f42e7d608a3..cfec61b78f0 100644 --- a/mail/exim-html/PLIST +++ b/mail/exim-html/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2004/05/07 18:08:29 abs Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/10/07 17:29:16 abs Exp $ share/doc/html/exim/C002.txt share/doc/html/exim/C006.txt share/doc/html/exim/C022.txt @@ -9,8 +9,8 @@ share/doc/html/exim/C044.txt share/doc/html/exim/C045.txt share/doc/html/exim/C046.txt share/doc/html/exim/C047.txt -share/doc/html/exim/C048.txt share/doc/html/exim/C049.txt +share/doc/html/exim/C050.txt share/doc/html/exim/F001.txt share/doc/html/exim/F002.txt share/doc/html/exim/F003.txt @@ -71,6 +71,8 @@ share/doc/html/exim/FAQ_7.html share/doc/html/exim/FAQ_8.html share/doc/html/exim/FAQ_9.html share/doc/html/exim/L001.txt +share/doc/html/exim/S001.txt +share/doc/html/exim/S002.txt share/doc/html/exim/filter_0.html share/doc/html/exim/filter_1.html share/doc/html/exim/filter_2.html diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo index d9f9d64c137..72e3baef440 100644 --- a/mail/exim-html/distinfo +++ b/mail/exim-html/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2004/05/07 17:47:32 abs Exp $ +$NetBSD: distinfo,v 1.7 2004/10/07 17:29:16 abs Exp $ -SHA1 (exim-html-4.30.tar.bz2) = 5d40155b92c07f8f077d3db23980a84ce9415145 -Size (exim-html-4.30.tar.bz2) = 518372 bytes +SHA1 (exim-html-4.40.tar.bz2) = 36409d64402c80abf3e7d8086e72aee56c0ccaf3 +Size (exim-html-4.40.tar.bz2) = 542983 bytes SHA1 (patch-aa) = 24370521bf1c1b8c2d7e7ade6490b0f61a58fa52 diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common index 6dd9524ddff..a2acbda25a9 100644 --- a/mail/exim/Makefile.common +++ b/mail/exim/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2004/08/27 10:46:52 abs Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/10/07 17:29:16 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.42 +EXIM_VERSION= 4.43 EXTRACT_SUFX= .tar.bz2 diff --git a/mail/exim/distinfo b/mail/exim/distinfo index f0ca713aa0d..073d80adff6 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.21 2004/09/25 07:45:51 grant Exp $ +$NetBSD: distinfo,v 1.22 2004/10/07 17:29:16 abs Exp $ -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 (exim-4.43.tar.bz2) = 675f2c5453c93e01dbbb61d15a264a23f9e61b8f +Size (exim-4.43.tar.bz2) = 1388183 bytes +SHA1 (exiscan-acl-4.43-28.patch.bz2) = b2e26ae5743407746c3c0405cf7653840087ed67 +Size (exiscan-acl-4.43-28.patch.bz2) = 83405 bytes +SHA1 (patch-aa) = ab149803121eb1ce7dc6875d8626a44454c2ae0a SHA1 (patch-ab) = efdbfd11ade8b7b6ab6a5b0511a1322abbc4c3d7 SHA1 (patch-ac) = e6bb70132b655862cf4af4e344dfe9509d7b8106 SHA1 (patch-ad) = ab2df5e42b993937d124f50510f70d594bafff4a diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa index 812612b25a5..651a94ac599 100644 --- a/mail/exim/patches/patch-aa +++ b/mail/exim/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ +$NetBSD: patch-aa,v 1.11 2004/10/07 17:29:16 abs Exp $ ---- Local/Makefile.pkgsrc.orig 2004-08-27 11:35:33.000000000 +0100 +--- Local/Makefile.pkgsrc.orig 2004-10-07 11:09:11.000000000 +0100 +++ Local/Makefile.pkgsrc @@ -98,7 +98,7 @@ # /usr/local/sbin. The installation script will try to create this directory, @@ -69,20 +69,21 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ -@@ -406,9 +406,9 @@ FIXED_NEVER_USERS=root +@@ -406,10 +406,10 @@ 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. -# AUTH_CRAM_MD5=yes ++AUTH_CRAM_MD5=yes + # AUTH_CYRUS_SASL=yes -# AUTH_PLAINTEXT=yes -# AUTH_SPA=yes -+AUTH_CRAM_MD5=yes +AUTH_PLAINTEXT=yes +AUTH_SPA=yes #------------------------------------------------------------------------------ -@@ -486,10 +486,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -495,10 +495,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 +97,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -553,7 +554,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -562,7 +563,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 +106,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs 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 -@@ -683,7 +684,8 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -707,7 +708,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 +116,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs 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: -@@ -739,11 +741,11 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -782,11 +784,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 +133,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ #------------------------------------------------------------------------------ -@@ -937,7 +939,7 @@ TMPDIR="/tmp" +@@ -980,7 +982,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 +142,7 @@ $NetBSD: patch-aa,v 1.10 2004/08/27 10:46:52 abs Exp $ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -@@ -973,3 +975,7 @@ TMPDIR="/tmp" +@@ -1016,3 +1018,7 @@ TMPDIR="/tmp" # SUPPORT_MOVE_FROZEN_MESSAGES=yes # End of EDITME for Exim 4. |