diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..19f7ff2e22052f9b77092811403e0b1e4635bfb1 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/emacs diff --git a/backport-CVE-2024-30202.patch b/backport-CVE-2024-30202.patch deleted file mode 100644 index 10d10d6d6c7095a488c07e70d9371ba523446ed5..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-30202.patch +++ /dev/null @@ -1,45 +0,0 @@ -From befa9fcaae29a6c9a283ba371c3c5234c7f644eb Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 12:19:46 +0300 -Subject: org-macro--set-templates: Prevent code evaluation - -* lisp/org/org-macro.el (org-macro--set-templates): Get rid of any -risk to evaluate code when `org-macro--set-templates' is called as a -part of major mode initialization. This way, no code evaluation is -ever triggered when user merely opens the file or when -`mm-display-org-inline' invokes Org major mode to fontify mime part -preview in email messages. ---- - lisp/org/org-macro.el | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el -index 776d162..0be51ee 100644 ---- a/lisp/org/org-macro.el -+++ b/lisp/org/org-macro.el -@@ -109,6 +109,13 @@ previous one, unless VALUE is nil. Return the updated list." - (let ((new-templates nil)) - (pcase-dolist (`(,name . ,value) templates) - (let ((old-definition (assoc name new-templates))) -+ ;; This code can be evaluated unconditionally, as a part of -+ ;; loading Org mode. We *must not* evaluate any code present -+ ;; inside the Org buffer while loading. Org buffers may come -+ ;; from various sources, like received email messages from -+ ;; potentially malicious senders. Org mode might be used to -+ ;; preview such messages and no code evaluation from inside the -+ ;; received Org text should ever happen without user consent. - (when (and (stringp value) (string-match-p "\\`(eval\\>" value)) - ;; Pre-process the evaluation form for faster macro expansion. - (let* ((args (org-macro--makeargs value)) -@@ -121,7 +128,7 @@ previous one, unless VALUE is nil. Return the updated list." - (cadr (read value)) - (error - (user-error "Invalid definition for macro %S" name))))) -- (setq value (eval (macroexpand-all `(lambda ,args ,body)) t)))) -+ (setq value `(lambda ,args ,body)))) - (cond ((and value old-definition) (setcdr old-definition value)) - (old-definition) - (t (push (cons name (or value "")) new-templates))))) --- -cgit v1.1 - diff --git a/backport-CVE-2024-30203-pre.patch b/backport-CVE-2024-30203-pre.patch deleted file mode 100644 index edc3b82f2af27e2ce7a66803d32220178efa0aaa..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-30203-pre.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ccc188fcf98ad9166ee551fac9d94b2603c3a51b Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 12:43:51 +0300 -Subject: * lisp/files.el (untrusted-content): New variable. - -The new variable is to be used when buffer contents comes from untrusted -source. ---- - lisp/files.el | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lisp/files.el b/lisp/files.el -index c0d26b2..5536af0 100644 ---- a/lisp/files.el -+++ b/lisp/files.el -@@ -695,6 +695,14 @@ Also see the `permanently-enabled-local-variables' variable." - Some modes may wish to set this to nil to prevent directory-local - settings being applied, but still respect file-local ones.") - -+(defvar-local untrusted-content nil -+ "Non-nil means that current buffer originated from an untrusted source. -+Email clients and some other modes may set this non-nil to mark the -+buffer contents as untrusted. -+ -+This variable might be subject to change without notice.") -+(put 'untrusted-content 'permanent-local t) -+ - ;; This is an odd variable IMO. - ;; You might wonder why it is needed, when we could just do: - ;; (setq-local enable-local-variables nil) --- -cgit v1.1 - diff --git a/backport-CVE-2024-30203.patch b/backport-CVE-2024-30203.patch deleted file mode 100644 index bdda416497f2841de8b5c4ee22546cbd6cad2737..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-30203.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 937b9042ad7426acdcca33e3d931d8f495bdd804 Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 12:44:30 +0300 -Subject: * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents - untrusted. - ---- - lisp/gnus/mm-view.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el -index 2e1261c..5f234e5 100644 ---- a/lisp/gnus/mm-view.el -+++ b/lisp/gnus/mm-view.el -@@ -504,6 +504,7 @@ If MODE is not set, try to find mode automatically." - (setq coding-system (mm-find-buffer-file-coding-system))) - (setq text (buffer-string)))) - (with-temp-buffer -+ (setq untrusted-content t) - (insert (cond ((eq charset 'gnus-decoded) - (with-current-buffer (mm-handle-buffer handle) - (buffer-string))) --- -cgit v1.1 - diff --git a/backport-CVE-2024-30204.patch b/backport-CVE-2024-30204.patch deleted file mode 100644 index 29cbc74e643f863b643d7111e444a38d2fd51760..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-30204.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 6f9ea396f49cbe38c2173e0a72ba6af3e03b271c Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 12:47:24 +0300 -Subject: org-latex-preview: Add protection when `untrusted-content' is non-nil - -* lisp/org/org.el (org--latex-preview-when-risky): New variable -controlling how to handle LaTeX previews in Org files from untrusted -origin. -(org-latex-preview): Consult `org--latex-preview-when-risky' before -generating previews. - -This patch adds a layer of protection when LaTeX preview is requested -for an email attachment, where `untrusted-content' is set to non-nil. ---- - lisp/org/org.el | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/lisp/org/org.el b/lisp/org/org.el -index c75afbf..0f5d17d 100644 ---- a/lisp/org/org.el -+++ b/lisp/org/org.el -@@ -1140,6 +1140,24 @@ the following lines anywhere in the buffer: - :package-version '(Org . "8.0") - :type 'boolean) - -+(defvar untrusted-content) ; defined in files.el -+(defvar org--latex-preview-when-risky nil -+ "If non-nil, enable LaTeX preview in Org buffers from unsafe source. -+ -+Some specially designed LaTeX code may generate huge pdf or log files -+that may exhaust disk space. -+ -+This variable controls how to handle LaTeX preview when rendering LaTeX -+fragments that originate from incoming email messages. It has no effect -+when Org mode is unable to determine the origin of the Org buffer. -+ -+An Org buffer is considered to be from unsafe source when the -+variable `untrusted-content' has a non-nil value in the buffer. -+ -+If this variable is non-nil, LaTeX previews are rendered unconditionally. -+ -+This variable may be renamed or changed in the future.") -+ - (defcustom org-insert-mode-line-in-empty-file nil - "Non-nil means insert the first line setting Org mode in empty files. - When the function `org-mode' is called interactively in an empty file, this -@@ -15695,6 +15713,7 @@ fragments in the buffer." - (interactive "P") - (cond - ((not (display-graphic-p)) nil) -+ ((and untrusted-content (not org--latex-preview-when-risky)) nil) - ;; Clear whole buffer. - ((equal arg '(64)) - (org-clear-latex-preview (point-min) (point-max)) --- -cgit v1.1 - diff --git a/backport-CVE-2024-30205.patch b/backport-CVE-2024-30205.patch deleted file mode 100644 index 83c0de2422160aca9afd0781489bf8c396df6a64..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-30205.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2bc865ace050ff118db43f01457f95f95112b877 Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 14:59:20 +0300 -Subject: org-file-contents: Consider all remote files unsafe - -* lisp/org/org.el (org-file-contents): When loading files, consider all -remote files (like TRAMP-fetched files) unsafe, in addition to URLs. ---- - lisp/org/org.el | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lisp/org/org.el b/lisp/org/org.el -index 0f5d17d..76559c9 100644 ---- a/lisp/org/org.el -+++ b/lisp/org/org.el -@@ -4576,12 +4576,16 @@ from file or URL, and return nil. - If NOCACHE is non-nil, do a fresh fetch of FILE even if cached version - is available. This option applies only if FILE is a URL." - (let* ((is-url (org-url-p file)) -+ (is-remote (condition-case nil -+ (file-remote-p file) -+ ;; In case of error, be safe. -+ (t t))) - (cache (and is-url - (not nocache) - (gethash file org--file-cache)))) - (cond - (cache) -- (is-url -+ ((or is-url is-remote) - (if (org--should-fetch-remote-resource-p file) - (condition-case error - (with-current-buffer (url-retrieve-synchronously file) --- -cgit v1.1 - diff --git a/backport-CVE-2024-39331.patch b/backport-CVE-2024-39331.patch deleted file mode 100644 index 3861ab02bfd36fbf55a011a507562de12f556871..0000000000000000000000000000000000000000 --- a/backport-CVE-2024-39331.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c645e1d8205f0f0663ec4a2d27575b238c646c7c Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Fri, 21 Jun 2024 15:45:25 +0200 -Subject: org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code - -* lisp/org/ol.el (org-link-expand-abbrev): Refuse expanding %(...) -link abbrevs that specify unsafe function. Instead, display a -warning, and do not expand the abbrev. Clear all the text properties -from the returned link, to avoid any potential vulnerabilities caused -by properties that may contain arbitrary Elisp. ---- - lisp/org/ol.el | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - -diff --git a/lisp/org/ol.el b/lisp/org/ol.el -index 4c84e62..c34d92b 100644 ---- a/lisp/org/ol.el -+++ b/lisp/org/ol.el -@@ -1063,17 +1063,35 @@ Abbreviations are defined in `org-link-abbrev-alist'." - (if (not as) - link - (setq rpl (cdr as)) -- (cond -- ((symbolp rpl) (funcall rpl tag)) -- ((string-match "%(\\([^)]+\\))" rpl) -- (replace-match -- (save-match-data -- (funcall (intern-soft (match-string 1 rpl)) tag)) -- t t rpl)) -- ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) -- ((string-match "%h" rpl) -- (replace-match (url-hexify-string (or tag "")) t t rpl)) -- (t (concat rpl tag))))))) -+ ;; Drop any potentially dangerous text properties like -+ ;; `modification-hooks' that may be used as an attack vector. -+ (substring-no-properties -+ (cond -+ ((symbolp rpl) (funcall rpl tag)) -+ ((string-match "%(\\([^)]+\\))" rpl) -+ (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl)))) -+ ;; Using `unsafep-function' is not quite enough because -+ ;; Emacs considers functions like `genenv' safe, while -+ ;; they can potentially be used to expose private system -+ ;; data to attacker if abbreviated link is clicked. -+ (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe)) -+ (eq t (get rpl-fun-symbol 'pure))) -+ (replace-match -+ (save-match-data -+ (funcall (intern-soft (match-string 1 rpl)) tag)) -+ t t rpl) -+ (org-display-warning -+ (format "Disabling unsafe link abbrev: %s -+You may mark function safe via (put '%s 'org-link-abbrev-safe t)" -+ rpl (match-string 1 rpl))) -+ (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local) -+ org-link-abbrev-alist (delete as org-link-abbrev-alist)) -+ link -+ ))) -+ ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) -+ ((string-match "%h" rpl) -+ (replace-match (url-hexify-string (or tag "")) t t rpl)) -+ (t (concat rpl tag)))))))) - - (defun org-link-open (link &optional arg) - "Open a link object LINK. --- -cgit v1.1 - diff --git a/emacs-29.1.tar.xz b/emacs-29.1.tar.xz deleted file mode 100644 index 9323da9c97f2193679eb14956be8d524391c67fa..0000000000000000000000000000000000000000 Binary files a/emacs-29.1.tar.xz and /dev/null differ diff --git a/emacs-29.4.tar.xz b/emacs-29.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..8c8e017eaee3a2202618b772144e1e10b19caead --- /dev/null +++ b/emacs-29.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235 +size 52210344 diff --git a/emacs.service b/emacs.service deleted file mode 100644 index d611118186191319df5484ef60b7ee2af7811579..0000000000000000000000000000000000000000 --- a/emacs.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Emacs: the extensible, self-documenting text editor - -[Service] -Type=forking -ExecStart=/usr/bin/emacs --daemon -ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" -Restart=always - -[Install] -WantedBy=default.target diff --git a/emacs.spec b/emacs.spec index b23959ab9ee4b4970d2d04487dfdd13aa3565a9b..4ee8d89d934ffe2cedc7f8d64c7b8fcd64bc614d 100644 --- a/emacs.spec +++ b/emacs.spec @@ -7,45 +7,71 @@ Name: emacs Epoch: 1 -Version: 29.1 -Release: 3 +Version: 29.4 +Release: 1 Summary: An extensible GNU text editor -License: GPLv3+ and CC0-1.0 -URL: http://www.gnu.org/software/emacs +License: GPL-3.0-or-later AND CC0-1.0 +URL: https://www.gnu.org/software/emacs Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source1: site-start.el Source2: default.el Source3: dotemacs.el Source4: emacs-terminal.sh -Source5: emacs.service Source6: emacs.desktop Source7: emacs-terminal.desktop #patch from fedora #https://src.fedoraproject.org/rpms/emacs/blob/rawhide/f/emacs-spellchecker.patch -Patch6001: emacs-spellchecker.patch +Patch1001: emacs-spellchecker.patch #https://src.fedoraproject.org/rpms/emacs/blob/rawhide/f/emacs-system-crypto-policies.patch -Patch6002: emacs-system-crypto-policies.patch -Patch6003: backport-CVE-2024-30202.patch -Patch6004: backport-CVE-2024-30203-pre.patch -Patch6005: backport-CVE-2024-30203.patch -Patch6006: backport-CVE-2024-30204.patch -Patch6007: backport-CVE-2024-30205.patch -Patch6008: backport-CVE-2024-39331.patch +Patch1002: emacs-system-crypto-policies.patch Patch9000: emacs-deal-taboo-words.patch -BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel -BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel -BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-devel libtiff-devel -BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm-devel libX11-devel -BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel -BuildRequires: xorg-x11-proto-devel webkit2gtk3-devel librsvg2-devel -BuildRequires: autoconf harfbuzz-devel jansson-devel systemd-devel gnupg2 -BuildRequires: libotf-devel m17n-lib-devel liblockfile-devel - -# For lucid +BuildRequires: make gcc +BuildRequires: autoconf automake libtool +BuildRequires: pkgconfig(alsa) >= 1.0.0 +BuildRequires: pkgconfig(cairo) >= 1.8.0 +BuildRequires: pkgconfig(cairo-xcb) >= 1.8.0 +BuildRequires: pkgconfig(dbus-1) >= 1.0 +BuildRequires: pkgconfig(fontconfig) >= 2.2.0 +BuildRequires: pkgconfig(freetype2) >= 2.5.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.26 +BuildRequires: pkgconfig(glib-2.0) >= 2.37.5 +BuildRequires: pkgconfig(gnutls) >= 2.12.2 +BuildRequires: pkgconfig(gobject-2.0) >= 2.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 +BuildRequires: pkgconfig(jansson) >= 2.7 +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libotf) +BuildRequires: pkgconfig(libpng) >= 1.0.0 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 +BuildRequires: pkgconfig(libseccomp) >= 2.5.2 +BuildRequires: pkgconfig(libsystemd) >= 222 +BuildRequires: pkgconfig(libwebpdemux) >= 0.6.0 +BuildRequires: pkgconfig(libxml-2.0) > 2.6.17 +BuildRequires: pkgconfig(m17n-flt) +BuildRequires: pkgconfig(webkit2gtk-4.1) >= 2.12 +BuildRequires: pkgconfig(xfixes) >= 4.0.0 +BuildRequires: pkgconfig(xft) >= 0.13.0 +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xinerama) >= 1.0.2 +BuildRequires: pkgconfig(xrandr) >= 1.2.2 +BuildRequires: giflib-devel +BuildRequires: gpm-devel +BuildRequires: libacl-devel +BuildRequires: libjpeg-devel +BuildRequires: liblockfile-devel +BuildRequires: libselinux-devel +BuildRequires: libtiff-devel +BuildRequires: libXpm-devel +BuildRequires: ncurses-devel +BuildRequires: sqlite-devel +BuildRequires: zlib-devel BuildRequires: Xaw3d-devel +BuildRequires: /usr/bin/makeinfo +BuildRequires: /usr/bin/desktop-file-install %ifarch %{ix86} BuildRequires: util-linux @@ -102,7 +128,7 @@ on a terminal %package common Summary: Emacs common files -License: GPLv3+ and GFDL and BSD +License: GPL-3.0-or-later AND GFDL-1.3-or-later AND BSD-3-Clause Requires: %{name}-filesystem = %{epoch}:%{version}-%{release} Requires(preun): /sbin/install-info Requires(preun): %{_sbindir}/alternatives @@ -172,44 +198,33 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fPIE" # Build GTK+ binary -mkdir build-gtk && cd build-gtk -ln -s ../configure . - -LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS; - -%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ +mkdir build-gtk && pushd build-gtk +%global _configure ../configure +%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ --with-harfbuzz --with-cairo --with-json \ - --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick + --with-xwidgets --with-modules %make_build bootstrap %{setarch} %make_build -cd .. +popd # Build Lucid binary %if !%{with bootstrap} -mkdir build-lucid && cd build-lucid -ln -s ../configure . - -LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS; - -%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ +mkdir build-lucid && pushd build-lucid +%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ --with-harfbuzz --with-cairo --with-json \ - --with-modules --without-libotf --without-m17n-flt --without-imagemagick + --with-modules %make_build bootstrap %{setarch} %make_build -cd .. +popd %endif # Build binary without X support -mkdir build-nox && cd build-nox -ln -s ../configure . - -LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS; - -%configure --with-x=no --with-modules --with-json +mkdir build-nox && pushd build-nox +%configure --with-x=no --with-modules --with-json --without-gconf %{setarch} %make_build -cd ../ +popd # Generate pkgconfig file cat > emacs.pc << EOF @@ -232,9 +247,9 @@ cat > macros.emacs << EOF EOF %install -cd build-gtk -%make_install -cd .. +pushd build-gtk +%make_install systemdunitdir=%{_userunitdir} +popd rm %{buildroot}%{_bindir}/emacs touch %{buildroot}%{_bindir}/emacs @@ -283,9 +298,6 @@ install -p -m 755 %SOURCE4 %{buildroot}/%{_bindir}/emacs-terminal rm -f %{buildroot}%{_infodir}/dir -install -d %{buildroot}%{_userunitdir} -install -p -m 0644 %SOURCE5 %{buildroot}%{_userunitdir}/emacs.service - # Emacs 26.1 don't installs the upstream unit file to /usr/lib64 on 64bit archs. rm -f %{buildroot}/usr/lib64/systemd/user/emacs.service @@ -335,18 +347,8 @@ cat el-*-files common-lisp-dir-files > el-filelist %{_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 \ @@ -354,7 +356,6 @@ fi %files -%defattr(-,root,root) %doc doc/NEWS BUGS README %license etc/COPYING %attr(0755,-,-) %ghost %{_bindir}/emacs @@ -369,20 +370,17 @@ fi %if !%{with bootstrap} %files lucid -%defattr(-,root,root) %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-lucid %{_bindir}/emacs-%{version}-lucid %endif %files nox -%defattr(-,root,root) %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-nox %{_bindir}/emacs-%{version}-nox %files common -f common-filelist -f el-filelist -%defattr(-,root,root) %doc doc/NEWS BUGS README %license etc/COPYING %{_rpmconfigdir}/macros.d/macros.emacs @@ -405,17 +403,18 @@ fi %{_datadir}/applications/emacs-terminal.desktop %files filesystem -%defattr(-,root,root) %dir %{_datadir}/emacs %dir %{_datadir}/emacs/site-lisp %dir %{_datadir}/emacs/site-lisp/site-start.d %files help -%defattr(-,root,root) %doc doc/NEWS BUGS README %{_mandir}/*/* %changelog +* Mon Dec 02 2024 Funda Wang - 1:29.4-1 +- update to 29.4 + * Tue Jul 02 2024 zhangpan - 1:29.1-3 - fix CVE-2024-39331