gentoo auto-resync : 20:06:2023 - 19:17:08

2 files changed, 38 insertions, 9 deletions

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 9111224ab3cd..ee872d8ba95f 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,6 +1,6 @@
 AUX Net-SSLeay-1.88-fix-libdir.patch 946 BLAKE2B 8f3522ccc62c5b09942d61dbe73fb87bec5c5fb15e460b5a00b4a0108f6c50299304acc7e37a268a46d75af86cbdfdfab80cdf2ebecf5836f676503869727cb5 SHA512 76ff12ce42631393dcf95008b3a4a5064f2f0cc54dd44b1002fe02fccdc4b8a47871f77b28ce43346f140058c23bd9d6be08261d6a4cecffc45ced5416aa4cb3
 AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455bb37b4cfa81879a880b35a315a90df9012b1fcbc545205b206777e6929454d31f881f2581d9dbd9f6b22cd849846bc0b9f3c6484b SHA512 7fd3078e55b4c829224289e7e1cc0628e2fb162dccf151b559022d5367ac06593a460779b28d9cae015dba6614d9e273399fa6b81144aefaf47d710f63b6c046
-AUX Net-SSLeay-1.92-libressl.patch 5010 BLAKE2B 792d7cc29d285faf286cf91d550a64cac7cf95216f78bc494ab6af946c7b18fcd41bf1ce788acae29e95695f75cca5a2088452b1c5c7eb4d67d263369f5349a6 SHA512 d7ab9dd929a2664ec9eaa4b01cacd2a653a93be5fd7ee3d80fdcb2bc13f067481d2cd1565b07798e14e76c7d342bc6253dfdcb9f7345ba3b790bdf79a1c01e46
+AUX Net-SSLeay-1.92-libressl.patch 6020 BLAKE2B 33c35f71a47240070cf3da15321c06adbffaaccb5e310ecd5d45905423d1324abfe6c914d4b0bd0fb249bc5bd43a22a7d7891d08a12b7eeaa2f4e9e99b2a6d2a SHA512 f504cefb47ecff620f3a52c7c0e76cdccd5dcadf32ec58806b38e62508a2efede1675ee5d8bf56fbec358f0c3073c0a066e18927899da638893f0223703314c2
 DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891
 DIST Net-SSLeay-1.92.tar.gz 555930 BLAKE2B 04d97860817b013a9680e0ef29b0004ddb98da2db859761a45612c4d25b6edd16bf92645293d1108d83352bce18665721c6df05455426b32a95a42b464119a3d SHA512 e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173
 EBUILD Net-SSLeay-1.900.0.ebuild 1406 BLAKE2B e9488af67a3fbe91a3fc2366e1411207e65c29954e3636bdc40c80a0b453858789393a07a88869a5e73ab57e4bcd0f4086fc7f64970881ed4433dc3d1e98e2b0 SHA512 c46d53252429c352cb05bde1eb5c50ea643c8137940defadbb2331dde6d8aa3ec0ef2c787597422402602d16f91bec91597b4823c8dcfdd89ad1cbcad874514e
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch
index 380fd152ea78..f3e1b4ae1bd2 100644
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch
@@ -5,6 +5,9 @@ https://github.com/radiator-software/p5-net-ssleay/pull/362
 https://github.com/radiator-software/p5-net-ssleay/commit/88c3bbc45399c8ef2c8879aada8bfa91d8bc6c10
 https://github.com/radiator-software/p5-net-ssleay/pull/363
 https://github.com/radiator-software/p5-net-ssleay/commit/3dd2f101b8e15a59f66e22525b8d001d5ad6ce7d
+https://github.com/radiator-software/p5-net-ssleay/pull/434
+https://github.com/radiator-software/p5-net-ssleay/pull/435
+https://github.com/radiator-software/p5-net-ssleay/commit/fe9e49d220fa424c55fc436303b24f5bddae0b8d
 
 From 4a886e06c1cac80e7fb3f8d52146a27ce557ba8c Mon Sep 17 00:00:00 2001
 From: Alexander Bluhm <alexander.bluhm@gmx.net>
@@ -46,14 +49,24 @@ Use RSA_get0... functions to provide RSA_get_key_parameters().
  SSLeay.xs | 25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
 
-diff --git a/SSLeay.xs b/SSLeay.xs
-index b0667e2..58f1716 100644
+From fe9e49d220fa424c55fc436303b24f5bddae0b8d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 29 May 2023 10:16:33 -0700
+Subject: [PATCH] SSLeay.xs: Disable Policy Tree API for LibreSSL 3.8 and later
+
+This is taken from the OpenBSD ports tree.
+
+https://github.com/openbsd/ports/commit/f6567f938c9bd51bfd99f8426eba6a1590cc6384
+---
+ SSLeay.xs | 2 ++
+ 1 file changed, 2 insertions(+)
+
 --- a/SSLeay.xs
 +++ b/SSLeay.xs
 @@ -1914,7 +1914,7 @@ X509 * find_issuer(X509 *cert,X509_STORE *store, STACK_OF(X509) *chain) {
      return issuer;
  }
- 
+
 -SV* bn2sv(BIGNUM* p_bn)
 +SV* bn2sv(const BIGNUM* p_bn)
  {
@@ -94,13 +107,29 @@ index b0667e2..58f1716 100644
      XPUSHs(bn2sv(rsa->iqmp));
 +#endif
  }
- 
+
 -#endif
 +#endif /* OpenSSL < 1.1 or LibreSSL */
- 
+
  void
  RSA_free(r)
-@@ -7197,7 +7218,7 @@ ASN1_OBJECT *
+@@ -7010,6 +7031,7 @@ X509_VERIFY_PARAM_get0_peername(param)
+
+ #endif /* OpenSSL 1.0.2-beta2, LibreSSL 2.7.0 */
+
++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3080000fL) /* LibreSSL < 3.8.0 */
+ void
+ X509_policy_tree_free(tree)
+     X509_POLICY_TREE *tree
+@@ -7052,6 +7074,7 @@ const X509_POLICY_NODE *
+ X509_policy_node_get0_parent(node)
+     const X509_POLICY_NODE *node
+
++#endif /* !(LibreSSL >= 3.7.0) */
+ #endif
+
+ ASN1_OBJECT *
+@@ -7197,7 +7220,7 @@ ASN1_OBJECT *
  P_X509_get_signature_alg(x)
          X509 * x
      CODE:
@@ -109,7 +138,7 @@ index b0667e2..58f1716 100644
          RETVAL = (X509_get0_tbs_sigalg(x)->algorithm);
  #else
          RETVAL = (x->cert_info->signature->algorithm);
-@@ -7690,7 +7711,7 @@ OCSP_response_results(rsp,...)
+@@ -7690,7 +7713,7 @@ OCSP_response_results(rsp,...)
  		if (!idsv) {
  		    /* getall: create new SV with OCSP_CERTID */
  		    unsigned char *pi,*pc;
@@ -118,7 +147,7 @@ index b0667e2..58f1716 100644
  		    int len = i2d_OCSP_CERTID((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sir),NULL);
  #else
  		    int len = i2d_OCSP_CERTID(sir->certId,NULL);
-@@ -7699,7 +7720,7 @@ OCSP_response_results(rsp,...)
+@@ -7699,7 +7722,7 @@ OCSP_response_results(rsp,...)
  		    Newx(pc,len,unsigned char);
  		    if (!pc) croak("out of memory");
  		    pi = pc;