23113495 Upgrade Nghttp2 library to version 1.9.2
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 12 Apr 2016 06:28:16 -0700
changeset 5804 c448287e1ee1
parent 5800 65c7ff58de8e
child 5805 5320af34d217
23113495 Upgrade Nghttp2 library to version 1.9.2
components/nghttp2/Makefile
components/nghttp2/nghttp2.license
components/nghttp2/nghttp2.p5m
--- a/components/nghttp2/Makefile	Mon Apr 18 10:44:17 2016 -0700
+++ b/components/nghttp2/Makefile	Tue Apr 12 06:28:16 2016 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		nghttp2
-COMPONENT_VERSION=	1.6.0
+COMPONENT_VERSION=	1.9.2
 COMPONENT_PROJECT_URL=	https://nghttp2.org/
 COMPONENT_ARCHIVE_HASH= \
-    sha256:c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26
+    sha256:8a47846bc81e7e82d81e0a17ffbe29486110b80458cc4ea99fa665612c2849d5
 COMPONENT_ARCHIVE_URL=	https://github.com/tatsuhiro-t/nghttp2/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/nghttp2
 
-TPNO = 26335
+TPNO = 27742
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
--- a/components/nghttp2/nghttp2.license	Mon Apr 18 10:44:17 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Copyright (c) 2012, 2014, 2015 Tatsuhiro Tsujikawa
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/components/nghttp2/nghttp2.p5m	Mon Apr 18 10:44:17 2016 -0700
+++ b/components/nghttp2/nghttp2.p5m	Tue Apr 12 06:28:16 2016 -0700
@@ -38,12 +38,12 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/include/nghttp2/nghttp2.h
 file path=usr/include/nghttp2/nghttp2ver.h
-link path=usr/lib/$(MACH64)/libnghttp2.so target=libnghttp2.so.14.4.0
-link path=usr/lib/$(MACH64)/libnghttp2.so.14 target=libnghttp2.so.14.4.0
-file path=usr/lib/$(MACH64)/libnghttp2.so.14.4.0
+link path=usr/lib/$(MACH64)/libnghttp2.so target=libnghttp2.so.14.6.0
+link path=usr/lib/$(MACH64)/libnghttp2.so.14 target=libnghttp2.so.14.6.0
+file path=usr/lib/$(MACH64)/libnghttp2.so.14.6.0
 file path=usr/lib/$(MACH64)/pkgconfig/libnghttp2.pc
-link path=usr/lib/libnghttp2.so target=libnghttp2.so.14.4.0
-link path=usr/lib/libnghttp2.so.14 target=libnghttp2.so.14.4.0
-file path=usr/lib/libnghttp2.so.14.4.0
+link path=usr/lib/libnghttp2.so target=libnghttp2.so.14.6.0
+link path=usr/lib/libnghttp2.so.14 target=libnghttp2.so.14.6.0
+file path=usr/lib/libnghttp2.so.14.6.0
 file path=usr/lib/pkgconfig/libnghttp2.pc
-license nghttp2.license license=MIT
+license COPYING license=MIT