-+<U1780> /xa1 KHMER CHARACTER KA
-+<U1781> /xa2 KHMER CHARACTER KHA
-+<U1782> /xa3 KHMER CHARACTER KO
-+<U1783> /xa4 KHMER CHARACTER KHO
-+<U1784> /xa5 KHMER CHARACTER NGO
-+<U1785> /xa6 KHMER CHARACTER CA
-+<U1786> /xa7 KHMER CHARACTER CHA
-+<U1787> /xa8 KHMER CHARACTER CO
-+<U1788> /xa9 KHMER CHARACTER CHO
-+<U1789> /xaa KHMER CHARACTER NYO
-+<U178A> /xab KHMER CHARACTER DA
-+<U178B> /xac KHMER CHARACTER TTHA
-+<U178C> /xad KHMER CHARACTER DO
-+<U178E> /xae KHMER CHARACTER TTHO
-+<U178F> /xaf KHMER CHARACTER NNO
-+<U1790> /xb0 KHMER CHARACTER TA
-+<U1791> /xb1 KHMER CHARACTER THA
-+<U1792> /xb2 KHMER CHARACTER TO
-+<U1793> /xb3 KHMER CHARACTER THO
-+<U1794> /xb4 KHMER CHARACTER NO
-+<U1795> /xb5 KHMER CHARACTER BA
-+<U1796> /xb6 KHMER CHARACTER PHA
-+<U1797> /xb7 KHMER CHARACTER PO
-+<U1798> /xb8 KHMER CHARACTER PHO
-+<U1799> /xb9 KHMER CHARACTER MO
-+<U179A> /xba KHMER CHARACTER YO
-+<U179B> /xbb KHMER CHARACTER RO
-+<U179C> /xbc KHMER CHARACTER LO
-+<U179D> /xbd KHMER CHARACTER VO
-+%
-+<U179E> /xbe KHMER CHARACTER SHA
-+%
-+<U179F> /xbf KHMER CHARACTER SSO
-+%
-+<U17A0> /xc0 KHMER CHARACTER SA
-+<U17A1> /xc1 KHMER CHARACTER HA
-+<U17A2> /xc2 KHMER CHARACTER LA
-+<U17A3> /xc3 KHMER CHARACTER QA
-+%
-+<U17A4> /xc4 KHMER INDEPENDENT VOWEL QAQ
-+<U17A5> /xc5 KHMER INDEPENDENT VOWEL QAA
-+<U17A6> /xc6 KHMER INDEPENDENT VOWEL QI
-+<U17A7> /xc7 KHMER INDEPENDENT VOWEL QII
-+<U17A8> /xc8 KHMER INDEPENDENT VOWEL QU
-+<U17A9> /xc9 KHMER INDEPENDENT VOWEL QUK
-+<U17AA> /xca KHMER INDEPENDENT VOWEL QUU
-+<U17AB> /xcb KHMER INDEPENDENT VOWEL QUUV
-+<U17AC> /xcc KHMER INDEPENDENT VOWEL RY
-+<U17AD> /xcd KHMER INDEPENDENT VOWEL RYY
-+<U17AE> /xce KHMER INDEPENDENT VOWEL LY
-+<U17AF> /xcf KHMER INDEPENDENT VOWEL LYY
-+<U17B0> /xd0 KHMER INDEPENDENT VOWEL QE
-+<U17B1> /xd1 KHMER INDEPENDENT VOWEL QAI
-+<U17B2> /xd2 KHMER INDEPENDENT VOWEL QOO
-+<U17B3> /xd3 KHMER INDEPENDENT VOWEL QOO
-+<U17B4> /xd4 KHMER INDEPENDENT VOWEL QAU
-+%
-+<U17B4> /xd5 KHMER VOWEL INHERENT AQ
-+<U17B5> /xd6 KHMER VOWEL INHERENT AA
-+%
-+<U200C> /xd9 ZERO WIDTH NON-JOINER
-+%
-+<U17B6> /xd7 KHMER VOWEL SIGN AA
-+<U17B7> /xd8 KHMER VOWEL SIGN I
-+<U17B8> /xd9 KHMER VOWEL SIGN II
-+<U17B9> /xda KHMER VOWEL SIGN Y
-+<U17BA> /xdb KHMER VOWEL SIGN YY
-+<U17BB> /xdc KHMER VOWEL SIGN U
-+<U17BC> /xdd KHMER VOWEL SIGN UU
-+<U17BD> /xde KHMER VOWEL SIGN UA
-+<U17BE> /xdf KHMER VOWEL SIGN OE
-+<U17BF> /xe0 KHMER VOWEL SIGN YA
-+<U17C0> /xe1 KHMER VOWEL SIGN IE
-+<U17C1> /xe2 KHMER VOWEL SIGN E
-+<U17C2> /xe3 KHMER VOWEL SIGN AE
-+<U17C3> /xe4 KHMER VOWEL SIGN AI
-+<U17C4> /xe5 KHMER VOWEL SIGN OO
-+<U17C5> /xe6 KHMER VOWEL SIGN AU
-+%
-+<U17C6> /xe7 KHMER VARIOUS SIGNS NIKAHIT
-+<U17C7> /xe8 KHMER VARIOUS SIGNS REASH MUK
-+<U17C8> /xe9 KHMER VARIOUS SIGNS YUU KA LEAP PINTU
-+%
-+<U17C9> /xea KHMER CONSONANT SHIFTERS SIGN MUUSIKATOAN
-+<U17CA> /xeb KHMER CONSONANT SHIFTERS SIGN TRII SAP
-+%
-+%
-+<U17CB> /xec KHMER VARIOUS SIGNS BAN TOK
-+<U17CC> /xed KHMER VARIOUS SIGNS RO BAT
-+<U17CD> /xee KHMER VARIOUS SIGNS TOAN DA KHEAT
-+<U17CE> /xef KHMER VARIOUS SIGNS KA KA BAT
-+<U17CF> /xf0 KHMER VARIOUS SIGNS AH SDA
-+<U17D0> /xf1 KHMER VARIOUS SIGNS SAMYOK SANH NHA
-+<U17D1> /xf2 KHMER VARIOUS SIGNS VIRIAM
-+<U17D2> /xf3 KHMER VARIOUS SIGNS COENG
-+<U17D3> /xf4 KHMER VARIOUS SIGNS BATHAMASAT
-+<U17D4> /xf5 KHMER VARIOUS SIGNS KHAN
-+<U17D5> /xf6 KHMER VARIOUS SIGNS BARIYOOSAN
-+<U17D6> /xf7 KHMER VARIOUS SIGNS CAMNU PII KUUN
-+<U17D7> /xf8 KHMER VARIOUS SIGNS LEK TOO
-+<U17D8> /xf9 KHMER VARIOUS SIGNS BEY YAL
-+<U17D9> /xfa KHMER VARIOUS SIGNS PHNAEK MUAN
-+<U17DA> /xfb KHMER VARIOUS SIGNS KOO MUUT
-+%
-+<U17DB> /xfc KHMER CURRENCY SYMBOL RIEL
-+<U17DC> /xfd KHMER VARIOUS SIGNS AVAKRAHASAYA
-+% position of digits inspired from tscii-0 encoding (tamil)
-+<U17E0> /x80 KHMER DIGIT SOON (0)
-+<U17E1> /x81 KHMER DIGIT MOUY (1)
-+<U17E2> /x8d KHMER DIGIT PE (2)
-+<U17E3> /x8e KHMER DIGIT BAY (3)
-+<U17E4> /x8f KHMER DIGIT BOURN (4)
-+<U17E5> /x90 KHMER DIGIT PRAM (5)
-+<U17E6> /x95 KHMER DIGIT PRAM MOUY (6)
-+<U17E7> /x96 KHMER DIGIT PRAM PE (7)
-+<U17E8> /x97 KHMER DIGIT PRAM BAY (8)
-+<U17E9> /x98 KHMER DIGIT PRAM BOURN (9)
-+%
-+END CHARMAP
-diff -uNr libc/localedata/charmaps/KOI8-C libc.charsets/localedata/charmaps/KOI8-C
---- libc/localedata/charmaps/KOI8-C Thu Jan 1 01:00:00 1970
-+++ libc.charsets/localedata/charmaps/KOI8-C Tue Jan 13 12:45:42 2004
-@@ -0,0 +1,267 @@
-+<code_set_name> KOI8-C
-+<comment_char> %
-+<escape_char> /
-+% version: 1.0
-+% repertoiremap: mnemonic,ds
-+% source: http://www.fortunecity.com/victorian/twain/286/TL/LS/KOI8-C.txt
-+%
-+% Author: Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>
-+
-+CHARMAP
-+<U0000> /x00 NULL (NUL)
-+<U0001> /x01 START OF HEADING (SOH)
-+<U0002> /x02 START OF TEXT (STX)
-+<U0003> /x03 END OF TEXT (ETX)
-+<U0004> /x04 END OF TRANSMISSION (EOT)
-+<U0005> /x05 ENQUIRY (ENQ)
-+<U0006> /x06 ACKNOWLEDGE (ACK)
-+<U0007> /x07 BELL (BEL)
-+<U0008> /x08 BACKSPACE (BS)
-+<U0009> /x09 CHARACTER TABULATION (HT)
-+<U000A> /x0a LINE FEED (LF)
-+<U000B> /x0b LINE TABULATION (VT)
-+<U000C> /x0c FORM FEED (FF)
-+<U000D> /x0d CARRIAGE RETURN (CR)
-+<U000E> /x0e SHIFT OUT (SO)
-+<U000F> /x0f SHIFT IN (SI)
-+<U0010> /x10 DATALINK ESCAPE (DLE)
-+<U0011> /x11 DEVICE CONTROL ONE (DC1)
-+<U0012> /x12 DEVICE CONTROL TWO (DC2)
-+<U0013> /x13 DEVICE CONTROL THREE (DC3)
-+<U0014> /x14 DEVICE CONTROL FOUR (DC4)
-+<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK)
-+<U0016> /x16 SYNCHRONOUS IDLE (SYN)
-+<U0017> /x17 END OF TRANSMISSION BLOCK (ETB)
-+<U0018> /x18 CANCEL (CAN)
-+<U0019> /x19 END OF MEDIUM (EM)
-+<U001A> /x1a SUBSTITUTE (SUB)
-+<U001B> /x1b ESCAPE (ESC)
-+<U001C> /x1c FILE SEPARATOR (IS4)
-+<U001D> /x1d GROUP SEPARATOR (IS3)
-+<U001E> /x1e RECORD SEPARATOR (IS2)
-+<U001F> /x1f UNIT SEPARATOR (IS1)
-+<U0020> /x20 SPACE
-+<U0021> /x21 EXCLAMATION MARK
-+<U0022> /x22 QUOTATION MARK
-+<U0023> /x23 NUMBER SIGN
-+<U0024> /x24 DOLLAR SIGN
-+<U0025> /x25 PERCENT SIGN
-+<U0026> /x26 AMPERSAND
-+<U0027> /x27 APOSTROPHE
-+<U0028> /x28 LEFT PARENTHESIS
-+<U0029> /x29 RIGHT PARENTHESIS
-+<U002A> /x2a ASTERISK
-+<U002B> /x2b PLUS SIGN
-+<U002C> /x2c COMMA
-+<U002D> /x2d HYPHEN-MINUS
-+<U002E> /x2e FULL STOP
-+<U002F> /x2f SOLIDUS
-+<U0030> /x30 DIGIT ZERO
-+<U0031> /x31 DIGIT ONE
-+<U0032> /x32 DIGIT TWO
-+<U0033> /x33 DIGIT THREE
-+<U0034> /x34 DIGIT FOUR
-+<U0035> /x35 DIGIT FIVE
-+<U0036> /x36 DIGIT SIX
-+<U0037> /x37 DIGIT SEVEN
-+<U0038> /x38 DIGIT EIGHT
++<U2018> /xa1 LEFT SINGLE QUOTATION MARK
++<U2019> /xa2 RIGHT SINGLE QUOTATION MARK
++<U00A3> /xa3 POUND SIGN
++<U20AC> /xa4 EURO SIGN
++<U20AF> /xa5 DRACHMA SIGN
++<U00A6> /xa6 BROKEN BAR
++<U00A7> /xa7 SECTION SIGN
++<U00A8> /xa8 DIAERESIS
++<U00A9> /xa9 COPYRIGHT SIGN
++<U037A> /xaa GREEK YPOGEGRAMMENI
++<U00AB> /xab LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
++<U00AC> /xac NOT SIGN
++<U00AD> /xad SOFT HYPHEN
++<U2015> /xaf HORIZONTAL BAR
++<U00B0> /xb0 DEGREE SIGN
++<U00B1> /xb1 PLUS-MINUS SIGN
++<U00B2> /xb2 SUPERSCRIPT TWO
++<U00B3> /xb3 SUPERSCRIPT THREE
++<U0384> /xb4 GREEK TONOS
++<U0385> /xb5 GREEK DIALYTIKA TONOS
++<U0386> /xb6 GREEK CAPITAL LETTER ALPHA WITH TONOS
++<U00B7> /xb7 MIDDLE DOT
++<U0388> /xb8 GREEK CAPITAL LETTER EPSILON WITH TONOS
++<U0389> /xb9 GREEK CAPITAL LETTER ETA WITH TONOS
++<U038A> /xba GREEK CAPITAL LETTER IOTA WITH TONOS
++<U00BB> /xbb RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
++<U038C> /xbc GREEK CAPITAL LETTER OMICRON WITH TONOS
++<U00BD> /xbd VULGAR FRACTION ONE HALF
++<U038E> /xbe GREEK CAPITAL LETTER UPSILON WITH TONOS
++<U038F> /xbf GREEK CAPITAL LETTER OMEGA WITH TONOS
++<U0390> /xc0 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
++<U0391> /xc1 GREEK CAPITAL LETTER ALPHA
++<U0392> /xc2 GREEK CAPITAL LETTER BETA
++<U0393> /xc3 GREEK CAPITAL LETTER GAMMA
++<U0394> /xc4 GREEK CAPITAL LETTER DELTA
++<U0395> /xc5 GREEK CAPITAL LETTER EPSILON
++<U0396> /xc6 GREEK CAPITAL LETTER ZETA
++<U0397> /xc7 GREEK CAPITAL LETTER ETA
++<U0398> /xc8 GREEK CAPITAL LETTER THETA
++<U0399> /xc9 GREEK CAPITAL LETTER IOTA
++<U039A> /xca GREEK CAPITAL LETTER KAPPA
++<U039B> /xcb GREEK CAPITAL LETTER LAMDA
++<U039C> /xcc GREEK CAPITAL LETTER MU
++<U039D> /xcd GREEK CAPITAL LETTER NU
++<U039E> /xce GREEK CAPITAL LETTER XI
++<U039F> /xcf GREEK CAPITAL LETTER OMICRON
++<U03A0> /xd0 GREEK CAPITAL LETTER PI
++<U03A1> /xd1 GREEK CAPITAL LETTER RHO
++<U03A3> /xd3 GREEK CAPITAL LETTER SIGMA
++<U03A4> /xd4 GREEK CAPITAL LETTER TAU
++<U03A5> /xd5 GREEK CAPITAL LETTER UPSILON
++<U03A6> /xd6 GREEK CAPITAL LETTER PHI
++<U03A7> /xd7 GREEK CAPITAL LETTER CHI
++<U03A8> /xd8 GREEK CAPITAL LETTER PSI
++<U03A9> /xd9 GREEK CAPITAL LETTER OMEGA
++<U03AA> /xda GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
++<U03AB> /xdb GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
++<U03AC> /xdc GREEK SMALL LETTER ALPHA WITH TONOS
++<U03AD> /xdd GREEK SMALL LETTER EPSILON WITH TONOS
++<U03AE> /xde GREEK SMALL LETTER ETA WITH TONOS
++<U03AF> /xdf GREEK SMALL LETTER IOTA WITH TONOS
++<U03B0> /xe0 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
++<U03B1> /xe1 GREEK SMALL LETTER ALPHA
++<U03B2> /xe2 GREEK SMALL LETTER BETA
++<U03B3> /xe3 GREEK SMALL LETTER GAMMA
++<U03B4> /xe4 GREEK SMALL LETTER DELTA
++<U03B5> /xe5 GREEK SMALL LETTER EPSILON
++<U03B6> /xe6 GREEK SMALL LETTER ZETA
++<U03B7> /xe7 GREEK SMALL LETTER ETA
++<U03B8> /xe8 GREEK SMALL LETTER THETA
++<U03B9> /xe9 GREEK SMALL LETTER IOTA
++<U03BA> /xea GREEK SMALL LETTER KAPPA
++<U03BB> /xeb GREEK SMALL LETTER LAMDA
++<U03BC> /xec GREEK SMALL LETTER MU
++<U03BD> /xed GREEK SMALL LETTER NU
++<U03BE> /xee GREEK SMALL LETTER XI
++<U03BF> /xef GREEK SMALL LETTER OMICRON
++<U03C0> /xf0 GREEK SMALL LETTER PI
++<U03C1> /xf1 GREEK SMALL LETTER RHO
++<U03C2> /xf2 GREEK SMALL LETTER FINAL SIGMA
++<U03C3> /xf3 GREEK SMALL LETTER SIGMA
++<U03C4> /xf4 GREEK SMALL LETTER TAU
++<U03C5> /xf5 GREEK SMALL LETTER UPSILON
++<U03C6> /xf6 GREEK SMALL LETTER PHI
++<U03C7> /xf7 GREEK SMALL LETTER CHI
++<U03C8> /xf8 GREEK SMALL LETTER PSI
++<U03C9> /xf9 GREEK SMALL LETTER OMEGA
++<U03CA> /xfa GREEK SMALL LETTER IOTA WITH DIALYTIKA
++<U03CB> /xfb GREEK SMALL LETTER UPSILON WITH DIALYTIKA
++<U03CC> /xfc GREEK SMALL LETTER OMICRON WITH TONOS
++<U03CD> /xfd GREEK SMALL LETTER UPSILON WITH TONOS
++<U03CE> /xfe GREEK SMALL LETTER OMEGA WITH TONOS
++END CHARMAP
+diff -urNp -x '*.orig' glibc-2.33.org/localedata/charmaps/KHMER-NS glibc-2.33/localedata/charmaps/KHMER-NS
+--- glibc-2.33.org/localedata/charmaps/KHMER-NS 1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.33/localedata/charmaps/KHMER-NS 2021-03-20 14:29:23.202826328 +0100
+@@ -0,0 +1,263 @@
++<code_set_name> KHMER-NS
++<comment_char> %
++<escape_char> /
++% version: 1.0
++% repertoiremap: mnemonic,NS
++% sources: http://kde.khmermp3.com
++% Copy Rights by Neang, Savun, Sane Technology,Inc.
++% E-Mail kcra@sanetech.com
++% Special Thanks to Pablo Saratxaga
++% pablo@mandrakesoft.com help to make this Possible for Cambodia.
++
++% NOTE: This code is the ...
++
++CHARMAP
++<U0000> /x00 NULL (NUL)
++<U0001> /x01 START OF HEADING (SOH)
++<U0002> /x02 START OF TEXT (STX)
++<U0003> /x03 END OF TEXT (ETX)
++<U0004> /x04 END OF TRANSMISSION (EOT)
++<U0005> /x05 ENQUIRY (ENQ)
++<U0006> /x06 ACKNOWLEDGE (ACK)
++<U0007> /x07 BELL (BEL)
++<U0008> /x08 BACKSPACE (BS)
++<U0009> /x09 CHARACTER TABULATION (HT)
++<U000A> /x0a LINE FEED (LF)
++<U000B> /x0b LINE TABULATION (VT)
++<U000C> /x0c FORM FEED (FF)
++<U000D> /x0d CARRIAGE RETURN (CR)
++<U000E> /x0e SHIFT OUT (SO)
++<U000F> /x0f SHIFT IN (SI)
++<U0010> /x10 DATALINK ESCAPE (DLE)
++<U0011> /x11 DEVICE CONTROL ONE (DC1)
++<U0012> /x12 DEVICE CONTROL TWO (DC2)
++<U0013> /x13 DEVICE CONTROL THREE (DC3)
++<U0014> /x14 DEVICE CONTROL FOUR (DC4)
++<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK)
++<U0016> /x16 SYNCHRONOUS IDLE (SYN)
++<U0017> /x17 END OF TRANSMISSION BLOCK (ETB)
++<U0018> /x18 CANCEL (CAN)
++<U0019> /x19 END OF MEDIUM (EM)
++<U001A> /x1a SUBSTITUTE (SUB)
++<U001B> /x1b ESCAPE (ESC)
++<U001C> /x1c FILE SEPARATOR (IS4)
++<U001D> /x1d GROUP SEPARATOR (IS3)
++<U001E> /x1e RECORD SEPARATOR (IS2)
++<U001F> /x1f UNIT SEPARATOR (IS1)
++<U0020> /x20 SPACE
++<U0021> /x21 EXCLAMATION MARK
++<U0022> /x22 QUOTATION MARK
++<U0023> /x23 NUMBER SIGN
++<U0024> /x24 DOLLAR SIGN
++<U0025> /x25 PERCENT SIGN
++<U0026> /x26 AMPERSAND
++<U0027> /x27 APOSTROPHE
++<U0028> /x28 LEFT PARENTHESIS
++<U0029> /x29 RIGHT PARENTHESIS
++<U002A> /x2a ASTERISK
++<U002B> /x2b PLUS SIGN
++<U002C> /x2c COMMA
++<U002D> /x2d HYPHEN-MINUS
++<U002E> /x2e FULL STOP
++<U002F> /x2f SOLIDUS
++<U0030> /x30 DIGIT ZERO
++<U0031> /x31 DIGIT ONE
++<U0032> /x32 DIGIT TWO
++<U0033> /x33 DIGIT THREE
++<U0034> /x34 DIGIT FOUR
++<U0035> /x35 DIGIT FIVE
++<U0036> /x36 DIGIT SIX
++<U0037> /x37 DIGIT SEVEN
++<U0038> /x38 DIGIT EIGHT