Attachment #122334 for bug #165514

View | Details | Raw Unified | Return to bug 165514
Collapse All | Expand All




#

PORTNAME=	libiconv
PORTVERSION=	1.14
PORTREVISION=	1
CATEGORIES=	converters devel
MASTER_SITES=	GNU
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	A character set conversion library

USE_AUTOTOOLS=	libtool
GNU_CONFIGURE=	yes
LIBTOOLFILES=	configure libcharset/configure preload/configure
LIBTOOLFILES=	configure libcharset/configure
CONFIGURE_ARGS=	--enable-static \
		--without-libintl-prefix \
		--docdir=${DOCSDIR}

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

.ifdef USE_ICONV
.error USE_ICONV is defined as an environment variable, or in the arguments \

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

post-patch:
	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h

Lines 1-4 Link Here

(-)converters/libiconv/distinfo (-4 / +2 lines)
1	SHA256 (libiconv-1.13.1.tar.gz) = 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49	1	SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
2	SIZE (libiconv-1.13.1.tar.gz) = 4716070	2	SIZE (libiconv-1.14.tar.gz) = 4984397
3	SHA256 (libiconv-1.13-ja-1.patch.gz) = fcbca68796a206f033cb2e61ad6ce159396232acb1d598dfc4c6307e59e67c87
4	SIZE (libiconv-1.13-ja-1.patch.gz) = 296487




--- 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;




--- 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@

 LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
 LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
 # Windows resource compiler (windres). Used via libtool.
@@ -50,7 +50,7 @@
 
 # Before making a release, change this according to the libtool documentation,
 # section "Library interface versions".
-LIBICONV_VERSION_INFO = 7:1:5
+LIBICONV_VERSION_INFO = 3
 
 PACKAGE_VERSION = @VERSION@




--- 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 "ko_KR.EUC EUC-KR"
+	;;
+    freebsd*)
+	echo "US-ASCII ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO_8859-1 ISO-8859-1"

+	echo "Big5 BIG5"
+	echo "SJIS SHIFT_JIS"
+	echo "Shift_JIS SHIFT_JIS"
+        ;;
   netbsd*)
     echo "646 ASCII"
     echo "ISO8859-1 ISO-8859-1"

Return to bug 165514

Lines 6-24 Link Here

(-)converters/libiconv/Makefile (-14 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= libiconv	8	PORTNAME= libiconv
9	PORTVERSION= 1.13.1	9	PORTVERSION= 1.14
10	PORTREVISION= 1
11	CATEGORIES= converters devel	10	CATEGORIES= converters devel
12	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= GNU
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		12
15	MAINTAINER= gnome@FreeBSD.org	13	MAINTAINER= gnome@FreeBSD.org
16	COMMENT= A character set conversion library	14	COMMENT= A character set conversion library
17		15
18	USE_AUTOTOOLS= libtool	16	USE_AUTOTOOLS= libtool
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20	USE_CSTD= gnu89	18	LIBTOOLFILES= configure libcharset/configure preload/configure
21	LIBTOOLFILES= configure libcharset/configure
22	CONFIGURE_ARGS= --enable-static \	19	CONFIGURE_ARGS= --enable-static \
23	--without-libintl-prefix \	20	--without-libintl-prefix \
24	--docdir=${DOCSDIR}	21	--docdir=${DOCSDIR}
Lines 32-38 Link Here
32	MAN3= iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3	29	MAN3= iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3
33		30
34	OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \	31	OPTIONS= EXTRA_ENCODINGS "Include extra character sets" on \
35	EXTRA_PATCHES "Apply patches to fix CP932, add EUCJP-MS" off	32	# EXTRA_PATCHES "Apply patches to fix CP932, add EUCJP-MS" off
36		33
37	.ifdef USE_ICONV	34	.ifdef USE_ICONV
38	.error USE_ICONV is defined as an environment variable, or in the arguments \	35	.error USE_ICONV is defined as an environment variable, or in the arguments \
Lines 45-57 Link Here
45	CONFIGURE_ARGS+= --enable-extra-encodings	42	CONFIGURE_ARGS+= --enable-extra-encodings
46	.endif	43	.endif
47		44
48	.if defined(WITH_EXTRA_PATCHES)	45	#.if defined(WITH_EXTRA_PATCHES)
49	PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/	46	#PATCH_SITES+= http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
50	PATCH_SITES+= ${MASTER_SITE_LOCAL}	47	#PATCH_SITES+= ${MASTER_SITE_LOCAL}
51	PATCH_SITE_SUBDIR= nork	48	#PATCH_SITE_SUBDIR= nork
52	PATCHFILES+= ${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz	49	#PATCHFILES+= ${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz
53	PATCH_DIST_STRIP+= -p1	50	#PATCH_DIST_STRIP+= -p1
54	.endif	51	#.endif
55		52
56	post-patch:	53	post-patch:
57	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h	54	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h

Removed Link Here

(-)converters/libiconv/files/patch-endless-wchar_t-loop (-32 lines)
1	--- lib/loop_wchar.h
2	+++ lib/loop_wchar.h
3	@@ -1,5 +1,5 @@
4	/*
5	- * Copyright (C) 2000-2002, 2005-2006, 2008 Free Software Foundation, Inc.
6	+ * Copyright (C) 2000-2002, 2005-2006, 2008-2009 Free Software Foundation, Inc.
7	* This file is part of the GNU LIBICONV Library.
8	*
9	* The GNU LIBICONV Library is free software; you can redistribute it
10	@@ -321,7 +321,8 @@ static size_t wchar_to_loop_convert (iconv_t icd,
11	size_t result = 0;
12	while (*inbytesleft > 0) {
13	size_t incount;
14	- for (incount = 1; incount <= *inbytesleft; incount++) {
15	+ for (incount = 1; ; ) {
16	+ /* Here incount <= inbytesleft. /
17	char buf[BUF_SIZE];
18	const char* inptr = *inbuf;
19	size_t inleft = incount;
20	@@ -403,6 +404,12 @@ static size_t wchar_to_loop_convert (iconv_t icd,
21	break;
22	}
23	}
24	+ incount++;
25	+ if (incount > *inbytesleft) {
26	+ /* Incomplete input. */
27	+ errno = EINVAL;
28	+ return -1;
29	+ }
30	}
31	}
32	return result;

Lines 1-5 Link Here

(-)converters/libiconv/files/patch-lib_Makefile.in (-4 / +4 lines)
1	--- lib/Makefile.in.orig 2009-03-25 22:14:26.000000000 -0400	1	--- lib/Makefile.in.orig 2011-08-07 19:48:03.000000000 +0200
2	+++ lib/Makefile.in 2009-06-06 15:26:31.000000000 -0400	2	+++ lib/Makefile.in 2011-10-23 22:03:44.000000000 +0200
3	@@ -26,8 +26,8 @@	3	@@ -26,8 +26,8 @@
4	-Dset_relocation_prefix=libiconv_set_relocation_prefix \	4	-Dset_relocation_prefix=libiconv_set_relocation_prefix \
5	-Drelocate=libiconv_relocate @DEFS@	5	-Drelocate=libiconv_relocate @DEFS@
Lines 11-21 Link Here
11	LIBTOOL_INSTALL = $(LIBTOOL) --mode=install	11	LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
12	LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall	12	LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
13	# Windows resource compiler (windres). Used via libtool.	13	# Windows resource compiler (windres). Used via libtool.
14	@@ -50,7 +50,7 @@ SHELL = /bin/sh	14	@@ -50,7 +50,7 @@
15		15
16	# Before making a release, change this according to the libtool documentation,	16	# Before making a release, change this according to the libtool documentation,
17	# section "Library interface versions".	17	# section "Library interface versions".
18	-LIBICONV_VERSION_INFO = 7:0:5	18	-LIBICONV_VERSION_INFO = 7:1:5
19	+LIBICONV_VERSION_INFO = 3	19	+LIBICONV_VERSION_INFO = 3
20		20
21	PACKAGE_VERSION = @VERSION@	21	PACKAGE_VERSION = @VERSION@

Lines 1-22 Link Here

(-)converters/libiconv/files/patch-libcharset::lib::config.charset (-22 / +20 lines)
1	--- libcharset/lib/config.charset.orig Thu Jan 30 03:43:59 2003	1	--- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200
2	+++ libcharset/lib/config.charset Tue Oct 14 16:55:29 2003	2	+++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200
3	@@ -246,8 +246,8 @@	3	@@ -348,7 +348,7 @@ case "$os" in
4	#echo "sun_eu_greek ?" # what is this?	4	#echo "sun_eu_greek ?" # what is this?
5	echo "UTF-8 UTF-8"	5	echo "UTF-8 UTF-8"
6	;;	6	;;
7	- freebsd* \| os2*)	7	- freebsd* \| os2*)
8	- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore	8	+ freebsd4.[0-5]* \| os2*)
9	+ freebsd4.[0-5] \| os2*)	9	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
10	+ # FreeBSD up to 4.6 doesn't have nl_langinfo(CODESET); therefore	10	# localcharset.c falls back to using the full locale name
11	# localcharset.c falls back to using the full locale name	11	# from the environment variables.
12	# from the environment variables.	12	@@ -385,6 +385,31 @@ case "$os" in
13	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just	13	echo "ja_JP.Shift_JIS SHIFT_JIS"
14	@@ -282,6 +282,31 @@	14	echo "ko_KR.EUC EUC-KR"
15	echo "ja_JP.SJIS SHIFT_JIS"	15	;;
16	echo "ja_JP.Shift_JIS SHIFT_JIS"	16	+ freebsd*)
17	echo "ko_KR.EUC EUC-KR"
18	+ ;;
19	+ freebsd*)
20	+ echo "US-ASCII ASCII"	17	+ echo "US-ASCII ASCII"
21	+ echo "ISO8859-1 ISO-8859-1"	18	+ echo "ISO8859-1 ISO-8859-1"
22	+ echo "ISO_8859-1 ISO-8859-1"	19	+ echo "ISO_8859-1 ISO-8859-1"
Lines 40-45 Link Here
40	+ echo "Big5 BIG5"	37	+ echo "Big5 BIG5"
41	+ echo "SJIS SHIFT_JIS"	38	+ echo "SJIS SHIFT_JIS"
42	+ echo "Shift_JIS SHIFT_JIS"	39	+ echo "Shift_JIS SHIFT_JIS"
43	;;	40	+ ;;
44	netbsd*)	41	netbsd*)
45	echo "646 ASCII"	42	echo "646 ASCII"
		43	echo "ISO8859-1 ISO-8859-1"