diff --git a/exim-4.87-config.patch b/exim-4.87-config.patch deleted file mode 100644 index 78bddc4..0000000 --- a/exim-4.87-config.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile -index 4aa7d76..3a5263c 100755 ---- a/scripts/Configure-Makefile -+++ b/scripts/Configure-Makefile -@@ -253,7 +253,7 @@ if [ "${EXIM_PERL}" != "" ] ; then - - mv $mft $mftt - echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft -- echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft -+ echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts` \$(CFLAGS)" >>$mft - echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft - echo "" >>$mft - cat $mftt >> $mft -diff --git a/src/EDITME b/src/EDITME -index d852103..bbb7527 100644 ---- a/src/EDITME -+++ b/src/EDITME -@@ -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=/usr/sbin - - - #------------------------------------------------------------------------------ -@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin - # don't exist. It will also install a default runtime configuration if this - # file does not exist. - --CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=/etc/exim/exim.conf - - # 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. -@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure - # 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=93 - - # 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 -@@ -152,7 +152,7 @@ EXIM_USER= - # 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=93 - - # Many sites define a user called "exim", with an appropriate default group, - # and use -@@ -232,7 +232,7 @@ TRANSPORT_SMTP=yes - # This one is special-purpose, and commonly not required, so it is not - # included by default. - --# TRANSPORT_LMTP=yes -+TRANSPORT_LMTP=yes - - - #------------------------------------------------------------------------------ -@@ -241,9 +241,9 @@ TRANSPORT_SMTP=yes - # MBX, is included only when requested. If you do not know what this is about, - # leave these settings commented out. - --# SUPPORT_MAILDIR=yes --# SUPPORT_MAILSTORE=yes --# SUPPORT_MBX=yes -+SUPPORT_MAILDIR=yes -+SUPPORT_MAILSTORE=yes -+SUPPORT_MBX=yes - - - #------------------------------------------------------------------------------ -@@ -301,19 +301,21 @@ LOOKUP_DBM=yes - LOOKUP_LSEARCH=yes - LOOKUP_DNSDB=yes - --# LOOKUP_CDB=yes --# LOOKUP_DSEARCH=yes -+LOOKUP_CDB=yes -+LOOKUP_DSEARCH=yes - # LOOKUP_IBASE=yes --# LOOKUP_LDAP=yes --# LOOKUP_MYSQL=yes --# LOOKUP_NIS=yes --# LOOKUP_NISPLUS=yes -+LOOKUP_LDAP=yes -+LDAP_LIB_TYPE=OPENLDAP2 -+LOOKUP_INCLUDE=-I/usr/include/mysql -+LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq -+LOOKUP_MYSQL=yes -+LOOKUP_NIS=yes -+LOOKUP_NISPLUS=yes - # LOOKUP_ORACLE=yes --# LOOKUP_PASSWD=yes --# LOOKUP_PGSQL=yes -+LOOKUP_PASSWD=yes -+LOOKUP_PGSQL=yes - # LOOKUP_REDIS=yes --# LOOKUP_SQLITE=yes --# LOOKUP_SQLITE_PC=sqlite3 -+LOOKUP_SQLITE=yes - # LOOKUP_WHOSON=yes - - # These two settings are obsolete; all three lookups are compiled when -@@ -390,14 +392,14 @@ EXIM_MONITOR=eximon.bin - # and the MIME ACL. Please read the documentation to learn more about these - # features. - --# WITH_CONTENT_SCAN=yes -+WITH_CONTENT_SCAN=yes - - # If you want to use the deprecated "demime" condition in the DATA ACL, - # uncomment the line below. Doing so will also explicitly turn on the - # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of - # the "demime" condition. - --# WITH_OLD_DEMIME=yes -+WITH_OLD_DEMIME=yes - - #------------------------------------------------------------------------------ - # If you're using ClamAV and are backporting fixes to an old version, instead -@@ -573,7 +575,7 @@ FIXED_NEVER_USERS=root - # CONFIGURE_OWNER setting, to specify a configuration file which is listed in - # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. - --# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs -+TRUSTED_CONFIG_LIST=/etc/exim/trusted-configs - - - #------------------------------------------------------------------------------ -@@ -618,16 +620,14 @@ FIXED_NEVER_USERS=root - # included in the Exim binary. You will then need to set up the run time - # configuration to make use of the mechanism(s) selected. - --# AUTH_CRAM_MD5=yes --# AUTH_CYRUS_SASL=yes --# AUTH_DOVECOT=yes --# AUTH_GSASL=yes --# AUTH_GSASL_PC=libgsasl --# AUTH_HEIMDAL_GSSAPI=yes --# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi --# AUTH_PLAINTEXT=yes --# AUTH_SPA=yes --# AUTH_TLS=yes -+AUTH_CRAM_MD5=yes -+AUTH_CYRUS_SASL=yes -+AUTH_DOVECOT=yes -+AUTH_GSASL=yes -+AUTH_GSASL_PC=libgsasl -+AUTH_PLAINTEXT=yes -+AUTH_SPA=yes -+AUTH_TLS=yes - - - #------------------------------------------------------------------------------ -@@ -648,7 +648,7 @@ FIXED_NEVER_USERS=root - # one that is set in the headers_charset option. The default setting is - # defined by this setting: - --HEADERS_CHARSET="ISO-8859-1" -+HEADERS_CHARSET="UTF-8" - - # 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 -@@ -668,7 +668,7 @@ HEADERS_CHARSET="ISO-8859-1" - # the Sieve filter support. For those OS where iconv() is known to be installed - # as standard, the file in OS/Makefile-xxxx contains - # --# HAVE_ICONV=yes -+HAVE_ICONV=yes - # - # If you are not using one of those systems, but have installed iconv(), you - # need to uncomment that line above. In some cases, you may find that iconv() -@@ -730,11 +730,11 @@ HEADERS_CHARSET="ISO-8859-1" - # leave these settings commented out. - - # This setting is required for any TLS support (either OpenSSL or GnuTLS) --# SUPPORT_TLS=yes -+SUPPORT_TLS=yes - - # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not --# USE_OPENSSL_PC=openssl --# TLS_LIBS=-lssl -lcrypto -+TLS_INCLUDE=-I/usr/kerberos/include -+TLS_LIBS=-lssl -lcrypto - - # Uncomment the first and either the second or the third of these if you - # are using GnuTLS. If you have pkg-config, then the second, else the third. -@@ -799,7 +799,7 @@ HEADERS_CHARSET="ISO-8859-1" - # Once you have done this, "make install" will build the info files and - # install them in the directory you have defined. - --# INFO_DIRECTORY=/usr/share/info -+INFO_DIRECTORY=/usr/share/info - - - #------------------------------------------------------------------------------ -@@ -812,7 +812,7 @@ HEADERS_CHARSET="ISO-8859-1" - # %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/%s.log - - # 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 -@@ -884,7 +884,7 @@ ZCAT_COMMAND=/usr/bin/zcat - # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded - # Perl costs quite a lot of resources. Only do this if you really need it. - --# EXIM_PERL=perl.o -+EXIM_PERL=perl.o - - - #------------------------------------------------------------------------------ -@@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat - # 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 - - - #------------------------------------------------------------------------------ -@@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat - # support, which is intended for use in conjunction with the SMTP AUTH - # facilities, is included only when requested by the following setting: - --# SUPPORT_PAM=yes -+SUPPORT_PAM=yes - - # You probably need to add -lpam to EXTRALIBS, and in some releases of - # GNU/Linux -ldl is also needed. -@@ -998,7 +998,7 @@ ZCAT_COMMAND=/usr/bin/zcat - # group. Once you have installed saslauthd, you should arrange for it to be - # started by root at boot time. - --# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux -+CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux - - - #------------------------------------------------------------------------------ -@@ -1011,9 +1011,9 @@ ZCAT_COMMAND=/usr/bin/zcat - # You may well also have to specify a local "include" file and an additional - # library for TCP wrappers, so you probably need something like this: - # --# USE_TCP_WRAPPERS=yes --# CFLAGS=-O -I/usr/local/include --# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -+USE_TCP_WRAPPERS=yes -+CFLAGS+=$(RPM_OPT_FLAGS) $(PIE) -+EXTRALIBS_EXIM=-lwrap -lpam -ldl -export-dynamic -rdynamic - # - # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM - # as well. -@@ -1065,7 +1065,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases - # is "yes", as well as supporting line editing, a history of input lines in the - # current run is maintained. - --# USE_READLINE=yes -+USE_READLINE=yes - - # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. - # Note that this option adds to the size of the Exim binary, because the -@@ -1075,7 +1075,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases - #------------------------------------------------------------------------------ - # Uncomment this setting to include IPv6 support. - --# HAVE_IPV6=yes -+HAVE_IPV6=yes - - ############################################################################### - # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1096,13 +1096,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases - # haven't got Perl, Exim will still build and run; you just won't be able to - # use those utilities. - --# CHOWN_COMMAND=/usr/bin/chown --# CHGRP_COMMAND=/usr/bin/chgrp --# CHMOD_COMMAND=/usr/bin/chmod --# MV_COMMAND=/bin/mv --# RM_COMMAND=/bin/rm --# TOUCH_COMMAND=/usr/bin/touch --# PERL_COMMAND=/usr/bin/perl -+CHOWN_COMMAND=/usr/bin/chown -+CHGRP_COMMAND=/usr/bin/chgrp -+CHMOD_COMMAND=/usr/bin/chmod -+MV_COMMAND=/usr/bin/mv -+RM_COMMAND=/usr/bin/rm -+TOUCH_COMMAND=/usr/bin/touch -+PERL_COMMAND=/usr/bin/perl - - - #------------------------------------------------------------------------------ -@@ -1304,7 +1304,7 @@ EXIM_TMPDIR="/tmp" - # (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.pid -+PID_FILE_PATH=/var/run/exim.pid - - # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory - # using the name "exim-daemon.pid". diff --git a/exim-4.87-spamdconf.patch b/exim-4.87-spamdconf.patch index 031268e..c5a21f6 100644 --- a/exim-4.87-spamdconf.patch +++ b/exim-4.87-spamdconf.patch @@ -1,7 +1,5 @@ -diff --git a/src/configure.default b/src/configure.default -index 531435b..374c51d 100644 ---- a/src/configure.default -+++ b/src/configure.default +--- a/src/configure.default.spamd 2016-12-25 21:06:57.453758443 +0000 ++++ b/src/configure.default 2016-12-25 21:07:49.940188407 +0000 @@ -109,6 +109,7 @@ hostlist relay_from_hosts = localhost acl_smtp_rcpt = acl_check_rcpt @@ -29,9 +27,9 @@ index 531435b..374c51d 100644 require verify = sender -@@ -533,27 +535,63 @@ acl_check_data: - # - deny condition = ${if > {$max_received_linelength}{998}} +@@ -535,27 +537,63 @@ acl_check_data: + got $max_received_linelength + condition = ${if > {$max_received_linelength}{998}} + # Put simple tests first. A good one is to check for the presence of a + # Message-Id: header, which RFC2822 says SHOULD be present. Some broken @@ -52,17 +50,17 @@ index 531435b..374c51d 100644 - # Add headers to a message if it is judged to be spam. Before enabling this, - # you must install SpamAssassin. You may also need to set the spamd_address - # option above. -+ # Bypass SpamAssassin checks if the message is too large. - # +- # - # warn spam = nobody - # add_header = X-Spam_score: $spam_score\n\ - # X-Spam_score_int: $spam_score_int\n\ - # X-Spam_bar: $spam_bar\n\ - # X-Spam_report: $spam_report ++ # Bypass SpamAssassin checks if the message is too large. ++ # + # accept condition = ${if >={$message_size}{100000} {1}} + # add_header = X-Spam-Note: SpamAssassin run bypassed due to message size - -- # Accept the message. ++ + # Run SpamAssassin, but allow for it to fail or time out. Add a warning message + # and accept the mail if that happens. Add an X-Spam-Flag: header if the SA + # score exceeds the SA system threshold. @@ -78,7 +76,8 @@ index 531435b..374c51d 100644 + # + # warn add_header = X-Spam-Score: $spam_score ($spam_bar)\n\ + # X-Spam-Report: $spam_report -+ + +- # Accept the message. + # And reject if the SpamAssassin score is greater than ten + # + # deny condition = ${if >{$spam_score_int}{100} {1}} diff --git a/exim-4.88-config.patch b/exim-4.88-config.patch new file mode 100644 index 0000000..40baabd --- /dev/null +++ b/exim-4.88-config.patch @@ -0,0 +1,298 @@ +diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile +index 3e486a6..6c4afec 100755 +--- a/scripts/Configure-Makefile ++++ b/scripts/Configure-Makefile +@@ -269,7 +269,7 @@ if [ "${EXIM_PERL}" != "" ] ; then + + mv $mft $mftt + echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft +- echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts`" >>$mft ++ echo "PERL_CCOPTS=`$PERL_COMMAND -MExtUtils::Embed -e ccopts` \$(CFLAGS)" >>$mft + echo "PERL_LIBS=`$PERL_COMMAND -MExtUtils::Embed -e ldopts`" >>$mft + echo "" >>$mft + cat $mftt >> $mft +diff --git a/src/src/EDITME b/src/src/EDITME +index 6929346..5a08197 100644 +--- a/src/EDITME ++++ b/src/EDITME +@@ -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=/usr/sbin + + + #------------------------------------------------------------------------------ +@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin + # don't exist. It will also install a default runtime configuration if this + # file does not exist. + +-CONFIGURE_FILE=/usr/exim/configure ++CONFIGURE_FILE=/etc/exim/exim.conf + + # 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. +@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure + # 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=93 + + # 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 +@@ -152,7 +152,7 @@ EXIM_USER= + # 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=93 + + # Many sites define a user called "exim", with an appropriate default group, + # and use +@@ -232,7 +232,7 @@ TRANSPORT_SMTP=yes + # This one is special-purpose, and commonly not required, so it is not + # included by default. + +-# TRANSPORT_LMTP=yes ++TRANSPORT_LMTP=yes + + + #------------------------------------------------------------------------------ +@@ -241,9 +241,9 @@ TRANSPORT_SMTP=yes + # MBX, is included only when requested. If you do not know what this is about, + # leave these settings commented out. + +-# SUPPORT_MAILDIR=yes +-# SUPPORT_MAILSTORE=yes +-# SUPPORT_MBX=yes ++SUPPORT_MAILDIR=yes ++SUPPORT_MAILSTORE=yes ++SUPPORT_MBX=yes + + + #------------------------------------------------------------------------------ +@@ -301,19 +301,21 @@ LOOKUP_DBM=yes + LOOKUP_LSEARCH=yes + LOOKUP_DNSDB=yes + +-# LOOKUP_CDB=yes +-# LOOKUP_DSEARCH=yes ++LOOKUP_CDB=yes ++LOOKUP_DSEARCH=yes + # LOOKUP_IBASE=yes +-# LOOKUP_LDAP=yes +-# LOOKUP_MYSQL=yes +-# LOOKUP_NIS=yes +-# LOOKUP_NISPLUS=yes ++LOOKUP_LDAP=yes ++LDAP_LIB_TYPE=OPENLDAP2 ++LOOKUP_INCLUDE=-I/usr/include/mysql ++LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq ++LOOKUP_MYSQL=yes ++LOOKUP_NIS=yes ++LOOKUP_NISPLUS=yes + # LOOKUP_ORACLE=yes +-# LOOKUP_PASSWD=yes +-# LOOKUP_PGSQL=yes ++LOOKUP_PASSWD=yes ++LOOKUP_PGSQL=yes + # LOOKUP_REDIS=yes +-# LOOKUP_SQLITE=yes +-# LOOKUP_SQLITE_PC=sqlite3 ++LOOKUP_SQLITE=yes + # LOOKUP_WHOSON=yes + + # These two settings are obsolete; all three lookups are compiled when +@@ -390,7 +392,7 @@ EXIM_MONITOR=eximon.bin + # and the MIME ACL. Please read the documentation to learn more about these + # features. + +-# WITH_CONTENT_SCAN=yes ++WITH_CONTENT_SCAN=yes + + #------------------------------------------------------------------------------ + # If you're using ClamAV and are backporting fixes to an old version, instead +@@ -577,7 +579,7 @@ FIXED_NEVER_USERS=root + # CONFIGURE_OWNER setting, to specify a configuration file which is listed in + # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. + +-# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs ++TRUSTED_CONFIG_LIST=/etc/exim/trusted-configs + + + #------------------------------------------------------------------------------ +@@ -622,16 +624,14 @@ FIXED_NEVER_USERS=root + # included in the Exim binary. You will then need to set up the run time + # configuration to make use of the mechanism(s) selected. + +-# AUTH_CRAM_MD5=yes +-# AUTH_CYRUS_SASL=yes +-# AUTH_DOVECOT=yes +-# AUTH_GSASL=yes +-# AUTH_GSASL_PC=libgsasl +-# AUTH_HEIMDAL_GSSAPI=yes +-# AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi +-# AUTH_PLAINTEXT=yes +-# AUTH_SPA=yes +-# AUTH_TLS=yes ++AUTH_CRAM_MD5=yes ++AUTH_CYRUS_SASL=yes ++AUTH_DOVECOT=yes ++AUTH_GSASL=yes ++AUTH_GSASL_PC=libgsasl ++AUTH_PLAINTEXT=yes ++AUTH_SPA=yes ++AUTH_TLS=yes + + + #------------------------------------------------------------------------------ +@@ -652,7 +652,7 @@ FIXED_NEVER_USERS=root + # one that is set in the headers_charset option. The default setting is + # defined by this setting: + +-HEADERS_CHARSET="ISO-8859-1" ++HEADERS_CHARSET="UTF-8" + + # 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 +@@ -672,7 +672,7 @@ HEADERS_CHARSET="ISO-8859-1" + # the Sieve filter support. For those OS where iconv() is known to be installed + # as standard, the file in OS/Makefile-xxxx contains + # +-# HAVE_ICONV=yes ++HAVE_ICONV=yes + # + # If you are not using one of those systems, but have installed iconv(), you + # need to uncomment that line above. In some cases, you may find that iconv() +@@ -734,11 +734,11 @@ HEADERS_CHARSET="ISO-8859-1" + # leave these settings commented out. + + # This setting is required for any TLS support (either OpenSSL or GnuTLS) +-# SUPPORT_TLS=yes ++SUPPORT_TLS=yes + + # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not +-# USE_OPENSSL_PC=openssl +-# TLS_LIBS=-lssl -lcrypto ++TLS_INCLUDE=-I/usr/kerberos/include ++TLS_LIBS=-lssl -lcrypto + + # Uncomment the first and either the second or the third of these if you + # are using GnuTLS. If you have pkg-config, then the second, else the third. +@@ -807,7 +807,7 @@ HEADERS_CHARSET="ISO-8859-1" + # Once you have done this, "make install" will build the info files and + # install them in the directory you have defined. + +-# INFO_DIRECTORY=/usr/share/info ++INFO_DIRECTORY=/usr/share/info + + + #------------------------------------------------------------------------------ +@@ -820,7 +820,7 @@ HEADERS_CHARSET="ISO-8859-1" + # %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/%s.log + + # 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 +@@ -892,7 +892,7 @@ ZCAT_COMMAND=/usr/bin/zcat + # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded + # Perl costs quite a lot of resources. Only do this if you really need it. + +-# EXIM_PERL=perl.o ++EXIM_PERL=perl.o + + + #------------------------------------------------------------------------------ +@@ -902,7 +902,7 @@ ZCAT_COMMAND=/usr/bin/zcat + # 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 + + + #------------------------------------------------------------------------------ +@@ -912,7 +912,7 @@ ZCAT_COMMAND=/usr/bin/zcat + # support, which is intended for use in conjunction with the SMTP AUTH + # facilities, is included only when requested by the following setting: + +-# SUPPORT_PAM=yes ++SUPPORT_PAM=yes + + # You probably need to add -lpam to EXTRALIBS, and in some releases of + # GNU/Linux -ldl is also needed. +@@ -1006,7 +1006,7 @@ ZCAT_COMMAND=/usr/bin/zcat + # group. Once you have installed saslauthd, you should arrange for it to be + # started by root at boot time. + +-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux ++CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux + + + #------------------------------------------------------------------------------ +@@ -1019,9 +1019,9 @@ ZCAT_COMMAND=/usr/bin/zcat + # You may well also have to specify a local "include" file and an additional + # library for TCP wrappers, so you probably need something like this: + # +-# USE_TCP_WRAPPERS=yes +-# CFLAGS=-O -I/usr/local/include +-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap ++USE_TCP_WRAPPERS=yes ++CFLAGS+=$(RPM_OPT_FLAGS) $(PIE) ++EXTRALIBS_EXIM=-lwrap -lpam -ldl -export-dynamic -rdynamic + # + # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM + # as well. +@@ -1073,7 +1073,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases + # is "yes", as well as supporting line editing, a history of input lines in the + # current run is maintained. + +-# USE_READLINE=yes ++USE_READLINE=yes + + # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. + # Note that this option adds to the size of the Exim binary, because the +@@ -1083,7 +1083,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases + #------------------------------------------------------------------------------ + # Uncomment this setting to include IPv6 support. + +-# HAVE_IPV6=yes ++HAVE_IPV6=yes + + ############################################################################### + # THINGS YOU ALMOST NEVER NEED TO MENTION # +@@ -1104,13 +1104,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases + # haven't got Perl, Exim will still build and run; you just won't be able to + # use those utilities. + +-# CHOWN_COMMAND=/usr/bin/chown +-# CHGRP_COMMAND=/usr/bin/chgrp +-# CHMOD_COMMAND=/usr/bin/chmod +-# MV_COMMAND=/bin/mv +-# RM_COMMAND=/bin/rm +-# TOUCH_COMMAND=/usr/bin/touch +-# PERL_COMMAND=/usr/bin/perl ++CHOWN_COMMAND=/usr/bin/chown ++CHGRP_COMMAND=/usr/bin/chgrp ++CHMOD_COMMAND=/usr/bin/chmod ++MV_COMMAND=/usr/bin/mv ++RM_COMMAND=/usr/bin/rm ++TOUCH_COMMAND=/usr/bin/touch ++PERL_COMMAND=/usr/bin/perl + + + #------------------------------------------------------------------------------ +@@ -1312,7 +1312,7 @@ EXIM_TMPDIR="/tmp" + # (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.pid ++PID_FILE_PATH=/var/run/exim.pid + + # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory + # using the name "exim-daemon.pid". diff --git a/exim.spec b/exim.spec index 416c598..5e817b5 100644 --- a/exim.spec +++ b/exim.spec @@ -47,7 +47,7 @@ Source25: exim-gen-cert Source26: clamd.exim.service Patch4: exim-4.87-rhl.patch -Patch6: exim-4.87-config.patch +Patch6: exim-4.88-config.patch Patch8: exim-4.82-libdir.patch Patch12: exim-4.87-cyrus.patch Patch13: exim-4.87-pamconfig.patch diff --git a/sources b/sources index c9e82cb..059a278 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf +SHA512 (exim-4.87.1.tar.bz2) = bdb0a0507a8ad63abe49026250bd8206f6993cc08a01e640f8076f8accc57a33b16c336196351bf5cb124f1a435b140f908b4d6707ce0efb8d305764cf156e6b