diff --git a/1000-anolis-emacs-support-loongarch64.patch b/1000-anolis-emacs-support-loongarch64.patch index f3923c788096edd0de40fb33639e755301227d8f..48d5a4b3eed82584c943214e0c639e33d6852d49 100644 --- a/1000-anolis-emacs-support-loongarch64.patch +++ b/1000-anolis-emacs-support-loongarch64.patch @@ -1,32 +1,24 @@ -diff -Nur emacs-26.1/build-aux/config.guess emacs-26.1.new/build-aux/config.guess ---- emacs-26.1/build-aux/config.guess 2018-04-23 22:17:34.000000000 +0800 -+++ emacs-26.1.new/build-aux/config.guess 2021-12-06 13:19:16.684000000 +0800 -@@ -893,6 +893,9 @@ +diff -Nur emacs-27.2/build-aux/config.guess emacs-27.2.new/build-aux/config.guess +--- emacs-27.2/build-aux/config.guess 2022-11-29 13:17:34.000000000 +0800 ++++ emacs-27.2.new/build-aux/config.guess 2022-11-29 13:19:16.684000000 +0800 +@@ -919,6 +919,9 @@ aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -diff -Nur emacs-26.1/build-aux/config.sub emacs-26.1.new/build-aux/config.sub ---- emacs-26.1/build-aux/config.sub 2018-04-23 22:17:34.000000000 +0800 -+++ emacs-26.1.new/build-aux/config.sub 2021-12-06 13:19:48.160000000 +0800 -@@ -245,6 +245,7 @@ - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ -+ | loongarch32 | loongarch64 | loongarchx32 \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -@@ -369,6 +370,7 @@ - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ -+ | loongarch32-* | loongarch64-* | loongarchx32-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" +diff -Nur emacs-27.2/build-aux/config.sub emacs-27.2.new/build-aux/config.sub +--- emacs-27.2/build-aux/config.sub 2022-11-29 13:17:34.000000000 +0800 ++++ emacs-27.2.new/build-aux/config.sub 2022-11-29 13:19:48.160000000 +0800 +@@ -1157,6 +1157,7 @@ + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ ++ | loongarch32 | loongarch64 | loongarchx32 \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ diff --git a/1001-emacs-add-sw.patch b/1001-emacs-add-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..bafdfa1a5225d6d96f5c11b9a03322e2d6568794 --- /dev/null +++ b/1001-emacs-add-sw.patch @@ -0,0 +1,86 @@ +From f0cc006e3b7f490ece36996dfbef46712cdaf36f Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Tue, 20 Jun 2023 14:20:50 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + build-aux/config.guess | 8 ++++++++ + build-aux/config.sub | 1 + + configure.ac | 2 +- + src/unexelf.c | 8 +++++++- + 4 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/build-aux/config.guess b/build-aux/config.guess +index 457a63a..827cd81 100755 +--- a/build-aux/config.guess ++++ b/build-aux/config.guess +@@ -926,6 +926,14 @@ EOF + UNAME_MACHINE=aarch64_be + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo "$UNAME_MACHINE"-sunway-linux-"$LIBC" ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff --git a/build-aux/config.sub b/build-aux/config.sub +index 90f19bb..eb9e11d 100755 +--- a/build-aux/config.sub ++++ b/build-aux/config.sub +@@ -1159,6 +1159,7 @@ case $cpu-$vendor in + | aarch64 | aarch64_be \ + | loongarch32 | loongarch64 | loongarchx32 \ + | abacus \ ++ | sw_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ +diff --git a/configure.ac b/configure.ac +index 0b34532..d4d637c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -703,7 +703,7 @@ case "${canonical}" in + *-apple-darwin* ) + case "${canonical}" in + *-apple-darwin[0-9].*) unported=yes ;; +- i[3456]86-* | x86_64-* | arm-* | aarch64-* ) ;; ++ i[3456]86-* | x86_64-* | arm-* | aarch64-* | sw_64-* ) ;; + * ) unported=yes ;; + esac + opsys=darwin +diff --git a/src/unexelf.c b/src/unexelf.c +index b5cded5..6c1e121 100644 +--- a/src/unexelf.c ++++ b/src/unexelf.c +@@ -120,7 +120,7 @@ typedef struct { + /* + * NetBSD does not have normal-looking user-land ELF support. + */ +-# if defined __alpha__ || defined __sparc_v9__ || defined _LP64 ++# if defined __alpha__ || defined __sparc_v9__ || defined _LP64 || defined __sw_64__ + # define ELFSIZE 64 + # else + # define ELFSIZE 32 +@@ -150,6 +150,12 @@ typedef struct { + # define pHDRR HDRR * + # endif /* __alpha__ */ + ++# ifdef __sw_64__ ++# include ++# define HDRR struct ecoff_symhdr ++# define pHDRR HDRR * ++# endif /* __sw_64__ */ ++ + #ifdef __mips__ /* was in pkgsrc patches for 20.7 */ + # define SHT_MIPS_DEBUG DT_MIPS_FLAGS + # define HDRR struct Elf_Shdr +-- +2.31.1 + diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..dbbfc02516ab49522ae09691267965b375f1f235 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an9_1 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..20f3950b7d684968a8aff5d3469987145481628d --- /dev/null +++ b/download @@ -0,0 +1,2 @@ +4c3d9ff35b2ab2fe518dc7eb3951e128 emacs-27.2.tar.xz +307a3f9821bec024a54c608b78c0d3f9 emacs-27.2.tar.xz.sig diff --git a/emacs-26.1.tar.xz b/emacs-26.1.tar.xz deleted file mode 100644 index dbc8aa515a44768c9ae10e4020b161703d785768..0000000000000000000000000000000000000000 Binary files a/emacs-26.1.tar.xz and /dev/null differ diff --git a/emacs-glibc-2.34.patch b/emacs-glibc-2.34.patch new file mode 100644 index 0000000000000000000000000000000000000000..6d764aa2666543ba69376273244d278001978dee --- /dev/null +++ b/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/emacs-ob-latex-command-injection-vulnerability.patch b/emacs-ob-latex-command-injection-vulnerability.patch new file mode 100644 index 0000000000000000000000000000000000000000..275ada9519bd4447c33d9b84d715da8747e61c43 --- /dev/null +++ b/emacs-ob-latex-command-injection-vulnerability.patch @@ -0,0 +1,43 @@ +From a8006ea580ed74f27f974d60b598143b04ad1741 Mon Sep 17 00:00:00 2001 +From: Xi Lu +Date: Sat, 11 Mar 2023 18:53:37 +0800 +Subject: * lisp/org/ob-latex.el: Fix command injection vulnerability + +(org-babel-execute:latex): +Replaced the `(shell-command "mv BAR NEWBAR")' with `rename-file'. + +TINYCHANGE +--- + lisp/org/ob-latex.el | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el +index a2c24b3..ce39628 100644 +--- a/lisp/org/ob-latex.el ++++ b/lisp/org/ob-latex.el +@@ -218,17 +218,14 @@ This function is called by `org-babel-execute-src-block'." + (if (string-suffix-p ".svg" out-file) + (progn + (shell-command "pwd") +- (shell-command (format "mv %s %s" +- (concat (file-name-sans-extension tex-file) "-1.svg") +- out-file))) ++ (rename-file (concat (file-name-sans-extension tex-file) "-1.svg") ++ out-file t)) + (error "SVG file produced but HTML file requested"))) + ((file-exists-p (concat (file-name-sans-extension tex-file) ".html")) + (if (string-suffix-p ".html" out-file) +- (shell-command "mv %s %s" +- (concat (file-name-sans-extension tex-file) +- ".html") +- out-file) +- (error "HTML file produced but SVG file requested"))))) ++ (rename-file (concat (file-name-sans-extension tex-file) ".html") ++ out-file t) ++ (error "HTML file produced but SVG file requested"))))) + ((or (string= "pdf" extension) imagemagick) + (with-temp-file tex-file + (require 'ox-latex) +-- +cgit v1.1 + diff --git a/emacs.spec b/emacs.spec index 51bb26698ca68a946f6fa0689136d11b0685d3d8..521d2097d29cbb309914cb28a2b736c4015d109b 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,30 +5,35 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 26.1 -Release: 7%{anolis_release}%{?dist} +Version: 27.2 +Release: 6%{anolis_release}%{?dist}.1 License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ -Group: Applications/Editors Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz -Source1: emacs.desktop -Source3: dotemacs.el -Source4: site-start.el -Source5: default.el +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 --keyring ./gnu-keyring.gpg --armor --export E6C9029C363AD41D787A8EBB91C1262F01EB8D39 > gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg +Source2: gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg +Source3: emacs.desktop +Source4: dotemacs.el +Source5: site-start.el +Source6: default.el # Emacs Terminal Mode, #551949, #617355 -Source6: emacs-terminal.desktop -Source7: emacs-terminal.sh -Source8: emacs.service -Source9: %{name}.appdata.xml -# rhbz#1810729 -Source10: package-keyring.gpg +Source7: emacs-terminal.desktop +Source8: emacs-terminal.sh +Source9: emacs.service +Source10: %{name}.appdata.xml # rhbz#713600 Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch - +Patch3: emacs-glibc-2.34.patch +Patch4: emacs-ob-latex-command-injection-vulnerability.patch +BuildRequires: gcc # Add by Anolis Patch1000: 1000-anolis-emacs-support-loongarch64.patch # End of Anolis +Patch1001: 1001-emacs-add-sw.patch BuildRequires: atk-devel BuildRequires: cairo-devel @@ -55,27 +60,34 @@ BuildRequires: librsvg2-devel BuildRequires: m17n-lib-devel BuildRequires: libotf-devel BuildRequires: libselinux-devel -BuildRequires: GConf2-devel BuildRequires: alsa-lib-devel BuildRequires: gpm-devel BuildRequires: liblockfile-devel BuildRequires: libxml2-devel +BuildRequires: autoconf BuildRequires: bzip2 BuildRequires: cairo BuildRequires: texinfo BuildRequires: gzip BuildRequires: desktop-file-utils BuildRequires: libacl-devel +BuildRequires: harfbuzz-devel +BuildRequires: jansson-devel +BuildRequires: systemd-devel BuildRequires: gtk3-devel BuildRequires: webkit2gtk3-devel +BuildRequires: gnupg2 + # For lucid BuildRequires: Xaw3d-devel %ifarch %{ix86} BuildRequires: util-linux %endif +BuildRequires: make + # Emacs doesn't run without dejavu-sans-mono-fonts, rhbz#732422 Requires: desktop-file-utils @@ -102,18 +114,8 @@ without leaving the editor. This package provides an emacs binary with support for X windows. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{epoch}:%{version}-%{release} - - -%description doc -Doc pages for %{name}. - %package lucid Summary: GNU Emacs text editor with LUCID toolkit X support -Group: Applications/Editors Requires(preun): %{_sbindir}/alternatives Requires(posttrans): %{_sbindir}/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} @@ -130,7 +132,6 @@ using LUCID toolkit. %package nox Summary: GNU Emacs text editor without X support -Group: Applications/Editors Requires(preun): %{_sbindir}/alternatives Requires(posttrans): %{_sbindir}/alternatives Requires: emacs-common = %{epoch}:%{version}-%{release} @@ -150,11 +151,8 @@ Summary: Emacs common files # The entire source code is GPLv3+ except lib-src/etags.c which is # also BSD. Manual (info) is GFDL. License: GPLv3+ and GFDL and BSD -Group: Applications/Editors -Requires(preun): /sbin/install-info Requires(preun): %{_sbindir}/alternatives Requires(posttrans): %{_sbindir}/alternatives -Requires(post): /sbin/install-info Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} Provides: %{name}-el = %{epoch}:%{version}-%{release} Obsoletes: emacs-el < 1:24.3-29 @@ -170,7 +168,6 @@ or emacs-nox. %package terminal Summary: A desktop menu item for GNU Emacs terminal. -Group: Applications/Editors Requires: emacs = %{epoch}:%{version}-%{release} BuildArch: noarch @@ -183,26 +180,39 @@ removed when another terminal becomes capable of handling Malayalam. %package filesystem Summary: Emacs filesystem layout -Group: Applications/Editors BuildArch: noarch %description filesystem This package provides some directories which are required by other packages that add functionality to Emacs. +%package devel +Summary: Development header files for Emacs + +%description devel +Development header files for Emacs. + +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q %patch1 -p1 -b .spellchecker %patch2 -p1 -b .system-crypto-policies +%patch3 -p1 -b .glibc2.34 +%patch4 -p1 -b .ob-latex-command-injection-vulnerability %patch1000 -p1 autoconf # We prefer our emacs.desktop file -cp %SOURCE1 etc/emacs.desktop - -# GPG key for GNU ELPA packages backported from Emacs 26.3 (#1810729) -cp %SOURCE10 etc/package-keyring.gpg +cp %SOURCE3 etc/emacs.desktop grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \ && mv lisp/Makefile.in.new lisp/Makefile.in @@ -242,8 +252,8 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc %build -export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" -export LDFLAGS="$LDFLAGS -Wl,-z,relro,-z,now -fpie" +export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}" +%set_build_flags # Build GTK+ binary mkdir build-gtk && cd build-gtk @@ -251,9 +261,9 @@ ln -s ../configure . %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-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json make bootstrap -%{setarch} make %{?_smp_mflags} +%{setarch} %make_build cd .. # Build Lucid binary @@ -262,16 +272,16 @@ ln -s ../configure . %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-modules --with-harfbuzz --with-cairo --with-json make bootstrap -%{setarch} make %{?_smp_mflags} +%{setarch} %make_build cd .. # Build binary without X support mkdir build-nox && cd build-nox ln -s ../configure . -%configure --with-x=no --with-modules -%{setarch} make %{?_smp_mflags} +%configure --with-x=no --with-modules --with-json +%{setarch} %make_build cd .. # Remove versioned file so that we end up with .1 suffix and only one DOC file @@ -299,29 +309,37 @@ EOF %install cd build-gtk -make install INSTALL="%{__install} -p" DESTDIR=%{buildroot} +%make_install cd .. # Let alternatives manage the symlink rm %{buildroot}%{_bindir}/emacs touch %{buildroot}%{_bindir}/emacs +# Remove emacs.pdmp from common +rm %{buildroot}%{emacs_libexecdir}/emacs.pdmp + # Do not compress the files which implement compression itself (#484830) gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el.gz +# Install emacs.pdmp of the emacs with GTK+ +install -p -m 0644 build-gtk/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}.pdmp + # Install the emacs with LUCID toolkit install -p -m 0755 build-lucid/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-lucid +install -p -m 0644 build-lucid/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}-lucid.pdmp # Install the emacs without X install -p -m 0755 build-nox/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-nox +install -p -m 0644 build-nox/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}-nox.pdmp # Make sure movemail isn't setgid chmod 755 %{buildroot}%{emacs_libexecdir}/movemail mkdir -p %{buildroot}%{site_lisp} -install -p -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el -install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp} +install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp}/site-start.el +install -p -m 0644 %SOURCE6 %{buildroot}%{site_lisp} # This solves bz#474958, "update-directory-autoloads" now finally # works the path is different each version, so we'll generate it here @@ -339,7 +357,7 @@ mkdir -p %{buildroot}%{site_lisp}/site-start.d # Default initialization file mkdir -p %{buildroot}%{_sysconfdir}/skel -install -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs +install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs # Install pkgconfig file mkdir -p %{buildroot}/%{pkgconfig} @@ -347,30 +365,32 @@ install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig} # Install app data mkdir -p %{buildroot}/%{_datadir}/appdata -cp -a %SOURCE9 %{buildroot}/%{_datadir}/appdata +cp -a %SOURCE10 %{buildroot}/%{_datadir}/appdata +# Upstream ships its own appdata file, but it's quite terse. +rm %{buildroot}/%{_datadir}/metainfo/emacs.appdata.xml # Install rpm macro definition file mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/ # Installing emacs-terminal binary -install -p -m 755 %SOURCE7 %{buildroot}%{_bindir}/emacs-terminal +install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir # Installing service file mkdir -p %{buildroot}%{_userunitdir} -install -p -m 0644 %SOURCE8 %{buildroot}%{_userunitdir}/emacs.service +install -p -m 0644 %SOURCE9 %{buildroot}%{_userunitdir}/emacs.service # Emacs 26.1 installs the upstream unit file to /usr/lib64 on 64bit archs, we don't want that rm -f %{buildroot}/usr/lib64/systemd/user/emacs.service # Install desktop files mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE1 + %SOURCE3 desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE6 + %SOURCE7 # # Create file lists @@ -416,18 +436,8 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 %{_sbindir}/alternatives --install %{_bindir}/emacs-nox emacs-nox %{_bindir}/emacs-%{version}-nox 60 -%post common -for f in %{info_files}; do - /sbin/install-info %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || : -done - %preun common %{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs -if [ "$1" = 0 ]; then - for f in %{info_files}; do - /sbin/install-info --delete %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || : - done -fi %posttrans common %{_sbindir}/alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ @@ -435,20 +445,24 @@ fi %files %{_bindir}/emacs-%{version} +%{_bindir}/emacs-%{version}.pdmp %attr(0755,-,-) %ghost %{_bindir}/emacs %{_datadir}/applications/emacs.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/*/apps/emacs.png %{_datadir}/icons/hicolor/scalable/apps/emacs.svg +%{_datadir}/icons/hicolor/scalable/apps/emacs.ico %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg %files lucid %{_bindir}/emacs-%{version}-lucid +%{_bindir}/emacs-%{version}-lucid.pdmp %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-lucid %files nox %{_bindir}/emacs-%{version}-nox +%{_bindir}/emacs-%{version}-nox.pdmp %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-nox @@ -480,33 +494,94 @@ fi %dir %{_datadir}/emacs/site-lisp %dir %{_datadir}/emacs/site-lisp/site-start.d +%files devel +%{_includedir}/emacs-module.h + %files doc %doc doc/NEWS BUGS README %changelog -* Sat Jul 16 2022 mgb01105731 - 1:26.1-7.0.2 -- Add doc sub package +* Tue Jun 20 2023 wxiat - 1:27.2-6.0.2.1 +- add sw patch -* Mon Dec 6 2021 Liwei Ge - 1:26.1-7.0.1 +* Thu May 04 2023 Xiaoping Liu - 1:27.2-6.0.1.1 +- Add doc sub package - Support loongarch64 platform -* Thu Aug 5 2021 Jacek Migacz - 1:26.1-7 -- provide gating.yaml for CI +* Wed Apr 4 2023 Jacek Migacz - 1:27.2-6.1 +- Fix ob-latex.el command injection vulnerability (#2180589) + +* 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 + +* Sat 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 -* Mon Jul 19 2021 Jacek Migacz - 1:26.1-6 -- a new GPG key for GNU ELPA packages (#1810729) +* Tue Aug 18 2020 Jan Synáček - 1:27.1-2 +- use make macros (original patch provided by Tom Stellard) +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro -* Mon Sep 10 2018 Jan Synáček - 1:26.1-5 -- review annocheck distro flag failures (#1624109) +* Tue Aug 11 2020 Bhavin Gandhi - 1:27.1-1 +- emacs-27.1 is available (#1867841) +- Add systemd-devel to support Type=notify in unit file +- Build with Cairo and Jansson support +- Remove ImageMagick dependency as it's no longer used -* Tue Aug 14 2018 Jan Synáček - 1:26.1-4 -- remove ImageMagick dependency (#1564992) +* Mon Jul 27 2020 Fedora Release Engineering - 1:26.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Aug 13 2018 Jan Synáček - 1:26.1-3 +* Thu Apr 16 2020 Dan Čermák - 1:26.3-3 +- Drop dependency on GConf2 + +* Tue Jan 28 2020 Fedora Release Engineering - 1:26.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Sep 08 2019 Maximiliano Sandoval - 1:26.3-1 +- emacs-26.3 is available (#1747101) + +* Wed Jul 24 2019 Fedora Release Engineering - 1:26.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Apr 17 2019 Jan Synáček - 1:26.2-1 +- emacs-26.2 is available (#1699434) + +* Thu Jan 31 2019 Fedora Release Engineering - 1:26.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 28 2018 Michael Cronenworth - 1:26.1-7 +- Rebuild for new ImageMagick 6.9.10 + +* Mon Aug 13 2018 Jan Synáček - 1:26.1-6 - remove python dependencies, emacs*.py have not been there for a while -* Mon Jun 18 2018 Jan Synáček - 1:26.1-2 -- remove build dependency on python2 (#1591707) +* Thu Jul 12 2018 Fedora Release Engineering - 1:26.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 1:26.1-4 +- Rebuilt for Python 3.7 + +* Tue Jun 26 2018 Jan Synáček - 1:26.1-3 +- Refix: Emacs crashes when loading color fonts (#1519038) + + emacs SIGABRT after XProtocolError on displaying an email in Gnus (#1591223) + +* Tue Jun 19 2018 Miro Hrončok - 1:26.1-2 +- Rebuilt for Python 3.7 * Wed May 30 2018 Jan Synáček - 1:26.1-1 - emacs-26.1 is available (#1583433) diff --git a/gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg b/gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg new file mode 100644 index 0000000000000000000000000000000000000000..85ae1394aba3d7c2577fe5c365ae24e064dc8dfe --- /dev/null +++ b/gpgkey-E6C9029C363AD41D787A8EBB91C1262F01EB8D39.gpg @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBF+pf4UBCAC6vjkWLSAsQpe8YIGKLQzNOJx/IjGtCdFF8uzmO5jmME+SD8RO +uJN+t5KXVw58uzu75EFD0vHTY9e+udJ2gkpuy0NnzkFcbumdLLo2ERKCoSctZZRh +zKXI5z5cHxCqW0B2ygHRrRLtoNlGID7bAgcgSViT1ptGqTXO7zGVu4Airok7dNzc +PtHgns8GlR5YAFX0TvE6oGd0l2VPghNeVJKJOjrbfhoDxl3ucFpqbqMH8z9HTLDO +Fpz8UaYYUdJMi3xX6vwTZxI2sM2RRVLUpZyllAkSMI4lln1OOgazM/62DJUs/rKI +HKBnF6h3/qsJUjUYXaAHbrXY26mWllAd536lABEBAAG0I0VsaSBaYXJldHNraWkg +KGVsaXopIDxlbGl6QGdudS5vcmc+iQE4BBMBAgAiBQJfqX+FAhsDBgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAAKCRCRwSYvAeuNOYUQB/4/iIKKOG45ijNaRoTvmJJZ +Mvj1S07WQxEm7c5SHEeEQbLOAxB9vESOV7sLueuN3oqEndtzyYt4x1WTSBmHFF7h +5fcCMjBs41siOIp5Sj/xD0Bvaa0IKGCRSZ7PAo8Mq3wgajXpTpn9vxE2PmtzA8Kd +EE0K1+f9pVAfOpUIcCl44rIxLUW352XG0y7iz6c/O6LB1deOKMiKFctKO7pBti1d +JEm1ImewLH3H8uTbwspLOs3EB8xhsESxmTidnze68HX2jt+2EeMgCdkiNU+LWbex +QZPfIS7+ZmE06ll0v6+Jy7ZdTkCCRypKWTnW7pIFsq/p4kybV8O/kHSV6B4vvQBf +uQENBF+pf4UBCACvFrdx/m22lgObypSmSS4TNlNvQnMUorrMmp0U32hv5adt6CKX +eMjk05F+GcIfVMrpxqMBn4sEUIXWhhogQJa9ZbWEP/HbS8XjMMbz0Q0Siaty9+DS +spK/9u2GWKsz3uQzLCexIJtzmXvjAVmvoMCAU/F2t038ggygjYLRgyLRNLgbbart +u2dMkvrfxRjheip60S4S3utOcwUf/qdoa1grNannCFluHr/ftXCeeuGB4H8iO0BX +WNby6NZPizxJttx9gdcH8/OmDOJkXyRMTT/3sSem76CSOjfXcz7saJlg680NQhG5 +TmuYERjJD4+U02K5RuqTsEnOuWeFy4p+/mslABEBAAGJAR8EGAECAAkFAl+pf4UC +GwwACgkQkcEmLwHrjTno7Af/a1XoLHxAUkS43nmF8iazn3ZnuwWKWLEAsNrxk56y +UxhUPRzNs0/fsABDQR1o0DyTqbScKOcOMSG2YMCctLiDd7FdfMWwkUsV9GUpPBiR +tD60Ewmn9sbNJKrEoZ5L6sqOUEslJRVABu5taOzVIRfeUPPaMRjvCcr0d+epKjW8 +1J9Aqj8SskuNkHwvHchTYFYVT22aemjjZ1MGOUm7QiybWQgYL6aSPV2gR+NQQ7pE +hOBoEi6GLEiBkoYOIXvmxsqQLBrUPbsJq8lItYEaw4HGt8BaPxtK2yZ9mSqC2xhW +Yr1j1YAIHffzubC0jxc5znXERsRANoJOwNUXmiddD7UM9A== +=g4R7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/package-keyring.gpg b/package-keyring.gpg deleted file mode 100644 index 490dee41a92eaa4afaade953da7c2a61ee303a50..0000000000000000000000000000000000000000 Binary files a/package-keyring.gpg and /dev/null differ