gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-05 14:07:27 -08:00
Code Issues Projects Releases Wiki Activity

net-p2p/transmission: use net-libs/mbedtls:3

Browse Source 
Closes: https://bugs.gentoo.org/959271
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42797
Closes: https://github.com/gentoo/gentoo/pull/42797
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Azamat H. Hackimov 2025-06-29 15:01:03 +03:00 committed by Mike Gilbert
parent 38f66f1906
commit 7efb79339f
No known key found for this signature in database
GPG Key ID: 7E58A298F42F9CCD
3 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
net-p2p/transmission/files/transmission-4.1.0-mbedtls-3.patch Normal file
View File

@ -0,0 +1,59 @@
From https://github.com/transmission/transmission/pull/7631
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
Date: Thu, 26 Jun 2025 18:59:19 +0300
Subject: [PATCH 1/2] Generate imported targets for MbedTLS
This change allows to use MbedTLS 3.6 config module without significant
code alteration which simplifies integration with future versions of
MbedTLS.
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,8 +298,7 @@ if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "mbedtls")
tr_fixup_list_option(WITH_CRYPTO "mbedtls" MBEDTLS_FOUND "AUTO" MBEDTLS_IS_REQUIRED)
if(WITH_CRYPTO STREQUAL "mbedtls")
set(CRYPTO_PKG "mbedtls")
- set(CRYPTO_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIRS})
- set(CRYPTO_LIBRARIES ${MBEDTLS_LIBRARIES})
+ set(CRYPTO_LIBRARIES MbedTLS::mbedtls MbedTLS::mbedcrypto)
endif()
endif()
--- a/cmake/FindMbedTLS.cmake
+++ b/cmake/FindMbedTLS.cmake
@@ -43,6 +43,22 @@ find_package_handle_standard_args(MbedTLS
MBEDTLS_INCLUDE_DIR
VERSION_VAR MBEDTLS_VERSION)
+if(MBEDTLS_LIBRARY AND NOT TARGET MbedTLS::mbedtls)
+ add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
+ set_target_properties(MbedTLS::mbedtls PROPERTIES
+ IMPORTED_LOCATION ${MBEDTLS_LIBRARY}
+ INTERFACE_INCLUDE_DIRECTORIES ${MBEDTLS_INCLUDE_DIR}
+ )
+endif()
+
+if(MBEDCRYPTO_LIBRARY AND NOT TARGET MbedTLS::mbedcrypto)
+ add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
+ set_target_properties(MbedTLS::mbedcrypto PROPERTIES
+ IMPORTED_LOCATION ${MBEDCRYPTO_LIBRARY}
+ INTERFACE_INCLUDE_DIRECTORIES ${MBEDTLS_INCLUDE_DIR}
+ )
+endif()
+
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDCRYPTO_LIBRARY)
if(MBEDTLS_PREFER_STATIC_LIB)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ set(GLIBMM_MINIMUM 2.60.0)
set(GTKMM3_MINIMUM 3.24.0)
set(GTKMM4_MINIMUM 4.11.1)
set(OPENSSL_MINIMUM 1.1.0)
-set(MBEDTLS_MINIMUM 1.3)
+set(MBEDTLS_MINIMUM 3.6)
set(NPM_MINIMUM 8.1.307) # Node.js 14
set(PSL_MINIMUM 0.21.1)
set(QT_MINIMUM 5.6)

4
net-p2p/transmission/transmission-4.1.0_beta2.ebuild → net-p2p/transmission/transmission-4.1.0_beta2-r1.ebuild
View File

@ -3,6 +3,7 @@
EAPI=8
CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
inherit cmake flag-o-matic tmpfiles systemd xdg-utils
if [[ ${PV} == 9999 ]]; then
@ -42,7 +43,7 @@ COMMON_DEPEND="
app-arch/libdeflate:=[gzip(+)]
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )
mbedtls? ( net-libs/mbedtls:3= )
net-libs/libnatpmp
>=net-libs/libpsl-0.21.1
>=net-libs/miniupnpc-1.7:=
@ -69,6 +70,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/transmission-dht-cmake-4.patch"
"${FILESDIR}/transmission-4.1.0-mbedtls-3.patch"
)
src_prepare() {

9
net-p2p/transmission/transmission-9999.ebuild
View File

@ -1,8 +1,9 @@
# Copyright 2006-2024 Gentoo Authors
# Copyright 2006-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
inherit cmake flag-o-matic tmpfiles systemd xdg-utils
if [[ ${PV} == 9999 ]]; then
@ -42,7 +43,7 @@ COMMON_DEPEND="
app-arch/libdeflate:=[gzip(+)]
>=dev-libs/libevent-2.1.0:=[threads(+)]
!mbedtls? ( dev-libs/openssl:0= )
mbedtls? ( net-libs/mbedtls:0= )
mbedtls? ( net-libs/mbedtls:3= )
net-libs/libnatpmp
>=net-libs/libpsl-0.21.1
>=net-libs/miniupnpc-1.7:=
@ -67,6 +68,10 @@ RDEPEND="${COMMON_DEPEND}
${ACCT_DEPEND}
"
PATCHES=(
"${FILESDIR}/transmission-4.1.0-mbedtls-3.patch"
)
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}