From nobody Mon Jun 24 00:39:20 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6pxj08sqz5PLLT; Mon, 24 Jun 2024 00:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W6pxh6QWQz4rSc; Mon, 24 Jun 2024 00:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719189560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhDHEjslmD8r1b8kI+gguJ7mkxbPfILeeM/jUY4nKUI=; b=wF597OWnHg/Z4wEtC6JARNhjJ1MLwF6C95I+ao9OITeqeaF209T/jYxj9PBhdn7SfWEd76 tMZzwfn+WbT1I4TBsc0WTpplSk2jEGcUvaSJMGM8Rxn+5DaBcJGO53mQjrEs5Z/ffdSLxj 1zmED2LgZSrNVl/VVAi/ooZ14CgvCgk776kaMvgnwLo8sNkB3/76dG9l1mJvu3nKU6CIjU 5isEiJb10381LhxW9Aaw3aaZ0jx6Jr2R65D4oMIEpwQSU7egkzUdLiuG4tHVOYVh7WOn7m gj/N4wi/+jSovMpBcOdoGzvwyNSFe5Wmqh54UjkuzNP4/UDYgryNCUrevUblFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719189560; a=rsa-sha256; cv=none; b=afXK89ud0MMWIHQuGsvxRB3w8qvHOgfu6hYY5mXWgRJaPa02J/xilqoz7DsBPO7TAS9Zhm +9LUVRWE+dHgDwoiov5zPYrRWxfY7DNj326IYBdbol5O6nTk0eHw7pUvbYxQyEene8nHQk e/dZAnMUt65tSzIEUHn7Gol6N+nMX0JpVFJfecxk1n1qp6N01lc87KVI2B0nvzkkmR6jmy B5PI1/8chOxG8c2DIiIj/hVkOatiKAADDnxGcnKaUGkD1gSMtaLeJWeJXGn5tNq7+fR44v MqxEOrP7njwlZFdurDVwb7pF7Ohl6EkU0Rd6TvI5ntEaYJRjqxQhXR5opKrcwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719189560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhDHEjslmD8r1b8kI+gguJ7mkxbPfILeeM/jUY4nKUI=; b=FVf/DtcjKL5IL0ZVcYz6YSq77MrSyYA0VkQHVctBv/8Xn8k5QRnBDt6d1BZ7nzvhj7rTx0 H3RXvAybJt4CrsA5uHFxAiovbYprcd4VqIcRGTP4YIVZa258Jtfo80YFBm6zWdEu6cVrQ/ L1GRt4b+g+2DBtXWjN6CHKe9TVSdavXMbvtjZzqL6Rm6E8hHByufyNw4Ev6UWOcZKbzBK+ HBfIIBGEUoCHfDYcDvCCLqT5jITqfpEpq3K9xuD0sQV63Hkg5gIUIOoR4rGKhYCTbV7Bpn L7wFyviP3xDPpXEbu6dEWBQqGRqiEIsdV8MIk5MYDc4k9N3Ob9DwK87vzsroBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W6pxh5mFHzxDH; Mon, 24 Jun 2024 00:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45O0dKlb051273; Mon, 24 Jun 2024 00:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45O0dKo7051271; Mon, 24 Jun 2024 00:39:20 GMT (envelope-from git) Date: Mon, 24 Jun 2024 00:39:20 GMT Message-Id: <202406240039.45O0dKo7051271@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 1b0d90b0aeab - 2024Q2 - editors/emacs: Backport Emacs 29.4 security fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 1b0d90b0aeabd9077ebdf5dce9b18af8a3f0face Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b0d90b0aeabd9077ebdf5dce9b18af8a3f0face commit 1b0d90b0aeabd9077ebdf5dce9b18af8a3f0face Author: Joseph Mingrone AuthorDate: 2024-06-23 21:21:07 +0000 Commit: Joseph Mingrone CommitDate: 2024-06-23 22:19:43 +0000 editors/emacs: Backport Emacs 29.4 security fix Details about the security vulnerability can be found at https://seclists.org/oss-sec/2024/q2/296. Reviewed by: ashish Sponsored by: The FreeBSD Foundation Security: https://vuxml.freebsd.org/freebsd/4f6c4c07-3179-11ef-9da5-1c697a616631.html Differential Revision: https://reviews.freebsd.org/D45714 (cherry picked from commit 8ef91da50b7381a2f0f014ed3c7ee247269482a2) --- editors/emacs/Makefile | 4 ++++ editors/emacs/distinfo | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index f88af1d29735..14863fc5a9a7 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,5 +1,6 @@ PORTNAME= emacs DISTVERSION= 29.3 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU @@ -9,6 +10,9 @@ PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs29canna/:canna PATCHFILES+= emacs29.1-canna-20230730.diff.xz:-p1:canna .endif +PATCH_SITES+= https://github.com/emacs-devel/emacs/commit/ +PATCHFILES+= c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch:-p1 + MAINTAINER= emacs@FreeBSD.org COMMENT= GNU editing macros ${COMMENT_${FLAVOR}} WWW= https://www.gnu.org/software/emacs/ diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index bd1540f5bfa5..d2e160ad5e4f 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1711330409 +TIMESTAMP = 1719177422 SHA256 (emacs-29.3.tar.xz) = c34c05d3ace666ed9c7f7a0faf070fea3217ff1910d004499bd5453233d742a0 SIZE (emacs-29.3.tar.xz) = 52203168 SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125 SIZE (emacs29.1-canna-20230730.diff.xz) = 26852 +SHA256 (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = fa7978109a164a894479c2827b297228566bfdf46d1a3def00975a35595ba0bf +SIZE (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = 2873