1 files changed, 27 insertions, 31 deletions

diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index c11da9eb79a3..636f5dd0c09f 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- src/EDITME.orig	2008-07-26 00:23:25.000000000 +0400
-+++ src/EDITME	2009-11-14 19:28:32.000000000 +0300
+--- src/EDITME.orig	2010-12-26 21:17:23.000000000 +0300
++++ src/EDITME	2011-01-06 11:25:01.000000000 +0300
 @@ -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.
@@ -21,16 +18,16 @@ $FreeBSD$
  
  # 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 @@
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged.
+@@ -133,7 +133,7 @@
+ # deliveries. (Local deliveries run as various non-root users, typically as the
+ # owner of a local mailbox.) Specifying these values as root is not supported.
  
 -EXIM_USER=
 +EXIM_USER=ref:XX_EXIM_USER_XX
  
  # 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 @@
+@@ -154,7 +154,7 @@
  # 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.
  
@@ -39,7 +36,7 @@ $FreeBSD$
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -295,6 +295,7 @@
+@@ -294,6 +294,7 @@
  # LDAP_LIB_TYPE=OPENLDAP2
  # LDAP_LIB_TYPE=NETSCAPE
  # LDAP_LIB_TYPE=SOLARIS
@@ -47,7 +44,7 @@ $FreeBSD$
  
  # If you don't set any of these, Exim assumes the original University of
  # Michigan (OpenLDAP 1) library.
-@@ -321,8 +322,10 @@
+@@ -320,8 +321,10 @@
  # specified in INCLUDE. The settings below are just examples; -lpq is for
  # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
  
@@ -60,7 +57,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -333,7 +336,7 @@
+@@ -332,7 +335,7 @@
  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  # local OS-specific make files.
  
@@ -69,7 +66,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -385,6 +388,7 @@
+@@ -403,6 +406,7 @@
  
  
  
@@ -77,7 +74,7 @@ $FreeBSD$
  ###############################################################################
  #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
  ###############################################################################
-@@ -453,6 +457,7 @@
+@@ -470,6 +474,7 @@
  
  # ALT_CONFIG_PREFIX=/some/directory/
  # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
@@ -85,7 +82,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -507,7 +512,7 @@
+@@ -548,7 +553,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -94,7 +91,7 @@ $FreeBSD$
  
  # 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
-@@ -592,7 +597,7 @@
+@@ -633,7 +638,7 @@
  # SUPPORT_TLS=yes
  
  # Uncomment this setting if you are using OpenSSL
@@ -103,7 +100,7 @@ $FreeBSD$
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -643,7 +648,7 @@
+@@ -684,7 +689,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -112,7 +109,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -656,7 +661,7 @@
+@@ -697,7 +702,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:
  
@@ -121,7 +118,7 @@ $FreeBSD$
  
  # 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
-@@ -732,7 +737,7 @@
+@@ -773,7 +778,7 @@
  # that the local_scan API is made available by the linker. You may also need
  # to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
  
@@ -130,19 +127,18 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -824,13 +829,21 @@
- # library for TCP wrappers, so you probably need something like this:
+@@ -870,6 +875,8 @@
  #
- # USE_TCP_WRAPPERS=yes
--# CFLAGS=-O -I/usr/local/include
--# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
--#
-+CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
-+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX
-+
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
- 
++CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
++EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX
+ #
+ # To use a name other than exim in the tcpwrappers config file,
+ # e.g. if you're running multiple daemons with different access lists,
+@@ -878,6 +885,14 @@
+ #
+ # TCP_WRAPPERS_DAEMON_NAME="exim"
  
 +# IPv6 is coming. Exim has experimental support that has been tried out on
 +# one or two OS. See the file README.IPV6 for the current status of this
@@ -152,10 +148,10 @@ $FreeBSD$
 +# HAVE_IPV6=YES
 +
 +
+ 
  #------------------------------------------------------------------------------
  # 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
-@@ -1097,7 +1110,7 @@
+@@ -1145,7 +1160,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: