mingw-w64-jansson - 2.9 - Update to latest version (#1962)

mingw-w64-nghttp2 - 1.16.1 - Update to latest version and use spdylay
mingw-w64-spdylay -  1,49,0 - New package - SPDY protocol version 2,3, and 3.1 implementation

mingw-w64-jansson/PKGBUILD

@@ -4,14 +4,14 @@
 _realname=jansson
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.7
-pkgrel=2
+pkgver=2.9
+pkgrel=1
 pkgdesc="A C library for encoding, decoding and manipulating JSON data (mingw-w64)"
 arch=('any')
 url="http://www.digip.org/jansson/"
 license=('MIT')
 source=("http://www.digip.org/${_realname}/releases/${_realname}-${pkgver}.tar.gz")
-sha256sums=('7905e6590fb316c0ff943df3dc6a21cd81a59cff7a6d12514054c359d04d78d7')
+sha256sums=('0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5')
 
 prepare() {
   cd "${srcdir}/${_realname}-$pkgver"

mingw-w64-nghttp2/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=nghttp2
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.16.0
+pkgver=1.16.1
 pkgrel=1
 pkgdesc="Framing layer of HTTP/2 is implemented as a reusable C library (mingw-w64)"
 arch=('any')
@@ -12,12 +12,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-jansson"
          #"${MINGW_PACKAGE_PREFIX}-jemalloc"
          #"${MINGW_PACKAGE_PREFIX}-libevent"
          #"${MINGW_PACKAGE_PREFIX}-libxml2"
-         "${MINGW_PACKAGE_PREFIX}-openssl")
+         "${MINGW_PACKAGE_PREFIX}-openssl"
+         "${MINGW_PACKAGE_PREFIX}-spdylay")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-cunit")
 license=('MIT')
 source=("https://github.com/tatsuhiro-t/nghttp2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz")
-sha256sums=('311d53e13d1aea8991d06f7963b75dc0a853eca961e53a38b6bd3d8b1d89019d')
+sha256sums=('226241d4869aec0c755c1650f72839a34ea31ecf31ba75586efa6c2b45a9e2d0')
 
 prepare() {
   cd $srcdir/${_realname}-${pkgver}
@@ -37,7 +38,8 @@ build() {
     --enable-static \
     --enable-shared \
     --enable-examples=no \
-    --disable-python-bindings
+    --disable-python-bindings \
+    --enable-hpack-tools=yes
   make
 }
 

mingw-w64-spdylay/PKGBUILD

@@ -0,0 +1,47 @@
+# Maintainer: Some One <some.one@some.email.com>
+
+_realname=spdylay
+pkgbase=mingw-w64-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+pkgver=1.4.0
+_pkgver=v$pkgver
+pkgrel=1
+pkgdesc="The experimental SPDY protocol version 2, 3 and 3.1 implementation in C (mingw-w64)"
+arch=('any')
+url="http://tatsuhiro-t.github.io/spdylay/"
+license=('MIT')
+source=("spdylay-${pkgver}.tar.gz::https://github.com/tatsuhiro-t/spdylay/releases/download/${_pkgver}/spdylay-${pkgver}.tar.gz"
+         spdylay-1.4.0-fix-zlib.patch)
+sha256sums=('f45641df48f0f8e13fe80166437828201b46f56681b11cd93a614a82ebd5dcba'
+            'a5d3f3be9ad333771c61aa11dfc18dcd0670bb76fe401493fb1ecb80a5d1217f')
+
+prepare() {
+  cd $srcdir/${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/spdylay-1.4.0-fix-zlib.patch
+}
+
+build() {
+  cd "$srcdir"/${_realname}-${pkgver}
+  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  ../${_realname}-${pkgver}/configure \
+    --prefix=${MINGW_PREFIX} \
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST} \
+    --enable-static \
+    --enable-shared \
+    --enable-src=no \
+    --enable-examples=no
+  make
+}
+
+chec() {
+  ${srcdir}/build-${CARCH}
+  make test
+}
+
+package() {
+  cd "${srcdir}"/build-${CARCH}
+  make install DESTDIR="${pkgdir}"
+}

mingw-w64-spdylay/spdylay-1.4.0-fix-zlib.patch

@@ -0,0 +1,69 @@
+--- spdylay-1.4.0/lib/spdylay_zlib.c.orig	2016-10-27 01:20:18.524432400 -0400
++++ spdylay-1.4.0/lib/spdylay_zlib.c	2016-10-27 01:29:56.338760400 -0400
+@@ -306,9 +306,9 @@
+                                 const uint8_t *in, size_t inlen)
+ {
+   int r;
+-  deflater->zst.avail_in = (uint)inlen;
++  deflater->zst.avail_in = (uInt)inlen;
+   deflater->zst.next_in = (uint8_t*)in;
+-  deflater->zst.avail_out = (uint)outlen;
++  deflater->zst.avail_out = (uInt)outlen;
+   deflater->zst.next_out = out;
+   r = deflate(&deflater->zst, Z_SYNC_FLUSH);
+   if(r == Z_OK) {
+@@ -328,7 +328,7 @@
+                                 const uint8_t *in, size_t inlen)
+ {
+   int r;
+-  inflater->zst.avail_in = (uint)inlen;
++  inflater->zst.avail_in = (uInt)inlen;
+   inflater->zst.next_in = (uint8_t*)in;
+   while(1) {
+     if(spdylay_buffer_avail(buf) == 0) {
+@@ -336,7 +336,7 @@
+         return r;
+       }
+     }
+-    inflater->zst.avail_out = (uint)spdylay_buffer_avail(buf);
++    inflater->zst.avail_out = (uInt)spdylay_buffer_avail(buf);
+     inflater->zst.next_out = spdylay_buffer_get(buf);
+     r = inflate(&inflater->zst, Z_NO_FLUSH);
+     if(r == Z_STREAM_ERROR || r == Z_STREAM_END || r == Z_DATA_ERROR) {
+@@ -347,7 +347,7 @@
+       hd_dict = spdylay_select_hd_dict(&hd_dict_length, inflater->version);
+       assert(hd_dict);
+       if(Z_OK != inflateSetDictionary(&inflater->zst, (uint8_t*)hd_dict,
+-                                      (uint)hd_dict_length)) {
++                                      (uInt)hd_dict_length)) {
+         return SPDYLAY_ERR_ZLIB;
+       }
+     } else {
+--- spdylay-1.4.0/lib/spdylay_gzip.c.orig	2016-10-27 01:39:54.613531300 -0400
++++ spdylay-1.4.0/lib/spdylay_gzip.c	2016-10-27 01:41:46.818574300 -0400
+@@ -63,9 +63,9 @@
+   if(inflater->finished) {
+     return SPDYLAY_ERR_GZIP;
+   }
+-  inflater->zst.avail_in = (uint)*inlen_ptr;
++  inflater->zst.avail_in = (uInt)*inlen_ptr;
+   inflater->zst.next_in = (unsigned char*)in;
+-  inflater->zst.avail_out = (uint)*outlen_ptr;
++  inflater->zst.avail_out = (uInt)*outlen_ptr;
+   inflater->zst.next_out = out;
+ 
+   rv = inflate(&inflater->zst, Z_NO_FLUSH);
+--- spdylay-1.4.0/tests/spdylay_gzip_test.c.orig	2016-10-27 01:52:48.865261600 -0400
++++ spdylay-1.4.0/tests/spdylay_gzip_test.c	2016-10-27 01:54:00.049311400 -0400
+@@ -46,9 +46,9 @@
+   rv = deflateInit(&zst, Z_DEFAULT_COMPRESSION);
+   assert(rv == Z_OK);
+ 
+-  zst.avail_in = (uint)inlen;
++  zst.avail_in = (uInt)inlen;
+   zst.next_in = (uint8_t*)in;
+-  zst.avail_out = (uint)outlen;
++  zst.avail_out = (uInt)outlen;
+   zst.next_out = out;
+   rv = deflate(&zst, Z_SYNC_FLUSH);
+   assert(rv == Z_OK);