Add support for for dynamically-loaded string expansion functions

via ${dlfun}.

Requested by:	Alex Miller <asm@asm.kiev.ua>

1 files changed, 20 insertions, 11 deletions

diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index 0f9761a76cd6..bbacd480130c 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -58,18 +58,18 @@ $FreeBSD$
 +LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
 +DBMLIB=XX_DB_LIBS_XX
  
+ 
  #------------------------------------------------------------------------------
- # Compiling the Exim monitor: If you want to compile the Exim monitor, a
-@@ -319,7 +322,7 @@
+@@ -320,7 +323,7 @@
  # 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
-@@ -370,6 +373,7 @@
+@@ -372,6 +375,7 @@
  
  
  
@@ -77,7 +77,7 @@ $FreeBSD$
  ###############################################################################
  #                 THESE ARE THINGS YOU MIGHT WANT TO SPECIFY                  #
  ###############################################################################
-@@ -438,6 +442,7 @@
+@@ -440,6 +444,7 @@
  
  # ALT_CONFIG_PREFIX=/some/directory/
  # ALT_CONFIG_PREFIX=/some/directory/exim.conf-
@@ -85,7 +85,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -491,7 +496,7 @@
+@@ -494,7 +499,7 @@
  # one that is set in the headers_charset option. The default setting is
  # defined by this setting:
  
@@ -94,7 +94,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
-@@ -563,7 +568,7 @@
+@@ -579,7 +584,7 @@
  # SUPPORT_TLS=yes
  
  # Uncomment this setting if you are using OpenSSL
@@ -103,7 +103,7 @@ $FreeBSD$
  
  # Uncomment these settings if you are using GnuTLS
  # USE_GNUTLS=yes
-@@ -614,7 +619,7 @@
+@@ -630,7 +635,7 @@
  # Once you have done this, "make install" will build the info files and
  # install them in the directory you have defined.
  
@@ -112,7 +112,7 @@ $FreeBSD$
  
  
  #------------------------------------------------------------------------------
-@@ -627,7 +632,7 @@
+@@ -643,7 +648,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 +121,16 @@ $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
-@@ -795,13 +800,21 @@
+@@ -719,7 +724,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.
+ 
+-# EXPAND_DLFUNC=yes
++EXPAND_DLFUNC=yes
+ 
+ 
+ #------------------------------------------------------------------------------
+@@ -811,13 +816,21 @@
  # library for TCP wrappers, so you probably need something like this:
  #
  # USE_TCP_WRAPPERS=yes
@@ -146,7 +155,7 @@ $FreeBSD$
  #------------------------------------------------------------------------------
  # 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
-@@ -1066,7 +1079,7 @@
+@@ -1082,7 +1095,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: