diff options
Diffstat (limited to 'mail/exim-devel/files')
| -rw-r--r-- | mail/exim-devel/files/POST-INSTALL-NOTES | 22 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-..::texinfo-3.30::doc::spec.texinfo | 40 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-OS::Makefile-FreeBSD | 10 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-scripts::exim_install | 37 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-src::EDITME | 122 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-src::configure.default | 49 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-xxx::no_fsync | 103 |
7 files changed, 0 insertions, 383 deletions
diff --git a/mail/exim-devel/files/POST-INSTALL-NOTES b/mail/exim-devel/files/POST-INSTALL-NOTES deleted file mode 100644 index fda40dc3c7bf..000000000000 --- a/mail/exim-devel/files/POST-INSTALL-NOTES +++ /dev/null @@ -1,22 +0,0 @@ -The following documentation has been installed: - - info 'Exim Overview' -> Overview of Exim - info Exim -> Exim Specification (User Guide) - info 'Exim Filtering' -> Exim Filter Specification (for end-users) - -Postscript, PDF, HTML and plain text versions of these documents, as well -as a comprehensive FAQ list, are available at http://www.exim.org/ . - -To run Exim instead of sendmail on startup: - -1) Create exim/configure from exim/configure.default . -2) Stop the sendmail daemon. -3) Adjust mailer.conf(5) and set 'sendmail_enable' and 'sendmail_flags' - as appropriate in rc.conf(5). -4) Start exim with appropriate command-line options. - -You may also want to configure newsyslog(8) to rotate Exim log files: - -/var/log/exim/mainlog exim:mail 640 7 * @T00 Z -/var/log/exim/rejectlog exim:mail 640 7 * @T00 Z - diff --git a/mail/exim-devel/files/patch-..::texinfo-3.30::doc::spec.texinfo b/mail/exim-devel/files/patch-..::texinfo-3.30::doc::spec.texinfo deleted file mode 100644 index 8053631d6c83..000000000000 --- a/mail/exim-devel/files/patch-..::texinfo-3.30::doc::spec.texinfo +++ /dev/null @@ -1,40 +0,0 @@ ---- ../exim-texinfo-3.30/doc/spec.texinfo.orig Tue Jun 12 12:20:49 2001 -+++ ../exim-texinfo-3.30/doc/spec.texinfo Mon Jun 18 17:50:02 2001 -@@ -6571,20 +6571,24 @@ - - - @cindex gid: caller --@center aller_gid: The group id under which the process that called Exim was -+$caller_gid: -+The group id under which the process that called Exim was - running. This is not the same as the group id of the originator of a message - (see $originator_gid). If Exim re-execs itself, this variable in the new - incarnation normally contains the Exim gid. - - @cindex uid: caller --@center aller_uid: The user id under which the process that called Exim was -+$caller_uid: -+The user id under which the process that called Exim was - running. This is not the same as the user id of the originator of a message - (see $originator_uid). If Exim re-execs itself, this variable in the new - incarnation normally contains the Exim uid. - --@center ompile_date: The date on which the Exim binary was compiled. -+$compile_date: -+The date on which the Exim binary was compiled. - --@center ompile_number: The building process for Exim keeps a count of the number -+$compile_number: -+The building process for Exim keeps a count of the number - of times it has been compiled. This serves to distinguish different - compilations of the same version of the program. - -@@ -6630,7 +6634,7 @@ - transport, the value is available in that transport. In all other situations, - this variable expands to nothing. - -- rrmsg_recipient: -+$errmsg_recipient: - This is set to the recipient address of an error message while Exim is creating - it. It is useful if a customized error message text file is in use (see - chapter "Customizing error and warning messages"). diff --git a/mail/exim-devel/files/patch-OS::Makefile-FreeBSD b/mail/exim-devel/files/patch-OS::Makefile-FreeBSD deleted file mode 100644 index 58f6355e13d8..000000000000 --- a/mail/exim-devel/files/patch-OS::Makefile-FreeBSD +++ /dev/null @@ -1,10 +0,0 @@ ---- OS/Makefile-FreeBSD.orig Mon Jun 11 12:04:05 2001 -+++ OS/Makefile-FreeBSD Mon Jun 11 12:04:33 2001 -@@ -5,6 +5,7 @@ - PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout - - CHOWN_COMMAND=/usr/sbin/chown -+STRIP_COMMAND=/usr/bin/strip - - HAVE_SA_LEN=YES - diff --git a/mail/exim-devel/files/patch-scripts::exim_install b/mail/exim-devel/files/patch-scripts::exim_install deleted file mode 100644 index db0bc1168f0a..000000000000 --- a/mail/exim-devel/files/patch-scripts::exim_install +++ /dev/null @@ -1,37 +0,0 @@ -*) Causes the configure file to be installed as a sample only. The - administrator needs to rename this file to "activate" exim. - ---- scripts/exim_install.orig Mon Aug 2 17:43:03 1999 -+++ scripts/exim_install Tue Aug 3 14:31:20 1999 -@@ -199,25 +199,20 @@ - fi - done - -- -- --# If there is no configuration file, install the default. -+# Install only a sample configuration, which encourages the admin to look -+# at it, since Exim won't run without a configure file. - - echo $com "" - --if [ ! -f ${CONFIGURE_FILE} ]; then -- echo $com Installing default configuration in ${CONFIGURE_FILE} -- echo $com because there is no existing configuration file. -- echo ${CP} ../src/configure.default ${CONFIGURE_FILE} -- ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE} -+ echo $com Installing default configuration file in ${CONFIGURE_FILE%/*}/configure.default -+ ${real} mkdir -p ${CONFIGURE_FILE%/*} -+ echo ${CP} ../src/configure.default ${CONFIGURE_FILE%/*} -+ ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE%/*} - if [ $? -ne 0 ]; then - echo $com "" - echo $com "*** Exim installation ${ver}failed ***" - exit 1 - fi --else -- echo $com Configuration file ${CONFIGURE_FILE} already exists --fi - - # Install info files if the directory is defined and the Texinfo - # source documentation is present. diff --git a/mail/exim-devel/files/patch-src::EDITME b/mail/exim-devel/files/patch-src::EDITME deleted file mode 100644 index 6a314acc6ec4..000000000000 --- a/mail/exim-devel/files/patch-src::EDITME +++ /dev/null @@ -1,122 +0,0 @@ ---- src/EDITME.orig Fri Jan 19 11:32:06 2001 -+++ src/EDITME Mon Jun 11 09:45:26 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. - --BIN_DIRECTORY=/usr/exim/bin -+BIN_DIRECTORY=XX_PREFIX_XX/sbin - - - # The default distribution of Exim contains only the plain text form of the -@@ -114,21 +114,21 @@ - # your info directory; "make install" will then build the info files and - # install them there. - --# INFO_DIRECTORY=/usr/local/info -+INFO_DIRECTORY=XX_PREFIX_XX/info - - - # The compress command is used by the exicyclog script to compress old log - # 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. - --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. - --ZCAT_COMMAND=/opt/gnu/bin/zcat -+ZCAT_COMMAND=/usr/bin/zcat - - - # 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. - --CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure - - - # In some installations there may be multiple machines sharing file systems, -@@ -243,7 +243,7 @@ - # are defaulted in the OS/Makefile-Default file, and can be overridden - # in local OS-specific make files. - --EXIM_MONITOR=eximon.bin -+#EXIM_MONITOR=eximon.bin - - - # Compiling in support for embedded Perl: If you want to be able to -@@ -286,7 +286,7 @@ - # "panic", or "reject" to form the final file name. For example, 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 -@@ -352,6 +352,8 @@ - - # 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 -+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 - - # If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP - # library you have. Unfortunately, though most of their functions are the -@@ -365,6 +367,7 @@ - # LDAP_LIB_TYPE=OPENLDAP2 - # LDAP_LIB_TYPE=NETSCAPE - # LDAP_LIB_TYPE=SOLARIS -+LDAP_LIB_TYPE=XX_LDAP_TYPE_XX - - # If you don't set any of these, Exim assumes the original University of - # Michigan (OpenLDAP 1) library. -@@ -411,7 +414,7 @@ - # the file name, allowing sites that run two separate daemons to distinguish - # them. Some installations may want something like this - --# PID_FILE_PATH=/var/lock/exim%s.pid -+PID_FILE_PATH=/var/run/exim%s.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 +463,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 -@@ -525,7 +528,7 @@ - # with TLS support. - - # SUPPORT_TLS=yes --# TLS_LIBS=-lssl -lcrypto -+TLS_LIBS=-lssl -lcrypto - - # If you are running Exim as a server, note that just building it with TLS - # support is not usually all you need to do. You normally need to set up a -@@ -575,5 +578,14 @@ - # chapter on building and installing Exim. - - # USE_TCP_WRAPPERS=yes -+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX -+ -+ -+# 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 -+# support. Do not set this option unless you are working on IPv6 and know -+# what you are doing. -+ -+# HAVE_IPV6=yes - - # End of EDITME diff --git a/mail/exim-devel/files/patch-src::configure.default b/mail/exim-devel/files/patch-src::configure.default deleted file mode 100644 index a5876067d758..000000000000 --- a/mail/exim-devel/files/patch-src::configure.default +++ /dev/null @@ -1,49 +0,0 @@ ---- src/configure.default.orig Thu Jun 14 19:39:54 2001 -+++ src/configure.default Thu Jun 14 20:10:52 2001 -@@ -99,6 +99,8 @@ - # normal user. This isn't usually a problem, as most sites have an alias for - # root that redirects such mail to a human administrator. - -+exim_user = exim -+exim_group = mail - never_users = root - - -@@ -122,6 +124,8 @@ - # See the section of the manual entitled "Control of relaying" for more - # information. - -+host_accept_relay = 127.0.0.1 -+ - - # The setting below causes Exim to do a reverse DNS lookup on all incoming - # IP calls, in order to get the true host name. If you feel this is too -@@ -230,8 +234,8 @@ - delivery_date_add - envelope_to_add - return_path_add --# group = mail --# mode = 0660 -+ group = mail -+ mode = 0660 - - - # This transport is used for handling pipe deliveries generated by alias -@@ -294,7 +298,8 @@ - driver = aliasfile - file = /etc/aliases - search_type = lsearch --# user = exim -+ user = exim -+ group = mail - file_transport = address_file - pipe_transport = address_pipe - -@@ -328,6 +333,7 @@ - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply -+ match_directory = !^/nonexistent - - - # This director matches local user mailboxes. diff --git a/mail/exim-devel/files/patch-xxx::no_fsync b/mail/exim-devel/files/patch-xxx::no_fsync deleted file mode 100644 index fc0f4791ac86..000000000000 --- a/mail/exim-devel/files/patch-xxx::no_fsync +++ /dev/null @@ -1,103 +0,0 @@ -diff -udrN src.orig/accept.c src/accept.c ---- src.orig/accept.c Thu Sep 6 15:25:28 2001 -+++ src/accept.c Thu Sep 6 15:28:03 2001 -@@ -2140,7 +2140,7 @@ - anything until the terminating dot line is sent. */ - - if (fflush(data_file) == EOF || ferror(data_file) || -- fsync(fileno(data_file)) < 0 || (accept_ferror)(fin)) -+ (perform_fsync && fsync(fileno(data_file))) < 0 || (accept_ferror)(fin)) - { - char *msg_errno = strerror(errno); - BOOL input_error = (accept_ferror)(fin) != 0; -diff -udrN src.orig/deliver.c src/deliver.c ---- src.orig/deliver.c Thu Sep 6 15:25:28 2001 -+++ src/deliver.c Thu Sep 6 15:29:22 2001 -@@ -578,7 +578,8 @@ - { - BOOL return_output = FALSE; - struct stat statbuf; -- fsync(addr->return_file); -+ if (perform_fsync) -+ fsync(addr->return_file); - - /* If there is no output, do nothing. */ - -@@ -1580,7 +1581,7 @@ - - /* Ensure the journal file is pushed out to disc. */ - -- if (fsync(journal_fd) < 0) -+ if (perform_fsync && fsync(journal_fd) < 0) - log_write(0, LOG_MAIN|LOG_PANIC, "failed to fsync journal: %s", - strerror(errno)); - } -diff -udrN src.orig/globals.c src/globals.c ---- src.orig/globals.c Thu Sep 6 15:25:28 2001 -+++ src/globals.c Thu Sep 6 15:24:49 2001 -@@ -494,6 +494,7 @@ - BOOL parse_allow_group = FALSE; - BOOL parse_found_group = FALSE; - char *percent_hack_domains = NULL; -+BOOL perform_fsync = TRUE; - char *pid_file_path = PID_FILE_PATH - "\0<--------------Space to patch pid_file_path->"; - BOOL preserve_message_logs = FALSE; -diff -udrN src.orig/globals.h src/globals.h ---- src.orig/globals.h Thu Sep 6 15:25:28 2001 -+++ src/globals.h Thu Sep 6 15:41:35 2001 -@@ -364,6 +364,7 @@ - extern BOOL parse_allow_group; /* Allow group syntax */ - extern BOOL parse_found_group; /* In the middle of a group */ - extern char *percent_hack_domains; /* Local domains for which '% operates */ -+extern BOOL perform_fsync; /* Use fsync() to flush to disk */ - extern char *pid_file_path; /* For writing daemon pids */ - extern BOOL preserve_message_logs; /* Save msglog files */ - extern char *primary_hostname; /* Primary name of this computer */ -diff -udrN src.orig/readconf.c src/readconf.c ---- src.orig/readconf.c Thu Sep 6 15:25:28 2001 -+++ src/readconf.c Thu Sep 6 15:24:19 2001 -@@ -81,6 +81,7 @@ - { "finduser_retries", opt_int, &finduser_retries }, - { "forbid_domain_literals", opt_bool, &forbid_domain_literals }, - { "freeze_tell_mailmaster", opt_bool, &freeze_tell_mailmaster }, -+ { "fsync", opt_bool, &perform_fsync }, - { "gecos_name", opt_stringptr, &gecos_name }, - { "gecos_pattern", opt_stringptr, &gecos_pattern }, - { "headers_check_syntax", opt_bool, &headers_check_syntax }, -diff -udrN src.orig/spool_out.c src/spool_out.c ---- src.orig/spool_out.c Thu Sep 6 15:25:28 2001 -+++ src/spool_out.c Thu Sep 6 15:29:51 2001 -@@ -277,7 +277,7 @@ - just pushes it out of C, and fclose() doesn't guarantee to do the write - either. That's just the way Unix works... */ - --if (fsync(fileno(f)) < 0) -+if (perform_fsync && fsync(fileno(f)) < 0) - return spool_write_error(where, errmsg, "sync", temp_name, f); - - /* Get the size of the file, and close it. */ -diff -udrN src.orig/transports/appendfile.c src/transports/appendfile.c ---- src.orig/transports/appendfile.c Thu Sep 6 15:25:28 2001 -+++ src/transports/appendfile.c Thu Sep 6 15:31:40 2001 -@@ -2556,7 +2556,7 @@ - /* Force out the remaining data to check for any errors; some OS don't allow - fsync() to be called for a FIFO. */ - --if (yield == OK && !isfifo && fsync(fd) < 0) yield = DEFER; -+if (perform_fsync && yield == OK && !isfifo && fsync(fd) < 0) yield = DEFER; - - /* Handle error while writing the file. Control should come here directly after - the error, with the reason in errno. In the case of expansion failure in prefix -diff -udrN src.orig/transports/smtp.c src/transports/smtp.c ---- src.orig/transports/smtp.c Thu Sep 6 15:25:28 2001 -+++ src/transports/smtp.c Thu Sep 6 15:31:55 2001 -@@ -1462,7 +1462,7 @@ - - /* Ensure the journal file is pushed out to disc. */ - -- if (fsync(journal_fd) < 0) -+ if (perform_fsync && fsync(journal_fd) < 0) - log_write(0, LOG_MAIN|LOG_PANIC, "failed to fsync journal: %s", - strerror(errno)); - } |