!49 delete taboo words and redundant files

From: @zppzhangpan 
Reviewed-by: @yanan-rock 
Signed-off-by: @yanan-rock
This commit is contained in:
openeuler-ci-bot 2023-06-21 02:08:45 +00:00 committed by Gitee
commit b8f7eab6e0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 119 additions and 4 deletions

112
delete-taboo-words.patch Normal file
View File

@ -0,0 +1,112 @@
From c8daa564361cb7648def8bfa3ee9133c9b110230 Mon Sep 17 00:00:00 2001
From: wuchaochao <wuchaochao4@h-partners.com>
Date: Sat, 4 Jun 2022 18:54:52 +0800
Subject: [PATCH] delete-taboo-words.patch
---
source/data/in/icudt62l.dat | Bin 26837136 -> 26837137 bytes
source/test/testdata/metaZones.txt | 10 +++++-----
source/test/testdata/structLocale.txt | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/data/in/icudt62l.dat b/source/data/in/icudt62l.dat
index 7e82c9195d7f16f166e7cd067c5b7820cabc4f04..5ce0da721b17a283b0d1b44eae87ff1798d53d89 100644
GIT binary patch
delta 1284
zcmYk)RaX^I00z-@Oh9bx?(S}}#lY?clxu)_Z3P(=@hG5TcXxMTcXxMUcVc{RKFt0F
z6B+!}J?dXU7~&D11SBL8iE+UdH<I8^Qj(FJ6r>~-sqr8UX-P+VGLVr>WF`w)$wqc^
zkds{GCJ%YZM}7)WkU|uu2t_GIaY|5<Qk13)WhqB_Do~M1RHh15sYZ1?sX<L@QJXr{
zr5^S1q5%zQL}R>ZLQ|U2oEEgC6|HGQTiVf{4s@gwo#{eXy5WN_esre?{y6AKFM895
z00QYtKl(F(fegaQV1_W1VGL&kBN@eLf(T{|AwVc&8All731<S9iA*AbNTQg`6s8i*
zG^R6ynapA~bC}CK=Cgo>EMhTBSjsY%vx1eZVl``6%R1JxfsJfpGh5ioHny{ao$O*a
zd)Ui9V%X0C4swXY9N{R(IL--9a*ETO;VkDk&jl`WiOXE!D%ZHq4Q_Ia+uY$U_qfjk
z9`cCCJmD$Nc+LxAdC4nY^M<#)<2@hv$R|GYg|B?$J3sizFXH&kpD<&MvGI(JZ)^f%
z6B?Vy*u=)V80%`Ro3TlZbvHJtvB`{0Zfpu;QyQDf*wki^hxz1i^$ze2^znBD_(jAy
zJj_4Rh_oV|NG~#oj3SfBEV78KBAduAa)_KFm&h&hh`b`7$S(?rf})TpEQ*MtqL?Ty
zN{Eu8lqfCAh_a%bC@(6AilUOJEUJjAqME2KJVgyrQ`8c*MIBLB)D!iEmuMgwibkTb
z@D@!(Q_)N`7cE3f(Mq%yZA4qqPP7*tL`Ts{bQWDiSJ6%Q2w&kRx{DsdUpPch(M$9e
zeMEo=6n#ZM(O(P@1H~ZW6obVOF;ol_!^H?OQj8L#MUV&<V?>BRgo?3ZoCp)+O-!64
x+&p&wZ?9NqxQU2$P7qd16q7`Rh!jy`vX~;KifA!SOcyguOssRJS>|fo{sLpPRRaJ3
delta 1282
zcmYk)RaX^I00z-@Y!n;2FcG`E8w&$F5mc@L=Czd=74axwcXxLyc6WCtb|=R7=ELk?
zFwr4TU8DXLj3FNJNkBppk(ea7kd$P&lAIKzBo(PiLt5NOM|v`lkxXPJ3t7oVc5>iO
zPI8f(Jme)G9^}W90u-bWg(*T&icy>rl%y1;DMMMxQJxA^q!N{>LRG3!of_1n7PYBE
zUFzXQeHze^Ml{BoCN!lP&GDfHEont-+R&DEw5J0d=|pFI>4G2rbfp{J3BW-QdeV#D
z1QJ9a`qGd73}7Hm1~Hf+3}qO@8No<K5ljf7gaM-&!&t%@M+D=sOkg6BL=nv-CNqVp
zOk+ATn8_?=Gl#j%V?GO5$RZZAgrzKFIV)JnDps?GwX9=38`#JuHnWATY-2k+*vT$-
zvxmLxBZmDP;2?)M%n^=qjN_c(B&Rsd8P0N!^IYH}m$=Lou5yj*+~6j+xXm5za*z8w
z;31EA%oCpSjOV-{mY2NZHE(#!JKpnwk9^`YU--&5zVm~h{34Fu{0TSK7#q*n_{JtM
zHleYJj7@B85@TJAO=@g1V_l6+Zfpu;QyQDf*wn_RF*dE)<7PfNT)YDPgZu&<fxeM(
z4mb0UbRxaTATo+fBD2UMvWjdXyT~EjMNW}R<Q92EUXf3Di2TA+6c7bPAyHTq5k*BY
zQCyS|B}FMwT9grGMLAJkR1g(KB~e*a5miMsQC-v!HAO8^ThtMCMLppq>Wc=Vp=cx;
z3vbaxG!@N6bKxUeh?b(2Xf4`^wxXSAFFJ^hqLb(>d_@=GC;UZM(M@z00m31Ah@PUC
z=q&<8kmw`&ihiQM7$61;rx+v#iy>mD7$$~`5n`kmC4xnW2o+%hF<OifV@0?aXJX<U
w5$3V$e|yC`BTQthbG)!(f|w{GMU;pZlf+~(MNAdb#B?#k#Kbyhnq@A30h=3C<NyEw
diff --git a/source/test/testdata/metaZones.txt b/source/test/testdata/metaZones.txt
index 0b57cab..8c15451 100644
--- a/source/test/testdata/metaZones.txt
+++ b/source/test/testdata/metaZones.txt
@@ -403,7 +403,7 @@ metaZones:table(nofallback){
Indian_Ocean{
001{"Indian/Chagos"}
}
- Indochina{
+ Ondochine{
001{"Asia/Saigon"}
KH{"Asia/Phnom_Penh"}
LA{"Asia/Vientiane"}
@@ -2684,7 +2684,7 @@ metaZones:table(nofallback){
}
"Asia:Bangkok"{
{
- "Indochina",
+ "Ondochine",
}
}
"Asia:Beirut"{
@@ -3047,7 +3047,7 @@ metaZones:table(nofallback){
}
"Asia:Phnom_Penh"{
{
- "Indochina",
+ "Ondochine",
}
}
"Asia:Pontianak"{
@@ -3108,7 +3108,7 @@ metaZones:table(nofallback){
}
"Asia:Saigon"{
{
- "Indochina",
+ "Ondochine",
}
}
"Asia:Sakhalin"{
@@ -3240,7 +3240,7 @@ metaZones:table(nofallback){
}
"Asia:Vientiane"{
{
- "Indochina",
+ "Ondochine",
}
}
"Asia:Vladivostok"{
diff --git a/source/test/testdata/structLocale.txt b/source/test/testdata/structLocale.txt
index 14f8e68..50bb6b3 100644
--- a/source/test/testdata/structLocale.txt
+++ b/source/test/testdata/structLocale.txt
@@ -38421,7 +38421,7 @@ structLocale:table(nofallback){
ss{""}
//ec{""} // Metazones have no exemplar city
}
- "meta:Indochina"{
+ "meta:Ondochine"{
ld{""}
lg{""}
ls{""}
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: icu
Version: 62.1
Release: 6
Release: 7
Summary: International Components for Unicode
License: MIT and UCD and Public Domain
URL: http://site.icu-project.org/
@ -16,6 +16,7 @@ Patch2: icuinfo-man.patch
Patch6000: icu-fix-memory-leak.patch
Patch6001: CVE-2020-10531.patch
Patch6002: backport-CVE-2020-21913.patch
Patch9000: delete-taboo-words.patch
%description
Tools and utilities for developing with icu.
@ -39,7 +40,7 @@ header files for libicu
# " this line just fixes syntax highlighting for vim that is confused by the above and continues literal
%prep
%autosetup -n %{name} -p1
%autosetup -n %{name} -p1 -S git
%build
pushd source
@ -110,7 +111,6 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%files -n libicu-devel
%defattr(-,root,root)
%doc source/samples/
%{_bindir}/%{name}-config*
%{_bindir}/icuinfo
%{_includedir}/unicode
@ -130,7 +130,10 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l
%changelog
* Fri Oct 22 2021 wangkeorng <wangkerong@huawei.com> - 62.1-6
* Tue Jun 13 2023 zhangpan <zhangpan103@h-partners.com> - 62.1-7
- delete taboo words and redundant files
* Fri Oct 22 2021 wangkerong <wangkerong@huawei.com> - 62.1-6
- fix CVE-2020-21913
* Fri Mar 20 2020 gulining <gulining1@huawei.com> - 62.1-5