From a2b555189b2cc051bf706eae3ba2b08d094f63c0 Mon Sep 17 00:00:00 2001 From: Gergely Kiss Date: Mon, 2 May 2016 02:46:33 +0200 Subject: [PATCH] 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 --- package/libs/libiconv/Makefile | 2 +- package/libs/libiconv/src/iconv.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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" -- 2.30.2