From 3b13e465164af997b99df1bca33727c45c4a8afd Mon Sep 17 00:00:00 2001 From: zhangpan Date: Fri, 12 Apr 2024 02:53:34 +0000 Subject: [PATCH] rebase 20.03-LTS-SP4 from 20.03-LTS-SP1 --- emacs-deal-taboo-words.patch | 41 ++++++++++++++++++++++++++++++++++++ emacs.spec | 20 ++++++++++++------ 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 emacs-deal-taboo-words.patch diff --git a/emacs-deal-taboo-words.patch b/emacs-deal-taboo-words.patch new file mode 100644 index 0000000..0b50ca3 --- /dev/null +++ b/emacs-deal-taboo-words.patch @@ -0,0 +1,41 @@ +From 771140a936b4cadf793e42c6637c5d7ec44b4d03 Mon Sep 17 00:00:00 2001 +From: yeah_wang +Date: Thu, 8 Apr 2021 16:07:05 +0800 +Subject: [PATCH] emacs-deal-taboo-words.patch + +--- + etc/publicsuffix.txt | 4 ---- + lisp/mail/mail-extr.el | 1 - + 2 files changed, 5 deletions(-) + +diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt +index ee0269c..b8652be 100644 +--- a/etc/publicsuffix.txt ++++ b/etc/publicsuffix.txt +@@ -6164,11 +6164,7 @@ mil.tr + k12.tr + edu.tr + kep.tr +- +-// Used by Northern Cyprus + nc.tr +- +-// Used by government agencies of Northern Cyprus + gov.nc.tr + + // travel : http://en.wikipedia.org/wiki/.travel +diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el +index f1a455d..077774e 100644 +--- a/lisp/mail/mail-extr.el ++++ b/lisp/mail/mail-extr.el +@@ -1932,7 +1932,6 @@ place. It affects how `mail-extract-address-components' works." + ("ec" "Ecuador" "The Republic of %s") + ("ee" "Estonia") + ("eg" "Egypt" "The Arab Republic of %s") +- ("eh" "Western Sahara") + ("er" "Eritrea") + ("es" "Spain" "The Kingdom of %s") + ("et" "Ethiopia") +-- +2.27.0 + diff --git a/emacs.spec b/emacs.spec index 0a9d7a1..88f2134 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Name: emacs Epoch: 1 Version: 27.1 -Release: 11 +Release: 13 Summary: An extensible GNU text editor License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs @@ -31,6 +31,8 @@ Patch6007: backport-CVE-2024-30203.patch Patch6008: backport-CVE-2024-30204.patch Patch6009: backport-CVE-2024-30205.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 @@ -407,21 +409,27 @@ fi %{_mandir}/*/* %changelog -* Mon Apr 01 2024 lingsheng - 1:27.1-11 +* Mon Apr 01 2024 lingsheng - 1:27.1-13 - fix CVE-2024-30203 CVE-2024-30204 CVE-2024-30205 -* Mon Sep 25 2023 leeffo - 1:27.1-10 +* Mon Sep 25 2023 leeffo - 1:27.1-12 - fix CVE-2022-48337 -* Fri Mar 24 2023 zhangpan - 1:27.1-9 +* Fri Mar 24 2023 zhangpan - 1:27.1-11 - fix CVE-2023-28617 -* Thu Feb 23 2023 zhangpan - 1:27.1-8 +* Thu Feb 23 2023 zhangpan - 1:27.1-10 - fix CVE-2022-48337 CVE-2022-48338 CVE-2022-48339 -* Thu Dec 01 2022 wangkerong - 1:27.1-7 +* Thu Dec 01 2022 wangkerong - 1:27.1-9 - fix CVE-2022-45939 +* Fri Mar 25 2022 xingxing - 1:27.1-8 +- modify patch message + +* Fri Mar 25 2022 xingxing - 1:27.1-7 +- round self-developed-patch + * Mon Aug 9 2021 yangcheng - 1:27.1-6 - fixed the upgrade error caused by the info file in the emacs-common software package being repackaged -- Gitee