diff --git a/.emacs.metadata b/.emacs.metadata index 987ddd4..3193782 100644 --- a/.emacs.metadata +++ b/.emacs.metadata @@ -1,2 +1,2 @@ -d1b6b9efa666614c5628dda9ea78628796a73f7f SOURCES/emacs-27.1.tar.xz -65d89afcf288d0054dbe3dfd213531585e5c3178 SOURCES/gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg +8d18e2bfb6e28cf060ce7587290954e9c582aa25 SOURCES/emacs-27.2.tar.xz +4898b4750740a0b711bb140a2fad512d80a991b0 SOURCES/gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg diff --git a/.gitignore b/.gitignore index 9cef1ff..15d9ecd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/emacs-27.1.tar.xz -SOURCES/gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg +SOURCES/emacs-27.2.tar.xz +SOURCES/gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg diff --git a/SOURCES/emacs-27.1.tar.xz.sig b/SOURCES/emacs-27.1.tar.xz.sig deleted file mode 100644 index f6e5fcb..0000000 --- a/SOURCES/emacs-27.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE1AWqLIYsVPF+7mvg6LzXhmr8+XgFAl8xzTYACgkQ6LzXhmr8 -+XjGjAf/S3scggDm1G3/EAKf0nMPBNBJaRboWohoUviu6/024WHKdsZ+qJ1w7Ad2 -saHbyoouiKJcq75rcfxe4faeRYy/V5QHchxfnvt092UnZrSMaq9jkjp5DUARxeZx -8pCB5OPC9BTMyT/gOe4mqIplYYBRsF26fcKfvcLTuZ45+4Jkii8CSNa9iJbYQoaW -41MqZFvPsQhRF7UH084ONxZnrXpBebrRSoY4yj1eM/lLtcHFgUvSg5UoP6EwXqcL -kkQB4+UGGOzxA3zwsLzmrq9gOa39w/pJY+Fs9+bYuf8xf2nbq3VnobKnPJveeMMq -0yTvrrY5E7/4vTXeb5ykmggNqTMa7w== -=29/a ------END PGP SIGNATURE----- diff --git a/SOURCES/emacs-27.2.tar.xz.sig b/SOURCES/emacs-27.2.tar.xz.sig new file mode 100644 index 0000000..250b469 --- /dev/null +++ b/SOURCES/emacs-27.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJgXHmkAAoJEJHBJi8B6405d2EIAIPafSj+sV3Hemu9CSPL+F38 +KutOo7nUF1AO0tgdijPGZ4BTBsWnsum0dLQ/JLtor7/NQuqrZTMJQbrorLluwCR7 +p1aVtwQ+enWn3G0Aq/4uWo0xaMCvJlEPOQuYE8Dtt12PFZzmfAE1r4KZa4cL073h +suugT/tz7awq7QS6GbjI88mkJXVMuEwVYPPS2tzBUTkA2152dikFSyqBhUnIo3Ni +eDN6NvSYBpL1I9HgNYuiBJp9xv8CzGtwm/7Nidntzl9SPVQlZkZIHNj8tRbE67Ge +R0EXBgnDsSKlRUM51R7PejnSG6134VcLCaItMF6dIiVBu6BwQXw1t+zdqnzG6v8= +=L6J6 +-----END PGP SIGNATURE----- diff --git a/SOURCES/emacs-glibc-2.34.patch b/SOURCES/emacs-glibc-2.34.patch new file mode 100644 index 0000000..6d764aa --- /dev/null +++ b/SOURCES/emacs-glibc-2.34.patch @@ -0,0 +1,40 @@ +From f97e07ea807cc6d38774a3888a15091b20645ac6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 9 Mar 2021 11:22:59 -0800 +Subject: [PATCH] Port alternate signal stack to upcoming glibc 2.34 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* src/sysdep.c (sigsegv_stack): Increase size to 64 KiB and align +it to max_align_t. This copies from Gnulib’s c-stack.c, and works +around a portability bug in draft glibc 2.34, which no longer +defines SIGSTKSZ when _GNU_SOURCE is defined. +--- + src/sysdep.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/sysdep.c b/src/sysdep.c +index 941b4e2fa2..24d8832b2f 100644 +--- a/src/sysdep.c ++++ b/src/sysdep.c +@@ -1785,7 +1785,15 @@ handle_arith_signal (int sig) + + /* Alternate stack used by SIGSEGV handler below. */ + +-static unsigned char sigsegv_stack[SIGSTKSZ]; ++/* Storage for the alternate signal stack. ++ 64 KiB is not too large for Emacs, and is large enough ++ for all known platforms. Smaller sizes may run into trouble. ++ For example, libsigsegv 2.6 through 2.8 have a bug where some ++ architectures use more than the Linux default of an 8 KiB alternate ++ stack when deciding if a fault was caused by stack overflow. */ ++static max_align_t sigsegv_stack[(64 * 1024 ++ + sizeof (max_align_t) - 1) ++ / sizeof (max_align_t)]; + + + /* Return true if SIGINFO indicates a stack overflow. */ +-- +2.29.2 + diff --git a/SPECS/emacs.spec b/SPECS/emacs.spec index 0199e84..088ea9a 100644 --- a/SPECS/emacs.spec +++ b/SPECS/emacs.spec @@ -4,17 +4,16 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 27.1 -Release: 3%{?dist} +Version: 27.2 +Release: 6%{?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 Source1: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig # generate the keyring via: # wget https://ftp.gnu.org/gnu/gnu-keyring.gpg -# gpg2 --import gnu-keyring.gpg -# gpg2 --armor --export D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978 > gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg -Source2: gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg +# gpg2 --keyring ./gnu-keyring.gpg --armor --export E6C9029C363AD41D787A8EBB91C1262F01EB8D39 > gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg +Source2: gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg Source3: emacs.desktop Source4: dotemacs.el Source5: site-start.el @@ -27,6 +26,7 @@ Source10: %{name}.appdata.xml # rhbz#713600 Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch +Patch3: emacs-glibc-2.34.patch BuildRequires: gcc BuildRequires: atk-devel @@ -189,6 +189,7 @@ Development header files for Emacs. %patch1 -p1 -b .spellchecker %patch2 -p1 -b .system-crypto-policies +%patch3 -p1 -b .glibc2.34 autoconf # We prefer our emacs.desktop file @@ -239,8 +240,6 @@ export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}" mkdir build-gtk && cd build-gtk ln -s ../configure . -LDFLAGS=-Wl,-z,relro; export LDFLAGS; - %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ --with-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json @@ -252,8 +251,6 @@ cd .. mkdir build-lucid && cd build-lucid ln -s ../configure . -LDFLAGS=-Wl,-z,relro; export LDFLAGS; - %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ --with-modules --with-harfbuzz --with-cairo --with-json @@ -483,6 +480,25 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %{_includedir}/emacs-module.h %changelog +* Wed Sep 22 2021 Jacek Migacz - 1:27.2-6 +- Adapt hardening options from _hardened_build macro (#2006856) + +* Wed Aug 18 2021 Jacek Migacz - 1:27.2-5 +- Provide gating.yaml for CI (#1975151) + +* Tue Aug 10 2021 Jacek Migacz - 1:27.2-4 +- Fix FTBFS with glibc 2.34 (#1975151) + +* Mon Aug 09 2021 Mohan Boddu - 1:27.2-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 1:27.2-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Thu Mar 27 2021 Bhavin Gandhi - 1:27.2-1 +- emacs-27.2 is available + * Tue Jan 26 2021 Fedora Release Engineering - 1:27.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild