24334631 Update libidn to version 1.33 s11u3-sru
authorRich Burridge <rich.burridge@oracle.com>
Tue, 16 Aug 2016 06:48:55 -0700
branchs11u3-sru
changeset 6616 57419ffb6010
parent 6601 51c69e06a3a9
child 6622 9b26b8274a0b
24334631 Update libidn to version 1.33 24334616 problem in LIBRARY/LIBIDN
components/libidn/Makefile
components/libidn/libidn.p5m
components/libidn/patches/002-includes.patch
--- a/components/libidn/Makefile	Wed Aug 10 08:37:31 2016 -0700
+++ b/components/libidn/Makefile	Tue Aug 16 06:48:55 2016 -0700
@@ -18,19 +18,19 @@
 #
 # 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.
 #
 include ../../make-rules/shared-macros.mk
 
 PATH=$(dir $(CC)):$(JAVA_HOME)/bin:/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		libidn
-COMPONENT_VERSION=	1.19
+COMPONENT_VERSION=	1.33
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/libidn/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:8ed2e936b1ae3e30b45b54ca3672deaa83ee0f4d20db5ad83dc1af7222d39f41
+    sha256:44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/libidn/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libidn
 
@@ -39,7 +39,7 @@
     sha256:7423f48d15fb1377ee0050c3e1f22e8a91668c2f158afed57b8ead3fed908785
 COMPONENT_ARCHIVE_URL_1 = http://download.berlios.de/tldchk/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			8441
+TPNO=			30227
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -48,6 +48,7 @@
 
 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)
@@ -63,6 +64,7 @@
 CFLAGS += $(CPP_POSIX)
 CFLAGS += $(CPP_C99_EXTENDED_MATH)
 CFLAGS += $(studio_PIC)
+CFLAGS += -DGNULIB_defined_stdint_types
 
 GUNZIP = /usr/bin/gunzip
 TAR = /usr/bin/tar
--- a/components/libidn/libidn.p5m	Wed Aug 10 08:37:31 2016 -0700
+++ b/components/libidn/libidn.p5m	Tue Aug 16 06:48:55 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 \
@@ -36,12 +36,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2007/167
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir  path=usr
-dir  path=usr/bin
 #
 file path=usr/bin/idn
-dir  path=usr/include
-dir  path=usr/include/idn
 file path=usr/include/idn/idn-free.h
 file path=usr/include/idn/idn-int.h
 file path=usr/include/idn/idna.h
@@ -49,35 +45,22 @@
 file path=usr/include/idn/punycode.h
 file path=usr/include/idn/stringprep.h
 file path=usr/include/idn/tld.h
-dir  path=usr/lib
-dir  path=usr/lib/$(MACH64)
-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.16
+link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.16
+file path=usr/lib/$(MACH64)/libidn.so.11.6.16
 file path=usr/lib/$(MACH64)/llib-lidn.ln
-dir  path=usr/lib/$(MACH64)/pkgconfig
 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.16
+link path=usr/lib/libidn.so.11 target=libidn.so.11.6.16
+file path=usr/lib/libidn.so.11.6.16
 file path=usr/lib/llib-lidn
 file path=usr/lib/llib-lidn.ln
-dir  path=usr/lib/pkgconfig
 file path=usr/lib/pkgconfig/libidn.pc
-dir  path=usr/share
-dir  path=usr/share/doc
-dir  path=usr/share/doc/idn
-dir  path=usr/share/doc/idn/html
 file path=usr/share/doc/idn/html/libidn-components.png
 file path=usr/share/doc/idn/html/libidn.html
-dir  path=usr/share/doc/idn/java
 file path=usr/share/doc/idn/java/about.html
 file path=usr/share/doc/idn/java/alphaindex.html
 file path=usr/share/doc/idn/java/deprecated.html
-dir  path=usr/share/doc/idn/java/gnu
-dir  path=usr/share/doc/idn/java/gnu/inet
-dir  path=usr/share/doc/idn/java/gnu/inet/encoding
 file path=usr/share/doc/idn/java/gnu/inet/encoding/CombiningClass.html
 file path=usr/share/doc/idn/java/gnu/inet/encoding/Composition.html
 file path=usr/share/doc/idn/java/gnu/inet/encoding/DecompositionKeys.html
@@ -94,7 +77,6 @@
 file path=usr/share/doc/idn/java/gnu/inet/encoding/package-summary.html
 file path=usr/share/doc/idn/java/gnu/inet/encoding/tree.html
 file path=usr/share/doc/idn/java/index.html
-dir  path=usr/share/doc/idn/java/resources
 file path=usr/share/doc/idn/java/resources/gjdoc.js
 file path=usr/share/doc/idn/java/resources/gjdochtml-clean-color1.css
 file path=usr/share/doc/idn/java/resources/gjdochtml-clean-layout.css
@@ -102,7 +84,6 @@
 file path=usr/share/doc/idn/java/serialized-form.html
 file path=usr/share/doc/idn/libidn-components.pdf
 file path=usr/share/doc/idn/libidn.pdf
-dir  path=usr/share/doc/idn/tld
 file path=usr/share/doc/idn/tld/ac.tld
 file path=usr/share/doc/idn/tld/at.tld
 file path=usr/share/doc/idn/tld/biz.tld
@@ -120,7 +101,6 @@
 file path=usr/share/doc/idn/tld/pl.tld
 file path=usr/share/doc/idn/tld/se.tld
 file path=usr/share/doc/idn/tld/sh.tld
-dir  path=usr/share/doc/idn/tld/templates
 file path=usr/share/doc/idn/tld/templates/arabic_digits
 file path=usr/share/doc/idn/tld/templates/arabic_letters
 file path=usr/share/doc/idn/tld/templates/greek_standard
@@ -129,62 +109,36 @@
 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
-dir  path=usr/share/lib
-dir  path=usr/share/lib/idn
-file path=usr/share/lib/idn/libidn-1.19.jar
-dir  path=usr/share/locale
-dir  path=usr/share/locale/cs
-dir  path=usr/share/locale/cs/LC_MESSAGES
+file path=usr/share/emacs/site-lisp/idna.el
+file path=usr/share/emacs/site-lisp/punycode.el
+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
-dir  path=usr/share/locale/da
-dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/de
-dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/en
-dir  path=usr/share/locale/en/LC_MESSAGES
 file path=usr/share/locale/en/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/eo
-dir  path=usr/share/locale/eo/LC_MESSAGES
+file path=usr/share/locale/[email protected]/LC_MESSAGES/libidn.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/libidn.mo
 file path=usr/share/locale/eo/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/fi
-dir  path=usr/share/locale/fi/LC_MESSAGES
 file path=usr/share/locale/fi/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/fr
-dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/id
-dir  path=usr/share/locale/id/LC_MESSAGES
+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
-dir  path=usr/share/locale/it
-dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/ja
-dir  path=usr/share/locale/ja/LC_MESSAGES
 file path=usr/share/locale/ja/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/nl
-dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/pl
-dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/ro
-dir  path=usr/share/locale/ro/LC_MESSAGES
+file path=usr/share/locale/pt_BR/LC_MESSAGES/libidn.mo
 file path=usr/share/locale/ro/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/sr
-dir  path=usr/share/locale/sr/LC_MESSAGES
 file path=usr/share/locale/sr/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/vi
-dir  path=usr/share/locale/vi/LC_MESSAGES
+file path=usr/share/locale/uk/LC_MESSAGES/libidn.mo
 file path=usr/share/locale/vi/LC_MESSAGES/libidn.mo
-dir  path=usr/share/locale/zh_CN
-dir  path=usr/share/locale/zh_CN/LC_MESSAGES
 file path=usr/share/locale/zh_CN/LC_MESSAGES/libidn.mo
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
 file path=usr/share/man/man1/idn.1
-dir  path=usr/share/man/man3
+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	Wed Aug 10 08:37:31 2016 -0700
+++ b/components/libidn/patches/002-includes.patch	Tue Aug 16 06:48:55 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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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
[email protected]@ -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