diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2023-12-25 11:58:50 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2023-12-25 11:58:50 +0100 |
| commit | 696f3182bbf70449d0fd2db9b8ff15824cdf8a12 (patch) | |
| tree | 72e890ffef13b1d1493bcc661ea7bc548562439b | |
| parent | mail-mta/exim: drop srs-alt/srs-native USE-flags descriptions (diff) | |
| download | gentoo-696f3182bbf70449d0fd2db9b8ff15824cdf8a12.tar.gz gentoo-696f3182bbf70449d0fd2db9b8ff15824cdf8a12.tar.bz2 gentoo-696f3182bbf70449d0fd2db9b8ff15824cdf8a12.zip | |
mail-mta/exim-4.96.2-r1: backport CVE-2023-51766 fix
Previously applied to 4.96 in error, patch latest from 4.96 branch
instead.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | mail-mta/exim/exim-4.96.2-r1.ebuild (renamed from mail-mta/exim/exim-4.96-r5.ebuild) | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mail-mta/exim/exim-4.96-r5.ebuild b/mail-mta/exim/exim-4.96.2-r1.ebuild index 95cd963bee1d..4504ad11f95d 100644 --- a/mail-mta/exim/exim-4.96-r5.ebuild +++ b/mail-mta/exim/exim-4.96.2-r1.ebuild @@ -35,14 +35,14 @@ COMM_URI="https://downloads.exim.org/exim4${SDIR}" GPV="r0" DESCRIPTION="A highly configurable, drop-in replacement for sendmail" SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz - https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches-${GPV}.tar.xz + https://dev.gentoo.org/~grobian/distfiles/${PN}-4.96-gentoo-patches-${GPV}.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )" HOMEPAGE="https://www.exim.org/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86" COMMON_DEPEND=">=sys-apps/sed-4.0.5 dev-libs/libpcre2:= @@ -116,9 +116,10 @@ src_prepare() { eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 eapply "${FILESDIR}"/exim-4.69-r1.27021.patch eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch + eapply -p2 "${FILESDIR}"/exim-4.97-CVE-2023-51766.patch # 3063 # Upstream post-release fixes :( - local GPVDIR=${WORKDIR}/${P}-gentoo-patches-${GPV} + local GPVDIR=${WORKDIR}/${PN}-4.96-gentoo-patches-${GPV} eapply "${GPVDIR}"/exim-4.96-rewrite-malformed-addr-fix.patch # upstr eapply "${GPVDIR}"/exim-4.96-spf-memory-error-fix.patch # upstr eapply "${GPVDIR}"/exim-4.96-regex-use-after-free.patch # upstr @@ -134,8 +135,6 @@ src_prepare() { eapply "${GPVDIR}"/exim-4.96-expansion-crash.patch # upstr eapply "${GPVDIR}"/exim-4.96-transport-crash.patch # upstr - eapply -p2 "${FILESDIR}"/exim-4.97-CVE-2023-51766.patch # 3063 - # oddity, they disable berkdb as hack, and then throw an error when # berkdb isn't enabled sed -i \ |