[vlc-commits] [Git][videolan/vlc][master] contrib: zlib: update to 1.2.13

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
0c0ab818 by Steve Lhomme at 2022-10-16T16:13:28+00:00
contrib: zlib: update to 1.2.13

Fixes CVE-2022-37434.

- - - - -


4 changed files:

- contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
- contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
- contrib/src/zlib/SHA512SUMS
- contrib/src/zlib/rules.mak


Changes:

=====================================
contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
=====================================
@@ -1,4 +1,4 @@
-From d923a126c8d3d2c94513d6fd05a1c6248c9c6bf9 Mon Sep 17 00:00:00 2001
+From 5c03377a53b137d647f1e485cd89e57f358ee3e9 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4 at ycbcr.xyz>
 Date: Fri, 9 Sep 2022 10:19:56 +0200
 Subject: [PATCH 1/2] Fix mingw static library name on mingw and Emscripten
@@ -9,10 +9,10 @@ They build code in a UNIX like environment but CMake doesn't set UNIX for it.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6fbb37..bb9a76d 100644
+index b412dc7..3f42869 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -199,10 +199,10 @@ if(NOT CYGWIN)
+@@ -163,10 +163,10 @@ if(NOT CYGWIN)
      set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
  endif()
  


=====================================
contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
=====================================
@@ -1,25 +1,26 @@
-From f12a2840ccb937d695d8a0db26c76d2f642525cf Mon Sep 17 00:00:00 2001
+From dc5305dbdd39d5f90c0413704d6945c5f8ac6617 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme <robux4 at ycbcr.xyz>
 Date: Thu, 29 Sep 2022 06:32:21 +0200
 Subject: [PATCH 2/2] Add an option to enable/disable building examples
 
 ---
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb9a76d..c08ac3f 100644
+index 3f42869..3f6de05 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(VERSION "1.2.12")
+@@ -5,6 +5,8 @@ project(zlib C)
  
- option(ASM686 "Enable building i686 assembly implementation")
- option(AMD64 "Enable building amd64 assembly implementation")
-+option(BUILD_EXAMPLES "Build examples" ON)
+ set(VERSION "1.2.13")
  
++option(BUILD_EXAMPLES "Build examples" ON)
++
  set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
  set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -230,6 +231,7 @@ endif()
+ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+@@ -194,6 +196,7 @@ endif()
  # Example binaries
  #============================================================================
  
@@ -27,7 +28,7 @@ index bb9a76d..c08ac3f 100644
  add_executable(example test/example.c)
  target_link_libraries(example zlib)
  add_test(example example)
-@@ -247,3 +249,4 @@ if(HAVE_OFF64_T)
+@@ -211,3 +214,4 @@ if(HAVE_OFF64_T)
      target_link_libraries(minigzip64 zlib)
      set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
  endif()


=====================================
contrib/src/zlib/SHA512SUMS
=====================================
@@ -1 +1 @@
-cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14  zlib-1.2.12.tar.gz
+9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725  zlib-1.2.13.tar.xz


=====================================
contrib/src/zlib/rules.mak
=====================================
@@ -1,18 +1,18 @@
 # ZLIB
-ZLIB_VERSION := 1.2.12
-ZLIB_URL := $(GITHUB)/madler/zlib/archive/refs/tags/v$(ZLIB_VERSION).tar.gz
+ZLIB_VERSION := 1.2.13
+ZLIB_URL := $(GITHUB)/madler/zlib/releases/download/v$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.xz
 
 PKGS += zlib
 ifeq ($(call need_pkg,"zlib"),)
 PKGS_FOUND += zlib
 endif
 
-$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
+$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.xz:
 	$(call download_pkg,$(ZLIB_URL),zlib)
 
-.sum-zlib: zlib-$(ZLIB_VERSION).tar.gz
+.sum-zlib: zlib-$(ZLIB_VERSION).tar.xz
 
-zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
+zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib
 	$(UNPACK)
 	$(APPLY) $(SRC)/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
 	$(APPLY) $(SRC)/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
@@ -24,14 +24,6 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 
 ZLIB_CONF = -DINSTALL_PKGCONFIG_DIR:STRING=$(PREFIX)/lib/pkgconfig -DBUILD_EXAMPLES=OFF
 
-# ASM is disabled as the necessary source files are not in the tarball nor the git
-# ifeq ($(ARCH),i386)
-# ZLIB_CONF += -DASM686=ON
-# endif
-# ifeq ($(ARCH),x86_64)
-# ZLIB_CONF += -DAMD64=ON
-# endif
-
 .zlib: zlib toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS) $(CMAKE) $(ZLIB_CONF)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0c0ab8186a6ff5a6b1cff7c528fe01f822abd6ce

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0c0ab8186a6ff5a6b1cff7c528fe01f822abd6ce
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance