--- a/components/libidn/Makefile Fri Apr 01 16:16:21 2016 -0700
+++ b/components/libidn/Makefile Fri Apr 01 16:38:52 2016 -0700
@@ -28,9 +28,9 @@
PATH=$(dir $(CC)):$(JAVA_HOME)/bin:$(USRBINDIR):$(GNUBIN)
COMPONENT_NAME= libidn
-COMPONENT_VERSION= 1.19
+COMPONENT_VERSION= 1.32
COMPONENT_ARCHIVE_HASH= \
- sha256:8ed2e936b1ae3e30b45b54ca3672deaa83ee0f4d20db5ad83dc1af7222d39f41
+ sha256:ba5d5afee2beff703a34ee094668da5c6ea5afa38784cebba8924105e185c4f5
COMPONENT_BUGDB= library/libidn
COMPONENT_ARCHIVE_1 = tld-0.7.tar.gz
@@ -38,13 +38,14 @@
sha256:7423f48d15fb1377ee0050c3e1f22e8a91668c2f158afed57b8ead3fed908785
COMPONENT_ARCHIVE_URL_1 = http://download.berlios.de/tldchk/$(COMPONENT_ARCHIVE_1)
-TPNO= 8441
+TPNO= 27576
INSTALL_TARGET=
include $(WS_MAKE_RULES)/gnu-component.mk
PATCH_LEVEL = 0
LINT_FLAGS += -I$(PROTOUSRINCDIR)/idn
+LINT_FLAGS += -DGNULIB_defined_stdint_types
# Enable C99 mode + -Xc for its additional warnings.
studio_C99MODE = -Xc $(studio_C99_ENABLE)
@@ -60,33 +61,18 @@
CFLAGS += $(CPP_POSIX)
CFLAGS += $(CPP_C99_EXTENDED_MATH)
CFLAGS += $(studio_PIC)
+CFLAGS += -DGNULIB_defined_stdint_types
COMPONENT_TEST_MASTER = \
$(COMPONENT_TEST_RESULTS_DIR)/results-libidn.master
COMPONENT_TEST_TRANSFORMS += \
- '-e "/libtool/d"' \
- '-e "/warning:/d"' \
- '-e "/Generat/d"' \
- '-e "/Creat/d"' \
- '-e "/Compos/d"' \
- '-e "/Writ/d"' \
- '-e "/Read/d"' \
- '-e "/from/d"' \
- '-e "/--run/d"' \
- '-e "/rm -f/d"' \
- '-e "/Nothing/d"' \
- '-e "/Leaving/d"' \
- '-e "/Entering/d"' \
- '-e "/Making/d"' \
- '-e "/make/d"' \
- '-e "/-m32/d"' \
- '-e "/-m64/d"' \
- '-e "/DEPDIR/d"' \
- '-e "/ar cru/d"' \
- '-e "/ranlib/d"' \
- '-e "/wrapped in unpack at/d"' \
- '-e "s/^make\[[0-9]\{1,\}\]/make/g"'
+ '-n ' \
+ '-e "/SKIP/p" ' \
+ '-e "/PASS/p" ' \
+ '-e "/FAIL/p" ' \
+ '-e "/====/p" ' \
+ '-e "/passed/p" '
CONFIGURE_ENV += INSTALL="$(INSTALL)"
--- a/components/libidn/libidn.p5m Fri Apr 01 16:16:21 2016 -0700
+++ b/components/libidn/libidn.p5m Fri Apr 01 16:38:52 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -45,15 +45,14 @@
file path=usr/include/idn/punycode.h
file path=usr/include/idn/stringprep.h
file path=usr/include/idn/tld.h
-link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
-link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.2
-file path=usr/lib/$(MACH64)/libidn.so.11.6.2
+link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.15
+link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.15
+file path=usr/lib/$(MACH64)/libidn.so.11.6.15
file path=usr/lib/$(MACH64)/llib-lidn.ln
file path=usr/lib/$(MACH64)/pkgconfig/libidn.pc
-link path=usr/lib/libidn.so target=libidn.so.11.6.2
-#
-link path=usr/lib/libidn.so.11 target=libidn.so.11.6.2
-file path=usr/lib/libidn.so.11.6.2
+link path=usr/lib/libidn.so target=libidn.so.11.6.15
+link path=usr/lib/libidn.so.11 target=libidn.so.11.6.15
+file path=usr/lib/libidn.so.11.6.15
file path=usr/lib/llib-lidn
file path=usr/lib/llib-lidn.ln
file path=usr/lib/pkgconfig/libidn.pc
@@ -110,24 +109,34 @@
file path=usr/share/doc/idn/tld/templates/latin_extended_a_letters
file path=usr/share/doc/idn/tld/templates/latin_extended_a_letters_icb
file path=usr/share/doc/idn/tld/tm.tld
-file path=usr/share/lib/idn/libidn-1.19.jar
+file path=usr/share/info/libidn-components.png
+file path=usr/share/info/libidn.info
+file path=usr/share/lib/idn/libidn-$(COMPONENT_VERSION).jar
+link path=usr/share/lib/idn/libidn.jar target=libidn-$(COMPONENT_VERSION).jar
file path=usr/share/locale/cs/LC_MESSAGES/libidn.mo
file path=usr/share/locale/da/LC_MESSAGES/libidn.mo
file path=usr/share/locale/de/LC_MESSAGES/libidn.mo
file path=usr/share/locale/en/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/en@boldquot/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/en@quot/LC_MESSAGES/libidn.mo
file path=usr/share/locale/eo/LC_MESSAGES/libidn.mo
file path=usr/share/locale/fi/LC_MESSAGES/libidn.mo
file path=usr/share/locale/fr/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/hr/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/hu/LC_MESSAGES/libidn.mo
file path=usr/share/locale/id/LC_MESSAGES/libidn.mo
file path=usr/share/locale/it/LC_MESSAGES/libidn.mo
file path=usr/share/locale/ja/LC_MESSAGES/libidn.mo
file path=usr/share/locale/nl/LC_MESSAGES/libidn.mo
file path=usr/share/locale/pl/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/libidn.mo
file path=usr/share/locale/ro/LC_MESSAGES/libidn.mo
file path=usr/share/locale/sr/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/uk/LC_MESSAGES/libidn.mo
file path=usr/share/locale/vi/LC_MESSAGES/libidn.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/libidn.mo
file path=usr/share/man/man1/idn.1
+file path=usr/share/man/man3/idn_free.3
file path=usr/share/man/man3/idna_strerror.3
file path=usr/share/man/man3/idna_to_ascii_4i.3
file path=usr/share/man/man3/idna_to_ascii_4z.3
--- a/components/libidn/patches/002-includes.patch Fri Apr 01 16:16:21 2016 -0700
+++ b/components/libidn/patches/002-includes.patch Fri Apr 01 16:38:52 2016 -0700
@@ -1,55 +1,15 @@
---- lib/idna.h.orig Wed Dec 21 08:03:15 2011
-+++ lib/idna.h Wed Dec 21 08:05:57 2011
-@@ -36,7 +36,7 @@
- # endif
+Provide the correct include file for finding the uint32_t definition.
+
+This patch will be sent upstream.
+
+--- lib/stringprep.h.orig 2016-03-29 07:36:25.142643305 -0700
++++ lib/stringprep.h 2016-03-29 07:36:48.406250204 -0700
+@@ -44,7 +44,7 @@
# include <stddef.h> /* size_t */
+ # include <sys/types.h> /* ssize_t */
-# include <idn-int.h> /* uint32_t */
+# include <idn/idn-int.h> /* uint32_t */
# ifdef __cplusplus
extern "C"
---- lib/pr29.h.orig Wed Dec 21 08:03:20 2011
-+++ lib/pr29.h Wed Dec 21 08:06:20 2011
-@@ -44,7 +44,7 @@
- # include <stdlib.h>
-
- /* Get uint32_t. */
--# include <idn-int.h>
-+# include <idn/idn-int.h>
-
- /* Error codes. */
- typedef enum
---- lib/punycode.h.orig Wed Dec 21 08:03:26 2011
-+++ lib/punycode.h Wed Dec 21 08:06:49 2011
-@@ -81,7 +81,7 @@
- #endif
-
- #include <stddef.h> /* size_t */
--#include <idn-int.h> /* uint32_t */
-+#include <idn/idn-int.h> /* uint32_t */
-
- enum punycode_status
- {
---- lib/stringprep.h.orig Wed Dec 21 08:03:32 2011
-+++ lib/stringprep.h Wed Dec 21 08:07:08 2011
-@@ -36,7 +36,7 @@
-
- # include <stddef.h> /* size_t */
- # include <unistd.h> /* ssize_t */
--# include <idn-int.h> /* uint32_t */
-+# include <idn/idn-int.h> /* uint32_t */
-
- # ifdef __cplusplus
- extern "C"
---- lib/tld.h.orig Wed Dec 21 08:03:38 2011
-+++ lib/tld.h Wed Dec 21 08:07:20 2011
-@@ -47,7 +47,7 @@
- # include <stdlib.h>
-
- /* Get uint32_t. */
--# include <idn-int.h>
-+# include <idn/idn-int.h>
-
- /* Interval of valid code points in the TLD. */
- struct Tld_table_element
--- a/components/libidn/test/results-libidn.master Fri Apr 01 16:16:21 2016 -0700
+++ b/components/libidn/test/results-libidn.master Fri Apr 01 16:38:52 2016 -0700
@@ -1,53 +1,91 @@
PASS: test-alloca-opt
PASS: test-binary-io.sh
+PASS: test-close
PASS: test-dup2
PASS: test-environ
PASS: test-errno
+PASS: test-fdopen
+PASS: test-fgetc
+PASS: test-fputc
+PASS: test-fread
+PASS: test-fstat
+PASS: test-fwrite
+PASS: test-getcwd-lgpl
+PASS: test-getdtablesize
PASS: test-getopt
+PASS: test-gettimeofday
+PASS: test-ignore-value
+PASS: test-intprops
+PASS: test-inttypes
PASS: test-lstat
PASS: test-malloca
PASS: test-open
+PASS: test-pathmax
PASS: test-setenv
PASS: test-stat
+SKIP: test-stdalign
PASS: test-stdbool
PASS: test-stddef
PASS: test-stdint
+PASS: test-stdio
PASS: test-strerror
PASS: test-symlink
+PASS: test-sys_time
+PASS: test-sys_types
+PASS: test-init.sh
PASS: test-unsetenv
-PASS: test-update-copyright.sh
PASS: test-vc-list-files-git.sh
PASS: test-vc-list-files-cvs.sh
PASS: test-verify
PASS: test-verify.sh
-No differences encountered
PASS: test-version-etc.sh
-===================
-All 23 tests passed
-===================
+============================================================================
+============================================================================
+# PASS: 40
+# SKIP: 1
+# XFAIL: 0
+# FAIL: 0
+# XPASS: 0
+============================================================================
+PASS: test-alloca-opt
PASS: test-c-ctype
PASS: test-c-strcase.sh
+PASS: test-environ
PASS: test-iconv
+PASS: test-intprops
+PASS: test-inttypes
+PASS: test-langinfo
+PASS: test-locale
+FAIL: test-localename
+PASS: test-lock
+PASS: test-malloca
+PASS: test-setenv
+PASS: test-setlocale1.sh
+PASS: test-setlocale2.sh
+SKIP: test-stdalign
PASS: test-stdbool
PASS: test-stddef
PASS: test-stdint
+PASS: test-stdlib
PASS: test-striconv
PASS: test-strverscmp
+PASS: test-sys_types
+PASS: test-init.sh
+PASS: test-thread_self
+PASS: test-thread_create
+PASS: test-unistd
+PASS: test-u8-check
+PASS: test-u8-mbtoucr
+PASS: test-u8-uctomb
+PASS: test-unsetenv
PASS: test-verify
PASS: test-verify.sh
-===================
-All 10 tests passed
-===================
-PASS: tst_stringprep
-PASS: tst_punycode
-PASS: tst_idna
-PASS: tst_idna2
-PASS: tst_nfkc
-PASS: tst_pr29
-PASS: tst_strerror
-PASS: tst_toutf8
-PASS: tst_symbols
-PASS: tst_tld
-===================
-All 10 tests passed
-===================
+============================================================================
+============================================================================
+# PASS: 31
+# SKIP: 1
+# XFAIL: 0
+# FAIL: 1
+# XPASS: 0
+============================================================================
+============================================================================