diff options
Diffstat (limited to 'mail/exim/files')
-rw-r--r-- | mail/exim/files/POST-INSTALL-NOTES | 29 | ||||
-rw-r--r-- | mail/exim/files/patch-src::EDITME | 47 | ||||
-rw-r--r-- | mail/exim/files/patch-src::auths::pwcheck.c | 12 | ||||
-rw-r--r-- | mail/exim/files/wishlist-eqi.patch | 90 |
4 files changed, 51 insertions, 127 deletions
diff --git a/mail/exim/files/POST-INSTALL-NOTES b/mail/exim/files/POST-INSTALL-NOTES index cdeacff6f373..d7660f460a1b 100644 --- a/mail/exim/files/POST-INSTALL-NOTES +++ b/mail/exim/files/POST-INSTALL-NOTES @@ -1,16 +1,22 @@ The following documentation has been installed: - info Exim -> Exim Specification (User Guide) - info 'Exim Filtering' -> Exim Filter Specification (for end-users) + man exim -> Exim options (command line) + %%DOCSDIR%%/spec.txt -> Exim Specification (User Guide) + %%DOCSDIR%%/filter.txt -> Exim Filter Specification (for end-users) -In addition, plain text versions of these documents have been installed -as: +Postscript, PDF, HTML and texinfo versions of these documents can be +installed via one of the mail/exim-doc-* ports. - %%DOCSDIR%%/filter.txt - %%DOCSDIR%%/spec.txt +An online version as well as a comprehensive FAQ and a mailing list +archive is available at: -Postscript, PDF, HTML and plain text versions of these documents, as well -as a comprehensive FAQ list, are available at http://www.exim.org/ . + http://www.exim.org/ + +Descriptions of new features not available it the manual, and a listing +of all changes, including bug fixes are documented in: + + %%DOCSDIR%%/NewStuff + %%DOCSDIR%%/ChangeLog To use Exim instead of sendmail on startup: @@ -25,8 +31,8 @@ To use Exim instead of sendmail on startup: You may also want to configure newsyslog(8) to rotate Exim log files: -/var/log/exim/mainlog mailnull:mail 640 7 * @T00 Z -/var/log/exim/rejectlog mailnull:mail 640 7 * @T00 Z +/var/log/exim/mainlog mailnull:mail 640 7 * @T00 ZN +/var/log/exim/rejectlog mailnull:mail 640 7 * @T00 ZN NOTE TO OPERATORS UPGRADING FROM exim-3.xx: @@ -39,3 +45,6 @@ are coming from a 3.xx release, please read the document in the file %%DOCSDIR%%/Exim4.upgrade, and allow some time to complete the upgrade. +Additional scripts to help upgrading are installed in: + + %%EXAMPLESDIR%% diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME index a6e48c5f2579..a1918da3e0f2 100644 --- a/mail/exim/files/patch-src::EDITME +++ b/mail/exim/files/patch-src::EDITME @@ -1,5 +1,5 @@ ---- src/EDITME.orig Mon Aug 18 14:52:52 2003 -+++ src/EDITME Mon Aug 18 17:34:17 2003 +--- src/EDITME.orig Mon Sep 15 12:47:55 2003 ++++ src/EDITME Sat Sep 20 17:08:19 2003 @@ -98,7 +98,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. @@ -35,7 +35,7 @@ # Many sites define a user called "exim", with an appropriate default group, # and use -@@ -265,6 +265,7 @@ +@@ -267,6 +267,7 @@ # LDAP_LIB_TYPE=OPENLDAP2 # LDAP_LIB_TYPE=NETSCAPE # LDAP_LIB_TYPE=SOLARIS @@ -43,20 +43,20 @@ # If you don't set any of these, Exim assumes the original University of # Michigan (OpenLDAP 1) library. -@@ -277,8 +278,10 @@ - # don't need to set LOOKUP_INCLUDE if the relevant directories are already - # specified in INCLUDE. +@@ -280,8 +281,10 @@ + # specified in INCLUDE. The settings below are just examples; -lpq is for + # PostgreSQL, -lgds is for Interbase. -# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include --# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -+INCLUDE=-IXX_PREFIX_XX/include XX_DB_INCLUDES_XX +-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds ++INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX +LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX +LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX +DBMLIB=XX_DB_LIBS_XX - #------------------------------------------------------------------------------ -@@ -289,7 +292,7 @@ + # Compiling the Exim monitor: If you want to compile the Exim monitor, a +@@ -291,7 +294,7 @@ # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. @@ -65,7 +65,24 @@ -@@ -393,7 +396,7 @@ +@@ -332,6 +335,7 @@ + + # ALT_CONFIG_PREFIX=/some/directory/ + # ALT_CONFIG_PREFIX=/some/directory/exim.conf- ++ALT_CONFIG_PREFIX=XX_PREFIX_XX/etc/exim/ + + + #------------------------------------------------------------------------------ +@@ -376,7 +380,7 @@ + # one that is set in the headers_charset option. The default setting is + # defined by this setting: + +-HEADERS_CHARSET="ISO-8859-1" ++HEADERS_CHARSET="XX_DEFAULT_CHARSET_XX" + + # If you are going to make use of $header_xxx expansions in your configuration + # file, or if your users are going to use them in filter files, and the normal +@@ -448,7 +452,7 @@ # SUPPORT_TLS=yes # Uncomment this setting if you are using OpenSSL @@ -74,7 +91,7 @@ # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -444,7 +447,7 @@ +@@ -499,7 +503,7 @@ # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. @@ -83,7 +100,7 @@ #------------------------------------------------------------------------------ -@@ -457,7 +460,7 @@ +@@ -512,7 +516,7 @@ # %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: @@ -92,7 +109,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 -@@ -594,12 +597,20 @@ +@@ -649,12 +653,20 @@ # # USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include @@ -115,7 +132,7 @@ #------------------------------------------------------------------------------ # The default action of the exim_install script (which is run by "make # install") is to install the Exim binary with a unique name such as -@@ -841,7 +852,7 @@ +@@ -896,7 +908,7 @@ # (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: diff --git a/mail/exim/files/patch-src::auths::pwcheck.c b/mail/exim/files/patch-src::auths::pwcheck.c deleted file mode 100644 index 3f887e046495..000000000000 --- a/mail/exim/files/patch-src::auths::pwcheck.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/auths/pwcheck.c.orig Wed Sep 10 16:33:51 2003 -+++ src/auths/pwcheck.c Wed Sep 10 16:34:53 2003 -@@ -210,7 +210,8 @@ - CYRUS_SASLAUTHD_SOCKET, strerror(errno)); - if (reply) - *reply = string_sprintf("cannot connect to saslauthd daemon at " -- "%s: %s", strerror(errno)); -+ "%s: %s", CYRUS_SASLAUTHD_SOCKET, -+ strerror(errno)); - return PWCHECK_FAIL; - } - diff --git a/mail/exim/files/wishlist-eqi.patch b/mail/exim/files/wishlist-eqi.patch deleted file mode 100644 index d412c73db9a3..000000000000 --- a/mail/exim/files/wishlist-eqi.patch +++ /dev/null @@ -1,90 +0,0 @@ -Return-Path: eikemeier@fillmore-labs.com -Delivery-Date: Thu, 28 Aug 2003 12:55:40 +0200 -Envelope-to: sheldonh@axl.seasidesoftware.co.za -Received: from mail1.gambling.com ([207.139.179.10]) - by axl.seasidesoftware.co.za with esmtp (Exim 4.22) - id 19sKQl-000MZl-Qw - for sheldonh@axl.seasidesoftware.co.za; Thu, 28 Aug 2003 12:55:08 +0200 -Received: from mx2.freebsd.org ([216.136.204.119]) - by mail1.gambling.com with esmtp (Exim 4.21) - id 19sKQe-0000zp-LM - for sheldonh@starjuice.net; Thu, 28 Aug 2003 06:55:00 -0400 -Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) - by mx2.freebsd.org (Postfix) with ESMTP id DC32F55487 - for <sheldonh@starjuice.net>; Thu, 28 Aug 2003 03:54:54 -0700 (PDT) - (envelope-from eikemeier@fillmore-labs.com) -Received: by hub.freebsd.org (Postfix) - id DBC0016A4C1; Thu, 28 Aug 2003 03:54:54 -0700 (PDT) -Delivered-To: sheldonh@freebsd.org -Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) - by hub.freebsd.org (Postfix) with ESMTP id D8C6F16A4C0 - for <sheldonh@FreeBSD.org>; Thu, 28 Aug 2003 03:54:54 -0700 (PDT) -Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83]) - by mx1.FreeBSD.org (Postfix) with ESMTP id CA9D243FDF - for <sheldonh@FreeBSD.org>; Thu, 28 Aug 2003 03:54:53 -0700 (PDT) - (envelope-from eikemeier@fillmore-labs.com) -Received: from p5080b7aa.dip.t-dialin.net - ([80.128.183.170] helo=fillmore-labs.com ident=epdlpdx7p1uekapy) - by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256) - (Exim 4.22) - id 19sKQR-000IqS-IX; Thu, 28 Aug 2003 12:54:47 +0200 -Message-ID: <3F4DDF6D.80409@fillmore-labs.com> -Date: Thu, 28 Aug 2003 12:54:37 +0200 -From: Oliver Eikemeier <eikemeier@fillmore-labs.com> -Reply-To: exim-users@exim.org -MIME-Version: 1.0 -To: exim-users@exim.org -Cc: Philip Hazel <ph10@cus.cam.ac.uk>, - Sheldon Hearn <sheldonh@FreeBSD.org> -Subject: Patch for Exim 4 wish list #181 (trivial): Caseless "eq" expansion - condition -Content-Type: text/plain; charset=us-ascii; format=flowed -Content-Transfer-Encoding: 7bit -X-Authenticated-Sender: eikemeier@fillmore-labs.com -User-Agent: KMail/1.5.9 -Organization: Fillmore Labs GmbH <http://www.fillmore-labs.com/> -X-Complaints-To: abuse@fillmore-labs.com -X-Spam-Score: 1.1 (+) -X-Spam-Score: 0.5 (/) - -The following patch gives you a 'eqi' operator, -which is like 'eq', only case-insensitive (ASCII only): - ---- wishlist-eqi.patch begins here --- -# -# (Exim 4 wish list #181) Caseless "eq" expansion condition -# - eqi = caseless eq -# ---- src/expand.c.orig Mon Aug 18 14:52:54 2003 -+++ src/expand.c Wed Aug 27 14:52:54 2003 -@@ -1482,6 +1482,7 @@ - - - /* eq: tests for string equality -+eqi: caseless test for string equality - match: does a regular expression match and sets up the numerical - variables if it succeeds - crypteq: encrypts plaintext and compares against an encrypted text, using -@@ -1491,6 +1492,7 @@ - - - else if (Ustrcmp(name, "eq") == 0 || -+ Ustrcmp(name, "eqi") == 0 || - Ustrcmp(name, "match") == 0 || - Ustrcmp(name, "crypteq") == 0 || - !isalpha(name[0])) -@@ -1565,7 +1567,7 @@ - break; - - case 'e': /* Straight text comparison */ -- *yield = (Ustrcmp(sub[0], sub[1]) == 0) == testfor; -+ *yield = (((name[2] == 'i')? strcmpic(sub[0], sub[1]) : Ustrcmp(sub[0], sub[1])) == 0) == testfor; - break; - - case 'm': /* Regular expression match */ ---- wishlist-eqi.patch ends here --- - -Regrads - Oliver - - |