rebase 20.03-LTS-SP4 from 20.03-LTS-SP1

emacs-deal-taboo-words.patch

@@ -0,0 +1,41 @@
+From 771140a936b4cadf793e42c6637c5d7ec44b4d03 Mon Sep 17 00:00:00 2001
+From: yeah_wang <wangye70@huawei.com>
+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
+

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 <lingsheng1@h-partners.com> - 1:27.1-11
+* Mon Apr 01 2024 lingsheng <lingsheng1@h-partners.com> - 1:27.1-13
 - fix CVE-2024-30203 CVE-2024-30204 CVE-2024-30205
 
-* Mon Sep 25 2023 leeffo <liweiganga@uniontech.com> - 1:27.1-10
+* Mon Sep 25 2023 leeffo <liweiganga@uniontech.com> - 1:27.1-12
 - fix CVE-2022-48337
 
-* Fri Mar 24 2023 zhangpan <zhangpan103@h-partners.com> - 1:27.1-9
+* Fri Mar 24 2023 zhangpan <zhangpan103@h-partners.com> - 1:27.1-11
 - fix CVE-2023-28617
 
-* Thu Feb 23 2023 zhangpan <zhangpan103@h-partners.com> - 1:27.1-8
+* Thu Feb 23 2023 zhangpan <zhangpan103@h-partners.com> - 1:27.1-10
 - fix CVE-2022-48337 CVE-2022-48338 CVE-2022-48339
 
-* Thu Dec 01 2022 wangkerong <wangkerong@h-partners.com> - 1:27.1-7
+* Thu Dec 01 2022 wangkerong <wangkerong@h-partners.com> - 1:27.1-9
 - fix CVE-2022-45939
 
+* Fri Mar 25 2022 xingxing <xingxing9@h-partners.com> - 1:27.1-8
+- modify patch message
+
+* Fri Mar 25 2022 xingxing <xingxing9@h-partners.com> - 1:27.1-7
+- round self-developed-patch
+
 * Mon Aug 9 2021 yangcheng <yangcheng87@huawei.com> - 1:27.1-6
 - fixed the upgrade error caused by the info file in the emacs-common software package being repackaged