cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.16; mostly from Brad

Browse Source
This commit is contained in:
naddy 2019-06-29 15:46:54 +00:00
parent e795f42c1f
commit 181d7559ac
8 changed files with 37 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
converters/libiconv/Makefile
View File

@ -1,27 +1,28 @@
# $OpenBSD: Makefile,v 1.50 2016/03/11 20:28:22 naddy Exp $
# $OpenBSD: Makefile,v 1.51 2019/06/29 15:46:54 naddy Exp $
COMMENT= character set conversion library
DISTNAME= libiconv-1.14
REVISION= 3
DISTNAME= libiconv-1.16
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
SHARED_LIBS= charset 1.1 \
iconv 6.0
iconv 7.0
HOMEPAGE= https://www.gnu.org/software/libiconv/
MAINTAINER= Brad Smith <brad@comstyle.com>
# LGPLv2 and GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE= Yes
WANTLIB= c
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux ${WRKSRC}/libcharset/build-aux
CONFIGURE_ARGS= --disable-nls \
--docdir="${PREFIX}/share/doc/libiconv" \
--enable-extra-encodings \
--enable-static

4
converters/libiconv/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libiconv-1.14.tar.gz) = crJN7RfWhxk8M2bQ6+fN4eaxjw34xVQ4rJW+OeijBhM=
SIZE (libiconv-1.14.tar.gz) = 4984397
SHA256 (libiconv-1.16.tar.gz) = 5qGxtYllQnfueQzONzTweHasTM+uy+6K+gtknPUpzAQ=
SIZE (libiconv-1.16.tar.gz) = 5166734

12
converters/libiconv/patches/patch-lib_relocatable_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-lib_relocatable_c,v 1.3 2011/09/02 15:44:46 naddy Exp $
--- lib/relocatable.c.orig Thu Sep 1 18:08:15 2011
+++ lib/relocatable.c Thu Sep 1 18:21:29 2011
@@ -446,16 +446,20 @@ relocate (const char *pathname)
$OpenBSD: patch-lib_relocatable_c,v 1.4 2019/06/29 15:46:54 naddy Exp $
Index: lib/relocatable.c
--- lib/relocatable.c.orig
+++ lib/relocatable.c
@@ -506,16 +506,20 @@ relocate (const char *pathname)
if (orig_prefix != NULL && curr_prefix != NULL
&& strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
{
@ -24,7 +26,7 @@ $OpenBSD: patch-lib_relocatable_c,v 1.3 2011/09/02 15:44:46 naddy Exp $
return result;
}
}
@@ -463,15 +467,16 @@ relocate (const char *pathname)
@@ -523,15 +527,16 @@ relocate (const char *pathname)
{
/* pathname starts with orig_prefix. */
const char *pathname_tail = &pathname[orig_prefix_len];

12
converters/libiconv/patches/patch-libcharset_lib_config_charset
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libcharset_lib_config_charset,v 1.9 2015/04/12 20:21:57 naddy Exp $
--- libcharset/lib/config.charset.orig Mon Apr 5 02:25:38 2010
+++ libcharset/lib/config.charset Fri Apr 10 21:46:05 2015
@@ -402,7 +402,7 @@ case "$os" in
echo "SJIS SHIFT_JIS"
;;
openbsd*)
- echo "646 ASCII"
+ echo "US-ASCII ASCII"
echo "ISO8859-1 ISO-8859-1"
echo "ISO8859-2 ISO-8859-2"
echo "ISO8859-4 ISO-8859-4"

40
converters/libiconv/patches/patch-libcharset_lib_localcharset_c
View File

@ -1,24 +1,16 @@
$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.5 2011/09/02 15:44:46 naddy Exp $
--- libcharset/lib/localcharset.c.orig Thu Sep 1 18:15:01 2011
+++ libcharset/lib/localcharset.c Thu Sep 1 18:17:12 2011
@@ -232,8 +232,9 @@ get_charset_aliases (void)
free (old_res_ptr);
break;
}
- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
- strcpy (res_ptr + res_size - (l2 + 1), buf2);
+ strlcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1,
+ l1 + 1 + l2 + 1 + 1);
+ strlcpy (res_ptr + res_size - (l2 + 1), buf2, l2 + 1 + 1);
}
fclose (fp);
if (res_size == 0)
@@ -352,6 +353,8 @@ get_charset_aliases (void)
If the canonical name cannot be determined, the result is a non-canonical
name. */
+const char *
+locale_charset (void) __attribute__((visibility ("default")));
#ifdef STATIC
STATIC
#endif
$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.6 2019/06/29 15:46:54 naddy Exp $
returned by nl_langinfo(CODESET) in the C/POSIX locale
Index: libcharset/lib/localcharset.c
--- libcharset/lib/localcharset.c.orig
+++ libcharset/lib/localcharset.c
@@ -143,7 +143,7 @@ static const struct table_entry alias_table[] =
# define alias_table_defined
# endif
# if defined __OpenBSD__ /* OpenBSD */
- { "646", "ASCII" },
+ { "US-ASCII", "ASCII" },
{ "ISO8859-1", "ISO-8859-1" },
{ "ISO8859-13", "ISO-8859-13" },
{ "ISO8859-15", "ISO-8859-15" },

8
converters/libiconv/patches/patch-src_Makefile_in
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-src_Makefile_in,v 1.6 2011/09/02 15:44:47 naddy Exp $
--- src/Makefile.in.orig Thu Sep 1 18:19:18 2011
+++ src/Makefile.in Thu Sep 1 18:20:19 2011
$OpenBSD: patch-src_Makefile_in,v 1.7 2019/06/29 15:46:54 naddy Exp $
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -71,7 +71,6 @@ OBJECTS_RES_no =
# without internationalization and not linked with libintl.

19
converters/libiconv/patches/patch-tests_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-tests_Makefile_in,v 1.2 2011/09/03 10:57:07 naddy Exp $
If SEPARATE_BUILD is enabled,
check-stateless . FOO
will check for a nonexistent ./FOO.IRREVERSIBLE.TXT and fail to take
$(srcdir)/FOO.IRREVERSIBLE.TXT into consideration.
--- tests/Makefile.in.orig Wed Nov 24 03:24:03 2010
+++ tests/Makefile.in Fri Sep 2 22:24:26 2011
@@ -128,7 +128,9 @@ check : all table-from table-to ../src/iconv_no_i18n t
$(srcdir)/check-stateless $(srcdir) CP936
$(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/gengb18030z.c ../srclib/libicrt.a -o gengb18030z && \
{ cat $(srcdir)/GB18030-BMP.TXT ; ./gengb18030z ; } | sort > GB18030.TXT && \
+ { test $(srcdir) = . || cp $(srcdir)/GB18030.IRREVERSIBLE.TXT GB18030.IRREVERSIBLE.TXT; } && \
$(srcdir)/check-stateless . GB18030 && \
+ { test $(srcdir) = . || $(RM) GB18030.IRREVERSIBLE.TXT; } && \
$(RM) -r gengb18030z@EXEEXT@ gengb18030z.dSYM GB18030.TXT
$(srcdir)/check-stateful $(srcdir) ISO-2022-CN
$(srcdir)/check-stateful $(srcdir) ISO-2022-CN-EXT

3
converters/libiconv/pkg/PLIST
View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.10 2015/03/16 18:07:38 naddy Exp $
@comment $OpenBSD: PLIST,v 1.11 2019/06/29 15:46:54 naddy Exp $
@bin bin/iconv
include/iconv.h
include/libcharset.h
include/localcharset.h
lib/charset.alias
lib/libcharset.a
lib/libcharset.la
@lib lib/libcharset.so.${LIBcharset_VERSION}