From 2ca260ba158e5444e5295048f09bd23af7fe4b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2015 17:55:59 +0100 Subject: [PATCH 01/19] New version Resolves: rhbz#1181479 - De-fuzzified config and dlopen-localscan patches --- ....83-config.patch => exim-4.85-config.patch | 34 +++++++++---------- ....patch => exim-4.85-dlopen-localscan.patch | 18 +++++----- exim.spec | 13 ++++--- sources | 2 +- 4 files changed, 36 insertions(+), 31 deletions(-) rename exim-4.83-config.patch => exim-4.85-config.patch (92%) rename exim-4.84-dlopen-localscan.patch => exim-4.85-dlopen-localscan.patch (95%) diff --git a/exim-4.83-config.patch b/exim-4.85-config.patch similarity index 92% rename from exim-4.83-config.patch rename to exim-4.85-config.patch index 252e00a..020f17a 100644 --- a/exim-4.83-config.patch +++ b/exim-4.85-config.patch @@ -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: diff --git a/exim-4.84-dlopen-localscan.patch b/exim-4.85-dlopen-localscan.patch similarity index 95% rename from exim-4.84-dlopen-localscan.patch rename to exim-4.85-dlopen-localscan.patch index 09854e0..384dde0 100644 --- a/exim-4.84-dlopen-localscan.patch +++ b/exim-4.85-dlopen-localscan.patch @@ -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 }, diff --git a/exim.spec b/exim.spec index 00d982a..8a2b612 100644 --- a/exim.spec +++ b/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 - 4.85-1 +- New version + Resolves: rhbz#1181479 +- De-fuzzified config and dlopen-localscan patches + * Fri Oct 10 2014 Jaroslav Škarvada - 4.84-4 - Do not override LFLAGS (problem reported by Todd Lyons) diff --git a/sources b/sources index 9c4f21d..e66e025 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d14522e604b687b9e515f5aa739b2c0 exim-4.84.tar.bz2 +ebae28762b6f125726283dc9434e8709 exim-4.85.tar.bz2 From b0e7a3ba8e4a1f9adfadf10e04ab4f5f7e6037b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 Feb 2015 18:24:07 +0100 Subject: [PATCH 02/19] Workaround for PIC compilation problem with gcc-5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Resolves: rhbz#1190784 Signed-off-by: Jaroslav Škarvada --- exim-4.85-pic.patch | 13 +++++++++++++ exim.spec | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 exim-4.85-pic.patch diff --git a/exim-4.85-pic.patch b/exim-4.85-pic.patch new file mode 100644 index 0000000..d61edba --- /dev/null +++ b/exim-4.85-pic.patch @@ -0,0 +1,13 @@ +diff --git a/src/lookups/Makefile b/src/lookups/Makefile +index 6ba0cb1..21a7ad7 100644 +--- a/src/lookups/Makefile ++++ b/src/lookups/Makefile +@@ -22,7 +22,7 @@ lookups.a: $(OBJ) + $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $*.c + + .c.so:; @echo "$(CC) -shared $*.c" +- $(FE)$(CC) $(LOOKUP_$*_INCLUDE) $(LOOKUP_$*_LIBS) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) $*.c -o $@ ++ $(FE)$(CC) $(LOOKUP_$*_INCLUDE) $(LOOKUP_$*_LIBS) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) $(PIC) $*.c -o $@ + + lf_check_file.o: $(PHDRS) lf_check_file.c lf_functions.h + lf_quote.o: $(PHDRS) lf_quote.c lf_functions.h diff --git a/exim.spec b/exim.spec index 8a2b612..0e61cc4 100644 --- a/exim.spec +++ b/exim.spec @@ -15,7 +15,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.85 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -65,6 +65,8 @@ Patch21: exim-4.82-localhost-is-local.patch Patch22: exim-4.82-greylist-conf.patch Patch23: exim-4.82-smarthost-config.patch Patch25: exim-4.82-dynlookup-config.patch +# Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 +Patch26: exim-4.85-pic.patch Requires: /etc/pki/tls/certs /etc/pki/tls/private Requires: /etc/aliases @@ -221,6 +223,7 @@ greylisting unconditional. %patch22 -p1 -b .grey %patch23 -p1 -b .smarthost %patch25 -p1 -b .dynconfig +%patch26 -p1 -b .fpic cp src/EDITME Local/Makefile sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile @@ -231,8 +234,10 @@ cp exim_monitor/EDITME Local/eximon.conf %build %ifnarch s390 s390x sparc sparcv9 sparcv9v sparc64 sparc64v export PIE=-fpie + export PIC=-fpic %else export PIE=-fPIE + export PIC=-fPIC %endif make _lib=%{_lib} FULLECHO= @@ -611,6 +616,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Tue Feb 10 2015 Jaroslav Škarvada - 4.85-2 +- Shared objects are now compiled with PIC, not PIE, which is needed for gcc-5, + (by pic patch) + Resolves: rhbz#1190784 + * Tue Jan 13 2015 Jaroslav Škarvada - 4.85-1 - New version Resolves: rhbz#1181479 From e21b21c36962b7bc9cd15dede0a849e5cf92c701 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 10 Mar 2015 14:25:18 -0400 Subject: [PATCH 03/19] Drop sysvinit subpackages for F23+ --- exim.spec | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index 0e61cc4..78cf947 100644 --- a/exim.spec +++ b/exim.spec @@ -15,7 +15,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.85 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -26,7 +26,9 @@ Requires(preun): %{_sbindir}/alternatives systemd Requires(postun): %{_sbindir}/alternatives systemd Requires(pre): %{_sbindir}/groupadd, %{_sbindir}/useradd %if %{with clamav} +%if 0%{?fedora} < 23 Requires: initscripts +%endif BuildRequires: clamav-devel %endif Source: ftp://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2 @@ -91,6 +93,7 @@ routed, and there are extensive facilities for checking incoming mail. Exim can be installed in place of sendmail, although the configuration of exim is quite different to that of sendmail. +%if 0%{?fedora} < 23 %package sysvinit Summary: SysV initscript for Exim Group: System Environment/Daemons @@ -101,6 +104,7 @@ Requires(post): chkconfig %description sysvinit This package contains the SysV initscript for Exim. +%endif %package mysql Summary: MySQL lookup support for Exim @@ -166,6 +170,7 @@ For further details of Exim content scanning, see chapter 41 of the Exim specification: http://www.exim.org/exim-html-%{version}/doc/html/spec_html/ch41.html +%if 0%{?fedora} < 23 %package clamav-sysvinit Summary: SysV initscript for Clam Antivirus scanner for Exim Group: System Environment/Daemons @@ -177,6 +182,7 @@ Requires(post): chkconfig %description clamav-sysvinit This package contains the SysV initscript. %endif +%endif %package greylist Summary: Example configuration for greylisting using Exim @@ -312,8 +318,10 @@ pod2man --center=EXIM --section=8 \ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/exim +%if 0%{?fedora} < 23 mkdir -p $RPM_BUILD_ROOT%{_initrddir} install %SOURCE2 $RPM_BUILD_ROOT%{_initrddir}/exim +%endif # Systemd mkdir -p %{buildroot}%{_unitdir} @@ -364,7 +372,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d clamsubst clamd.conf %{_sysconfdir}/clamd.d/exim.conf exim exim \ 's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive\)$\)!\1!;s!^Example!#Example!;' +%if 0%{?fedora} < 23 clamsubst clamd.init %{_initrddir}/clamd.exim exim exim '' +%endif clamsubst clamd.logrotate %{_sysconfdir}/logrotate.d/clamd.exim exim exim '' cat < $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.exim CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' @@ -438,6 +448,7 @@ fi /sbin/chkconfig --del exim >/dev/null 2>&1 || : /bin/systemctl try-restart exim.service >/dev/null 2>&1 || : +%if 0%{?fedora} < 23 %triggerpostun -n exim-sysvinit -- exim < %{sysv2systemdnvr} /sbin/chkconfig --add exim >/dev/null 2>&1 || : @@ -452,6 +463,7 @@ fi %postun sysvinit [ "$1" -ge "1" ] && %{_initrddir}/exim condrestart >/dev/null 2>&1 ||: +%endif %post greylist if [ ! -r %{_var}/spool/exim/db/greylist.db ]; then @@ -524,9 +536,11 @@ fi %ghost %{_sysconfdir}/pam.d/smtp %ghost %{_mandir}/man1/mailq.1.gz +%if 0%{?fedora} < 23 %files sysvinit %defattr(-,root,root,-) %{_initrddir}/exim +%endif %files mysql %defattr(-,root,root,-) @@ -579,6 +593,7 @@ fi /sbin/chkconfig --del clamd.exim >/dev/null 2>&1 || : /bin/systemctl try-restart clamd.exim.service >/dev/null 2>&1 || : +%if 0%{?fedora} < 23 %triggerpostun -n exim-clamav-sysvinit -- exim < %{sysv2systemdnvr} /sbin/chkconfig --add clamd.exim >/dev/null 2>&1 ||: @@ -591,6 +606,7 @@ test "$1" != 0 || /sbin/chkconfig --del clamd.exim >/dev/null 2>&1 || : %postun clamav-sysvinit test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : +%endif %files clamav %defattr(-,root,root,-) @@ -603,10 +619,12 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %ghost %attr(0750,exim,exim) %dir %{_var}/run/clamd.exim %ghost %attr(0644,exim,exim) %{_var}/log/clamd.exim +%if 0%{?fedora} < 23 %files clamav-sysvinit %defattr(-,root,root,-) %attr(0755,root,root) %config %{_initrddir}/clamd.exim %endif +%endif %files greylist %defattr(-,root,root,-) @@ -616,6 +634,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Tue Mar 10 2015 Adam Jackson 4.85-3 +- Drop sysvinit subpackages for F23+ + * Tue Feb 10 2015 Jaroslav Škarvada - 4.85-2 - Shared objects are now compiled with PIC, not PIE, which is needed for gcc-5, (by pic patch) From cf1b3d9a90ccafc1234d5e8646bf83861ed3097e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 13:21:29 +0200 Subject: [PATCH 04/19] Perl 5.22 rebuild --- exim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index 78cf947..36e26f4 100644 --- a/exim.spec +++ b/exim.spec @@ -15,7 +15,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.85 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -634,6 +634,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Wed Jun 03 2015 Jitka Plesnikova - 4.85-4 +- Perl 5.22 rebuild + * Tue Mar 10 2015 Adam Jackson 4.85-3 - Drop sysvinit subpackages for F23+ From e30dd5b6f915626ef2710f4b8f8cf64ec746f018 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:52:12 +0000 Subject: [PATCH 05/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- exim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index 36e26f4..96d7b0a 100644 --- a/exim.spec +++ b/exim.spec @@ -15,7 +15,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.85 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -634,6 +634,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 4.85-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jitka Plesnikova - 4.85-4 - Perl 5.22 rebuild From 1329eeaea1bbf7bc39cdff4f199b52db13d245ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 27 Jul 2015 14:43:48 +0200 Subject: [PATCH 06/19] New version Resolves: rhbz#1246923 - Updated and defuzzified patches --- ...lter.patch => exim-4.86-allow-filter.patch | 4 +-- ....85-config.patch => exim-4.86-config.patch | 36 ++++++++++--------- ...-4.82-cyrus.patch => exim-4.86-cyrus.patch | 4 +-- ....patch => exim-4.86-dlopen-localscan.patch | 22 ++++++------ ...onf.patch => exim-4.86-greylist-conf.patch | 14 ++++---- ...mconfig.patch => exim-4.86-pamconfig.patch | 10 +++--- ...procmail.patch => exim-4.86-procmail.patch | 6 ++-- exim-rhl.patch => exim-4.86-rhl.patch | 6 ++-- ....patch => exim-4.86-smarthost-config.patch | 8 ++--- ...amdconf.patch => exim-4.86-spamdconf.patch | 26 +++++++------- exim.spec | 29 ++++++++------- sources | 2 +- 12 files changed, 87 insertions(+), 80 deletions(-) rename exim-4.82-allow-filter.patch => exim-4.86-allow-filter.patch (81%) rename exim-4.85-config.patch => exim-4.86-config.patch (92%) rename exim-4.82-cyrus.patch => exim-4.86-cyrus.patch (90%) rename exim-4.85-dlopen-localscan.patch => exim-4.86-dlopen-localscan.patch (94%) rename exim-4.82-greylist-conf.patch => exim-4.86-greylist-conf.patch (94%) rename exim-4.82-pamconfig.patch => exim-4.86-pamconfig.patch (91%) rename exim-4.82-procmail.patch => exim-4.86-procmail.patch (89%) rename exim-rhl.patch => exim-4.86-rhl.patch (84%) rename exim-4.82-smarthost-config.patch => exim-4.86-smarthost-config.patch (91%) rename exim-4.83-spamdconf.patch => exim-4.86-spamdconf.patch (97%) diff --git a/exim-4.82-allow-filter.patch b/exim-4.86-allow-filter.patch similarity index 81% rename from exim-4.82-allow-filter.patch rename to exim-4.86-allow-filter.patch index 5772252..ed83b69 100644 --- a/exim-4.82-allow-filter.patch +++ b/exim-4.86-allow-filter.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 37a6a00..52e0536 100644 +index 96ffe56..843edd2 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -684,7 +684,7 @@ userforward: +@@ -699,7 +699,7 @@ userforward: # local_part_suffix = +* : -* # local_part_suffix_optional file = $home/.forward diff --git a/exim-4.85-config.patch b/exim-4.86-config.patch similarity index 92% rename from exim-4.85-config.patch rename to exim-4.86-config.patch index 020f17a..26a3059 100644 --- a/exim-4.85-config.patch +++ b/exim-4.86-config.patch @@ -12,7 +12,7 @@ index eeb26ee..9cb6385 100755 echo "" >>$mft cat $mftt >> $mft diff --git a/src/EDITME b/src/EDITME -index 4a290a4..b4c60cb 100644 +index d481122..9372675 100644 --- a/src/EDITME +++ b/src/EDITME @@ -98,7 +98,7 @@ @@ -121,7 +121,7 @@ index 4a290a4..b4c60cb 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 -@@ -576,7 +578,7 @@ FIXED_NEVER_USERS=root +@@ -583,7 +585,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 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -621,15 +623,13 @@ FIXED_NEVER_USERS=root +@@ -628,16 +630,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. @@ -143,6 +143,7 @@ index 4a290a4..b4c60cb 100644 -# 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 @@ -150,10 +151,11 @@ index 4a290a4..b4c60cb 100644 +AUTH_GSASL_PC=libgsasl +AUTH_PLAINTEXT=yes +AUTH_SPA=yes ++AUTH_TLS=yes #------------------------------------------------------------------------------ -@@ -650,7 +650,7 @@ FIXED_NEVER_USERS=root +@@ -658,7 +658,7 @@ FIXED_NEVER_USERS=root # one that is set in the headers_charset option. The default setting is # defined by this setting: @@ -162,7 +164,7 @@ index 4a290a4..b4c60cb 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 -@@ -670,7 +670,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -678,7 +678,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 +173,7 @@ index 4a290a4..b4c60cb 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() -@@ -732,11 +732,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -740,11 +740,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 +188,7 @@ index 4a290a4..b4c60cb 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. -@@ -801,7 +801,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -809,7 +809,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 +197,7 @@ index 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -814,7 +814,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -822,7 +822,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 +206,7 @@ index 4a290a4..b4c60cb 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 -@@ -880,7 +880,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -894,7 +894,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 +215,7 @@ index 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -890,7 +890,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -904,7 +904,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 +224,7 @@ index 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -900,7 +900,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -914,7 +914,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 +233,7 @@ index 4a290a4..b4c60cb 100644 # You probably need to add -lpam to EXTRALIBS, and in some releases of # GNU/Linux -ldl is also needed. -@@ -968,7 +968,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -982,7 +982,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 +242,7 @@ index 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -981,9 +981,9 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -995,9 +995,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 +255,7 @@ index 4a290a4..b4c60cb 100644 # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1035,7 +1035,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1049,7 +1049,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 +264,7 @@ index 4a290a4..b4c60cb 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 -@@ -1045,7 +1045,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1059,7 +1059,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -271,7 +273,7 @@ index 4a290a4..b4c60cb 100644 ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1066,13 +1066,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1080,13 +1080,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 +294,7 @@ index 4a290a4..b4c60cb 100644 #------------------------------------------------------------------------------ -@@ -1272,7 +1272,7 @@ TMPDIR="/tmp" +@@ -1286,7 +1286,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: diff --git a/exim-4.82-cyrus.patch b/exim-4.86-cyrus.patch similarity index 90% rename from exim-4.82-cyrus.patch rename to exim-4.86-cyrus.patch index e4978da..07f3407 100644 --- a/exim-4.82-cyrus.patch +++ b/exim-4.86-cyrus.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index b631a4d..153c77b 100644 +index 97e9053..5393ca3 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -721,6 +721,16 @@ address_reply: +@@ -736,6 +736,16 @@ address_reply: driver = autoreply diff --git a/exim-4.85-dlopen-localscan.patch b/exim-4.86-dlopen-localscan.patch similarity index 94% rename from exim-4.85-dlopen-localscan.patch rename to exim-4.86-dlopen-localscan.patch index 384dde0..174d9ac 100644 --- a/exim-4.85-dlopen-localscan.patch +++ b/exim-4.86-dlopen-localscan.patch @@ -1,8 +1,8 @@ diff --git a/src/EDITME b/src/EDITME -index b4c60cb..5f95c89 100644 +index 9372675..813dd41 100644 --- a/src/EDITME +++ b/src/EDITME -@@ -786,6 +786,20 @@ TLS_LIBS=-lssl -lcrypto +@@ -794,6 +794,20 @@ TLS_LIBS=-lssl -lcrypto #------------------------------------------------------------------------------ @@ -24,10 +24,10 @@ index b4c60cb..5f95c89 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 a0997a0..9dd84f8 100644 +index c33e098..6983a83 100644 --- a/src/config.h.defaults +++ b/src/config.h.defaults -@@ -27,6 +27,8 @@ it's a default value. */ +@@ -28,6 +28,8 @@ it's a default value. */ #define AUTH_VARS 3 @@ -37,10 +37,10 @@ index a0997a0..9dd84f8 100644 #define CONFIGURE_FILE diff --git a/src/globals.c b/src/globals.c -index fb705d9..efee424 100644 +index 66baffe..3a35d01 100644 --- a/src/globals.c +++ b/src/globals.c -@@ -170,6 +170,10 @@ uschar *tls_verify_certificates= NULL; +@@ -169,6 +169,10 @@ uschar *tls_verify_certificates= US"system"; uschar *tls_verify_hosts = NULL; #endif @@ -52,10 +52,10 @@ index fb705d9..efee424 100644 /* Per Recipient Data Response variables */ BOOL prdr_enable = FALSE; diff --git a/src/globals.h b/src/globals.h -index f4baa0b..729426c 100644 +index ab03302..cb2db5a 100644 --- a/src/globals.h +++ b/src/globals.h -@@ -130,6 +130,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ +@@ -131,6 +131,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ extern uschar *tls_verify_hosts; /* Mandatory client verification */ #endif @@ -63,9 +63,9 @@ index f4baa0b..729426c 100644 +extern uschar *local_scan_path; /* Path to local_scan() library */ +#endif + - #ifdef EXPERIMENTAL_DSN extern uschar *dsn_envid; /* DSN envid string */ extern int dsn_ret; /* DSN ret type*/ + extern const pcre *regex_DSN; /* For recognizing DSN settings */ diff --git a/src/local_scan.c b/src/local_scan.c index 3500047..8599172 100644 --- a/src/local_scan.c @@ -250,10 +250,10 @@ index 3500047..8599172 100644 + /* End of local_scan.c */ diff --git a/src/readconf.c b/src/readconf.c -index 40af940..81be47f 100644 +index 8a62d02..69c8c89 100644 --- a/src/readconf.c +++ b/src/readconf.c -@@ -293,6 +293,9 @@ static optionlist optionlist_config[] = { +@@ -295,6 +295,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 }, diff --git a/exim-4.82-greylist-conf.patch b/exim-4.86-greylist-conf.patch similarity index 94% rename from exim-4.82-greylist-conf.patch rename to exim-4.86-greylist-conf.patch index eac3cbc..fc20587 100644 --- a/exim-4.82-greylist-conf.patch +++ b/exim-4.86-greylist-conf.patch @@ -1,5 +1,5 @@ diff --git a/src/configure.default b/src/configure.default -index 3728043..0126880 100644 +index 915806e..8b1f3bf 100644 --- a/src/configure.default +++ b/src/configure.default @@ -106,6 +106,7 @@ hostlist relay_from_hosts = localhost @@ -10,7 +10,7 @@ index 3728043..0126880 100644 acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data acl_smtp_mime = acl_check_mime -@@ -340,6 +341,29 @@ timeout_frozen_after = 7d +@@ -355,6 +356,29 @@ timeout_frozen_after = 7d begin acl @@ -40,7 +40,7 @@ index 3728043..0126880 100644 # This access control list is used for every RCPT command in an incoming # SMTP message. The tests are run in order until the address is either # accepted or denied. -@@ -460,7 +484,8 @@ acl_check_rcpt: +@@ -475,7 +499,8 @@ acl_check_rcpt: # There are no default checks on DNS black lists because the domains that # contain these lists are changing all the time. However, here are two # examples of how you can get Exim to perform a DNS black list lookup at this @@ -50,7 +50,7 @@ index 3728043..0126880 100644 # # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # dnslists = black.list.example -@@ -468,6 +493,10 @@ acl_check_rcpt: +@@ -483,6 +508,10 @@ acl_check_rcpt: # warn dnslists = black.list.example # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # log_message = found in $dnslist_domain @@ -61,7 +61,7 @@ index 3728043..0126880 100644 ############################################################################# ############################################################################# -@@ -481,6 +510,10 @@ acl_check_rcpt: +@@ -496,6 +525,10 @@ acl_check_rcpt: # require verify = csa ############################################################################# @@ -72,7 +72,7 @@ index 3728043..0126880 100644 # At this point, the address has passed all the checks that have been # configured, so we accept it unconditionally. -@@ -506,6 +539,12 @@ acl_check_data: +@@ -521,6 +554,12 @@ acl_check_data: # deny condition = ${if !def:h_Message-ID: {1}} # message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\ # Most messages without it are spam, so your mail has been rejected. @@ -85,7 +85,7 @@ index 3728043..0126880 100644 # Deny if the message contains a virus. Before enabling this check, you # must install a virus scanner and set the av_scanner option above. -@@ -540,8 +579,30 @@ acl_check_data: +@@ -555,8 +594,30 @@ acl_check_data: # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # $spam_report diff --git a/exim-4.82-pamconfig.patch b/exim-4.86-pamconfig.patch similarity index 91% rename from exim-4.82-pamconfig.patch rename to exim-4.86-pamconfig.patch index 3906975..51691ca 100644 --- a/exim-4.82-pamconfig.patch +++ b/exim-4.86-pamconfig.patch @@ -1,5 +1,5 @@ diff --git a/src/configure.default b/src/configure.default -index 153c77b..38f0f56 100644 +index 5393ca3..dae5a54 100644 --- a/src/configure.default +++ b/src/configure.default @@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data @@ -56,9 +56,9 @@ index 153c77b..38f0f56 100644 +# +auth_advertise_hosts = - # The settings below, which are actually the same as the defaults in the - # code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP -@@ -800,7 +818,7 @@ begin authenticators + # The settings below cause Exim to make RFC 1413 (ident) callbacks + # for all incoming SMTP calls. You can limit the hosts to which these +@@ -815,7 +833,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth2 # server_prompts = : @@ -67,7 +67,7 @@ index 153c77b..38f0f56 100644 # server_advertise_condition = ${if def:tls_in_cipher } # LOGIN authentication has traditional prompts and responses. There is no -@@ -812,7 +830,7 @@ begin authenticators +@@ -827,7 +845,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth1 # server_prompts = <| Username: | Password: diff --git a/exim-4.82-procmail.patch b/exim-4.86-procmail.patch similarity index 89% rename from exim-4.82-procmail.patch rename to exim-4.86-procmail.patch index 06e6e46..a995d1f 100644 --- a/exim-4.82-procmail.patch +++ b/exim-4.86-procmail.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 8b599d2..37a6a00 100644 +index 5250b58..96ffe56 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -692,6 +692,12 @@ userforward: +@@ -707,6 +707,12 @@ userforward: pipe_transport = address_pipe reply_transport = address_reply @@ -15,7 +15,7 @@ index 8b599d2..37a6a00 100644 # This router matches local user mailboxes. If the router fails, the error # message is "Unknown user". -@@ -729,6 +735,16 @@ begin transports +@@ -744,6 +750,16 @@ begin transports remote_smtp: driver = smtp diff --git a/exim-rhl.patch b/exim-4.86-rhl.patch similarity index 84% rename from exim-rhl.patch rename to exim-4.86-rhl.patch index c91b528..33bb25e 100644 --- a/exim-rhl.patch +++ b/exim-4.86-rhl.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 1274349..b631a4d 100644 +index 3223bff..97e9053 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -590,7 +590,7 @@ system_aliases: +@@ -605,7 +605,7 @@ system_aliases: driver = redirect allow_fail allow_defer @@ -11,7 +11,7 @@ index 1274349..b631a4d 100644 # user = exim file_transport = address_file pipe_transport = address_pipe -@@ -687,8 +687,8 @@ local_delivery: +@@ -702,8 +702,8 @@ local_delivery: delivery_date_add envelope_to_add return_path_add diff --git a/exim-4.82-smarthost-config.patch b/exim-4.86-smarthost-config.patch similarity index 91% rename from exim-4.82-smarthost-config.patch rename to exim-4.86-smarthost-config.patch index 89254b1..f119de0 100644 --- a/exim-4.82-smarthost-config.patch +++ b/exim-4.86-smarthost-config.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 0126880..b7c30ac 100644 +index 8b1f3bf..b2c8046 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -796,6 +796,15 @@ begin transports +@@ -811,6 +811,15 @@ begin transports remote_smtp: driver = smtp @@ -18,7 +18,7 @@ index 0126880..b7c30ac 100644 # This transport invokes procmail to deliver mail procmail: driver = pipe -@@ -904,6 +913,21 @@ begin rewrite +@@ -919,6 +928,21 @@ begin rewrite # AUTHENTICATION CONFIGURATION # ###################################################################### @@ -40,7 +40,7 @@ index 0126880..b7c30ac 100644 # The following authenticators support plaintext username/password # authentication using the standard PLAIN mechanism and the traditional # but non-standard LOGIN mechanism, with Exim acting as the server. -@@ -919,7 +943,7 @@ begin rewrite +@@ -934,7 +958,7 @@ begin rewrite # The default RCPT ACL checks for successful authentication, and will accept # messages from authenticated users from anywhere on the Internet. diff --git a/exim-4.83-spamdconf.patch b/exim-4.86-spamdconf.patch similarity index 97% rename from exim-4.83-spamdconf.patch rename to exim-4.86-spamdconf.patch index b931f11..f65b24f 100644 --- a/exim-4.83-spamdconf.patch +++ b/exim-4.86-spamdconf.patch @@ -1,5 +1,5 @@ diff --git a/src/configure.default b/src/configure.default -index 38f0f56..8b599d2 100644 +index dae5a54..5250b58 100644 --- a/src/configure.default +++ b/src/configure.default @@ -108,6 +108,7 @@ hostlist relay_from_hosts = localhost @@ -19,7 +19,7 @@ index 38f0f56..8b599d2 100644 # For spam scanning, there is a similar option that defines the interface to -@@ -403,7 +404,8 @@ acl_check_rcpt: +@@ -418,7 +419,8 @@ acl_check_rcpt: accept local_parts = postmaster domains = +local_domains @@ -29,7 +29,7 @@ index 38f0f56..8b599d2 100644 require verify = sender -@@ -495,27 +497,63 @@ acl_check_rcpt: +@@ -510,27 +512,63 @@ acl_check_rcpt: acl_check_data: @@ -53,10 +53,16 @@ index 38f0f56..8b599d2 100644 - # 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 + # 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. @@ -66,19 +72,13 @@ index 38f0f56..8b599d2 100644 + # + # accept condition = ${if !def:spam_score_int {1}} + # add_header = X-Spam-Note: SpamAssassin invocation failed - # -- # 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 ++ # + + # Unconditionally add score and report headers + # + # 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.spec b/exim.spec index 96d7b0a..6ca0e4a 100644 --- a/exim.spec +++ b/exim.spec @@ -14,8 +14,8 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.85 -Release: 5%{?dist} +Version: 4.86 +Release: 1%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -54,18 +54,18 @@ Source25: exim-gen-cert Source26: clamd.exim.service %endif -Patch4: exim-rhl.patch -Patch6: exim-4.85-config.patch +Patch4: exim-4.86-rhl.patch +Patch6: exim-4.86-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.85-dlopen-localscan.patch -Patch19: exim-4.82-procmail.patch -Patch20: exim-4.82-allow-filter.patch +Patch12: exim-4.86-cyrus.patch +Patch13: exim-4.86-pamconfig.patch +Patch14: exim-4.86-spamdconf.patch +Patch18: exim-4.86-dlopen-localscan.patch +Patch19: exim-4.86-procmail.patch +Patch20: exim-4.86-allow-filter.patch Patch21: exim-4.82-localhost-is-local.patch -Patch22: exim-4.82-greylist-conf.patch -Patch23: exim-4.82-smarthost-config.patch +Patch22: exim-4.86-greylist-conf.patch +Patch23: exim-4.86-smarthost-config.patch Patch25: exim-4.82-dynlookup-config.patch # Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Patch26: exim-4.85-pic.patch @@ -634,6 +634,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Mon Jul 27 2015 Jaroslav Škarvada - 4.86-1 +- New version + Resolves: rhbz#1246923 +- Updated and defuzzified patches + * Wed Jun 17 2015 Fedora Release Engineering - 4.85-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e66e025..2df38dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebae28762b6f125726283dc9434e8709 exim-4.85.tar.bz2 +797f248ef3e0c0e2f178e915f88fc4e9 exim-4.86.tar.bz2 From d8c6103723160634ae304cd0297823407a1d8bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 18 Sep 2015 18:14:55 +0200 Subject: [PATCH 07/19] Hardened build, rebuilt with the full RELRO (only the daemon) --- exim.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/exim.spec b/exim.spec index 6ca0e4a..edf66f6 100644 --- a/exim.spec +++ b/exim.spec @@ -12,10 +12,13 @@ %global sysv2systemdnvr 4.76-6 +# hardened build if not overridden +%{!?_hardened_build:%global _hardened_build 1} + Summary: The exim mail transfer agent Name: exim Version: 4.86 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -245,7 +248,7 @@ cp exim_monitor/EDITME Local/eximon.conf export PIE=-fPIE export PIC=-fPIC %endif -make _lib=%{_lib} FULLECHO= +make _lib=%{_lib} FULLECHO= LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-pie -Wl,-z,relro,-z,now}" %if %{with sa} # build sa-exim @@ -634,6 +637,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Fri Sep 18 2015 Jaroslav Škarvada - 4.86-2 +- Hardened build, rebuilt with the full RELRO (only the daemon) + * Mon Jul 27 2015 Jaroslav Škarvada - 4.86-1 - New version Resolves: rhbz#1246923 From 6ec502e3715c7864a0fc5de3988479dfc6f1fdd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Nov 2015 18:09:41 +0100 Subject: [PATCH 08/19] Fixed exim-gen-cert not to output error on success --- exim-gen-cert | 4 ++-- exim.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/exim-gen-cert b/exim-gen-cert index 811efda..dbcd26e 100644 --- a/exim-gen-cert +++ b/exim-gen-cert @@ -22,11 +22,11 @@ ${FQDN} root@${FQDN} EOF if [ $? -eq 0 ]; then - success + echo success chown exim.exim /etc/pki/tls/{private,certs}/exim.pem chmod 600 /etc/pki/tls/{private,certs}/exim.pem else - failure + echo failure fi echo fi diff --git a/exim.spec b/exim.spec index edf66f6..4d2aa60 100644 --- a/exim.spec +++ b/exim.spec @@ -18,7 +18,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.86 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -637,6 +637,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Mon Nov 2 2015 Jaroslav Škarvada - 4.86-3 +- Fixed exim-gen-cert not to output error on success + * Fri Sep 18 2015 Jaroslav Škarvada - 4.86-2 - Hardened build, rebuilt with the full RELRO (only the daemon) From 5d0620373cea7303c178b9cee8eaf221ffc85dd0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:09:12 +0000 Subject: [PATCH 09/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- exim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index 4d2aa60..aee7a42 100644 --- a/exim.spec +++ b/exim.spec @@ -18,7 +18,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.86 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -637,6 +637,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 4.86-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Nov 2 2015 Jaroslav Škarvada - 4.86-3 - Fixed exim-gen-cert not to output error on success From d7b60f90839b283bf4ac22057aead8e393909871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 3 Mar 2016 13:36:11 +0100 Subject: [PATCH 10/19] New version Resolves: rhbz#1314118 - Fixed local privilege escalation for set-uid root when using perl_startup Resolves: CVE-2016-1531 - Defuzzified patches --- ...scan.patch => exim-4.86.2-dlopen-localscan.patch | 8 ++++---- exim.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) rename exim-4.86-dlopen-localscan.patch => exim-4.86.2-dlopen-localscan.patch (98%) diff --git a/exim-4.86-dlopen-localscan.patch b/exim-4.86.2-dlopen-localscan.patch similarity index 98% rename from exim-4.86-dlopen-localscan.patch rename to exim-4.86.2-dlopen-localscan.patch index 174d9ac..b3ab1fc 100644 --- a/exim-4.86-dlopen-localscan.patch +++ b/exim-4.86.2-dlopen-localscan.patch @@ -37,7 +37,7 @@ index c33e098..6983a83 100644 #define CONFIGURE_FILE diff --git a/src/globals.c b/src/globals.c -index 66baffe..3a35d01 100644 +index 1dbc015..10fb3e4 100644 --- a/src/globals.c +++ b/src/globals.c @@ -169,6 +169,10 @@ uschar *tls_verify_certificates= US"system"; @@ -52,7 +52,7 @@ index 66baffe..3a35d01 100644 /* Per Recipient Data Response variables */ BOOL prdr_enable = FALSE; diff --git a/src/globals.h b/src/globals.h -index ab03302..cb2db5a 100644 +index f3e884b..7063d97 100644 --- a/src/globals.h +++ b/src/globals.h @@ -131,6 +131,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ @@ -250,10 +250,10 @@ index 3500047..8599172 100644 + /* End of local_scan.c */ diff --git a/src/readconf.c b/src/readconf.c -index 8a62d02..69c8c89 100644 +index 1de6bd7..d1e5142 100644 --- a/src/readconf.c +++ b/src/readconf.c -@@ -295,6 +295,9 @@ static optionlist optionlist_config[] = { +@@ -300,6 +300,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 }, diff --git a/exim.spec b/exim.spec index aee7a42..ec2dab6 100644 --- a/exim.spec +++ b/exim.spec @@ -17,8 +17,8 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.86 -Release: 4%{?dist} +Version: 4.86.2 +Release: 1%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -63,7 +63,7 @@ Patch8: exim-4.82-libdir.patch Patch12: exim-4.86-cyrus.patch Patch13: exim-4.86-pamconfig.patch Patch14: exim-4.86-spamdconf.patch -Patch18: exim-4.86-dlopen-localscan.patch +Patch18: exim-4.86.2-dlopen-localscan.patch Patch19: exim-4.86-procmail.patch Patch20: exim-4.86-allow-filter.patch Patch21: exim-4.82-localhost-is-local.patch @@ -637,6 +637,13 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Thu Mar 3 2016 Jaroslav Škarvada - 4.86.2-1 +- New version + Resolves: rhbz#1314118 +- Fixed local privilege escalation for set-uid root when using perl_startup + Resolves: CVE-2016-1531 +- Defuzzified patches + * Wed Feb 03 2016 Fedora Release Engineering - 4.86-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 2df38dc..6c84ef6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -797f248ef3e0c0e2f178e915f88fc4e9 exim-4.86.tar.bz2 +1443a4a88d6b78ad9b6a681c51437b55 exim-4.86.2.tar.bz2 From a4234ab10286486cd555ac63b19545f3ea4935bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 10 Apr 2016 23:30:22 +0200 Subject: [PATCH 11/19] New version Resolves: rhbz#1325557 --- ...lter.patch => exim-4.87-allow-filter.patch | 4 +- ....86-config.patch => exim-4.87-config.patch | 49 ++++++++++--------- ...-4.86-cyrus.patch => exim-4.87-cyrus.patch | 4 +- ....patch => exim-4.87-dlopen-localscan.patch | 27 +++++----- ....patch => exim-4.87-dynlookup-config.patch | 6 +-- ...onf.patch => exim-4.87-greylist-conf.patch | 16 +++--- ...atch => exim-4.87-localhost-is-local.patch | 4 +- ...mconfig.patch => exim-4.87-pamconfig.patch | 14 +++--- ...procmail.patch => exim-4.87-procmail.patch | 8 +-- exim-4.86-rhl.patch => exim-4.87-rhl.patch | 6 +-- ....patch => exim-4.87-smarthost-config.patch | 10 ++-- ...amdconf.patch => exim-4.87-spamdconf.patch | 14 +++--- exim.spec | 30 +++++++----- sources | 2 +- 14 files changed, 100 insertions(+), 94 deletions(-) rename exim-4.86-allow-filter.patch => exim-4.87-allow-filter.patch (81%) rename exim-4.86-config.patch => exim-4.87-config.patch (90%) rename exim-4.86-cyrus.patch => exim-4.87-cyrus.patch (90%) rename exim-4.86.2-dlopen-localscan.patch => exim-4.87-dlopen-localscan.patch (93%) rename exim-4.82-dynlookup-config.patch => exim-4.87-dynlookup-config.patch (86%) rename exim-4.86-greylist-conf.patch => exim-4.87-greylist-conf.patch (93%) rename exim-4.82-localhost-is-local.patch => exim-4.87-localhost-is-local.patch (90%) rename exim-4.86-pamconfig.patch => exim-4.87-pamconfig.patch (90%) rename exim-4.86-procmail.patch => exim-4.87-procmail.patch (83%) rename exim-4.86-rhl.patch => exim-4.87-rhl.patch (84%) rename exim-4.86-smarthost-config.patch => exim-4.87-smarthost-config.patch (88%) rename exim-4.86-spamdconf.patch => exim-4.87-spamdconf.patch (93%) diff --git a/exim-4.86-allow-filter.patch b/exim-4.87-allow-filter.patch similarity index 81% rename from exim-4.86-allow-filter.patch rename to exim-4.87-allow-filter.patch index ed83b69..c3a94f3 100644 --- a/exim-4.86-allow-filter.patch +++ b/exim-4.87-allow-filter.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 96ffe56..843edd2 100644 +index e4ca5b9..d1ce2f1 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -699,7 +699,7 @@ userforward: +@@ -722,7 +722,7 @@ userforward: # local_part_suffix = +* : -* # local_part_suffix_optional file = $home/.forward diff --git a/exim-4.86-config.patch b/exim-4.87-config.patch similarity index 90% rename from exim-4.86-config.patch rename to exim-4.87-config.patch index 26a3059..78bddc4 100644 --- a/exim-4.86-config.patch +++ b/exim-4.87-config.patch @@ -1,8 +1,8 @@ diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile -index eeb26ee..9cb6385 100755 +index 4aa7d76..3a5263c 100755 --- a/scripts/Configure-Makefile +++ b/scripts/Configure-Makefile -@@ -249,7 +249,7 @@ if [ "${EXIM_PERL}" != "" ] ; then +@@ -253,7 +253,7 @@ if [ "${EXIM_PERL}" != "" ] ; then mv $mft $mftt echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft @@ -12,7 +12,7 @@ index eeb26ee..9cb6385 100755 echo "" >>$mft cat $mftt >> $mft diff --git a/src/EDITME b/src/EDITME -index d481122..9372675 100644 +index d852103..bbb7527 100644 --- a/src/EDITME +++ b/src/EDITME @@ -98,7 +98,7 @@ @@ -73,7 +73,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -296,18 +296,20 @@ LOOKUP_DBM=yes +@@ -301,19 +301,21 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -96,15 +96,16 @@ index d481122..9372675 100644 # LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes --# LOOKUP_SQLITE=yes --# LOOKUP_SQLITE_PC=sqlite3 +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 -@@ -383,14 +385,14 @@ EXIM_MONITOR=eximon.bin +@@ -390,14 +392,14 @@ EXIM_MONITOR=eximon.bin # and the MIME ACL. Please read the documentation to learn more about these # features. @@ -119,9 +120,9 @@ index d481122..9372675 100644 -# WITH_OLD_DEMIME=yes +WITH_OLD_DEMIME=yes + #------------------------------------------------------------------------------ # 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 -@@ -583,7 +585,7 @@ FIXED_NEVER_USERS=root +@@ -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. @@ -130,7 +131,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -628,16 +630,14 @@ FIXED_NEVER_USERS=root +@@ -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. @@ -155,7 +156,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -658,7 +658,7 @@ FIXED_NEVER_USERS=root +@@ -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: @@ -164,7 +165,7 @@ index d481122..9372675 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 -@@ -678,7 +678,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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 # @@ -173,7 +174,7 @@ index d481122..9372675 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() -@@ -740,11 +740,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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) @@ -188,7 +189,7 @@ index d481122..9372675 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. -@@ -809,7 +809,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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. @@ -197,7 +198,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -822,7 +822,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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: @@ -206,7 +207,7 @@ index d481122..9372675 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 -@@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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. @@ -215,7 +216,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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. @@ -224,7 +225,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -914,7 +914,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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: @@ -233,7 +234,7 @@ index d481122..9372675 100644 # You probably need to add -lpam to EXTRALIBS, and in some releases of # GNU/Linux -ldl is also needed. -@@ -982,7 +982,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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. @@ -242,7 +243,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -995,9 +995,9 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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: # @@ -255,7 +256,7 @@ index d481122..9372675 100644 # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1049,7 +1049,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -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. @@ -264,7 +265,7 @@ index d481122..9372675 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 -@@ -1059,7 +1059,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1075,7 +1075,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -273,7 +274,7 @@ index d481122..9372675 100644 ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1080,13 +1080,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -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. @@ -294,7 +295,7 @@ index d481122..9372675 100644 #------------------------------------------------------------------------------ -@@ -1286,7 +1286,7 @@ TMPDIR="/tmp" +@@ -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: diff --git a/exim-4.86-cyrus.patch b/exim-4.87-cyrus.patch similarity index 90% rename from exim-4.86-cyrus.patch rename to exim-4.87-cyrus.patch index 07f3407..97f2710 100644 --- a/exim-4.86-cyrus.patch +++ b/exim-4.87-cyrus.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 97e9053..5393ca3 100644 +index 12ed1e0..0af6fb8 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -736,6 +736,16 @@ address_reply: +@@ -763,6 +763,16 @@ address_reply: driver = autoreply diff --git a/exim-4.86.2-dlopen-localscan.patch b/exim-4.87-dlopen-localscan.patch similarity index 93% rename from exim-4.86.2-dlopen-localscan.patch rename to exim-4.87-dlopen-localscan.patch index b3ab1fc..6712860 100644 --- a/exim-4.86.2-dlopen-localscan.patch +++ b/exim-4.87-dlopen-localscan.patch @@ -1,8 +1,8 @@ diff --git a/src/EDITME b/src/EDITME -index 9372675..813dd41 100644 +index bbb7527..df3dcc8 100644 --- a/src/EDITME +++ b/src/EDITME -@@ -794,6 +794,20 @@ TLS_LIBS=-lssl -lcrypto +@@ -784,6 +784,20 @@ TLS_LIBS=-lssl -lcrypto #------------------------------------------------------------------------------ @@ -24,7 +24,7 @@ index 9372675..813dd41 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 c33e098..6983a83 100644 +index 266c268..6a4a1f8 100644 --- a/src/config.h.defaults +++ b/src/config.h.defaults @@ -28,6 +28,8 @@ it's a default value. */ @@ -37,11 +37,11 @@ index c33e098..6983a83 100644 #define CONFIGURE_FILE diff --git a/src/globals.c b/src/globals.c -index 1dbc015..10fb3e4 100644 +index ec2685b..f8375bf 100644 --- a/src/globals.c +++ b/src/globals.c -@@ -169,6 +169,10 @@ uschar *tls_verify_certificates= US"system"; - uschar *tls_verify_hosts = NULL; +@@ -171,6 +171,10 @@ uschar *tls_verify_hosts = NULL; + uschar *tls_advertise_hosts = NULL; #endif +#ifdef DLOPEN_LOCAL_SCAN @@ -52,20 +52,21 @@ index 1dbc015..10fb3e4 100644 /* Per Recipient Data Response variables */ BOOL prdr_enable = FALSE; diff --git a/src/globals.h b/src/globals.h -index f3e884b..7063d97 100644 +index 57a5695..0a60902 100644 --- a/src/globals.h +++ b/src/globals.h -@@ -131,6 +131,10 @@ extern uschar *tls_verify_certificates;/* Path for certificates to check */ +@@ -129,6 +129,11 @@ extern uschar *tls_try_verify_hosts; /* Optional client verification */ + extern uschar *tls_verify_certificates;/* Path for certificates to check */ extern uschar *tls_verify_hosts; /* Mandatory client verification */ #endif - ++ +#ifdef DLOPEN_LOCAL_SCAN +extern uschar *local_scan_path; /* Path to local_scan() library */ +#endif + + extern uschar *tls_advertise_hosts; /* host for which TLS is advertised */ + extern uschar *dsn_envid; /* DSN envid string */ - extern int dsn_ret; /* DSN ret type*/ - extern const pcre *regex_DSN; /* For recognizing DSN settings */ diff --git a/src/local_scan.c b/src/local_scan.c index 3500047..8599172 100644 --- a/src/local_scan.c @@ -250,10 +251,10 @@ index 3500047..8599172 100644 + /* End of local_scan.c */ diff --git a/src/readconf.c b/src/readconf.c -index 1de6bd7..d1e5142 100644 +index 5ca6a84..f1ec503 100644 --- a/src/readconf.c +++ b/src/readconf.c -@@ -300,6 +300,9 @@ static optionlist optionlist_config[] = { +@@ -317,6 +317,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 }, diff --git a/exim-4.82-dynlookup-config.patch b/exim-4.87-dynlookup-config.patch similarity index 86% rename from exim-4.82-dynlookup-config.patch rename to exim-4.87-dynlookup-config.patch index a768af2..d922078 100644 --- a/exim-4.82-dynlookup-config.patch +++ b/exim-4.87-dynlookup-config.patch @@ -1,8 +1,8 @@ diff --git a/src/EDITME b/src/EDITME -index 07f8211..7d7a4a4 100644 +index df3dcc8..de01565 100644 --- a/src/EDITME +++ b/src/EDITME -@@ -301,14 +301,16 @@ LOOKUP_DSEARCH=yes +@@ -306,14 +306,16 @@ LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2 @@ -20,6 +20,6 @@ index 07f8211..7d7a4a4 100644 LOOKUP_PASSWD=yes -LOOKUP_PGSQL=yes +LOOKUP_PGSQL=2 + # LOOKUP_REDIS=yes LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes - diff --git a/exim-4.86-greylist-conf.patch b/exim-4.87-greylist-conf.patch similarity index 93% rename from exim-4.86-greylist-conf.patch rename to exim-4.87-greylist-conf.patch index fc20587..0741a3e 100644 --- a/exim-4.86-greylist-conf.patch +++ b/exim-4.87-greylist-conf.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 915806e..8b1f3bf 100644 +index 1f10008..40b3bb2 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -106,6 +106,7 @@ hostlist relay_from_hosts = localhost +@@ -107,6 +107,7 @@ hostlist relay_from_hosts = localhost # manual for details. The lists above are used in the access control lists for # checking incoming messages. The names of these ACLs are defined here: @@ -10,7 +10,7 @@ index 915806e..8b1f3bf 100644 acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data acl_smtp_mime = acl_check_mime -@@ -355,6 +356,29 @@ timeout_frozen_after = 7d +@@ -368,6 +369,29 @@ timeout_frozen_after = 7d begin acl @@ -40,7 +40,7 @@ index 915806e..8b1f3bf 100644 # This access control list is used for every RCPT command in an incoming # SMTP message. The tests are run in order until the address is either # accepted or denied. -@@ -475,7 +499,8 @@ acl_check_rcpt: +@@ -493,7 +517,8 @@ acl_check_rcpt: # There are no default checks on DNS black lists because the domains that # contain these lists are changing all the time. However, here are two # examples of how you can get Exim to perform a DNS black list lookup at this @@ -50,7 +50,7 @@ index 915806e..8b1f3bf 100644 # # deny message = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text # dnslists = black.list.example -@@ -483,6 +508,10 @@ acl_check_rcpt: +@@ -501,6 +526,10 @@ acl_check_rcpt: # warn dnslists = black.list.example # add_header = X-Warning: $sender_host_address is in a black list at $dnslist_domain # log_message = found in $dnslist_domain @@ -61,7 +61,7 @@ index 915806e..8b1f3bf 100644 ############################################################################# ############################################################################# -@@ -496,6 +525,10 @@ acl_check_rcpt: +@@ -514,6 +543,10 @@ acl_check_rcpt: # require verify = csa ############################################################################# @@ -72,7 +72,7 @@ index 915806e..8b1f3bf 100644 # At this point, the address has passed all the checks that have been # configured, so we accept it unconditionally. -@@ -521,6 +554,12 @@ acl_check_data: +@@ -544,6 +577,12 @@ acl_check_data: # deny condition = ${if !def:h_Message-ID: {1}} # message = RFC2822 says that all mail SHOULD have a Message-ID header.\n\ # Most messages without it are spam, so your mail has been rejected. @@ -85,7 +85,7 @@ index 915806e..8b1f3bf 100644 # Deny if the message contains a virus. Before enabling this check, you # must install a virus scanner and set the av_scanner option above. -@@ -555,8 +594,30 @@ acl_check_data: +@@ -578,8 +617,30 @@ acl_check_data: # message = Your message scored $spam_score SpamAssassin point. Report follows:\n\ # $spam_report diff --git a/exim-4.82-localhost-is-local.patch b/exim-4.87-localhost-is-local.patch similarity index 90% rename from exim-4.82-localhost-is-local.patch rename to exim-4.87-localhost-is-local.patch index 47cff55..5810698 100644 --- a/exim-4.82-localhost-is-local.patch +++ b/exim-4.87-localhost-is-local.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 52e0536..3728043 100644 +index d1ce2f1..1f10008 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: diff --git a/exim-4.86-pamconfig.patch b/exim-4.87-pamconfig.patch similarity index 90% rename from exim-4.86-pamconfig.patch rename to exim-4.87-pamconfig.patch index 51691ca..c068a96 100644 --- a/exim-4.86-pamconfig.patch +++ b/exim-4.87-pamconfig.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 5393ca3..dae5a54 100644 +index 0af6fb8..531435b 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -141,7 +141,7 @@ acl_smtp_data = acl_check_data +@@ -142,7 +142,7 @@ acl_smtp_data = acl_check_data # Allow any client to use TLS. @@ -11,7 +11,7 @@ index 5393ca3..dae5a54 100644 # Specify the location of the Exim server's TLS certificate and private key. # The private key must not be encrypted (password protected). You can put -@@ -149,8 +149,8 @@ acl_smtp_data = acl_check_data +@@ -150,8 +150,8 @@ acl_smtp_data = acl_check_data # need the first setting, or in separate files, in which case you need both # options. @@ -22,7 +22,7 @@ index 5393ca3..dae5a54 100644 # In order to support roaming users who wish to send email from anywhere, # you may want to make Exim listen on other ports as well as port 25, in -@@ -161,8 +161,8 @@ acl_smtp_data = acl_check_data +@@ -162,8 +162,8 @@ acl_smtp_data = acl_check_data # them you should also allow TLS-on-connect on the traditional but # non-standard port 465. @@ -33,7 +33,7 @@ index 5393ca3..dae5a54 100644 # Specify the domain you want to be added to all unqualified addresses -@@ -220,6 +220,24 @@ never_users = root +@@ -221,6 +221,24 @@ never_users = root host_lookup = * @@ -58,7 +58,7 @@ index 5393ca3..dae5a54 100644 # The settings below cause Exim to make RFC 1413 (ident) callbacks # for all incoming SMTP calls. You can limit the hosts to which these -@@ -815,7 +833,7 @@ begin authenticators +@@ -842,7 +860,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth2 # server_prompts = : @@ -67,7 +67,7 @@ index 5393ca3..dae5a54 100644 # server_advertise_condition = ${if def:tls_in_cipher } # LOGIN authentication has traditional prompts and responses. There is no -@@ -827,7 +845,7 @@ begin authenticators +@@ -854,7 +872,7 @@ begin authenticators # driver = plaintext # server_set_id = $auth1 # server_prompts = <| Username: | Password: diff --git a/exim-4.86-procmail.patch b/exim-4.87-procmail.patch similarity index 83% rename from exim-4.86-procmail.patch rename to exim-4.87-procmail.patch index a995d1f..66b9fc2 100644 --- a/exim-4.86-procmail.patch +++ b/exim-4.87-procmail.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 5250b58..96ffe56 100644 +index 374c51d..e4ca5b9 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -707,6 +707,12 @@ userforward: +@@ -730,6 +730,12 @@ userforward: pipe_transport = address_pipe reply_transport = address_reply @@ -15,9 +15,9 @@ index 5250b58..96ffe56 100644 # This router matches local user mailboxes. If the router fails, the error # message is "Unknown user". -@@ -744,6 +750,16 @@ begin transports - remote_smtp: +@@ -771,6 +777,16 @@ remote_smtp: driver = smtp + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +# This transport invokes procmail to deliver mail +procmail: diff --git a/exim-4.86-rhl.patch b/exim-4.87-rhl.patch similarity index 84% rename from exim-4.86-rhl.patch rename to exim-4.87-rhl.patch index 33bb25e..8f8be4f 100644 --- a/exim-4.86-rhl.patch +++ b/exim-4.87-rhl.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index 3223bff..97e9053 100644 +index 3c8cf97..12ed1e0 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -605,7 +605,7 @@ system_aliases: +@@ -628,7 +628,7 @@ system_aliases: driver = redirect allow_fail allow_defer @@ -11,7 +11,7 @@ index 3223bff..97e9053 100644 # user = exim file_transport = address_file pipe_transport = address_pipe -@@ -702,8 +702,8 @@ local_delivery: +@@ -729,8 +729,8 @@ local_delivery: delivery_date_add envelope_to_add return_path_add diff --git a/exim-4.86-smarthost-config.patch b/exim-4.87-smarthost-config.patch similarity index 88% rename from exim-4.86-smarthost-config.patch rename to exim-4.87-smarthost-config.patch index f119de0..8cdcebf 100644 --- a/exim-4.86-smarthost-config.patch +++ b/exim-4.87-smarthost-config.patch @@ -1,10 +1,10 @@ diff --git a/src/configure.default b/src/configure.default -index 8b1f3bf..b2c8046 100644 +index 40b3bb2..9acae90 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -811,6 +811,15 @@ begin transports - remote_smtp: +@@ -838,6 +838,15 @@ remote_smtp: driver = smtp + message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}} +# This transport is used for delivering messages over SMTP using the +# "message submission" port (RFC4409). @@ -18,7 +18,7 @@ index 8b1f3bf..b2c8046 100644 # This transport invokes procmail to deliver mail procmail: driver = pipe -@@ -919,6 +928,21 @@ begin rewrite +@@ -946,6 +955,21 @@ begin rewrite # AUTHENTICATION CONFIGURATION # ###################################################################### @@ -40,7 +40,7 @@ index 8b1f3bf..b2c8046 100644 # The following authenticators support plaintext username/password # authentication using the standard PLAIN mechanism and the traditional # but non-standard LOGIN mechanism, with Exim acting as the server. -@@ -934,7 +958,7 @@ begin rewrite +@@ -961,7 +985,7 @@ begin rewrite # The default RCPT ACL checks for successful authentication, and will accept # messages from authenticated users from anywhere on the Internet. diff --git a/exim-4.86-spamdconf.patch b/exim-4.87-spamdconf.patch similarity index 93% rename from exim-4.86-spamdconf.patch rename to exim-4.87-spamdconf.patch index f65b24f..031268e 100644 --- a/exim-4.86-spamdconf.patch +++ b/exim-4.87-spamdconf.patch @@ -1,8 +1,8 @@ diff --git a/src/configure.default b/src/configure.default -index dae5a54..5250b58 100644 +index 531435b..374c51d 100644 --- a/src/configure.default +++ b/src/configure.default -@@ -108,6 +108,7 @@ hostlist relay_from_hosts = localhost +@@ -109,6 +109,7 @@ hostlist relay_from_hosts = localhost acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data @@ -10,7 +10,7 @@ index dae5a54..5250b58 100644 # You should not change those settings until you understand how ACLs work. -@@ -120,7 +121,7 @@ acl_smtp_data = acl_check_data +@@ -121,7 +122,7 @@ acl_smtp_data = acl_check_data # of what to set for other virus scanners. The second modification is in the # acl_check_data access control list (see below). @@ -19,7 +19,7 @@ index dae5a54..5250b58 100644 # For spam scanning, there is a similar option that defines the interface to -@@ -418,7 +419,8 @@ acl_check_rcpt: +@@ -431,7 +432,8 @@ acl_check_rcpt: accept local_parts = postmaster domains = +local_domains @@ -29,9 +29,9 @@ index dae5a54..5250b58 100644 require verify = sender -@@ -510,27 +512,63 @@ acl_check_rcpt: - - acl_check_data: +@@ -533,27 +535,63 @@ acl_check_data: + # + deny 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 diff --git a/exim.spec b/exim.spec index ec2dab6..ad3fb1c 100644 --- a/exim.spec +++ b/exim.spec @@ -17,7 +17,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.86.2 +Version: 4.87 Release: 1%{?dist} License: GPLv2+ Url: http://www.exim.org/ @@ -57,19 +57,19 @@ Source25: exim-gen-cert Source26: clamd.exim.service %endif -Patch4: exim-4.86-rhl.patch -Patch6: exim-4.86-config.patch +Patch4: exim-4.87-rhl.patch +Patch6: exim-4.87-config.patch Patch8: exim-4.82-libdir.patch -Patch12: exim-4.86-cyrus.patch -Patch13: exim-4.86-pamconfig.patch -Patch14: exim-4.86-spamdconf.patch -Patch18: exim-4.86.2-dlopen-localscan.patch -Patch19: exim-4.86-procmail.patch -Patch20: exim-4.86-allow-filter.patch -Patch21: exim-4.82-localhost-is-local.patch -Patch22: exim-4.86-greylist-conf.patch -Patch23: exim-4.86-smarthost-config.patch -Patch25: exim-4.82-dynlookup-config.patch +Patch12: exim-4.87-cyrus.patch +Patch13: exim-4.87-pamconfig.patch +Patch14: exim-4.87-spamdconf.patch +Patch18: exim-4.87-dlopen-localscan.patch +Patch19: exim-4.87-procmail.patch +Patch20: exim-4.87-allow-filter.patch +Patch21: exim-4.87-localhost-is-local.patch +Patch22: exim-4.87-greylist-conf.patch +Patch23: exim-4.87-smarthost-config.patch +Patch25: exim-4.87-dynlookup-config.patch # Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Patch26: exim-4.85-pic.patch @@ -637,6 +637,10 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Sun Apr 10 2016 Jaroslav Škarvada - 4.87-1 +- New version + Resolves: rhbz#1325557 + * Thu Mar 3 2016 Jaroslav Škarvada - 4.86.2-1 - New version Resolves: rhbz#1314118 diff --git a/sources b/sources index 6c84ef6..d8e24d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1443a4a88d6b78ad9b6a681c51437b55 exim-4.86.2.tar.bz2 +2effc2bd47ad2dc010f655c11a1b1173 exim-4.87.tar.bz2 From 21ff2315c2c3eee047f9ceb25b7da23614dcc3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Apr 2016 11:46:53 +0200 Subject: [PATCH 12/19] Used sane environment defaults in default configuration Resolves: rhbz#1323775 --- exim-4.87-environment.patch | 14 ++++++++++++++ exim.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 exim-4.87-environment.patch diff --git a/exim-4.87-environment.patch b/exim-4.87-environment.patch new file mode 100644 index 0000000..e0ea3ed --- /dev/null +++ b/exim-4.87-environment.patch @@ -0,0 +1,14 @@ +diff --git a/src/configure.default b/src/configure.default +--- a/src/configure.default ++++ b/src/configure.default +@@ -357,8 +357,8 @@ timeout_frozen_after = 7d + # Note that TZ is handled separateley by the timezone runtime option + # and TIMEZONE_DEFAULT buildtime option. + +-# keep_environment = ^LDAP +-# add_environment = PATH=/usr/bin::/bin ++keep_environment = ^LDAP ++add_environment = PATH=/usr/bin::/bin + + + diff --git a/exim.spec b/exim.spec index ad3fb1c..87af4a6 100644 --- a/exim.spec +++ b/exim.spec @@ -18,7 +18,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.87 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -72,6 +72,7 @@ Patch23: exim-4.87-smarthost-config.patch Patch25: exim-4.87-dynlookup-config.patch # Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Patch26: exim-4.85-pic.patch +Patch27: exim-4.87-environment.patch Requires: /etc/pki/tls/certs /etc/pki/tls/private Requires: /etc/aliases @@ -233,6 +234,7 @@ greylisting unconditional. %patch23 -p1 -b .smarthost %patch25 -p1 -b .dynconfig %patch26 -p1 -b .fpic +%patch27 -p1 -b .environment cp src/EDITME Local/Makefile sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile @@ -637,6 +639,10 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Mon Apr 18 2016 Jaroslav Škarvada - 4.87-2 +- Used sane environment defaults in default configuration + Resolves: rhbz#1323775 + * Sun Apr 10 2016 Jaroslav Škarvada - 4.87-1 - New version Resolves: rhbz#1325557 From 1201d2cec12bf2d2dca6d63f1381e0c003637c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 4 May 2016 16:12:29 +0200 Subject: [PATCH 13/19] Dropped sa-exim which has been obsoleted long time ago by the proper built-in ACL support - Unconditionalized sources Resolves: rhbz#1332211 --- exim.spec | 62 +++++++------------------------------------------------ 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/exim.spec b/exim.spec index 87af4a6..ea649d5 100644 --- a/exim.spec +++ b/exim.spec @@ -1,7 +1,3 @@ -# SA-Exim has long since been obsoleted by the proper built-in ACL support -# from exiscan. Disable it by default -%bcond_with sa - # By default build clamav subpackage on Fedora, # do not build on RHEL %if 0%{?rhel} @@ -18,7 +14,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.87 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -40,22 +36,15 @@ Source3: exim.sysconfig Source4: exim.logrotate Source5: exim-tidydb.sh Source11: exim.pam -%if %{with clamav} Source12: exim-clamav-tmpfiles.conf -%endif -%if %{with sa} -Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz -%endif Source20: exim-greylist.conf.inc Source21: mk-greylist-db.sql Source22: greylist-tidy.sh Source23: trusted-configs Source24: exim.service Source25: exim-gen-cert -%if %{with clamav} Source26: clamd.exim.service -%endif Patch4: exim-4.87-rhl.patch Patch6: exim-4.87-config.patch @@ -78,9 +67,6 @@ Requires: /etc/pki/tls/certs /etc/pki/tls/private Requires: /etc/aliases Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: libdb-devel openssl-devel openldap-devel pam-devel -%if %{with sa} -BuildRequires: lynx -%endif BuildRequires: pcre-devel sqlite-devel tcp_wrappers-devel cyrus-sasl-devel BuildRequires: openldap-devel openssl-devel mysql-devel postgresql-devel BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel @@ -136,18 +122,6 @@ displays information about Exim's processing in an X window, and an administrator can perform a number of control actions from the window interface. -%if %{with sa} -%package sa -Summary: Exim SpamAssassin at SMTP time - d/l plugin -Group: System Environment/Daemons -Requires: exim = %{version}-%{release} - -%description sa -The exim-sa package is an old method for allowing SpamAssassin to be run on -incoming mail at SMTP time. It is deprecated in favour of the built-in ACL -support for content scanning. -%endif - %if %{with clamav} %package clamav Summary: Clam Antivirus scanner dæmon configuration for use with Exim @@ -216,9 +190,6 @@ greylisting unconditional. %prep %setup -q -%if %{with sa} -%setup -q -T -D -a 13 -%endif %patch4 -p1 -b .rhl %patch6 -p1 -b .config @@ -252,13 +223,6 @@ cp exim_monitor/EDITME Local/eximon.conf %endif make _lib=%{_lib} FULLECHO= LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-pie -Wl,-z,relro,-z,now}" -%if %{with sa} -# build sa-exim -cd sa-exim* -perl -pi -e 's|\@lynx|HOME=/ /usr/bin/lynx|g;' Makefile -make SACONF=%{_sysconfdir}/exim/sa-exim.conf CFLAGS="$RPM_OPT_FLAGS -fPIC" -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -344,15 +308,6 @@ install -m 0644 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/exim mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily install -m 0755 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/exim-tidydb -%if %{with sa} -# install sa -cd sa-exim* -mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/exim -install *.so $RPM_BUILD_ROOT%{_libexecdir}/exim -install -m 644 *.conf $RPM_BUILD_ROOT%{_sysconfdir}/exim -ln -s sa-exim*.so $RPM_BUILD_ROOT%{_libexecdir}/exim/sa-exim.so -%endif - # generate ghost .pem file mkdir -p $RPM_BUILD_ROOT/etc/pki/tls/{certs,private} touch $RPM_BUILD_ROOT/etc/pki/tls/{certs,private}/exim.pem @@ -560,15 +515,6 @@ fi %{_sbindir}/eximon %{_sbindir}/eximon.bin -%if %{with sa} -%files sa -%defattr(-,root,root) -%{_libexecdir}/exim -%config(noreplace) %{_sysconfdir}/exim/sa-*.conf -%doc sa-exim*/*.html -%doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} -%endif - %if %{with clamav} %post clamav /bin/mkdir -p 0750 %{_var}/run/clamd.exim @@ -639,6 +585,12 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Wed May 4 2016 Jaroslav Škarvada - 4.87-3 +- Dropped sa-exim which has been obsoleted long time ago by the proper + built-in ACL support +- Unconditionalized sources + Resolves: rhbz#1332211 + * Mon Apr 18 2016 Jaroslav Škarvada - 4.87-2 - Used sane environment defaults in default configuration Resolves: rhbz#1323775 From 462797715162e2beb867cbc8c50a5527e3f79ca0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 00:37:38 +0200 Subject: [PATCH 14/19] Perl 5.24 rebuild --- exim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exim.spec b/exim.spec index ea649d5..f38337c 100644 --- a/exim.spec +++ b/exim.spec @@ -14,7 +14,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.87 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -585,6 +585,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Sat May 14 2016 Jitka Plesnikova - 4.87-4 +- Perl 5.24 rebuild + * Wed May 4 2016 Jaroslav Škarvada - 4.87-3 - Dropped sa-exim which has been obsoleted long time ago by the proper built-in ACL support From ea3c76ef2a0b752e188bccc629a5fcec1f56cc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 9 Jun 2016 13:46:52 +0200 Subject: [PATCH 15/19] Allow configuration of user:group through sysconfig Resolves: rhbz#1344250 --- exim-gen-cert | 10 +++++++++- exim.init | 7 +++++-- exim.spec | 6 +++++- exim.sysconfig | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/exim-gen-cert b/exim-gen-cert index dbcd26e..27e8448 100644 --- a/exim-gen-cert +++ b/exim-gen-cert @@ -2,6 +2,14 @@ . /etc/sysconfig/network +# Source exim configureation. +if [ -f /etc/sysconfig/exim ] ; then + . /etc/sysconfig/exim +fi + +USER=${USER:=exim} +GROUP=${GROUP:=exim} + gen_cert() { if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then umask 077 @@ -23,7 +31,7 @@ root@${FQDN} EOF if [ $? -eq 0 ]; then echo success - chown exim.exim /etc/pki/tls/{private,certs}/exim.pem + chown $USER:$GROUP /etc/pki/tls/{private,certs}/exim.pem chmod 600 /etc/pki/tls/{private,certs}/exim.pem else echo failure diff --git a/exim.init b/exim.init index 58ffd51..275fae2 100644 --- a/exim.init +++ b/exim.init @@ -23,6 +23,9 @@ else QUEUE=1h fi +USER=${USER:=exim} +GROUP=${GROUP:=exim} + gen_cert() { if [ ! -f /etc/pki/tls/certs/exim.pem ] ; then umask 077 @@ -44,7 +47,7 @@ root@${FQDN} EOF if [ $? -eq 0 ]; then success - chown exim.exim /etc/pki/tls/{private,certs}/exim.pem + chown $USER:$GROUP /etc/pki/tls/{private,certs}/exim.pem chmod 600 /etc/pki/tls/{private,certs}/exim.pem else failure @@ -65,7 +68,7 @@ start() { then if [ "exim" != "`ls -l /var/log/exim/main.log | awk '{print $4}'`" ] then - chown -R exim:exim /var/log/exim /var/spool/exim + chown -R $USER:$GROUP /var/log/exim /var/spool/exim fi fi diff --git a/exim.spec b/exim.spec index f38337c..37563e2 100644 --- a/exim.spec +++ b/exim.spec @@ -14,7 +14,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.87 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -585,6 +585,10 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Thu Jun 9 2016 Jaroslav Škarvada - 4.87-5 +- Allow configuration of user:group through sysconfig + Resolves: rhbz#1344250 + * Sat May 14 2016 Jitka Plesnikova - 4.87-4 - Perl 5.24 rebuild diff --git a/exim.sysconfig b/exim.sysconfig index cada3c9..69e525d 100644 --- a/exim.sysconfig +++ b/exim.sysconfig @@ -1,2 +1,4 @@ DAEMON=yes QUEUE=1h +USER=exim +GROUP=exim From 94d30de7f12fadce0dc1c5a2e130b93937b7d4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:28:42 +0200 Subject: [PATCH 16/19] Mandatory Perl build-requires added --- exim.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exim.spec b/exim.spec index 37563e2..a6800c5 100644 --- a/exim.spec +++ b/exim.spec @@ -70,6 +70,8 @@ BuildRequires: libdb-devel openssl-devel openldap-devel pam-devel BuildRequires: pcre-devel sqlite-devel tcp_wrappers-devel cyrus-sasl-devel BuildRequires: openldap-devel openssl-devel mysql-devel postgresql-devel BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel +BuildRequires: perl-devel +BuildRequires: perl-generators BuildRequires: libICE-devel libXpm-devel libXt-devel perl(ExtUtils::Embed) BuildRequires: systemd-units libgsasl-devel From abf48374cf53f21b90377403c50ed4e713fdc732 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 25 Dec 2016 20:42:04 +0000 Subject: [PATCH 17/19] 4.88 --- exim.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/exim.spec b/exim.spec index a6800c5..416c598 100644 --- a/exim.spec +++ b/exim.spec @@ -13,8 +13,8 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.87 -Release: 5%{?dist} +Version: 4.88 +Release: 1%{?dist} License: GPLv2+ Url: http://www.exim.org/ Group: System Environment/Daemons @@ -587,6 +587,9 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || : %{_sysconfdir}/cron.daily/greylist-tidy.sh %changelog +* Sun Dec 25 2016 David Woodhouse - 4.88-1 +- Update to 4.88 (CVE-2016-9963 / rhbz#1405323) + * Thu Jun 9 2016 Jaroslav Škarvada - 4.87-5 - Allow configuration of user:group through sysconfig Resolves: rhbz#1344250 diff --git a/sources b/sources index d8e24d5..c9e82cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2effc2bd47ad2dc010f655c11a1b1173 exim-4.87.tar.bz2 +SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf From 4d3a8b6fe3145ae4e8a6358fb3f442b9684bdf9c Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 25 Dec 2016 21:20:08 +0000 Subject: [PATCH 18/19] Update patches for 4.88 --- exim-4.87-spamdconf.patch | 23 ++++---- ....87-config.patch => exim-4.88-config.patch | 52 ++++++++----------- exim.spec | 2 +- sources | 2 +- 4 files changed, 35 insertions(+), 44 deletions(-) rename exim-4.87-config.patch => exim-4.88-config.patch (87%) 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.87-config.patch b/exim-4.88-config.patch similarity index 87% rename from exim-4.87-config.patch rename to exim-4.88-config.patch index 78bddc4..40baabd 100644 --- a/exim-4.87-config.patch +++ b/exim-4.88-config.patch @@ -1,8 +1,8 @@ -diff --git a/scripts/Configure-Makefile b/scripts/Configure-Makefile -index 4aa7d76..3a5263c 100755 +diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile +index 3e486a6..6c4afec 100755 --- a/scripts/Configure-Makefile +++ b/scripts/Configure-Makefile -@@ -253,7 +253,7 @@ if [ "${EXIM_PERL}" != "" ] ; then +@@ -269,7 +269,7 @@ if [ "${EXIM_PERL}" != "" ] ; then mv $mft $mftt echo "PERL_CC=`$PERL_COMMAND -MConfig -e 'print $Config{cc}'`" >>$mft @@ -11,8 +11,8 @@ index 4aa7d76..3a5263c 100755 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 +diff --git a/src/src/EDITME b/src/src/EDITME +index 6929346..5a08197 100644 --- a/src/EDITME +++ b/src/EDITME @@ -98,7 +98,7 @@ @@ -105,24 +105,16 @@ index d852103..bbb7527 100644 # LOOKUP_WHOSON=yes # These two settings are obsolete; all three lookups are compiled when -@@ -390,14 +392,14 @@ EXIM_MONITOR=eximon.bin +@@ -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 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 +@@ -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. @@ -131,7 +123,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -618,16 +620,14 @@ FIXED_NEVER_USERS=root +@@ -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. @@ -156,7 +148,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -648,7 +648,7 @@ FIXED_NEVER_USERS=root +@@ -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: @@ -165,7 +157,7 @@ index d852103..bbb7527 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 -@@ -668,7 +668,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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 # @@ -174,7 +166,7 @@ index d852103..bbb7527 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() -@@ -730,11 +730,11 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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) @@ -189,7 +181,7 @@ index d852103..bbb7527 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. -@@ -799,7 +799,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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. @@ -198,7 +190,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -812,7 +812,7 @@ HEADERS_CHARSET="ISO-8859-1" +@@ -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: @@ -207,7 +199,7 @@ index d852103..bbb7527 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 -@@ -884,7 +884,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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. @@ -216,7 +208,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -894,7 +894,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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. @@ -225,7 +217,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -904,7 +904,7 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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: @@ -234,7 +226,7 @@ index d852103..bbb7527 100644 # 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 +@@ -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. @@ -243,7 +235,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -1011,9 +1011,9 @@ ZCAT_COMMAND=/usr/bin/zcat +@@ -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: # @@ -256,7 +248,7 @@ index d852103..bbb7527 100644 # # 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 +@@ -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. @@ -265,7 +257,7 @@ index d852103..bbb7527 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 -@@ -1075,7 +1075,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -1083,7 +1083,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases #------------------------------------------------------------------------------ # Uncomment this setting to include IPv6 support. @@ -274,7 +266,7 @@ index d852103..bbb7527 100644 ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # -@@ -1096,13 +1096,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases +@@ -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. @@ -295,7 +287,7 @@ index d852103..bbb7527 100644 #------------------------------------------------------------------------------ -@@ -1304,7 +1304,7 @@ EXIM_TMPDIR="/tmp" +@@ -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: 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 From 296d145db82dd0ba4f08990c658fdb4ac86406b4 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 25 Dec 2016 21:23:22 +0000 Subject: [PATCH 19/19] really 4.88 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 059a278..c9e82cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (exim-4.87.1.tar.bz2) = bdb0a0507a8ad63abe49026250bd8206f6993cc08a01e640f8076f8accc57a33b16c336196351bf5cb124f1a435b140f908b4d6707ce0efb8d305764cf156e6b +SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf