From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 28 00:40:05 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9EFB106564A for ; Tue, 28 Feb 2012 00:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 822298FC0A for ; Tue, 28 Feb 2012 00:40:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1S0e5sN057192 for ; Tue, 28 Feb 2012 00:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1S0e5kr057191; Tue, 28 Feb 2012 00:40:05 GMT (envelope-from gnats) Resent-Date: Tue, 28 Feb 2012 00:40:05 GMT Resent-Message-Id: <201202280040.q1S0e5kr057191@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Koop Mast Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24D19106564A for ; Tue, 28 Feb 2012 00:33:33 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0EE578FC0C for ; Tue, 28 Feb 2012 00:33:33 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q1S0XWjZ054864 for ; Tue, 28 Feb 2012 00:33:32 GMT (envelope-from kwm@freefall.freebsd.org) Received: (from kwm@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q1S0XWV5054863; Tue, 28 Feb 2012 00:33:32 GMT (envelope-from kwm) Message-Id: <201202280033.q1S0XWV5054863@freefall.freebsd.org> Date: Tue, 28 Feb 2012 00:33:32 GMT From: Koop Mast To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/165514: [exp-run] libiconv 1.14 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Koop Mast List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2012 00:40:05 -0000 >Number: 165514 >Category: ports >Synopsis: [exp-run] libiconv 1.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 28 00:40:05 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Koop Mast >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: Ports exp run to check update of libiconv 1.14. >How-To-Repeat: >Fix: --- libiconv-1.14.diff begins here --- ? converters/libiconv/work Index: converters/libiconv/Makefile =================================================================== RCS file: /home/pcvs/ports/converters/libiconv/Makefile,v retrieving revision 1.56 diff -a -u -r1.56 Makefile --- converters/libiconv/Makefile 11 Aug 2011 19:19:07 -0000 1.56 +++ converters/libiconv/Makefile 28 Feb 2012 00:27:21 -0000 @@ -6,19 +6,16 @@ # PORTNAME= libiconv -PORTVERSION= 1.13.1 -PORTREVISION= 1 +PORTVERSION= 1.14 CATEGORIES= converters devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GNU MAINTAINER= gnome@FreeBSD.org COMMENT= A character set conversion library USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_CSTD= gnu89 -LIBTOOLFILES= configure libcharset/configure +LIBTOOLFILES= configure libcharset/configure preload/configure CONFIGURE_ARGS= --enable-static \ --without-libintl-prefix \ --docdir=${DOCSDIR} @@ -32,7 +29,7 @@ MAN3= iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3 OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \ - EXTRA_PATCHES "Apply patches to fix CP932, add EUCJP-MS" off +# EXTRA_PATCHES "Apply patches to fix CP932, add EUCJP-MS" off .ifdef USE_ICONV .error USE_ICONV is defined as an environment variable, or in the arguments \ @@ -45,13 +42,13 @@ CONFIGURE_ARGS+= --enable-extra-encodings .endif -.if defined(WITH_EXTRA_PATCHES) -PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ -PATCH_SITES+= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= nork -PATCHFILES+= ${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz -PATCH_DIST_STRIP+= -p1 -.endif +#.if defined(WITH_EXTRA_PATCHES) +#PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/ +#PATCH_SITES+= ${MASTER_SITE_LOCAL} +#PATCH_SITE_SUBDIR= nork +#PATCHFILES+= ${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz +#PATCH_DIST_STRIP+= -p1 +#.endif post-patch: @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h Index: converters/libiconv/distinfo =================================================================== RCS file: /home/pcvs/ports/converters/libiconv/distinfo,v retrieving revision 1.19 diff -a -u -r1.19 distinfo --- converters/libiconv/distinfo 20 Mar 2011 12:46:42 -0000 1.19 +++ converters/libiconv/distinfo 28 Feb 2012 00:27:21 -0000 @@ -1,4 +1,2 @@ -SHA256 (libiconv-1.13.1.tar.gz) = 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49 -SIZE (libiconv-1.13.1.tar.gz) = 4716070 -SHA256 (libiconv-1.13-ja-1.patch.gz) = fcbca68796a206f033cb2e61ad6ce159396232acb1d598dfc4c6307e59e67c87 -SIZE (libiconv-1.13-ja-1.patch.gz) = 296487 +SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 +SIZE (libiconv-1.14.tar.gz) = 4984397 Index: converters/libiconv/files/patch-endless-wchar_t-loop =================================================================== RCS file: converters/libiconv/files/patch-endless-wchar_t-loop diff -N converters/libiconv/files/patch-endless-wchar_t-loop --- converters/libiconv/files/patch-endless-wchar_t-loop 6 Feb 2010 00:55:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ ---- lib/loop_wchar.h -+++ lib/loop_wchar.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2000-2002, 2005-2006, 2008 Free Software Foundation, Inc. -+ * Copyright (C) 2000-2002, 2005-2006, 2008-2009 Free Software Foundation, Inc. - * This file is part of the GNU LIBICONV Library. - * - * The GNU LIBICONV Library is free software; you can redistribute it -@@ -321,7 +321,8 @@ static size_t wchar_to_loop_convert (iconv_t icd, - size_t result = 0; - while (*inbytesleft > 0) { - size_t incount; -- for (incount = 1; incount <= *inbytesleft; incount++) { -+ for (incount = 1; ; ) { -+ /* Here incount <= *inbytesleft. */ - char buf[BUF_SIZE]; - const char* inptr = *inbuf; - size_t inleft = incount; -@@ -403,6 +404,12 @@ static size_t wchar_to_loop_convert (iconv_t icd, - break; - } - } -+ incount++; -+ if (incount > *inbytesleft) { -+ /* Incomplete input. */ -+ errno = EINVAL; -+ return -1; -+ } - } - } - return result; Index: converters/libiconv/files/patch-lib_Makefile.in =================================================================== RCS file: /home/pcvs/ports/converters/libiconv/files/patch-lib_Makefile.in,v retrieving revision 1.4 diff -a -u -r1.4 patch-lib_Makefile.in --- converters/libiconv/files/patch-lib_Makefile.in 15 Aug 2009 18:07:49 -0000 1.4 +++ converters/libiconv/files/patch-lib_Makefile.in 28 Feb 2012 00:27:21 -0000 @@ -1,5 +1,5 @@ ---- lib/Makefile.in.orig 2009-03-25 22:14:26.000000000 -0400 -+++ lib/Makefile.in 2009-06-06 15:26:31.000000000 -0400 +--- lib/Makefile.in.orig 2011-08-07 19:48:03.000000000 +0200 ++++ lib/Makefile.in 2011-10-23 22:03:44.000000000 +0200 @@ -26,8 +26,8 @@ -Dset_relocation_prefix=libiconv_set_relocation_prefix \ -Drelocate=libiconv_relocate @DEFS@ @@ -11,11 +11,11 @@ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall # Windows resource compiler (windres). Used via libtool. -@@ -50,7 +50,7 @@ SHELL = /bin/sh +@@ -50,7 +50,7 @@ # Before making a release, change this according to the libtool documentation, # section "Library interface versions". --LIBICONV_VERSION_INFO = 7:0:5 +-LIBICONV_VERSION_INFO = 7:1:5 +LIBICONV_VERSION_INFO = 3 PACKAGE_VERSION = @VERSION@ Index: converters/libiconv/files/patch-libcharset::lib::config.charset =================================================================== RCS file: /home/pcvs/ports/converters/libiconv/files/patch-libcharset::lib::config.charset,v retrieving revision 1.2 diff -a -u -r1.2 patch-libcharset::lib::config.charset --- converters/libiconv/files/patch-libcharset::lib::config.charset 14 Oct 2003 08:00:14 -0000 1.2 +++ converters/libiconv/files/patch-libcharset::lib::config.charset 28 Feb 2012 00:27:21 -0000 @@ -1,22 +1,19 @@ ---- libcharset/lib/config.charset.orig Thu Jan 30 03:43:59 2003 -+++ libcharset/lib/config.charset Tue Oct 14 16:55:29 2003 -@@ -246,8 +246,8 @@ - #echo "sun_eu_greek ?" # what is this? - echo "UTF-8 UTF-8" - ;; -- freebsd* | os2*) -- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore -+ freebsd4.[0-5] | os2*) -+ # FreeBSD up to 4.6 doesn't have nl_langinfo(CODESET); therefore - # localcharset.c falls back to using the full locale name - # from the environment variables. - # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just -@@ -282,6 +282,31 @@ - echo "ja_JP.SJIS SHIFT_JIS" - echo "ja_JP.Shift_JIS SHIFT_JIS" - echo "ko_KR.EUC EUC-KR" -+ ;; -+ freebsd*) +--- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200 ++++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200 +@@ -348,7 +348,7 @@ case "$os" in + #echo "sun_eu_greek ?" # what is this? + echo "UTF-8 UTF-8" + ;; +- freebsd* | os2*) ++ freebsd4.[0-5]* | os2*) + # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. +@@ -385,6 +385,31 @@ case "$os" in + echo "ja_JP.Shift_JIS SHIFT_JIS" + echo "ko_KR.EUC EUC-KR" + ;; ++ freebsd*) + echo "US-ASCII ASCII" + echo "ISO8859-1 ISO-8859-1" + echo "ISO_8859-1 ISO-8859-1" @@ -40,6 +37,7 @@ + echo "Big5 BIG5" + echo "SJIS SHIFT_JIS" + echo "Shift_JIS SHIFT_JIS" - ;; - netbsd*) - echo "646 ASCII" ++ ;; + netbsd*) + echo "646 ASCII" + echo "ISO8859-1 ISO-8859-1" --- libiconv-1.14.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: