[packages] libiconv: add ASCII as alias to US-ASCII, fixes various glib applications

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26775 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index 1842ae2..6509ce1 100644 (file)
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -11,7 +11,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiconv
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk

diff --git a/libs/libiconv/src/iconv.c b/libs/libiconv/src/iconv.c
index 64009f2..8b2bd97 100644 (file)
--- a/libs/libiconv/src/iconv.c
+++ b/libs/libiconv/src/iconv.c
@@ -42,6 +42,7 @@ static const unsigned char charsets[] =
        "\001" "UTF-16LE"   "\0"
        "\002" "UTF-32BE"   "\0"
        "\003" "UTF-32LE"   "\0"
+       "\006" "ASCII"      "\0"
        "\006" "US-ASCII"   "\0"
        "\007" "ISO-8859-1" "\0"
        "\007" "LATIN1"     "\0"