Add aliases patch

3 files changed, 506 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b18b7e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/libiconv-1.14.tar.gz
diff --git a/cygwin-libiconv.spec b/cygwin-libiconv.spec
index 20715e1..402c89a 100644
--- a/cygwin-libiconv.spec
+++ b/cygwin-libiconv.spec
@@ -2,7 +2,7 @@
 
 Name:      cygwin-libiconv
 Version:   1.14
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   GNU libraries and utilities for character set conversion
 
 License:   GPLv2+ and LGPLv2+
@@ -13,6 +13,7 @@ BuildArch: noarch
 Source0:   http://ftp.gnu.org/pub/gnu/libiconv/libiconv-%{version}.tar.gz
 Patch0:    libiconv-1.14-wchar.patch
 Patch1:    libiconv-1.14-reloc.patch
+Patch2:    libiconv-1.14-aliases.patch
 
 BuildRequires: cygwin32-filesystem
 BuildRequires: cygwin32-gcc
@@ -39,8 +40,6 @@ Cygwin Iconv library
 %package -n cygwin32-libiconv
 Summary:        Cygwin32 Iconv library
 Group:          Development/Libraries
-Provides:       cygwin-libiconv = %{version}-%{release}
-Obsoletes:      cygwin-libiconv < %{version}-%{release}
 
 %description -n cygwin32-libiconv
 Iconv library for Cygwin i686 toolchain.
@@ -49,8 +48,6 @@ Iconv library for Cygwin i686 toolchain.
 Summary:        Static version of the Cygwin Iconv library
 Group:          Development/Libraries
 Requires:       cygwin32-libiconv = %{version}-%{release}
-Provides:       cygwin-libiconv-static = %{version}-%{release}
-Obsoletes:      cygwin-libiconv-static < %{version}-%{release}
 
 %description -n cygwin32-libiconv-static
 Static version of Iconv library for Cygwin i686 toolchain.
@@ -78,6 +75,7 @@ Static version of Iconv library for Cygwin x86_64 toolchain.
 rm -f m4/libtool.m4 m4/lt*.m4
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
 %cygwin_autoreconf -I `pwd`/m4 -I `pwd`/srcm4
 
 
@@ -144,6 +142,9 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/charset.alias
 
 
 %changelog
+* Tue Dec 05 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.14-6
+- Add aliases patch
+
 * Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.14-5
 - Fix build on EL6
 
diff --git a/libiconv-1.14-aliases.patch b/libiconv-1.14-aliases.patch
new file mode 100644
index 0000000..382ff22
--- /dev/null
+++ b/libiconv-1.14-aliases.patch
@@ -0,0 +1,499 @@
+--- origsrc/libiconv-1.14/lib/encodings.def	2010-11-23 20:24:03.000000000 -0600
++++ src/libiconv-1.14/lib/encodings.def	2015-03-11 16:36:16.892417700 -0500
+@@ -47,7 +47,7 @@ DEFENCODING(( "US-ASCII",
+               "IBM367",                 /* IANA */
+               "US",                     /* IANA */
+               "csASCII",                /* IANA */
+-            /*"ISO646.1991-IRV",           X11R6.4 */
++              "ISO646.1991-IRV",        /* X11R6.4 */
+             ),
+             ascii,
+             { ascii_mbtowc, NULL },       { ascii_wctomb, NULL })
+@@ -59,17 +59,14 @@ DEFALIAS(     "646",
+ /* General multi-byte encodings */
+ 
+ DEFENCODING(( "UTF-8",                  /* IANA, RFC 2279 */
+-            /*"UTF8",                      JDK 1.1 */
+-            /*"CP65001",                   Windows */
++              "UTF8",                   /* JDK 1.1 */
++              "CP65001",                /* Windows */
+             ),
+             utf8,
+             { utf8_mbtowc, NULL },        { utf8_wctomb, NULL })
+-#ifdef USE_HPUX_ALIASES
+-DEFALIAS(     "UTF8",                   /* HP-UX */
+-            utf8)
+-#endif
+ 
+ DEFENCODING(( "UCS-2",                  /* glibc */
++              "UCS2",                   /* glibc */
+               "ISO-10646-UCS-2",        /* IANA */
+               "csUnicode",              /* IANA */
+             ),
+@@ -77,22 +74,25 @@ DEFENCODING(( "UCS-2",
+             { ucs2_mbtowc, NULL },        { ucs2_wctomb, NULL })
+ 
+ DEFENCODING(( "UCS-2BE",                /* glibc */
++              "UCS2BE",                 /* glibc */
+               "UNICODEBIG",             /* glibc */
+               "UNICODE-1-1",            /* IANA */
+               "csUnicode11",            /* IANA */
+-            /*"CP1201",                    Windows */
++              "CP1201",                 /* Windows */
+             ),
+             ucs2be,
+             { ucs2be_mbtowc, NULL },      { ucs2be_wctomb, NULL })
+ 
+ DEFENCODING(( "UCS-2LE",                /* glibc */
++              "UCS2LE",                 /* glibc */
+               "UNICODELITTLE",          /* glibc */
+-            /*"CP1200",                    Windows */
++              "CP1200",                 /* Windows */
+             ),
+             ucs2le,
+             { ucs2le_mbtowc, NULL },      { ucs2le_wctomb, NULL })
+ 
+ DEFENCODING(( "UCS-4",                  /* glibc */
++              "UCS4",                   /* glibc */
+               "ISO-10646-UCS-4",        /* IANA */
+               "csUCS4",                 /* IANA */
+             ),
+@@ -100,43 +100,52 @@ DEFENCODING(( "UCS-4",
+             { ucs4_mbtowc, NULL },        { ucs4_wctomb, NULL })
+ 
+ DEFENCODING(( "UCS-4BE",                /* glibc */
+-            /*"CP12001",                   Windows */
++              "UCS4BE",                 /* glibc */
++              "CP12001",                /* Windows */
+             ),
+             ucs4be,
+             { ucs4be_mbtowc, NULL },      { ucs4be_wctomb, NULL })
+ 
+ DEFENCODING(( "UCS-4LE",                /* glibc */
+-            /*"CP12000",                   Windows */
++              "UCS4LE",                 /* glibc */
++              "CP12000",                /* Windows */
+             ),
+             ucs4le,
+             { ucs4le_mbtowc, NULL },      { ucs4le_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-16",                 /* IANA, RFC 2781 */
++              "UTF16",                  /* glibc */
+             ),
+             utf16,
+             { utf16_mbtowc, NULL },       { utf16_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-16BE",               /* IANA, RFC 2781 */
++              "UTF16BE",                /* glibc */
+             ),
+             utf16be,
+             { utf16be_mbtowc, NULL },     { utf16be_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-16LE",               /* IANA, RFC 2781 */
++              "UTF16LE",                /* glibc */
++              "UNICODEFFFE",            /* glibc */
+             ),
+             utf16le,
+             { utf16le_mbtowc, NULL },     { utf16le_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-32",                 /* IANA, Unicode 3.1 */
++              "UTF32",                  /* glibc */
+             ),
+             utf32,
+             { utf32_mbtowc, NULL },       { utf32_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-32BE",               /* IANA, Unicode 3.1 */
++              "UTF32BE",                /* glibc */
+             ),
+             utf32be,
+             { utf32be_mbtowc, NULL },     { utf32be_wctomb, NULL })
+ 
+ DEFENCODING(( "UTF-32LE",               /* IANA, Unicode 3.1 */
++              "UTF32LE",                /* glibc */
+             ),
+             utf32le,
+             { utf32le_mbtowc, NULL },     { utf32le_wctomb, NULL })
+@@ -144,7 +153,7 @@ DEFENCODING(( "UTF-32LE",
+ DEFENCODING(( "UTF-7",                  /* IANA, RFC 2152 */
+               "UNICODE-1-1-UTF-7",      /* IANA, RFC 1642 */
+               "csUnicode11UTF7",        /* IANA */
+-            /*"CP65000",                   Windows */
++              "CP65000",                /* Windows */
+             ),
+             utf7,
+             { utf7_mbtowc, NULL },        { utf7_wctomb, utf7_reset })
+@@ -191,8 +200,8 @@ DEFENCODING(( "ISO-8859-1",
+               "L1",                     /* IANA */
+               "csISOLatin1",            /* IANA */
+               "ISO8859-1",              /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */
+-            /*"ISO8859_1",                 JDK 1.1 */
+-            /*"CP28591",                   Windows */
++              "ISO8859_1",              /* JDK 1.1 */
++              "CP28591",                /* Windows */
+             ),
+             iso8859_1,
+             { iso8859_1_mbtowc, NULL },   { iso8859_1_wctomb, NULL })
+@@ -209,8 +218,8 @@ DEFENCODING(( "ISO-8859-2",
+               "L2",                     /* IANA */
+               "csISOLatin2",            /* IANA */
+               "ISO8859-2",              /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */
+-            /*"ISO8859_2",                 JDK 1.1 */
+-            /*"CP28592",                   Windows */
++              "ISO8859_2",              /* JDK 1.1 */
++              "CP28592",                /* Windows */
+             ),
+             iso8859_2,
+             { iso8859_2_mbtowc, NULL },   { iso8859_2_wctomb, NULL })
+@@ -227,8 +236,8 @@ DEFENCODING(( "ISO-8859-3",
+               "L3",                     /* IANA */
+               "csISOLatin3",            /* IANA */
+               "ISO8859-3",              /* X11R6.4, glibc, FreeBSD, Solaris */
+-            /*"ISO8859_3",                 JDK 1.1 */
+-            /*"CP28593",                   Windows */
++              "ISO8859_3",              /* JDK 1.1 */
++              "CP28593",                /* Windows */
+             ),
+             iso8859_3,
+             { iso8859_3_mbtowc, NULL },   { iso8859_3_wctomb, NULL })
+@@ -241,8 +250,8 @@ DEFENCODING(( "ISO-8859-4",
+               "L4",                     /* IANA */
+               "csISOLatin4",            /* IANA */
+               "ISO8859-4",              /* X11R6.4, glibc, FreeBSD, OSF/1, Solaris */
+-            /*"ISO8859_4",                 JDK 1.1 */
+-            /*"CP28594",                   Windows */
++              "ISO8859_4",              /* JDK 1.1 */
++              "CP28594",                /* Windows */
+             ),
+             iso8859_4,
+             { iso8859_4_mbtowc, NULL },   { iso8859_4_wctomb, NULL })
+@@ -254,8 +263,8 @@ DEFENCODING(( "ISO-8859-5",
+               "CYRILLIC",               /* IANA */
+               "csISOLatinCyrillic",     /* IANA */
+               "ISO8859-5",              /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */
+-            /*"ISO8859_5",                 JDK 1.1 */
+-            /*"CP28595",                   Windows */
++              "ISO8859_5",              /* JDK 1.1 */
++              "CP28595",                /* Windows */
+             ),
+             iso8859_5,
+             { iso8859_5_mbtowc, NULL },   { iso8859_5_wctomb, NULL })
+@@ -273,8 +282,8 @@ DEFENCODING(( "ISO-8859-6",
+               "ARABIC",                 /* IANA */
+               "csISOLatinArabic",       /* IANA */
+               "ISO8859-6",              /* X11R6.4, glibc, FreeBSD, AIX, Solaris */
+-            /*"ISO8859_6",                 JDK 1.1 */
+-            /*"CP28596",                   Windows */
++              "ISO8859_6",              /* JDK 1.1 */
++              "CP28596",                /* Windows */
+             ),
+             iso8859_6,
+             { iso8859_6_mbtowc, NULL },   { iso8859_6_wctomb, NULL })
+@@ -294,8 +303,8 @@ DEFENCODING(( "ISO-8859-7",
+               "GREEK",                  /* IANA */
+               "csISOLatinGreek",        /* IANA */
+               "ISO8859-7",              /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */
+-            /*"ISO8859_7",                 JDK 1.1 */
+-            /*"CP28597",                   Windows */
++              "ISO8859_7",              /* JDK 1.1 */
++              "CP28597",                /* Windows */
+             ),
+             iso8859_7,
+             { iso8859_7_mbtowc, NULL },   { iso8859_7_wctomb, NULL })
+@@ -311,9 +320,9 @@ DEFENCODING(( "ISO-8859-8",
+               "HEBREW",                 /* IANA */
+               "csISOLatinHebrew",       /* IANA */
+               "ISO8859-8",              /* X11R6.4, glibc, FreeBSD, AIX, OSF/1, Solaris */
+-            /*"ISO8859_8",                 JDK 1.1 */
+-            /*"CP28598",                   Windows */
+-            /*"CP38598",                   Windows */
++              "ISO8859_8",              /* JDK 1.1 */
++              "CP28598",                /* Windows */
++              "CP38598",                /* Windows */
+             ),
+             iso8859_8,
+             { iso8859_8_mbtowc, NULL },   { iso8859_8_wctomb, NULL })
+@@ -330,8 +339,8 @@ DEFENCODING(( "ISO-8859-9",
+               "L5",                     /* IANA */
+               "csISOLatin5",            /* IANA */
+               "ISO8859-9",              /* X11R6.4, glibc, FreeBSD, AIX, IRIX, OSF/1, Solaris */
+-            /*"ISO8859_9",                 JDK 1.1 */
+-            /*"CP28599",                   Windows */
++              "ISO8859_9",              /* JDK 1.1 */
++              "CP28599",                /* Windows */
+             ),
+             iso8859_9,
+             { iso8859_9_mbtowc, NULL },   { iso8859_9_wctomb, NULL })
+@@ -365,6 +374,7 @@ DEFENCODING(( "ISO-8859-13",
+               "LATIN7",                 /* glibc */
+               "L7",                     /* glibc */
+               "ISO8859-13",             /* glibc, FreeBSD */
++              "CP28603",                /* Windows */
+             ),
+             iso8859_13,
+             { iso8859_13_mbtowc, NULL },  { iso8859_13_wctomb, NULL })
+@@ -391,7 +401,7 @@ DEFENCODING(( "ISO-8859-15",
+               "ISO-IR-203",
+               "LATIN-9",                /* IANA */
+               "ISO8859-15",             /* glibc, FreeBSD, AIX, OSF/1, Solaris */
+-            /*"CP28605",                   Windows */
++              "CP28605",                /* Windows */
+             ),
+             iso8859_15,
+             { iso8859_15_mbtowc, NULL },  { iso8859_15_wctomb, NULL })
+@@ -413,7 +423,7 @@ DEFENCODING(( "ISO-8859-16",
+ 
+ DEFENCODING(( "KOI8-R",                 /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
+               "csKOI8R",                /* IANA */
+-            /*"CP20866",                   Windows */
++              "CP20866",                /* Windows */
+             ),
+             koi8_r,
+             { koi8_r_mbtowc, NULL },      { koi8_r_wctomb, NULL })
+@@ -424,6 +434,7 @@ DEFENCODING(( "KOI8-U",
+             { koi8_u_mbtowc, NULL },      { koi8_u_wctomb, NULL })
+ 
+ DEFENCODING(( "KOI8-RU",
++              "CP21866",                /* Windows */
+             ),
+             koi8_ru,
+             { koi8_ru_mbtowc, NULL },     { koi8_ru_wctomb, NULL })
+@@ -547,73 +558,73 @@ DEFENCODING(( "MacRoman",
+               "MACINTOSH",              /* IANA */
+               "MAC",                    /* IANA */
+               "csMacintosh",            /* IANA */
+-            /*"CP10000",                   Windows */
++              "CP10000",                /* Windows */
+             ),
+             mac_roman,
+             { mac_roman_mbtowc, NULL },   { mac_roman_wctomb, NULL })
+ 
+ DEFENCODING(( "MacCentralEurope",       /* JDK 1.1 */
+-            /*"CP10029",                   Windows */
++              "CP10029",                /* Windows */
+             ),
+             mac_centraleurope,
+             { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
+ 
+ DEFENCODING(( "MacIceland",             /* JDK 1.1 */
+-            /*"CP10079",                   Windows */
++              "CP10079",                /* Windows */
+             ),
+             mac_iceland,
+             { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
+ 
+ DEFENCODING(( "MacCroatian",            /* JDK 1.1 */
+-            /*"CP10082",                   Windows */
++              "CP10082",                /* Windows */
+             ),
+             mac_croatian,
+             { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
+ 
+ DEFENCODING(( "MacRomania",             /* JDK 1.1 */
+-            /*"CP10010",                   Windows */
++              "CP10010",                /* Windows */
+             ),
+             mac_romania,
+             { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
+ 
+ DEFENCODING(( "MacCyrillic",            /* JDK 1.1 */
+-            /*"CP10007",                   Windows */
++              "CP10007",                /* Windows */
+             ),
+             mac_cyrillic,
+             { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
+ 
+ DEFENCODING(( "MacUkraine",             /* JDK 1.1 */
+-            /*"CP10017",                   Windows */
++              "CP10017",                /* Windows */
+             ),
+             mac_ukraine,
+             { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
+ 
+ DEFENCODING(( "MacGreek",               /* JDK 1.1 */
+-            /*"CP10006",                   Windows */
++              "CP10006",                /* Windows */
+             ),
+             mac_greek,
+             { mac_greek_mbtowc, NULL },   { mac_greek_wctomb, NULL })
+ 
+ DEFENCODING(( "MacTurkish",             /* JDK 1.1 */
+-            /*"CP10081",                   Windows */
++              "CP10081",                /* Windows */
+             ),
+             mac_turkish,
+             { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
+ 
+ DEFENCODING(( "MacHebrew",              /* JDK 1.1 */
+-            /*"CP10005",                   Windows */
++              "CP10005",                /* Windows */
+             ),
+             mac_hebrew,
+             { mac_hebrew_mbtowc, NULL },  { mac_hebrew_wctomb, NULL })
+ 
+ DEFENCODING(( "MacArabic",              /* JDK 1.1 */
+-            /*"CP10004",                   Windows */
++              "CP10004",                /* Windows */
+             ),
+             mac_arabic,
+             { mac_arabic_mbtowc, NULL },  { mac_arabic_wctomb, NULL })
+ 
+ DEFENCODING(( "MacThai",                /* JDK 1.1 */
+-            /*"CP10021",                   Windows */
++              "CP10021",                /* Windows */
+             ),
+             mac_thai,
+             { mac_thai_mbtowc, NULL },    { mac_thai_wctomb, NULL })
+@@ -738,8 +749,8 @@ DEFENCODING(( "JIS_X0201",
+               "JISX0201-1976",
+               "X0201",                  /* IANA */
+               "csHalfWidthKatakana",    /* IANA */
+-            /*"JISX0201.1976-0",           X11R6.4 */
+-            /*"JIS0201",                   JDK 1.1 */
++              "JISX0201.1976-0",        /* X11R6.4 */
++              "JIS0201",                /* JDK 1.1 */
+             ),
+             jisx0201,
+             { jisx0201_mbtowc, NULL },    { jisx0201_wctomb, NULL })
+@@ -747,14 +758,13 @@ DEFENCODING(( "JIS_X0201",
+ DEFENCODING(( "JIS_X0208",
+               "JIS_X0208-1983",         /* IANA */
+               "JIS_X0208-1990",
+-              "JIS0208",
+               "X0208",                  /* IANA */
+               "ISO-IR-87",              /* IANA */
+               "JIS_C6226-1983",         /* IANA */
+               "csISO87JISX0208",        /* IANA */
+-            /*"JISX0208.1983-0",           X11R6.4 */
+-            /*"JISX0208.1990-0",           X11R6.4 */
+-            /*"JIS0208",                   JDK 1.1 */
++              "JISX0208.1983-0",        /* X11R6.4 */
++              "JISX0208.1990-0",        /* X11R6.4 */
++              "JIS0208",                /* JDK 1.1 */
+             ),
+             jisx0208,
+             { jisx0208_mbtowc, NULL },    { jisx0208_wctomb, NULL })
+@@ -765,8 +775,8 @@ DEFENCODING(( "JIS_X0212",
+               "X0212",                  /* IANA */
+               "ISO-IR-159",             /* IANA */
+               "csISO159JISX02121990",   /* IANA */
+-            /*"JISX0212.1990-0",           X11R6.4 */
+-            /*"JIS0212",                   JDK 1.1 */
++              "JISX0212.1990-0",        /* X11R6.4 */
++              "JIS0212",                /* JDK 1.1 */
+             ),
+             jisx0212,
+             { jisx0212_mbtowc, NULL },    { jisx0212_wctomb, NULL })
+@@ -784,7 +794,7 @@ DEFENCODING(( "GB_2312-80",
+               "ISO-IR-58",              /* IANA */
+               "csISO58GB231280",        /* IANA */
+               "CHINESE",                /* IANA */
+-            /*"GB2312.1980-0",             X11R6.4 */
++              "GB2312.1980-0",          /* X11R6.4 */
+             ),
+             gb2312,
+             { gb2312_mbtowc, NULL },      { gb2312_wctomb, NULL })
+@@ -801,7 +811,7 @@ DEFENCODING(( "KSC_5601",
+               "ISO-IR-149",             /* IANA */
+               "csKSC56011987",          /* IANA */
+               "KOREAN",                 /* IANA */
+-            /*"KSC5601.1987-0",            X11R6.4 */
++              "KSC5601.1987-0",         /* X11R6.4 */
+             /*"KSX1001:1992",              Ken Lunde */
+             ),
+             ksc5601,
+@@ -813,8 +823,8 @@ DEFENCODING(( "EUC-JP",
+               "EUCJP",                  /* glibc, HP-UX, IRIX, OSF/1, Solaris */
+               "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
+               "csEUCPkdFmtJapanese",    /* IANA */
+-            /*"EUC_JP",                    JDK 1.1 */
+-            /*"CP51932",                   Windows */
++              "EUC_JP",                 /* JDK 1.1 */
++              "CP51932",                /* Windows */
+             ),
+             euc_jp,
+             { euc_jp_mbtowc, NULL },      { euc_jp_wctomb, NULL })
+@@ -841,6 +851,7 @@ DEFALIAS(     "PCK",
+ #endif
+ 
+ DEFENCODING(( "CP932",                  /* glibc */
++              "WINDOWS-31J",            /* IANA */
+             ),
+             cp932,
+             { cp932_mbtowc, NULL },       { cp932_wctomb, NULL })
+@@ -851,7 +862,7 @@ DEFALIAS(     "IBM-932",
+ 
+ DEFENCODING(( "ISO-2022-JP",            /* IANA, RFC 1468 */
+               "csISO2022JP",            /* IANA */
+-            /*"ISO2022JP",                 JDK 1.1 */
++              "ISO2022JP",              /* JDK 1.1 */
+             ),
+             iso2022_jp,
+             { iso2022_jp_mbtowc, NULL },  { iso2022_jp_wctomb, iso2022_jp_reset })
+@@ -872,8 +883,8 @@ DEFENCODING(( "EUC-CN",
+               "GB2312",                 /* IANA */
+               "CN-GB",                  /* RFC 1922 */
+               "csGB2312",               /* IANA */
+-            /*"EUC_CN",                    JDK 1.1 */
+-            /*"CP51936",                   Windows */
++              "EUC_CN",                 /* JDK 1.1 */
++              "CP51936",                /* Windows */
+             ),
+             euc_cn,
+             { euc_cn_mbtowc, NULL },      { euc_cn_wctomb, NULL })
+@@ -903,14 +914,14 @@ DEFENCODING(( "CP936",
+             { cp936_mbtowc, NULL },       { cp936_wctomb, NULL })
+ 
+ DEFENCODING(( "GB18030",                /* IANA, glibc */
+-            /*"CP54936",                   Windows */
++              "CP54936",                /* Windows */
+             ),
+             gb18030,
+             { gb18030_mbtowc, NULL },     { gb18030_wctomb, NULL })
+ 
+ DEFENCODING(( "ISO-2022-CN",            /* IANA, RFC 1922 */
+               "csISO2022CN",
+-            /*"ISO2022CN",                 JDK 1.1 */
++              "ISO2022CN",              /* JDK 1.1 */
+             ),
+             iso2022_cn,
+             { iso2022_cn_mbtowc, NULL },  { iso2022_cn_wctomb, iso2022_cn_reset })
+@@ -922,6 +933,7 @@ DEFENCODING(( "ISO-2022-CN-EXT",
+ 
+ DEFENCODING(( "HZ",                     /* RFC 1843 */
+               "HZ-GB-2312",             /* IANA, RFC 1842 */
++              "CP52936",                /* Windows */
+             ),
+             hz,
+             { hz_mbtowc, NULL },          { hz_wctomb, hz_reset })
+@@ -929,8 +941,8 @@ DEFENCODING(( "HZ",
+ DEFENCODING(( "EUC-TW",                 /* glibc */
+               "EUCTW",                  /* glibc, HP-UX, IRIX, OSF/1 */
+               "csEUCTW",
+-            /*"EUC_TW",                    JDK 1.1 */
+-            /*"CP51950",                   Windows */
++              "EUC_TW",                 /* JDK 1.1 */
++              "CP51950",                /* Windows */
+             ),
+             euc_tw,
+             { euc_tw_mbtowc, NULL },      { euc_tw_wctomb, NULL })
+@@ -983,8 +995,8 @@ DEFENCODING(( "BIG5-HKSCS",
+ DEFENCODING(( "EUC-KR",                 /* IANA, RFC 1557 */
+               "EUCKR",                  /* glibc, HP-UX, IRIX, OSF/1 */
+               "csEUCKR",                /* IANA */
+-            /*"EUC_KR",                    JDK 1.1 */
+-            /*"CP51949",                   Windows */
++              "EUC_KR",                 /* JDK 1.1 */
++              "CP51949",                /* Windows */
+             ),
+             euc_kr,
+             { euc_kr_mbtowc, NULL },      { euc_kr_wctomb, NULL })
+@@ -1023,7 +1035,8 @@ DEFALIAS(     "KO_KR.JOHAP92",
+ 
+ DEFENCODING(( "ISO-2022-KR",            /* IANA, RFC 1557 */
+               "csISO2022KR",            /* IANA */
+-            /*"ISO2022KR",                 JDK 1.1 */
++              "ISO2022KR",              /* JDK 1.1 */
++              "CP50225",                /* Windows */
+             ),
+             iso2022_kr,
+             { iso2022_kr_mbtowc, NULL },  { iso2022_kr_wctomb, iso2022_kr_reset })