From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BFCC158016 for ; Mon, 25 Dec 2023 11:00:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21E782BC018; Mon, 25 Dec 2023 11:00:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 044472BC018 for ; Mon, 25 Dec 2023 11:00:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B77033FE49 for ; Mon, 25 Dec 2023 11:00:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5200C14AA for ; Mon, 25 Dec 2023 11:00:35 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1703501930.696f3182bbf70449d0fd2db9b8ff15824cdf8a12.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/exim/exim-4.96-r5.ebuild mail-mta/exim/exim-4.96.2-r1.ebuild X-VCS-Directories: mail-mta/exim/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 696f3182bbf70449d0fd2db9b8ff15824cdf8a12 X-VCS-Branch: master Date: Mon, 25 Dec 2023 11:00:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d53c6f5-d4af-4ebe-83f4-0fd1bb64c0c5 X-Archives-Hash: 524b07c2c35b38d0264fb6309a239f61 commit: 696f3182bbf70449d0fd2db9b8ff15824cdf8a12 Author: Fabian Groffen gentoo org> AuthorDate: Mon Dec 25 10:58:50 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Dec 25 10:58:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f3182 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 gentoo.org> mail-mta/exim/{exim-4.96-r5.ebuild => exim-4.96.2-r1.ebuild} | 9 ++++----- 1 file 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 similarity index 98% rename from mail-mta/exim/exim-4.96-r5.ebuild rename to 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 \