1 files changed, 32 insertions, 41 deletions

diff --git a/mail/exim-monitor/files/patch-src::EDITME b/mail/exim-monitor/files/patch-src::EDITME
index 9f86005558c6..0ee15f3d818a 100644
--- a/mail/exim-monitor/files/patch-src::EDITME
+++ b/mail/exim-monitor/files/patch-src::EDITME
@@ -1,64 +1,55 @@
 --- src/EDITME.orig	Mon Aug 27 14:35:47 2001
 +++ src/EDITME	Mon Aug 27 14:37:31 2001
-@@ -103,7 +103,7 @@
- # installed in this directory. There is no default for this variable built into
- # the source files; it must be set in one of the local configuration files.
+@@ -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.
  
 -BIN_DIRECTORY=/usr/exim/bin
 +BIN_DIRECTORY=XX_PREFIX_XX/sbin
  
  
- # The default distribution of Exim contains only the plain text form of the
-@@ -121,14 +121,14 @@
- # files. Both the name of the command and the suffix that it adds to files
- # need to be defined here. See also the EXICYCLOG_MAX configuration.
+ #------------------------------------------------------------------------------
+@@ -113,7 +113,7 @@
+ # directories if they don't exist. It will also install a default run time
+ # configuration if this file does not exist.
  
--COMPRESS_COMMAND=/opt/gnu/bin/gzip
-+COMPRESS_COMMAND=/usr/bin/gzip
- COMPRESS_SUFFIX=gz
- 
- 
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
+-CONFIGURE_FILE=/usr/exim/configure
++CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
  
--ZCAT_COMMAND=/opt/gnu/bin/zcat
-+ZCAT_COMMAND=/usr/bin/zcat
  
+ #------------------------------------------------------------------------------
+@@ -126,14 +126,14 @@
+ # owner of a local mailbox.) Specifying these values as root is very strongly
+ # discouraged. These values are compiled into the binary.
  
- # The runtime configuration file: This variable defines where Exim's runtime
-@@ -137,7 +137,7 @@
- # location of all other runtime files and directories can be changed in the
- # runtime configuration file.
+-EXIM_USER=
++EXIM_USER=mailnull
  
--CONFIGURE_FILE=/usr/exim/configure
-+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
+ # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
+ # also be a setting of EXIM_GROUP. If, on the other hand, you use a name
+ # 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.
  
+-# EXIM_GROUP=
++EXIM_GROUP=mail
  
- # In some installations there may be multiple machines sharing file systems,
-@@ -286,7 +286,7 @@
- # "panic", or "reject" to form the final file name. For example, some
- # installations may want something like this:
+ # Many sites define a user called "exim", with an appropriate default group,
+ # and use
+@@ -371,7 +373,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:
  
 -# LOG_FILE_PATH=/var/log/exim_%slog
 +LOG_FILE_PATH=/var/log/exim/%slog
  
  # 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
-@@ -411,7 +411,7 @@
- # the file name, allowing sites that run two separate daemons to distinguish
- # them. Some installations may want something like this
+@@ -695,7 +705,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:
  
--# PID_FILE_PATH=/var/lock/exim%s.pid
-+PID_FILE_PATH=/var/run/exim%s.pid
+-# PID_FILE_PATH=/var/lock/exim.pid
++PID_FILE_PATH=/var/run/exim.pid
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
- # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-@@ -460,7 +460,7 @@
- # uid and gid.
- 
- # Many installations will want something like this:
--# SPOOL_DIRECTORY=/var/spool/exim
-+SPOOL_DIRECTORY=/var/spool/exim
- 
- # Others may prefer to keep all Exim things under one directory:
- # SPOOL_DIRECTORY=/usr/exim/spool
+ # using the name "exim-daemon.pid".