diff options
author | Pavel Vinogradov | 2022-04-19 18:11:18 -0400 |
---|---|---|
committer | Pavel Vinogradov | 2022-04-19 18:12:27 -0400 |
commit | fad06c8ecf931ad5234b20c08b6f2f9d6308e044 (patch) | |
tree | 74f049509a477105625b90732bc2b05da280a508 /ftp | |
parent | a4a90f84d2463cf6d674be9c70d1abe513682c53 (diff) |
ftp/transmission-i2p: reworked LibreSSL 3.5.x patch
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/transmission-i2p/HISTORY | 4 | ||||
-rwxr-xr-x | ftp/transmission-i2p/PRE_BUILD | 8 | ||||
-rw-r--r-- | ftp/transmission-i2p/patches/libressl-3.5.patch (renamed from ftp/transmission-i2p/patches-libressl-3.5/struct-dh_st.patch) | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ftp/transmission-i2p/HISTORY b/ftp/transmission-i2p/HISTORY index 3cedc7bc2a..0eed1e4551 100644 --- a/ftp/transmission-i2p/HISTORY +++ b/ftp/transmission-i2p/HISTORY @@ -1,3 +1,7 @@ +2022-04-19 Pavel Vinogradov <public@sourcemage.org> + * PRE_BUILD, patches-libressl-3.5/struct-dh_st.patch, + patches/libressl-3.5.patch: reworked LibreSSL 3.5.x patch + 2022-03-17 Pavel Vinogradov <public@sourcemage.org> * DETAILS: git -> git_http, (https://github.blog/2021-09-01-improving-git-protocol-security-github/) diff --git a/ftp/transmission-i2p/PRE_BUILD b/ftp/transmission-i2p/PRE_BUILD index 439dd55d6d..0ec8ad8845 100755 --- a/ftp/transmission-i2p/PRE_BUILD +++ b/ftp/transmission-i2p/PRE_BUILD @@ -1,10 +1,4 @@ default_pre_build && cd $SOURCE_DIRECTORY && -apply_patch_dir patches && - -if spell_ok libressl; then - local LIBRESSL_VER="$(installed_version libressl)" && - LIBRESSL_VER=${LIBRESSL_VER%.*} && - apply_patch_dir "patches-libressl-${LIBRESSL_VER}" -fi +apply_patch_dir patches diff --git a/ftp/transmission-i2p/patches-libressl-3.5/struct-dh_st.patch b/ftp/transmission-i2p/patches/libressl-3.5.patch index 8ec5557f55..c6efa7b03c 100644 --- a/ftp/transmission-i2p/patches-libressl-3.5/struct-dh_st.patch +++ b/ftp/transmission-i2p/patches/libressl-3.5.patch @@ -1,10 +1,11 @@ diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h --- a/libtransmission/crypto.h +++ b/libtransmission/crypto.h -@@ -34,6 +34,33 @@ enum +@@ -34,6 +34,35 @@ enum KEY_LEN = 96 }; ++#if (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)) +struct dh_st + { + /* This first argument is used to pick up errors when @@ -31,6 +32,7 @@ diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h + const DH_METHOD *meth; + ENGINE *engine; + }; ++#endif + /** @brief Holds state information for encrypted peer communications */ typedef struct |