Update exim from 4.54 to 4.62

Exim version 4.62
-----------------

TF/01 Fix the add_header change below (4.61 PH/55) which had a bug that (amongst
      other effects) broke the use of negated acl sub-conditions.

PH/01 ${readsocket now supports Internet domain sockets (modified John Jetmore
      patch).

PH/02 When tcp-wrappers is called from Exim, it returns only "deny" or "allow".
      "Deny" causes Exim to reject the incoming connection with a 554 error.
      Unfortunately, if there is a major crisis, such as a disk failure,
      tcp-wrappers gives "deny", whereas what one would like would be some
      kind of temporary error. A kludge has been added to help with this.
      Before calling hosts_ctl(), errno is set zero. If the result is "deny", a
      554 error is used if errno is still zero or contains ENOENT (which occurs
      if either of the /etc/hosts.{allow,deny} files is missing). Otherwise, a
      451 error is used.

PH/03 Add -lutil to the default FreeBSD LIBS setting.

PH/04 Change PH/19 for 4.61 was too wide. It should not be applied to host
      errors. Otherwise a message that provokes a temporary error (when other
      messages do not) can cause a whole host to time out.

PH/05 Batch deliveries by appendfile and pipe transports did not work when the
      addresses were routed directly to files or pipes from a redirect router.
      File deliveries just didn't batch; pipe deliveries might have suffered
      odd errors.

PH/06 A failure to get a lock for a hints database would erroneously always say
      "Failed to get write lock", even when it was really a read lock.

PH/07 The appendfile transport was creating MBX lock files with a fixed mode
      of 0600. This has been changed to use the value of the lockfile_mode
      option (which defaults to 0600).

PH/08 Applied small patch from the Sieve maintainer.

PH/09 If maildir_quota_directory_regex was set to exclude (say) the .Trash
      folder from quota calculations, a direct delivery into this folder messed
      up the contents of the maildirsize file. This was because the regex was
      used only to exclude .Trash (or whatever) when the size of the mailbox
      was calculated. There was no check that a delivery was happening into an
      excluded directory. This bug has been fixed by ignoring all quota
      processing for deliveries into excluded directories.

PH/10 Added the maildirfolder_create_regex option to appendfile.


Exim version 4.61
-----------------

PH/01 The code for finding all the local interface addresses on a FreeBSD
      system running IPv6 was broken. This may well have applied to all BSD
      systems, as well as to others that have similar system calls. The broken
      code found IPv4 interfaces correctly, but gave incorrect values for the
      IPv6 interfaces. In particular, ::1 was not found. The effect in Exim was
      that it would not match correctly against @[] and not recognize the IPv6
      addresses as local.

PH/02 The ipliteral router was not recognizing addresses of the form user@
      [ipv6:....] because it didn't know about the "ipv6:" prefix.

PH/03 Added disable_ipv6.

PH/04 Changed $reply_address to use the raw form of the headers instead of the
      decoded form, because it is most often used to construct To: headers
      lines in autoreplies, and the decoded form may well be syntactically
      invalid. However, $reply_address has leading white space removed, and all
      newlines turned into spaces so that the autoreply transport does not
      grumble.

PH/05 If group was specified without a user on a router, and no group or user
      was specified on a transport, the group from the router was ignored.

PH/06 Increased the number of ACL variables to 20 of each type, and arranged
      for visible compile-time settings that can be used to change these
      numbers, for those that want even more. Backwards compatibility with old
      spool files has been maintained. However, going back to a previous Exim
      release will lost any variables that are in spool files.

PH/07 Two small changes when running in the test harness: increase delay when
      passing a TCP/IP connection to a new process, in case the original
      process has to generate a bounce, and remove special handling of
      127.0.0.2 (sic), which is no longer necessary.

PH/08 Changed debug output of dbfn_open() flags from numbers to names, so as to
      be the same on different OS.

PH/09 Moved a debug statement in filter processing to avoid a race problem when
      testing.

JJ/01 exipick: fixed bug where -b (brief) output option showed "Vars:"
      whether --show-vars was specified or not

JJ/02 exipick: Added support for new ACL variable spool format introduced
      in 4.61-PH/06

PH/10 Fixed another bug related to PH/04 above: if an incoming message had a
      syntactically invalid From: or Reply-to: line, and a filter used this to
      generate an autoreply, and therefore failed to obtain an address for the
      autoreply, Exim could try to deliver to a non-existent relative file
      name, causing unrelated and misleading errors. What now happens is that
      it logs this as a hard delivery error, but does not attempt to create a
      bounce message.

PH/11 The exinext utility has a -C option for testing purposes, but although
      the given file was scanned by exinext itself; it wasn't being passed on
      when Exim was called.

PH/12 In the smtp transport, treat an explicit ECONNRESET error the same as
      an end-of-file indication when reading a command response.

PH/13 Domain literals for IPv6 were not recognized unless IPv6 support was
      compiled. In many other places in Exim, IPv6 addresses are always
      recognized, so I have changed this. It also means that IPv4 domain
      literals of the form [IPV4:n.n.n.n] are now always recognized.

PH/14 When a uid/gid is specified for the queryprogram router, it cannot be
      used if the router is not running as root, for example, when verifying at
      ACL time, or when using -bh. The debugging output from this situation was
      non-existent - all you got was a failure to exec. I have made two
      changes:

      (a) Failures to set uid/gid, the current directory, or a process leader
          in a subprocess such as that created by queryprogram now generate
          suitable debugging ouput when -d is set.

      (b) The queryprogram router detects when it is not running as root,
          outputs suitable debugging information if -d is set, and then runs
          the subprocess without attempting to change uid/gid.

PH/15 Minor change to Makefile for building test_host (undocumented testing
      feature).

PH/16 As discussed on the list in Nov/Dec: Exim no longer looks at the
      additional section of a DNS packet that returns MX or SRV records.
      Instead, it always explicitly searches for A/AAAA records. This avoids
      major problems that occur when a DNS server includes only records of one
      type (A or AAAA) in an MX/SRV packet. A byproduct of this change has
      fixed another bug: if SRV records were looked up and the corresponding
      address records were *not* found in the additional section, the port
      values from the SRV records were lost.

PH/17 If a delivery to a pipe, file, or autoreply was deferred, Exim was not
      using the correct key (the original address) when searching the retry
      rules in order to find which one to use for generating the retry hint.

PH/18 If quota_warn_message contains a From: header, Exim now refrains from
      adding the default one. Similarly, if it contains a Reply-To: header, the
      errors_reply_to option, if set, is not used.

PH/19 When calculating a retry time, Exim used to measure the "time since
      failure" by looking at the "first failed" field in the retry record. Now
      it does not use this if it is later than than the arrival time of the
      message. Instead it uses the arrival time. This makes for better
      behaviour in cases where some deliveries succeed, thus re-setting the
      "first failed" field. An example is a quota failure for a huge message
      when small messages continue to be delivered. Without this change, the
      "time since failure" will always be short, possible causing more frequent
      delivery attempts for the huge message than are intended.
      [Note: This change was subsequently modified - see PH/04 for 4.62.]

PH/20 Added $auth1, $auth2, $auth3 to contain authentication data (as well as
      $1, $2, $3) because the numerical variables can be reset during some
      expansion items (e.g. "match"), thereby losing the authentication data.

PH/21 Make -bV show the size of off_t variables so that the test suite can
      decide whether to run tests for quotas > 2G.

PH/22 Test the values given for quota, quota_filecount, quota_warn_threshold,
      mailbox_size, and mailbox_filecount in the appendfile transport. If a
      filecount value is greater than 2G or if a quota value is greater than 2G
      on a system where the size of off_t is not greater than 4, a panic error
      is given.

PH/23 When a malformed item such as 1.2.3/24 appears in a host list, it can
      never match. The debug and -bh output now contains an explicit error
      message indicating a malformed IPv4 address or mask.

PH/24 An host item such as 1.2.3.4/abc was being treated as the IP address
      1.2.3.4 without a mask. Now it is not recognized as an IP address, and
      PH/23 above applies.

PH/25 Do not write to syslog when running in the test harness. The only
      occasion when this arises is a failure to open the main or panic logs
      (for which there is an explicit test).

PH/26 Added the /no_tell option to "control=freeze".

PH/27 If a host name lookup failed very early in a connection, for example, if
      the IP address matched host_lookup and the reverse lookup yielded a name
      that did not have a forward lookup, an error message of the form "no IP
      address found for host xxx.xxx.xxx (during SMTP connection from NULL)"
      could be logged. Now it outputs the IP address instead of "NULL".

PH/28 An enabling patch from MH: add new function child_open_exim2() which
      allows the sender and the authenticated sender to be set when
      submitting a message from within Exim. Since child_open_exim() is
      documented for local_scan(), the new function should be too.

PH/29 In GnuTLS, a forced expansion failure for tls_privatekey was not being
      ignored. In both GnuTLS and OpenSSL, an expansion of tls_privatekey that
      results in an empty string is now treated as unset.

PH/30 Fix eximon buffer overflow bug (Bugzilla #73).

PH/31 Added sender_verify_fail logging option.

PH/32 In November 2003, the code in Exim that added an empty Bcc: header when
      needed by RFC 822 but not by RFC 2822 was commented out. I have now
      tidied the source and removed it altogether.

PH/33 When a queue run was abandoned because the load average was too high, a
      log line was always written; now it is written only if the queue_run log
      selector is set. In addition, the log line for abandonment now contains
      information about the queue run such as the pid. This is always present
      in "start" and "stop" lines but was omitted from the "abandon" line.

PH/34 Omit spaces between a header name and the colon in the error message that
      is given when verify = headers_syntax fails (if there are lots of them,
      the message gets confusing).

PH/35 Change the default for dns_check_names_pattern to allow slashes within
      names, as there are now some PTR records that contain slashes. This check
      is only to protect against broken name servers that fall over on strange
      characters, so the fact that it applies to all lookups doesn't matter.

PH/36 Now that the new test suite is complete, we can remove some of the
      special code in Exim that was needed for the old test suite. For example,
      sorting DNS records because real resolvers return them in an arbitrary
      order. The new test suite's fake resolver always returns records in the
      same order.

PH/37 When running in the test harness, use -odi for submitted messages (e.g.
      bounces) except when queue_only is set, to avoid logging races between
      the different processes.

PH/38 Panic-die if .include specifies a non-absolute path.

PH/39 A tweak to the "H" retry rule from its user.

JJ/03 exipick: Removed parentheses from 'next' and 'last' calls that specified
      a label.  They prevented compilation on older perls.

JJ/04 exipick: Refactored code to prevent implicit split to @_ which caused
      a warning to be raised on newish perls.

JJ/05 exipick: Fixed bug where -bpc always showed a count of all messages
      on queue.  Changes to match documented behaviour of showing count of
      messages matching specified criteria.

PH/40 Changed the default ident timeout from 30s to 5s.

PH/41 Added support for the use of login_cap features, on those BSD systems
      that have them, for controlling the resources used by pipe deliveries.

PH/42 The content-scanning code uses fopen() to create files in which to put
      message data. Previously it was not paying any attention to the mode of
      the files. Exim runs with umask(0) because the rest of the code creates
      files with open(), and sets the required mode explicitly. Thus, these
      files were ending up world-writeable. This was not a big issue, because,
      being within the spool directory, they were not world-accessible. I have
      created a function called modefopen, which takes an additional mode
      argument. It sets umask(777), creates the file, chmods it to the required
      mode, then resets the umask. All the relevant calls to fopen() in the
      content scanning code have been changed to use this function.

PH/43 If retry_interval_max is set greater than 24 hours, it is quietly reset
      to 24 hours. This avoids potential overflow problems when processing G
      and H retry rules. I suspect nobody ever tinkers with this value.

PH/44 Added STRIP_COMMAND=/usr/bin/strip to the FreeBSD Makefile.

PH/45 When the plaintext authenticator is running as a client, the server's
      challenges are checked to ensure they are valid base64 strings. By
      default, the authentication attempt is cancelled if an invalid string is
      received. Setting client_ignore_invalid_base64 true ignores these errors.
      The decoded challenge strings are now placed in $auth1, $auth2, etc. as
      they are received. Thus, the responses can be made to depend on the
      challenges. If an invalid string is ignored, an empty string is placed in
      the variable.

PH/46 Messages that are created by the autoreply transport now contains a
      References: header, in accordance with RFCs 2822 and 3834.

PH/47 Added authenticated_sender_force to the smtp transport.

PH/48 The ${prvs expansion was broken on systems where time_t was long long.

PH/49 Installed latest patch from the Sieve maintainer.

PH/50 When an Exim quota was set without a file count quota, and mailbox_size
      was also set, the appendfile transport was unnecessarily scanning a
      directory of message files (e.g. for maildir delivery) to find the count
      of files (along with the size), even though it did not need this
      information. It now does the scan only if it needs to find either the
      size of the count of files.

PH/51 Added ${time_eval: to convert Exim time strings into seconds.

PH/52 Two bugs concerned with error handling when the smtp transport is
      used in LMTP mode:

      (i) Exim was not creating retry information for temporary errors given
      for individual recipients after the DATA command when the smtp transport
      was used in LMTP mode. This meant that they could be retried too
      frequently, and not timed out correctly.

      (ii) Exim was setting the flag that allows error details to be returned
      for LMTP errors on RCPT commands, but not for LMTP errors for individual
      recipients that were returned after the DATA command.

PH/53 This is related to PH/52, but is more general: for any failing address,
      when detailed error information was permitted to be returned to the
      sender, but the error was temporary, then after the final timeout, only
      "retry timeout exceeded" was returned. Now it returns the full error as
      well as "retry timeout exceeded".

PH/54 Added control=allow_auth_unadvertised, as it seems there are clients that
      do this, and (what is worse) MTAs that accept it.

PH/55 Added the add_header modified to ACLs. The use of "message" with "warn"
      will now be deprecated.

PH/56 New os.c-cygwin from the Cygwin maintainer.

JJ/06 exipick: added --unsorted option to allow unsorted output in all output
      formats (previously only available in exim formats via -bpr, -bpru,
      and -bpra.  Now also available in native and exiqgrep formats)

JJ/07 exipick: added --freeze and --thaw options to allow faster interaction
      with very large, slow to parse queues

JJ/08 exipick: added ! as generic prefix to negate any criteria format

JJ/09 exipick: miscellaneous performance enhancements (~24% improvements)

PH/57 Tidies in SMTP dialogue display in debug output: (i) It was not showing
      responses to authentication challenges, though it was showing the
      challenges; (ii) I've removed the CR characters from the debug output for
      SMTP output lines.

PH/58 Allow for the insertion of a newline as well as a space when a string
      is turned into more than one encoded-word during RFC 2047 encoding. The
      Sieve code now uses this.

PH/59 Added the following errors that can be detected in retry rules: mail_4xx,
      data_4xx, lost_connection, tls_required.

PH/60 When a VRFY deferred or FAILED, the log message rather than the user
      message was being sent as an SMTP response.

PH/61 Add -l and -k options to exicyclog.

PH/62 When verifying, if an address was redirected to one new address, so that
      verification continued, and the new address failed or deferred after
      having set something in $address_data, the value of $address_data was not
      passed back to the ACL. This was different to the case when no
      redirection occurred. The value is now passed back in both cases.

PH/63 Changed the macro HAVE_LOGIN_CAP (see PH/41 for this release above) to
      HAVE_SETCLASSRESOURCES because there are different APIs in use that all
      use login_cap.h, so on its own it isn't the distinguishing feature. The
      new name refers directly to the setclassresources() function.

PH/65 Added configuration files for NetBSD3.

PH/66 Updated OS/Makefile-HP-UX for gcc 4.1.0 with HP-UX 11.

PH/67 Fixed minor infelicity in the sorting of addresses to ensure that IPv6
      is preferred over IPv4.

PH/68 The bounce_return_message and bounce_return_body options were not being
      honoured for bounces generated during the reception of non-SMTP messages.
      In particular, this applied to messages rejected by the ACL. This bug has
      been fixed. However, if bounce_return_message is true and bounce_return_
      body is false, the headers that are returned for a non-SMTP message
      include only those that have been read before the error was detected.
      (In the case of an ACL rejection, they have all been read.)

PH/69 The HTML version of the specification is now built in a directory called
      spec_html instead of spec.html, because the latter looks like a path with
      a MIME-type, and this confuses some software.

PH/70 Catch two compiler warnings in sieve.c.

PH/71 Fixed an obscure and subtle bug (thanks Alexander & Matthias). The
      function verify_get_ident() calls ip_connect() to connect a socket, but
      if the "connect()" function timed out, ip_connect() used to close the
      socket. However, verify_get_ident() also closes the socket later, and in
      between Exim writes to the log, which may get opened at this point. When
      the socket was closed in ip_connect(), the log could get the same file
      descriptor number as the socket. This naturally causes chaos. The fix is
      not to close the socket in ip_connect(); the socket should be closed by
      the function that creates it. There was only one place in the code where
      this was missing, in the iplookup router, which I don't think anybody now
      uses, but I've fixed it anyway.

PH/72 Make dns_again_means_nonexist apply to lookups using gethostbyname() as
      well as to direct DNS lookups. Otherwise the handling of names in host
      lists is inconsistent and therefore confusing.


Exim version 4.60
-----------------

PH/01 Two changes to the default runtime configuration:

      (1) Move the checks for relay_from_hosts and authenticated clients from
          after to before the (commented out) DNS black list checks.

      (2) Add control=submission to the relay_from_hosts and authenticated
          clients checks, on the grounds that messages accepted by these
          statements are most likely to be submissions.

PH/02 Several tidies to the handling of ${prvs and ${prvscheck:

      (1) Generate an error if the third argument for the ${prvs expansion is
          not a single digit.

      (2) Treat a missing third argument of ${prvscheck as if it were an empty
          string.

      (3) Reset the variables that are obtained from the first argument of
          ${prvscheck and used in the second argument before leaving the code,
          because their memory is reclaimed, so using them afterwards may do
          silly things.

      (4) Tidy up the code for expanding the arguments of ${prvscheck one by
          one (it's much easier than Tom thought :-).

      (5) Because of (4), we can now allow for the use of $prvscheck_result
          inside the third argument.

PH/03 For some reason, the default setting of PATH when running a command from
      a pipe transport was just "/usr/bin". I have changed it to
      "/bin:/usr/bin".

PH/04 SUPPORT_TRANSLATE_IP_ADDRESS and MOVE_FROZEN_MESSAGES did not cause
      anything to be listed in the output from -bV.

PH/05 When a filter generated an autoreply, the entire To: header line was
      quoted in the delivery log line, like this:

        => >A.N.Other <ano@some.domain> <original@ddress> ...

      This has been changed so that it extracts the operative address. There
      may be more than one such address. If so, they are comma-separated, like
      this:

        => >ano@some.domain,ona@other.domain <original@ddress> ...

PH/06 When a client host used a correct literal IP address in a HELO or EHLO
      command, (for example, EHLO [1.2.3.4]) and the client's IP address was
      not being looked up in the rDNS to get a host name, Exim was showing the
      IP address twice in Received: lines, even though the IP addresses were
      identical. For example:

        Received: from [1.2.3.4] (helo=[1.2.3.4])

      However, if the real host name was known, it was omitting the HELO data
      if it matched the actual IP address. This has been tidied up so that it
      doesn't show the same IP address twice.

PH/07 When both +timestamp and +memory debugging was on, the value given by
      $tod_xxx expansions could be wrong, because the tod_stamp() function was
      called by the debug printing, thereby overwriting the timestamp buffer.
      Debugging no longer uses the tod_stamp() function when +timestamp is set.

PH/08 When the original message was included in an autoreply transport, it
      always said "this is a copy of the message, including all the headers",
      even if body_only or headers_only was set. It now gives an appropriate
      message.

PH/09 Applied a patch from the Sieve maintainer which:

      o  fixes some comments
      o  adds the (disabled) notify extension core
      o  adds some debug output for the result of if/elsif tests
      o  points to the current vacation draft in the documentation
         and documents the missing references header update

      and most important:

      o  fixes a bug in processing the envelope test (when testing
         multiple envelope elements, the last element determinted the
         result)

PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to
      Electronic Mail") by including:

        Auto-submitted: auto-generated

      in the messages that it generates (bounce messages and others, such as
      warnings). In the case of bounce messages for non-SMTP mesages, there was
      also a typo: it was using "Auto_submitted" (underscore instead of
      hyphen). Since every message generated by Exim is necessarily in response
      to another message, thes have all been changed to:

        Auto-Submitted: auto-replied

      in accordance with these statements in the RFC:

        The auto-replied keyword:

        -  SHOULD be used on messages sent in direct response to another
           message by an automatic process,

        -  MUST NOT be used on manually-generated messages,

        -  MAY be used on Delivery Status Notifications (DSNs) and Message
           Disposition Notifications (MDNs),

        -  MUST NOT be used on messages generated by automatic or periodic
           processes, except for messages which are automatic responses to
           other messages.

PH/11 Added "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
      to the default Received: header definition.

PH/12 Added log selector acl_warn_skipped (default on).

PH/13 After a successful wildlsearch lookup, discard the values of numeric
      variables because (a) they are in the wrong storage pool and (b) even if
      they were copied, it wouldn't work properly because of the caching.

PH/14 Add check_rfc2047_length to disable enforcement of RFC 2047 length
      checking when decoding. Apparently there are clients that generate
      overlong encoded strings. Why am I not surprised?

PH/15 If the first argument of "${if match_address" was not empty, but did not
      contain an "@" character, Exim crashed. Now it writes a panic log message
      and treats the condition as false.

PH/16 In autoreply, treat an empty string for "once" the same as unset.

PH/17 A further patch from the Sieve maintainer: "Introduce the new Sieve
      extension "envelope-auth".  The code is finished and in agreement with
      other implementations, but there is no documentation so far and in fact,
      nobody wrote the draft yet.  This extension is currently #undef'ed, thus
      not changing the active code.

      Print executed "if" and "elsif" statements when debugging is used. This
      helps a great deal to understand what a filter does.

      Document more things not specified clearly in RFC3028.  I had all this
      sorted out, when out of a sudden new issues came to my mind.  Oops."

PH/18 Exim was not recognizing the "net-" search type prefix in match_ip lists
      (Bugzilla #53).

PH/19 Exim expands the IPv6 address given to -bh to its full non-abbreviated
      canonical form (as documented). However, after a host name lookup from
      the IP address, check_host() was doing a simple string comparison with
      addresses acquired from the DNS when checking that the found name did
      have the original IP as one of its addresses. Since any found IPv6
      addresses are likely to be in abbreviated form, the comparison could
      fail. Luckily, there already exists a function for doing the comparison
      by converting both addresses to binary, so now that is used instead of
      the text comparison.

PH/20 There was another similar case to PH/19, when a complete host name was
      given in a host list; looking up its IP address could give an abbreviated
      form, whereas the current host's name might or might not be abbreviated.
      The same fix has been applied.

9 files changed, 45 insertions, 46 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 56704781601..c858f12bac0 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2006/06/14 22:43:39 abs Exp $
+# $NetBSD: Makefile,v 1.77 2006/08/08 15:24:01 abs Exp $
 
-DISTNAME=	exim-4.54
-PKGREVISION=	3
+DISTNAME=	exim-4.62
 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/distinfo b/mail/exim/distinfo
index a91163c7a92..02cdecd277d 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.32 2006/06/14 22:43:39 abs Exp $
+$NetBSD: distinfo,v 1.33 2006/08/08 15:24:01 abs Exp $
 
-SHA1 (exim-4.54.tar.bz2) = d1d5a41aeedc464462562a0f970fabb20c98c712
-RMD160 (exim-4.54.tar.bz2) = 5b7219874dd834396add0fd0e1ee21b97fc8d122
-Size (exim-4.54.tar.bz2) = 1547608 bytes
-SHA1 (patch-aa) = 6e42695cfdc48b2bcc534dd4c4c5e55bbfdbc6f4
-SHA1 (patch-ab) = 32452f2fed6f0300f460aa9de8528b5ab2fe15c1
-SHA1 (patch-ac) = ed2b1b02cfa8338e82cf6bb74e9f9e5959dd8775
-SHA1 (patch-ad) = 2f43716b398ce650a20750285ba19d7ba5c690bb
-SHA1 (patch-ae) = acc7897d417e137de73a2cac1dd46834f719e202
-SHA1 (patch-af) = cfaa64d0979ebfb6486cb280fb1d17aeea39f2d0
-SHA1 (patch-ag) = f62a4c68586a1541db40fea42580475d300377e0
+SHA1 (exim-4.62.tar.bz2) = 2b3f95c1880de07ef22a96d7141eaa66e3c46768
+RMD160 (exim-4.62.tar.bz2) = 9553b758e3bfd3d12027262b6211e37ad3259252
+Size (exim-4.62.tar.bz2) = 1577729 bytes
+SHA1 (patch-aa) = c7107d46d54ed08c2086af7504b432e10af9db80
+SHA1 (patch-ab) = 1c6e7882346974390c22e7b9e09a76c5ed670d1d
+SHA1 (patch-ac) = a3ecdafc44ad2212b00e49de594efb26612b0b75
+SHA1 (patch-ad) = 52c768378483bf02295d46c01d55f955697834eb
+SHA1 (patch-ae) = 6cb0f00d159de7c342a55b09fb87ab533c5670bf
+SHA1 (patch-af) = f4dd3bad1b67a1ae27c14c3f92f338d3280f390c
+SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index 1ad5ae1b655..4f6c5b9ae6e 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
+$NetBSD: patch-aa,v 1.16 2006/08/08 15:24:01 abs Exp $
 
---- Local/Makefile.pkgsrc.orig	2005-08-29 08:16:24.000000000 -0700
-+++ Local/Makefile.pkgsrc	2005-08-29 08:21:51.000000000 -0700
+--- Local/Makefile.pkgsrc.orig	2006-08-08 16:11:10.000000000 +0100
++++ Local/Makefile.pkgsrc
 @@ -100,7 +100,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  # 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.
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # owner of a local mailbox.) Specifying these values as root is very strongly
  # discouraged.
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ EXIM_USER=
  
  # Almost all installations choose this:
  
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  
-@@ -229,7 +229,7 @@
+@@ -235,7 +235,7 @@ TRANSPORT_SMTP=yes
  # This one is special-purpose, and commonly not required, so it is not
  # included by default.
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -238,9 +238,9 @@
+@@ -244,9 +244,9 @@ TRANSPORT_SMTP=yes
  # MBX, is included only when requested. If you do not know what this is about,
  # leave these settings commented out.
  
@@ -69,16 +69,16 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -312,7 +312,7 @@
+@@ -320,7 +320,7 @@ LOOKUP_LSEARCH=yes
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
 -EXIM_MONITOR=eximon.bin
 +# EXIM_MONITOR=eximon.bin
  
+ 
  #------------------------------------------------------------------------------
- # Compiling Exim with content scanning support: If you want to compile Exim
-@@ -464,10 +464,10 @@
+@@ -473,10 +473,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.
  
@@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -553,10 +553,11 @@
+@@ -562,10 +562,11 @@ HEADERS_CHARSET="ISO-8859-1"
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -620,7 +621,7 @@
+@@ -629,7 +630,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:
  
@@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig 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
-@@ -782,7 +783,8 @@
+@@ -791,7 +792,8 @@ ZCAT_COMMAND=/usr/bin/zcat
  # this setting. See the manual section entitled "Use of tcpwrappers" in the
  # chapter on building and installing Exim.
  #
@@ -125,7 +125,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig 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:
-@@ -861,11 +863,11 @@
+@@ -870,11 +872,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.
  
@@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  
  #------------------------------------------------------------------------------
-@@ -1059,7 +1061,7 @@
+@@ -1068,7 +1070,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:
  
@@ -151,7 +151,7 @@ $NetBSD: patch-aa,v 1.15 2005/10/23 20:07:19 rillig Exp $
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1095,3 +1097,8 @@
+@@ -1104,3 +1106,8 @@ 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 dfb78254bac..c7b41bff7fc 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.12 2005/05/17 17:06:12 abs Exp $
+$NetBSD: patch-ab,v 1.13 2006/08/08 15:24:01 abs Exp $
 
---- OS/Makefile-Default.orig	2005-05-04 12:35:39.000000000 +0100
+--- OS/Makefile-Default.orig	2006-04-28 11:32:21.000000000 +0100
 +++ OS/Makefile-Default
 @@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
  
diff --git a/mail/exim/patches/patch-ac b/mail/exim/patches/patch-ac
index b08b729d475..de97d440e42 100644
--- a/mail/exim/patches/patch-ac
+++ b/mail/exim/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.9 2005/05/17 17:06:12 abs Exp $
+$NetBSD: patch-ac,v 1.10 2006/08/08 15:24:01 abs Exp $
 
---- OS/Makefile-NetBSD-a.out.orig	2005-05-04 12:35:39.000000000 +0100
+--- OS/Makefile-NetBSD-a.out.orig	2006-04-28 11:32:21.000000000 +0100
 +++ OS/Makefile-NetBSD-a.out
 @@ -3,7 +3,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 d1eb21c821e..eb0af548f8c 100644
--- a/mail/exim/patches/patch-ad
+++ b/mail/exim/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.8 2005/05/17 17:06:12 abs Exp $
+$NetBSD: patch-ad,v 1.9 2006/08/08 15:24:01 abs Exp $
 
---- OS/Makefile-NetBSD.orig	2005-05-04 12:35:39.000000000 +0100
+--- OS/Makefile-NetBSD.orig	2006-04-28 11:32:21.000000000 +0100
 +++ OS/Makefile-NetBSD
 @@ -3,7 +3,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 154c520ce42..12c703e3f50 100644
--- a/mail/exim/patches/patch-ae
+++ b/mail/exim/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2005/05/17 17:06:12 abs Exp $
+$NetBSD: patch-ae,v 1.9 2006/08/08 15:24:01 abs Exp $
 
---- scripts/exim_install.orig	2005-05-04 12:35:39.000000000 +0100
+--- scripts/exim_install.orig	2006-04-28 11:32:21.000000000 +0100
 +++ scripts/exim_install
-@@ -80,6 +80,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
+@@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2005/05/17 17:06:12 abs Exp $
  # 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
-@@ -390,15 +392,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+@@ -415,15 +417,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
    fi
diff --git a/mail/exim/patches/patch-af b/mail/exim/patches/patch-af
index 03226a4fb94..236e8155c9e 100644
--- a/mail/exim/patches/patch-af
+++ b/mail/exim/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2005/09/10 23:11:40 abs Exp $
+$NetBSD: patch-af,v 1.7 2006/08/08 15:24:01 abs Exp $
 
---- OS/os.h-NetBSD.orig	2005-05-04 12:35:39.000000000 +0100
+--- OS/os.h-NetBSD.orig	2006-04-28 11:32:21.000000000 +0100
 +++ OS/os.h-NetBSD
 @@ -12,4 +12,10 @@ typedef struct flock flock_t;
  #define os_strsignal strsignal
diff --git a/mail/exim/patches/patch-ag b/mail/exim/patches/patch-ag
index 65da0fb5a86..cf2cd59591e 100644
--- a/mail/exim/patches/patch-ag
+++ b/mail/exim/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.5 2006/06/14 22:43:39 abs Exp $
+$NetBSD: patch-ag,v 1.6 2006/08/08 15:24:01 abs Exp $
 
---- src/spam.h.orig	2005-10-04 09:55:28.000000000 +0100
+--- src/spam.h.orig	2006-04-28 11:32:23.000000000 +0100
 +++ src/spam.h
 @@ -12,7 +12,7 @@
  #ifdef WITH_CONTENT_SCAN