Update our dependent libraries.

Not sure if we're affected by CVE-2015-8126, but we probably should ship a new build regardless.
thpatch · Nov 15, 2015 · b9edf3b · b9edf3b
1 parent 754ea73
commit b9edf3b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/libs/jansson b/libs/jansson
diff --git a/libs/libpng b/libs/libpng
diff --git a/libs/zlib-ng b/libs/zlib-ng
diff --git a/libs/zlib-ng.vcxproj b/libs/zlib-ng.vcxproj
@@ -89,6 +89,9 @@ copy /y $(ProjectDir)\zlib-ng\zlib.h $(ProjectDir)\
     <ClCompile Include="zlib-ng\compress.c" />
     <ClCompile Include="zlib-ng\crc32.c" />
     <ClCompile Include="zlib-ng\deflate.c" />
+    <ClCompile Include="zlib-ng\deflate_fast.c" />
+    <ClCompile Include="zlib-ng\deflate_medium.c" />
+    <ClCompile Include="zlib-ng\deflate_slow.c" />
     <ClCompile Include="zlib-ng\gzclose.c">
       <ExcludedFromBuild Condition="$(BuildZLib1)!=true">true</ExcludedFromBuild>
     </ClCompile>

diff --git a/win32_utf8 b/win32_utf8
+14 −0		cmake/jansson_private_config.h.cmake
+14 −1		doc/apiref.rst
+2 −2		src/dump.c
+7 −0		src/jansson.h
+13 −3		src/jansson_private.h
+10 −10		src/load.c
+1 −1		test/suites/api/test_memory_funcs.c
+19 −0		test/suites/api/test_object.c
+3 −0		CMakeLists.txt
+10 −4		Makefile.in
+8 −2		configure
+2 −0		crc32.c
+11 −354		deflate.c
+114 −0		deflate_fast.c
+88 −61		deflate_medium.c
+115 −0		deflate_p.h
+160 −0		deflate_slow.c
+3 −4		gzguts.h
+2 −2		zconf.h.in