diff --git a/emacs-64KB-page-size-for-pdump.patch b/emacs-64KB-page-size-for-pdump.patch new file mode 100644 index 0000000..371e5c2 --- /dev/null +++ b/emacs-64KB-page-size-for-pdump.patch @@ -0,0 +1,31 @@ +From 216c65b135c2b0be7e048cdc6683873b03b99b9a Mon Sep 17 00:00:00 2001 +From: Lars Ingebrigtsen +Date: Sun, 28 Mar 2021 19:13:00 +0200 +Subject: [PATCH] Use a 64KB page size for pdump + +* src/pdumper.c (dump_get_page_size): Use a 64KB page size on all +architectures, as this many vary between systems (bug#47125). +--- + src/pdumper.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/pdumper.c b/src/pdumper.c +index 337742fda4..fdd9b3bacb 100644 +--- a/src/pdumper.c ++++ b/src/pdumper.c +@@ -162,11 +162,7 @@ ptrdiff_t_to_dump_off (ptrdiff_t value) + static int + dump_get_page_size (void) + { +-#if defined (WINDOWSNT) || defined (CYGWIN) +- return 64 * 1024; /* Worst-case allocation granularity. */ +-#else +- return getpagesize (); +-#endif ++ return 64 * 1024; + } + + #define dump_offsetof(type, member) \ +-- +2.36.1 + diff --git a/emacs.spec b/emacs.spec index 42f2b33..1bcc215 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 27.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz @@ -28,6 +28,7 @@ Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch Patch3: emacs-glibc-2.34.patch Patch4: emacs-ctags-local-command-execute-vulnerability.patch +Patch5: emacs-64KB-page-size-for-pdump.patch BuildRequires: gcc BuildRequires: atk-devel BuildRequires: cairo-devel @@ -191,6 +192,7 @@ Development header files for Emacs. %patch2 -p1 -b .system-crypto-policies %patch3 -p1 -b .glibc2.34 %patch4 -p1 -b .ctags-local-command-execute-vulnerability +%patch5 -p1 -b .64KB-page-size-for-pdump autoconf # We prefer our emacs.desktop file @@ -481,6 +483,9 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %{_includedir}/emacs-module.h %changelog +* Tue Jan 10 2023 Jacek Migacz - 1:27.2-8 +- Use a 64KB page size for pdump (#1979804) + * Wed Jan 04 2023 Jacek Migacz - 1:27.2-7 - Fix ctags local command execute vulnerability (#2149387)