New version
Resolves: rhbz#1181479 - De-fuzzified config and dlopen-localscan patches
This commit is contained in:
Jaroslav Škarvada
parent
f44fc2848a
commit
2ca260ba15
|
|
@ -12,7 +12,7 @@ index eeb26ee..9cb6385 100755
|
|||
echo "" >>$mft
|
||||
cat $mftt >> $mft
|
||||
diff --git a/src/EDITME b/src/EDITME
|
||||
index d576fd7..a3ffd48 100644
|
||||
index 4a290a4..b4c60cb 100644
|
||||
--- a/src/EDITME
|
||||
+++ b/src/EDITME
|
||||
@@ -98,7 +98,7 @@
|
||||
|
|
@ -121,7 +121,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# If you're using ClamAV and are backporting fixes to an old version, instead
|
||||
# of staying current (which is the more usual approach) then you may need to
|
||||
@@ -573,7 +575,7 @@ FIXED_NEVER_USERS=root
|
||||
@@ -576,7 +578,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.
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -618,15 +620,13 @@ FIXED_NEVER_USERS=root
|
||||
@@ -621,15 +623,13 @@ 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.
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -647,7 +647,7 @@ FIXED_NEVER_USERS=root
|
||||
@@ -650,7 +650,7 @@ FIXED_NEVER_USERS=root
|
||||
# one that is set in the headers_charset option. The default setting is
|
||||
# defined by this setting:
|
||||
|
||||
|
|
@ -162,7 +162,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# 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
|
||||
@@ -667,7 +667,7 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
@@ -670,7 +670,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
|
||||
#
|
||||
|
|
@ -171,7 +171,7 @@ index d576fd7..a3ffd48 100644
|
|||
#
|
||||
# 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()
|
||||
@@ -729,11 +729,11 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
@@ -732,11 +732,11 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
# leave these settings commented out.
|
||||
|
||||
# This setting is required for any TLS support (either OpenSSL or GnuTLS)
|
||||
|
|
@ -186,7 +186,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# 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.
|
||||
@@ -798,7 +798,7 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
@@ -801,7 +801,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.
|
||||
|
||||
|
|
@ -195,7 +195,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -811,7 +811,7 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
@@ -814,7 +814,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:
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# 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
|
||||
@@ -877,7 +877,7 @@ ZCAT_COMMAND=/usr/bin/zcat
|
||||
@@ -880,7 +880,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.
|
||||
|
||||
|
|
@ -213,7 +213,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -887,7 +887,7 @@ ZCAT_COMMAND=/usr/bin/zcat
|
||||
@@ -890,7 +890,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.
|
||||
|
||||
|
|
@ -222,7 +222,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -897,7 +897,7 @@ ZCAT_COMMAND=/usr/bin/zcat
|
||||
@@ -900,7 +900,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:
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# You probably need to add -lpam to EXTRALIBS, and in some releases of
|
||||
# GNU/Linux -ldl is also needed.
|
||||
@@ -965,7 +965,7 @@ ZCAT_COMMAND=/usr/bin/zcat
|
||||
@@ -968,7 +968,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.
|
||||
|
||||
|
|
@ -240,7 +240,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -978,9 +978,9 @@ ZCAT_COMMAND=/usr/bin/zcat
|
||||
@@ -981,9 +981,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:
|
||||
#
|
||||
|
|
@ -253,7 +253,7 @@ index d576fd7..a3ffd48 100644
|
|||
#
|
||||
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
|
||||
# as well.
|
||||
@@ -1032,7 +1032,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
|
||||
@@ -1035,7 +1035,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.
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
# 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
|
||||
@@ -1042,7 +1042,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
|
||||
@@ -1045,7 +1045,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases
|
||||
#------------------------------------------------------------------------------
|
||||
# Uncomment this setting to include IPv6 support.
|
||||
|
||||
|
|
@ -271,7 +271,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
###############################################################################
|
||||
# THINGS YOU ALMOST NEVER NEED TO MENTION #
|
||||
@@ -1063,13 +1063,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
|
||||
@@ -1066,13 +1066,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.
|
||||
|
||||
|
|
@ -292,7 +292,7 @@ index d576fd7..a3ffd48 100644
|
|||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -1269,7 +1269,7 @@ TMPDIR="/tmp"
|
||||
@@ -1272,7 +1272,7 @@ 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:
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/EDITME b/src/EDITME
|
||||
index a3ffd48..c186529 100644
|
||||
index b4c60cb..5f95c89 100644
|
||||
--- a/src/EDITME
|
||||
+++ b/src/EDITME
|
||||
@@ -783,6 +783,20 @@ TLS_LIBS=-lssl -lcrypto
|
||||
@@ -786,6 +786,20 @@ TLS_LIBS=-lssl -lcrypto
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
|
@ -24,7 +24,7 @@ index a3ffd48..c186529 100644
|
|||
# documentation. Other forms are available separately. If you want to install
|
||||
# the documentation in "info" format, first fetch the Texinfo documentation
|
||||
diff --git a/src/config.h.defaults b/src/config.h.defaults
|
||||
index ba4615c..878e687 100644
|
||||
index a0997a0..9dd84f8 100644
|
||||
--- a/src/config.h.defaults
|
||||
+++ b/src/config.h.defaults
|
||||
@@ -27,6 +27,8 @@ it's a default value. */
|
||||
|
|
@ -37,10 +37,10 @@ index ba4615c..878e687 100644
|
|||
|
||||
#define CONFIGURE_FILE
|
||||
diff --git a/src/globals.c b/src/globals.c
|
||||
index d3f9987..c01d430 100644
|
||||
index fb705d9..efee424 100644
|
||||
--- a/src/globals.c
|
||||
+++ b/src/globals.c
|
||||
@@ -162,6 +162,10 @@ uschar *tls_verify_certificates= NULL;
|
||||
@@ -170,6 +170,10 @@ uschar *tls_verify_certificates= NULL;
|
||||
uschar *tls_verify_hosts = NULL;
|
||||
#endif
|
||||
|
||||
|
|
@ -52,10 +52,10 @@ index d3f9987..c01d430 100644
|
|||
/* Per Recipient Data Response variables */
|
||||
BOOL prdr_enable = FALSE;
|
||||
diff --git a/src/globals.h b/src/globals.h
|
||||
index 2bedcf5..6085955 100644
|
||||
index f4baa0b..729426c 100644
|
||||
--- a/src/globals.h
|
||||
+++ b/src/globals.h
|
||||
@@ -126,6 +126,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */
|
||||
@@ -130,6 +130,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */
|
||||
extern uschar *tls_verify_hosts; /* Mandatory client verification */
|
||||
#endif
|
||||
|
||||
|
|
@ -250,10 +250,10 @@ index 3500047..8599172 100644
|
|||
+
|
||||
/* End of local_scan.c */
|
||||
diff --git a/src/readconf.c b/src/readconf.c
|
||||
index adb538c..d378b3a 100644
|
||||
index 40af940..81be47f 100644
|
||||
--- a/src/readconf.c
|
||||
+++ b/src/readconf.c
|
||||
@@ -290,6 +290,9 @@ static optionlist optionlist_config[] = {
|
||||
@@ -293,6 +293,9 @@ static optionlist optionlist_config[] = {
|
||||
{ "local_from_prefix", opt_stringptr, &local_from_prefix },
|
||||
{ "local_from_suffix", opt_stringptr, &local_from_suffix },
|
||||
{ "local_interfaces", opt_stringptr, &local_interfaces },
|
||||
13
exim.spec
13
exim.spec
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
Summary: The exim mail transfer agent
|
||||
Name: exim
|
||||
Version: 4.84
|
||||
Release: 4%{?dist}
|
||||
Version: 4.85
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Url: http://www.exim.org/
|
||||
Group: System Environment/Daemons
|
||||
|
|
@ -53,12 +53,12 @@ Source26: clamd.exim.service
|
|||
%endif
|
||||
|
||||
Patch4: exim-rhl.patch
|
||||
Patch6: exim-4.83-config.patch
|
||||
Patch6: exim-4.85-config.patch
|
||||
Patch8: exim-4.82-libdir.patch
|
||||
Patch12: exim-4.82-cyrus.patch
|
||||
Patch13: exim-4.82-pamconfig.patch
|
||||
Patch14: exim-4.83-spamdconf.patch
|
||||
Patch18: exim-4.84-dlopen-localscan.patch
|
||||
Patch18: exim-4.85-dlopen-localscan.patch
|
||||
Patch19: exim-4.82-procmail.patch
|
||||
Patch20: exim-4.82-allow-filter.patch
|
||||
Patch21: exim-4.82-localhost-is-local.patch
|
||||
|
|
@ -611,6 +611,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
|
|||
%{_sysconfdir}/cron.daily/greylist-tidy.sh
|
||||
|
||||
%changelog
|
||||
* Tue Jan 13 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 4.85-1
|
||||
- New version
|
||||
Resolves: rhbz#1181479
|
||||
- De-fuzzified config and dlopen-localscan patches
|
||||
|
||||
* Fri Oct 10 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 4.84-4
|
||||
- Do not override LFLAGS (problem reported by Todd Lyons)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue