From patchwork Mon May 2 00:46:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gergely Kiss X-Patchwork-Id: 617327 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qylxK0WFtz9t5h for ; Mon, 2 May 2016 10:46:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Nm3q7epc; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 253ACB918A3; Mon, 2 May 2016 02:46:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Mon, 2 May 2016 02:46:37 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id F0455B90D65 for ; Mon, 2 May 2016 02:46:35 +0200 (CEST) X-policyd-weight: using cached result; rate: -7 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 2 May 2016 02:46:35 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id w143so14979053wmw.3 for ; Sun, 01 May 2016 17:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:from:subject:cc:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=BC+gry+kgApRtsx7KMXS18xB2m+3olMv16DYujnkNqw=; b=Nm3q7epcMVoqEtIKpRkbSlk6dpxr/GGby5FCbPvr1///9XuawPgMyhOsx6Suf2n+ou B18nUdsy71gvr55EmMdddfK7NprB7d18Zg/OxjquMHXmA2n7CJW+0/qPIPc0+W9O5Ds8 iJuGl9AVtujY+jsu7XwCi0Y/0Y6JSBSE+Ml7N+TLAaJfrmmHIdhgnmK7cz0vOlJDnYwY il1WYKzE2vq4BI15xH0CKURBMGicoP2dzkZKn9w3I6mJBQ2ScqyorUYM7sOgb/K+GBbE hsa7yz4Bbm7bIhUrk2QhWEmKJdRSInWE1oDyAYY/LYMypPdHVM4ZIcW/hy0dx0JXzAIw NNTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:cc:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=BC+gry+kgApRtsx7KMXS18xB2m+3olMv16DYujnkNqw=; b=KUimH5Rpj9zC9K0P610gcuLqd2gTU/oydX7l4GPlVzF6aWnLfpqjoY9fVX15O6T13f evNtMiblJxmj/vKCYA7XnvqwlV82FZeIctOAo6pbsUaYJaJL7Yqlj45ERYYYOLDEBJSQ LvGnikEqq4Z+BlcHpJ4mV7FbDWqyQKrETPTxStsQr56ZDcJtGThVaWAeB2H1yYOh4WgT b8brYJbPKllZT0rep7YXIx/RzFX+car+tZR8MoPkJaOV81ex5Af/9Wxe32WVLeeiuI29 zYstVfgNBZumUz+AuH7FCuGfZbPeLhdBQXNruSBRvAYDnmmF3ymcd50JZyboItSJaned 7VhQ== X-Gm-Message-State: AOPr4FWfmglwtR+P6h9WDClXsy0+U11GGW4K8SPRaLndJKZ2YKPIjtc4hzWsCZmrdN1YPg== X-Received: by 10.28.131.195 with SMTP id f186mr15385180wmd.97.1462149994665; Sun, 01 May 2016 17:46:34 -0700 (PDT) Received: from nb.nb (catv-80-99-0-63.catv.broadband.hu. [80.99.0.63]) by smtp.googlemail.com with ESMTPSA id c194sm15904065wme.9.2016.05.01.17.46.33 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 May 2016 17:46:33 -0700 (PDT) To: OpenWrt Development List From: Gergely Kiss Message-ID: <5726A369.1090704@gmail.com> Date: Mon, 2 May 2016 02:46:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH] libiconv: add all ASCII aliases X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 7d9ba4c..9716261 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 d2e19e3..c3cfefa 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"