diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-05-10 22:36:47 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-06-19 19:29:54 +0200 |
| commit | 32de2e4468e7a54d9e150c666f1537ae2ebe6d4d (patch) | |
| tree | c8db83a41ee234ef2618bcfc8d615fdb483f95ad /package/libs | |
| parent | ab0a61efa23e13b74870ccc2874c4cdb7d2b7fe8 (diff) | |
| download | master-187ad058-32de2e4468e7a54d9e150c666f1537ae2ebe6d4d.tar.gz master-187ad058-32de2e4468e7a54d9e150c666f1537ae2ebe6d4d.tar.bz2 master-187ad058-32de2e4468e7a54d9e150c666f1537ae2ebe6d4d.zip | |
libiconv: add all ASCII aliases
This patch adds missing ASCII aliases to the libiconv stub in order to avoid conversion errors like https://github.com/openwrt/packages/issues/2373
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49339 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/libiconv/Makefile | 2 | ||||
| -rw-r--r-- | package/libs/libiconv/src/iconv.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/package/libs/libiconv/Makefile b/package/libs/libiconv/Makefile index 7d9ba4caf8..97162617da 100644 --- a/package/libs/libiconv/Makefile +++ b/package/libs/libiconv/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiconv -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/libiconv/src/iconv.c b/package/libs/libiconv/src/iconv.c index d2e19e3c45..c3cfefa3cc 100644 --- a/package/libs/libiconv/src/iconv.c +++ b/package/libs/libiconv/src/iconv.c @@ -44,6 +44,15 @@ static const unsigned char charsets[] = "\003" "UTF-32LE" "\0" "\006" "ASCII" "\0" "\006" "US-ASCII" "\0" + "\006" "ISO646-US" "\0" + "\006" "ISO_646.IRV:1991" "\0" + "\006" "ISO-IR-6" "\0" + "\006" "ANSI_X3.4-1968" "\0" + "\006" "ANSI_X3.4-1986" "\0" + "\006" "CP367" "\0" + "\006" "IBM367" "\0" + "\006" "US" "\0" + "\006" "CSASCII" "\0" "\007" "ISO-8859-1" "\0" "\007" "LATIN1" "\0" "\010" "ISO-8859-15""\0" |