pool/exim
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 4.87:

Browse Source 
drops fix-CVE-2016-9963-31c02defdc5118834e801d4fe8f11c1d9b5ebadf.patch
- remove exim4-manpages.tar.bz2: upstream does not exist anymore

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=195
This commit is contained in:
Dirk Mueller 2017-11-27 10:36:58 +00:00 committed by Git OBS Bridge
parent fd72976a49
commit fedc49a34e
9 changed files with 6225 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exim-4.86.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7756deafd0583776e091f2efcba9b36203e668cf420d8876f314980803636eb3
size 1799316

11
exim-4.86.2.tar.bz2.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCgAGBQJW1yh1AAoJEGoXY4qgRQz1nU8H/2mFC/HsFxrJ9vZsHD/TZdW3
RHITiCLEGHYlVNVL3LAEfPIANLALqKl9lyWXhWZc4FxKKPkp6TNGpy9L4Yp+5jiJ
UkEkiS3aqIA1vyLvWxJ8s5CybBq/WaAq3e396S3ShCkXFPreetxvJc98Q0gD2rCd
zZISbTnceuX0pHrhBtjeJXqShuTUrUW6G6HNvebncHK0yPSI5CJHgoTvmeYpwt/3
zSFzBB9juvKni5jbZcOk6lOuj0P0jXJqICMJ53tEpu+NksCgABaAI6XdVV/e6X/D
RFVn2bUPGssdi8UO801IhPLpNbvgIIxIXNil9kQFo3Y1Rbotc+LLLnXhLmVK1to=
=f02h
-----END PGP SIGNATURE-----

3
exim-4.88.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d
size 1824610

10
exim-4.88.tar.bz2.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJYVqBoAAoJELzljIzkHzLf5vIH/R4gcGqdEwGkFDRwQA5ImNif
USPeSli63U2tL2YRpf8E/sMWlf2ywZl9vGkVWhvYFvMWI4gn+hNAh0jUj2BakCdI
aEjUk0KSA0nXHzIGmNyf0lAcC1VONRq0KLxfQvlGF8RrKnBL7urg46EVFagmU8g9
m3KVHPjv1cUIICZdJVWICUChjjm23pBvtqr1M9TgUAhWQU0FaG9dmgY2Kh4s2pnG
0o+llbQdU1hvtk0lTMzZYmYTtS3totoyR3aKYdws/epOnE1MgVOIlnp2q5R9FMO1
RE5bHa2Qg5UCf5wwAKSOxIDLPEVUoX6qkbP7inByuGKZ5dSvBQwUGPAt+b2Lb38=
=jgHZ
-----END PGP SIGNATURE-----

7
exim.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 27 10:36:17 UTC 2017 - dmueller@suse.com
- update to 4.87:
drops fix-CVE-2016-9963-31c02defdc5118834e801d4fe8f11c1d9b5ebadf.patch
- remove exim4-manpages.tar.bz2: upstream does not exist anymore
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 27 08:52:33 UTC 2017 - kstreitova@suse.com Mon Nov 27 08:52:33 UTC 2017 - kstreitova@suse.com

6832
exim.keyring
View File

File diff suppressed because it is too large Load Diff

12
exim.spec
View File

@ -78,7 +78,7 @@ Requires(pre): group(mail)
%endif %endif
Requires(pre): fileutils textutils Requires(pre): fileutils textutils
%endif %endif
Version: 4.86.2 Version: 4.88
Release: 0 Release: 0
%if %{with_mysql} %if %{with_mysql}
BuildRequires: mysql-devel BuildRequires: mysql-devel
@ -102,14 +102,11 @@ Source2: exim.logrotate
Source11: exim.rc Source11: exim.rc
Source12: permissions.exim Source12: permissions.exim
Source13: apparmor.usr.sbin.exim Source13: apparmor.usr.sbin.exim
Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages.tar.bz2
Source30: eximstats-html-update.py Source30: eximstats-html-update.py
Source31: eximstats.conf Source31: eximstats.conf
Source32: eximstats.conf-2.2 Source32: eximstats.conf-2.2
Source40: exim.service Source40: exim.service
Patch0: exim-tail.patch Patch0: exim-tail.patch
Patch1: exim-4.86.2+fixes-867e8fe25dbfb1e31493488ad695bde55b890397.patch
Patch2: fix-CVE-2016-9963-31c02defdc5118834e801d4fe8f11c1d9b5ebadf.patch
Patch3: exim-CVE-2017-1000369.patch Patch3: exim-CVE-2017-1000369.patch
Patch4: exim-CVE-2017-16943.patch Patch4: exim-CVE-2017-16943.patch
Patch5: exim-4.86.2-mariadb_102_compile_fix.patch Patch5: exim-4.86.2-mariadb_102_compile_fix.patch
@ -155,8 +152,6 @@ once, if at all. The rest is done by logrotate / cron.)
%prep %prep
%setup -q -n exim-%{version} %setup -q -n exim-%{version}
%patch0 %patch0
%patch1 -p 1
%patch2 -p 1
%patch3 -p 1 %patch3 -p 1
%patch4 -p 1 %patch4 -p 1
%patch5 -p 1 %patch5 -p 1
@ -295,6 +290,7 @@ cat <<-EOF > Local/Makefile
EXPERIMENTAL_PROXY=yes EXPERIMENTAL_PROXY=yes
EXPERIMENTAL_CERTNAMES=yes EXPERIMENTAL_CERTNAMES=yes
EXPERIMENTAL_DSN=yes EXPERIMENTAL_DSN=yes
SYSTEM_ALIASES_FILE=/etc/aliases
%if %{with dane} %if %{with dane}
EXPERIMENTAL_DANE=yes EXPERIMENTAL_DANE=yes
%endif %endif
@ -330,7 +326,7 @@ make inst_dest=$RPM_BUILD_ROOT/usr/sbin \
inst_info=$RPM_BUILD_ROOT/%{_infodir} \ inst_info=$RPM_BUILD_ROOT/%{_infodir} \
INSTALL_ARG=-no_chown install INSTALL_ARG=-no_chown install
#mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim #mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim
mv $RPM_BUILD_ROOT/usr/sbin/exim-4.86* $RPM_BUILD_ROOT/usr/sbin/exim mv $RPM_BUILD_ROOT/usr/sbin/exim-4.8* $RPM_BUILD_ROOT/usr/sbin/exim
mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
install -m 0644 %{S:40} $RPM_BUILD_ROOT/%{_unitdir}/exim.service install -m 0644 %{S:40} $RPM_BUILD_ROOT/%{_unitdir}/exim.service
@ -359,8 +355,6 @@ install -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/logrotate.d/exim
# man pages # man pages
mv doc/exim.8 $RPM_BUILD_ROOT/%{_mandir}/man8/ mv doc/exim.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
pod2man --center=EXIM --section=8 $RPM_BUILD_ROOT/usr/sbin/eximstats > $RPM_BUILD_ROOT/%{_mandir}/man8/eximstats.8 pod2man --center=EXIM --section=8 $RPM_BUILD_ROOT/usr/sbin/eximstats > $RPM_BUILD_ROOT/%{_mandir}/man8/eximstats.8
tar xvjf %{S:20}
cp -p exim4-manpages/* $RPM_BUILD_ROOT/%{_mandir}/man8/
for i in \ for i in \
sendmail \ sendmail \
runq \ runq \

3
exim4-manpages.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f12e569711973eff4a92625a3dee70edb02d1e8d41c29e238f4cbec16f242a60
size 8392

66
fix-CVE-2016-9963-31c02defdc5118834e801d4fe8f11c1d9b5ebadf.patch
View File

@ -1,66 +0,0 @@
From 31c02defdc5118834e801d4fe8f11c1d9b5ebadf Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh@wizmail.org>
Date: Fri, 16 Dec 2016 20:36:39 +0000
Subject: [PATCH 1/3] Fix DKIM information leakage
Cherry picked from exim-4_87 .. exim-4_87_1
---
doc/doc-txt/ChangeLog | 7 +++
doc/doc-txt/cve-2016-9663 | 86 +++++++++++++++++++++++++++++++++
src/src/dkim.c | 1 +
src/src/transports/smtp.c | 4 +-
test/confs/4510 | 71 +++++++++++++++++++++++++++
test/log/4510 | 20 ++++++++
test/mail/4510.store | 58 ++++++++++++++++++++++
test/runtest | 8 +++
test/scripts/4510-DKIM-Bounces/4510 | 15 ++++++
test/scripts/4510-DKIM-Bounces/REQUIRES | 2 +
10 files changed, 271 insertions(+), 1 deletion(-)
create mode 100644 doc/doc-txt/cve-2016-9663
create mode 100644 test/confs/4510
create mode 100644 test/log/4510
create mode 100644 test/mail/4510.store
create mode 100644 test/scripts/4510-DKIM-Bounces/4510
create mode 100644 test/scripts/4510-DKIM-Bounces/REQUIRES
diff --git a/src/dkim.c b/src/dkim.c
index 3e71545..8e93566 100644
--- a/src/dkim.c
+++ b/src/dkim.c
@@ -519,6 +519,7 @@ dkim_exim_sign(int dkim_fd, uschar *dkim_private_key,
(char *)dkim_signing_selector,
(char *)dkim_private_key_expanded
);
+ dkim_private_key_expanded[0] = '\0';
pdkim_set_debug_stream(ctx,debug_file);
diff --git a/src/transports/smtp.c b/src/transports/smtp.c
index a952413..cc8f025 100644
--- a/src/transports/smtp.c
+++ b/src/transports/smtp.c
@@ -293,6 +293,7 @@ static uschar *rf_names[] = { US"NEVER", US"SUCCESS", US"FAILURE", US"DELAY" };
static uschar *smtp_command; /* Points to last cmd for error messages */
static uschar *mail_command; /* Points to MAIL cmd for error messages */
static BOOL update_waiting; /* TRUE to update the "wait" database */
+static uschar *data_command = US""; /* Points to DATA cmd for error messages */
/*************************************************
@@ -2244,6 +2245,7 @@ if (ok || (smtp_use_pipelining && !mua_wrapper))
case -1: goto END_OFF; /* Timeout on RCPT */
default: goto RESPONSE_FAILED; /* I/O error, or any MAIL/DATA error */
}
+ data_command = string_copy(big_buffer); /* Save for later error message */
}
/* Save the first address of the next batch. */
@@ -2418,7 +2420,7 @@ if (!ok) ok = TRUE; else
#else
"LMTP error after %s: %s",
#endif
- big_buffer, string_printing(buffer));
+ data_command, string_printing(buffer));
setflag(addr, af_pass_message); /* Allow message to go to user */
if (buffer[0] == '5')
addr->transport_return = FAIL;