diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-04 16:01:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-04 16:01:53 +0000 |
| commit | c36891f9148bb4566de67ddf7aec3b9b2c161201 (patch) | |
| tree | 23b1377465209a93291ce02b09e10cf3f7fe6eaa /community/exim | |
| parent | 195489d518b8e70928436fa81f521e5fa7527175 (diff) | |
| download | aports-c36891f9148bb4566de67ddf7aec3b9b2c161201.tar.bz2 aports-c36891f9148bb4566de67ddf7aec3b9b2c161201.tar.xz | |
community/exim: security fix for CVE-2017-1000369
fixes #7460
Diffstat (limited to 'community/exim')
| -rw-r--r-- | community/exim/APKBUILD | 8 | ||||
| -rw-r--r-- | community/exim/CVE-2017-1000369.patch | 47 |
2 files changed, 54 insertions, 1 deletions
diff --git a/community/exim/APKBUILD b/community/exim/APKBUILD index df470441d3..5399297398 100644 --- a/community/exim/APKBUILD +++ b/community/exim/APKBUILD @@ -6,7 +6,7 @@ # Maintainer: Jesse Young <jlyo@jlyo.org> pkgname=exim pkgver=4.89 -pkgrel=4 +pkgrel=5 pkgdesc="A Message Transfer Agent" url="http://www.exim.org/" arch="all" @@ -21,6 +21,7 @@ install="exim.pre-install" subpackages="$pkgname-cdb $pkgname-dbmdb $pkgname-dnsdb $pkgname-sqlite $pkgname-mysql $pkgname-postgresql $pkgname-utils $pkgname-scripts::noarch $pkgname-doc" source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz + CVE-2017-1000369.patch exim.Makefile exim.confd exim.initd @@ -28,6 +29,10 @@ source="ftp://ftp.exim.org/pub/exim/exim4/$pkgname-$pkgver.tar.xz exim.gencert" builddir="$srcdir/$pkgname-$pkgver" +# secfixes: +# 4.89-r5: +# - CVE-2017-1000369 + prepare() { default_prepare || return 1 @@ -101,6 +106,7 @@ dbmdb() { _mv_ext dbmdb; } dnsdb() { _mv_ext dnsdb; } sha512sums="ce5faef3847a5baf1b4fec1ffe46ce7efaafb24e63bcc52a61f38e8312a88eccaa816c3947ba428bef3eed38b1e91e606f6ed07bc0a3e14c6a6ed0ecb41eb9fa exim-4.89.tar.xz +cffe895974e9f570e2f60583206e0c2865e9ca400636e5ed2117c531fc62b03753f41286565ee253c11610e61589275cb5235b34cae052b5dcc6e5c37fbc7ece CVE-2017-1000369.patch e9524d3a2cc230b4ecb3b098f53247121b9582fc7807b1549c5a3fd54bb416b837c4e09476f2e01dca03d590a968c40bf90d4b6a9f8a4abad082fdec91916a0f exim.Makefile bb6f5ead067af19ace661cc92bcd428da97570aedd1f9dc5b61a34e7e3fb3e028be6c96d51df73353bdfcaf69a3ee053fb03d245f868d63ebf518aa96ec82d66 exim.confd 8d0c594c5e3834ddd3a7743c025caf3f5c04f6ac17e25f2278e7a36b726150f0f8e36a1c76cd1a4b454edcb163181ee05ea40a6b61a0e9172c600e4808ccc80f exim.initd diff --git a/community/exim/CVE-2017-1000369.patch b/community/exim/CVE-2017-1000369.patch new file mode 100644 index 0000000000..af2e73c5d5 --- /dev/null +++ b/community/exim/CVE-2017-1000369.patch @@ -0,0 +1,47 @@ +From 65e061b76867a9ea7aeeb535341b790b90ae6c21 Mon Sep 17 00:00:00 2001 +From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de> +Date: Wed, 31 May 2017 23:08:56 +0200 +Subject: [PATCH] Cleanup (prevent repeated use of -p/-oMr to avoid mem leak) + +--- + doc/doc-docbook/spec.xfpt | 3 ++- + src/src/exim.c | 19 +++++++++++++++++-- + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/src/src/exim.c b/src/src/exim.c +index 67583e584..88e119778 100644 +--- a/src/src/exim.c ++++ b/src/exim.c +@@ -3106,7 +3106,14 @@ for (i = 1; i < argc; i++) + + /* -oMr: Received protocol */ + +- else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i]; ++ else if (Ustrcmp(argrest, "Mr") == 0) ++ ++ if (received_protocol) ++ { ++ fprintf(stderr, "received_protocol is set already\n"); ++ exit(EXIT_FAILURE); ++ } ++ else received_protocol = argv[++i]; + + /* -oMs: Set sender host name */ + +@@ -3202,7 +3209,15 @@ for (i = 1; i < argc; i++) + + if (*argrest != 0) + { +- uschar *hn = Ustrchr(argrest, ':'); ++ uschar *hn; ++ ++ if (received_protocol) ++ { ++ fprintf(stderr, "received_protocol is set already\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ hn = Ustrchr(argrest, ':'); + if (hn == NULL) + { + received_protocol = argrest; |