Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fad06c8ecf931ad5234b20c08b6f2f9d6308e044)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fad06c8ecf931ad5234b20c08b6f2f9d6308e044)
  • Date: Tue, 19 Apr 2022 22:15:32 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

ftp/transmission-i2p/HISTORY | 4 +
ftp/transmission-i2p/PRE_BUILD | 8 --
ftp/transmission-i2p/patches-libressl-3.5/struct-dh_st.patch | 37
----------
ftp/transmission-i2p/patches/libressl-3.5.patch | 39
+++++++++++
4 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit fad06c8ecf931ad5234b20c08b6f2f9d6308e044
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

ftp/transmission-i2p: reworked LibreSSL 3.5.x patch

diff --git a/ftp/transmission-i2p/HISTORY b/ftp/transmission-i2p/HISTORY
index 3cedc7b..0eed1e4 100644
--- a/ftp/transmission-i2p/HISTORY
+++ b/ftp/transmission-i2p/HISTORY
@@ -1,3 +1,7 @@
+2022-04-19 Pavel Vinogradov <public AT 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 AT 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 439dd55..0ec8ad8 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/struct-dh_st.patch
deleted file mode 100644
index 8ec5557..0000000
--- a/ftp/transmission-i2p/patches-libressl-3.5/struct-dh_st.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
---- a/libtransmission/crypto.h
-+++ b/libtransmission/crypto.h
-@@ -34,6 +34,33 @@ enum
- KEY_LEN = 96
- };
-
-+struct dh_st
-+ {
-+ /* This first argument is used to pick up errors when
-+ * a DH is passed instead of a EVP_PKEY */
-+ int pad;
-+ int version;
-+ BIGNUM *p;
-+ BIGNUM *g;
-+ long length; /* optional */
-+ BIGNUM *pub_key; /* g^x */
-+ BIGNUM *priv_key; /* x */
-+
-+ int flags;
-+ BN_MONT_CTX *method_mont_p;
-+ /* Place holders if we want to do X9.42 DH */
-+ BIGNUM *q;
-+ BIGNUM *j;
-+ unsigned char *seed;
-+ int seedlen;
-+ BIGNUM *counter;
-+
-+ int references;
-+ CRYPTO_EX_DATA ex_data;
-+ const DH_METHOD *meth;
-+ ENGINE *engine;
-+ };
-+
- /** @brief Holds state information for encrypted peer communications */
- typedef struct
- {
diff --git a/ftp/transmission-i2p/patches/libressl-3.5.patch
b/ftp/transmission-i2p/patches/libressl-3.5.patch
new file mode 100644
index 0000000..c6efa7b
--- /dev/null
+++ b/ftp/transmission-i2p/patches/libressl-3.5.patch
@@ -0,0 +1,39 @@
+diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
+--- a/libtransmission/crypto.h
++++ b/libtransmission/crypto.h
+@@ -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
++ * a DH is passed instead of a EVP_PKEY */
++ int pad;
++ int version;
++ BIGNUM *p;
++ BIGNUM *g;
++ long length; /* optional */
++ BIGNUM *pub_key; /* g^x */
++ BIGNUM *priv_key; /* x */
++
++ int flags;
++ BN_MONT_CTX *method_mont_p;
++ /* Place holders if we want to do X9.42 DH */
++ BIGNUM *q;
++ BIGNUM *j;
++ unsigned char *seed;
++ int seedlen;
++ BIGNUM *counter;
++
++ int references;
++ CRYPTO_EX_DATA ex_data;
++ const DH_METHOD *meth;
++ ENGINE *engine;
++ };
++#endif
++
+ /** @brief Holds state information for encrypted peer communications */
+ typedef struct
+ {



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (fad06c8ecf931ad5234b20c08b6f2f9d6308e044), Pavel Vinogradov, 04/19/2022

Archive powered by MHonArc 2.6.24.

Top of Page