Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit e96473beab12 · 2025-04-08T00:57:03.000+02:00
diff --git a/cmake/ext/ftp/CMakeLists.txt b/cmake/ext/ftp/CMakeLists.txt
@@ -84,7 +84,7 @@ target_sources(
 )
 
 if(PHP_EXT_FTP_SSL OR PHP_EXT_OPENSSL)
-  find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
+  find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION} COMPONENTS SSL)
   set_package_properties(
     OpenSSL
     PROPERTIES
diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt
@@ -159,7 +159,7 @@ target_sources(
     xp_ssl.c
 )
 
-find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
+find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION} COMPONENTS SSL)
 set_package_properties(
   OpenSSL
   PROPERTIES
@@ -168,7 +168,7 @@ set_package_properties(
 )
 
 # Link publicly for internal_functions files.
-target_link_libraries(php_ext_openssl PUBLIC OpenSSL::SSL OpenSSL::Crypto)
+target_link_libraries(php_ext_openssl PRIVATE OpenSSL::SSL)
 
 if(TARGET OpenSSL::SSL)
   cmake_push_check_state(RESET)

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ target_sources(`
`84`	`84`	`)`
`85`	`85`
`86`	`86`	`if(PHP_EXT_FTP_SSL OR PHP_EXT_OPENSSL)`
`87`		`- find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})`
	`87`	`+ find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION} COMPONENTS SSL)`
`88`	`88`	`set_package_properties(`
`89`	`89`	`OpenSSL`
`90`	`90`	`PROPERTIES`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ target_sources(`
`159`	`159`	`xp_ssl.c`
`160`	`160`	`)`
`161`	`161`
`162`		`-find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})`
	`162`	`+find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION} COMPONENTS SSL)`
`163`	`163`	`set_package_properties(`
`164`	`164`	`OpenSSL`
`165`	`165`	`PROPERTIES`
`@@ -168,7 +168,7 @@ set_package_properties(`
`168`	`168`	`)`
`169`	`169`
`170`	`170`	`# Link publicly for internal_functions files.`
`171`		`-target_link_libraries(php_ext_openssl PUBLIC OpenSSL::SSL OpenSSL::Crypto)`
	`171`	`+target_link_libraries(php_ext_openssl PRIVATE OpenSSL::SSL)`
`172`	`172`
`173`	`173`	`if(TARGET OpenSSL::SSL)`
`174`	`174`	`cmake_push_check_state(RESET)`