git: 1b0d90b0aeab - 2024Q2 - editors/emacs: Backport Emacs 29.4 security fix

The branch 2024Q2 has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1b0d90b0aeabd9077ebdf5dce9b18af8a3f0face

commit 1b0d90b0aeabd9077ebdf5dce9b18af8a3f0face
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2024-06-23 21:21:07 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
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