diff --git a/GB18030-2022-Break-the-composed-of-9-characters.patch b/GB18030-2022-Break-the-composed-of-9-characters.patch new file mode 100644 index 0000000000000000000000000000000000000000..fb742a774736f96a7df577f772e57e8e682ac57e --- /dev/null +++ b/GB18030-2022-Break-the-composed-of-9-characters.patch @@ -0,0 +1,56 @@ +From c35f8480dd6d055e4f83c9df548ebb63d3765553 Mon Sep 17 00:00:00 2001 +From: kiraskyler +Date: Wed, 19 Jul 2023 14:45:09 +0800 +Subject: [PATCH] GB18030-2022-Break-the-composed-of-9-characters + +--- + src/hb-ucd-table.hh | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/src/hb-ucd-table.hh b/src/hb-ucd-table.hh +index f7d76ee..8e76213 100644 +--- a/src/hb-ucd-table.hh ++++ b/src/hb-ucd-table.hh +@@ -2189,8 +2189,7 @@ _hb_ucd_u8[17868] = + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, + }; +-static const uint16_t +-_hb_ucd_u16[9320] = ++static const uint16_t _hb_ucd_u16[9320] = + { + 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 7, 8, 9, 10, 11, 12, + 13, 13, 13, 14, 15, 13, 13, 16, 17, 18, 19, 20, 21, 22, 13, 23, +@@ -2698,22 +2697,22 @@ _hb_ucd_u16[9320] = + 1930,1931,1932, 0, 0, 0,1933, 0, 710, 385, 724, 715, 455, 103, 186, 825, + 825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500, + 649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679, +- 293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, ++ 293, 388, 440, 492, 0, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, + 781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540, + 714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589, + 648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101, + 430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110, +- 135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, +- 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610, ++ 135, 0, 403, 580, 624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, ++ 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, 476, 509, 0, 591, 610, + 726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494, + 113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748, + 774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161, + 395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727, +- 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684, +- 687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566, ++ 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 0, ++ 687, 749, 776, 175, 452, 191, 480, 510, 659, 0, 805, 813, 397, 444, 619, 566, + 568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729, +- 680, 767, 694, 295, 128, 210, 0, 0, 227, 0, 379, 0, 0, 150, 493, 525, +- 544, 551, 552, 556, 783, 576, 604, 0, 661, 0, 703, 0, 0, 735, 743, 0, ++ 680, 767, 694, 295, 0, 0, 0, 0, 227, 0, 379, 0, 0, 150, 493, 525, ++ 0, 551, 552, 556, 783, 576, 604, 0, 0, 0, 703, 0, 0, 735, 743, 0, + 0, 0, 793, 794, 795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213, + 215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458, + 477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591, +-- +2.39.1 + diff --git a/harfbuzz.spec b/harfbuzz.spec index 75f45bf1d6d094d6877430078597e8c6f7f7bd20..623cd05c4a138a50284258627a4c460f6176891b 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,12 +1,13 @@ Name: harfbuzz Version: 6.0.0 -Release: 1 +Release: 2 Summary: A text shaping engine License: MIT URL: https://harfbuzz.github.io/ Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz Patch0001: backport-CVE-2023-25193.patch +Patch0002: GB18030-2022-Break-the-composed-of-9-characters.patch BuildRequires: gcc-c++ freetype-devel cairo-devel glib2-devel graphite2-devel BuildRequires: gtk-doc libicu-devel gobject-introspection-devel make @@ -70,6 +71,9 @@ make check %{_datadir}/gtk-doc/html/harfbuzz/* %changelog +* Wed Jul 19 2023 kiraskyler - 6.0.0-2 +- Remove character mappings for the 9 fonts according to GB18030-2022 standard + * Wed Feb 22 2023 liweiganga - 6.0.0-1 - upstream to 6.0.0