[depends] Update OpenSSL to 3.0.18

Author: thexai

CMakeLists.txt

@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
+
 project(audiodecoder.sacd)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})

audiodecoder.sacd/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audiodecoder.sacd"
-  version="22.0.1"
+  version="22.0.2"
   name="SACD ISO support"
   provider-name="Team Kodi, AlwinEsch">
   <requires>@ADDON_DEPENDS@</requires>

audiodecoder.sacd/changelog.txt

@@ -1,3 +1,6 @@
+v22.0.2
+- Update openssl to 3.0.18
+
 v20.3.0:
 - Update openssl to 1.1.1n
 - Fix build for macOS arm64

depends/common/openssl/001-android-getauxvalrevert.patch

@@ -1,6 +1,6 @@
 --- a/crypto/armcap.c
 +++ b/crypto/armcap.c
-@@ -68,12 +68,6 @@
+@@ -71,12 +71,6 @@
  #   include <sys/auxv.h>
  #   define OSSL_IMPLEMENT_GETAUXVAL
  #  endif
@@ -11,27 +11,27 @@
 -#   define OSSL_IMPLEMENT_GETAUXVAL
 -#  endif
  # endif
- # if defined(__FreeBSD__)
+ # if defined(__FreeBSD__) || defined(__OpenBSD__)
  #  include <sys/param.h>
-@@ -94,15 +88,6 @@
+@@ -97,15 +91,6 @@
+ #  endif
  # endif
 
- /*
+-/*
 - * Android: according to https://developer.android.com/ndk/guides/cpu-features,
 - * getauxval is supported starting with API level 18
 - */
--#  if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
--#   include <sys/auxv.h>
--#   define OSSL_IMPLEMENT_GETAUXVAL
--#  endif
+-# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
 -
--/*
+ /*
   * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
   * AArch64 used AT_HWCAP.
-  */
 --- a/crypto/ppccap.c
 +++ b/crypto/ppccap.c
-@@ -211,12 +211,6 @@
+@@ -90,12 +90,6 @@
  # if __GLIBC_PREREQ(2, 16)
  #  include <sys/auxv.h>
  #  define OSSL_IMPLEMENT_GETAUXVAL

depends/common/openssl/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(openssl)
 
 if(NOT CPU AND CMAKE_SYSTEM_PROCESSOR)
@@ -13,7 +13,7 @@ if(CORE_SYSTEM_NAME MATCHES "android")
   elseif(CPU MATCHES i686)
     set(OPENSSL_TARGET android-x86)
   endif()
-elseif(CORE_SYSTEM_NAME MATCHES "linux" OR CORE_SYSTEM_NAME MATCHES "rbpi")
+elseif(CORE_SYSTEM_NAME MATCHES "linux")
   if(CPU MATCHES aarch64 OR CPU MATCHES arm64 OR CPU STREQUAL x86_64 OR ARCH MATCHES aarch64 OR ARCH STREQUAL x86_64)
     set(OPENSSL_TARGET linux-generic64)
   elseif(CPU MATCHES arm OR CPU MATCHES "i.86" OR ARCH MATCHES arm OR CPU MATCHES cortex-a7 OR CPU MATCHES arm1176jzf-s)
@@ -22,7 +22,7 @@ elseif(CORE_SYSTEM_NAME MATCHES "linux" OR CORE_SYSTEM_NAME MATCHES "rbpi")
     message(WARNING "Could not detect bitness for CPU ${CPU} - assuming 32bit")
     set(OPENSSL_TARGET linux-generic32)
   endif()
-elseif(CORE_SYSTEM_NAME MATCHES "ios" OR CORE_SYSTEM_NAME MATCHES "darwin_embedded")
+elseif(CORE_SYSTEM_NAME MATCHES "darwin_embedded")
   set(OPENSSL_TARGET iphoneos-cross)
 elseif(CORE_SYSTEM_NAME MATCHES "osx")
   if(CPU STREQUAL x86_64)
@@ -34,7 +34,7 @@ endif()
 
 list(APPEND configure_command ${CMAKE_COMMAND} -E env)
 if(CORE_SYSTEM_NAME MATCHES "android")
-  list(APPEND configure_command ANDROID_NDK_HOME=${NDKROOT})
+  list(APPEND configure_command ANDROID_NDK_ROOT=${NDKROOT})
   list(APPEND configure_command PATH=${TOOLCHAIN}/bin:$ENV{PATH})
 endif()
 list(APPEND configure_command AR=${CMAKE_AR})
@@ -48,23 +48,22 @@ list(APPEND configure_command LDFLAGS=${CMAKE_LD_FLAGS})
 list(APPEND configure_command RANLIB=${CMAKE_RANLIB})
 list(APPEND configure_command <SOURCE_DIR>/Configure)
 list(APPEND configure_command ${OPENSSL_TARGET})
-list(APPEND configure_command no-shared zlib)
-if(PLATFORM MATCHES appletvos)
-  list(APPEND configure_command no-async)
-endif()
+list(APPEND configure_command no-shared no-apps no-tests no-ui-console zlib)
 list(APPEND configure_command --prefix=${OUTPUT_DIR})
 list(APPEND configure_command --with-zlib-include=${OUTPUT_DIR}/include)
 list(APPEND configure_command --with-zlib-lib=${OUTPUT_DIR}/lib)
 if(CORE_SYSTEM_NAME MATCHES "android")
-  list(APPEND configure_command -D__ANDROID_API__=21)
+  list(APPEND configure_command -U__ANDROID_API__)
+  list(APPEND configure_command -D__ANDROID_API__=24)
   list(APPEND configure_command -isystem ${NDKROOT}/sysroot/usr/include)
   list(APPEND configure_command -isystem ${NDKROOT}/sysroot/usr/include/${HOST})
 endif()
-list(APPEND configure_command COMMAND sed -ie "s|PROGRAMS=|PROGRAMS=#|" ${PROJECT_SOURCE_DIR}/Makefile)
 
 list(APPEND build_command ${CMAKE_COMMAND} -E env)
-list(APPEND build_command PATH=${TOOLCHAIN}/bin:$ENV{PATH})
-list(APPEND build_command make)
+if(TOOLCHAIN)
+  list(APPEND build_command PATH=${TOOLCHAIN}/bin:$ENV{PATH})
+endif()
+list(APPEND build_command $(MAKE) build_sw)
 
 include(ExternalProject)
 
@@ -76,4 +75,4 @@ externalproject_add(openssl
                     INSTALL_COMMAND ""
                     BUILD_IN_SOURCE 1)
 
-install(CODE "execute_process(COMMAND make install_sw WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})")
+install(CODE "execute_process(COMMAND make install_dev WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})")

depends/common/openssl/openssl.sha256

@@ -1 +1 @@
-6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e
+c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec

depends/common/openssl/openssl.txt

@@ -1 +1 @@
-openssl https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz
+openssl https://github.com/openssl/openssl/releases/download/openssl-3.5.2/openssl-3.5.2.tar.gz

depends/windows/openssl/01-quote-cc.patch

@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.15)
 
-project(openssl VERSION 1.1.1 LANGUAGES C)
+project(openssl VERSION 3.0.18 LANGUAGES C)
 
 find_package(StrawberryPerl REQUIRED)
 
@@ -17,7 +17,7 @@ elseif(_AMD64_)
 	set(OPENSSL_PLATFORM VC-WIN64A)
 elseif(_ARM64_)
 	message(STATUS "arm64")
-	set(OPENSSL_PLATFORM VC-WIN64-ARM)    
+	set(OPENSSL_PLATFORM VC-WIN64-ARM)
 else()
 	message(FATAL_ERROR "Unsupported target architecture")
 endif()

depends/windows/openssl/CMakeLists.txt

@@ -1 +1 @@
-0686897afd3a08223760db73d8034550401b53ffc545798d7ca476564f80315e
+8037cdcb2a932d2db4f2fad79eda7e379c10bf17c5b3c8cb4ce9d084ad269a67