* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/
@ 2017-12-03 22:14 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2017-12-03 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 7f78e757977ae29b9761caf69b83f8434eeb3465
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 11:20:54 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 22:14:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f78e757
dev-perl/Net-SSLeay: Improve fix-libdir patch to help cross-compiling
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../files/Net-SSLeay-1.82-fix-libdir.patch | 41 +++++++++++-----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
index 43dd224ef2d..6aff3f85ab2 100644
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.82-fix-libdir.patch
@@ -1,26 +1,27 @@
-From 7beee46a64a9af1a7edf6bb9011327b4a08e353a Mon Sep 17 00:00:00 2001
-From: Torsten Veller <tove@gentoo.org>
-Date: Mon, 16 Jul 2012 05:31:43 +1200
-Subject: Fix libdir
-
Bug: https://bugs.gentoo.org/416339
----
- inc/Module/Install/PRIVATE/Net/SSLeay.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-index 49913e6..0a3aa24 100644
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
-@@ -67,7 +67,7 @@ sub ssleay_get_build_opts {
+The previous patch for the above bug report used $ENV{LIBDIR} but this
+wasn't enough to help with cross-compiling. We could use $ENV{SYSROOT}
+but this results in a bogus RPATH entry. It is better to simply trust
+the toolchain, which may have its own sysroot applied.
+
+Cross-compiling Perl modules requires additional hackery but at least
+that hackery will work now. :)
+
+Chewi
+2017/12/03
+
+diff -Naur a/inc/Module/Install/PRIVATE/Net/SSLeay.pm b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2017-10-13 01:38:01.000000000 +0100
++++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2017-12-03 10:52:27.304861804 +0000
+@@ -65,10 +65,8 @@
+ cccdlflags => '',
+ };
for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
- push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
+- push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
}
-- for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
-+ for ($prefix, "$prefix/$ENV{LIBDIR}", "$prefix/out32dll") {
- push @{$opts->{lib_paths}}, $_ if -d $_;
+ for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
+- push @{$opts->{lib_paths}}, $_ if -d $_;
}
---
-2.14.3
-
+ my $rsaref = $self->ssleay_is_rsaref;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/
@ 2023-06-20 14:04 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-06-20 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 2cd8bce8727c9b68b8cbb3aa5fb6f2528a4db6d9
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon Jun 12 23:04:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 14:03:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd8bce8
dev-perl/Net-SSLeay: update libressl patch
The patch is updated with a fix for >= libressl 3.8.0 that was accepted
upstream.
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/radiator-software/p5-net-ssleay/pull/434
Upstream-PR: https://github.com/radiator-software/p5-net-ssleay/pull/435
Upstream-Commit: https://github.com/radiator-software/p5-net-ssleay/commit/fe9e49d220fa424c55fc436303b24f5bddae0b8d
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31406
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/Net-SSLeay-1.92-libressl.patch | 45 ++++++++++++++++++----
1 file changed, 37 insertions(+), 8 deletions(-)
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-20 14:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-20 14:04 [gentoo-commits] repo/gentoo:master commit in: dev-perl/Net-SSLeay/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-12-03 22:14 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox