mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
libnet-ssleay-perl: upgrade 1.94 -> 1.96
1.Changelog: https://metacpan.org/dist/Net-SSLeay/changes 2.Remove following patches as merged upstream 0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch 0001-test-32_x509_get_cert_info-allow-single-colon.patch Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
-29
@@ -1,29 +0,0 @@
|
|||||||
From 4068d585875d3ba99da2cbe41f60d0dd4f4290d1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
||||||
Date: Wed, 16 Oct 2024 21:48:51 +0200
|
|
||||||
Subject: [PATCH] test: 32_x509_get_cert_info allow single colon.
|
|
||||||
|
|
||||||
Starting with 3.4.0 the double colon in emailAddress has been removed.
|
|
||||||
Adapt the test to allow a single colon in 3.4.0 and later.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/4068d585875d3ba99da2cbe41f60d0dd4f4290d1]
|
|
||||||
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
||||||
---
|
|
||||||
t/local/32_x509_get_cert_info.t | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t
|
|
||||||
index 0f7e2d5a..0fd1b689 100644
|
|
||||||
--- a/t/local/32_x509_get_cert_info.t
|
|
||||||
+++ b/t/local/32_x509_get_cert_info.t
|
|
||||||
@@ -188,6 +188,10 @@ for my $f (keys (%$dump)) {
|
|
||||||
) {
|
|
||||||
$ext_data =~ s{(othername:) [^, ]+}{$1<unsupported>}g;
|
|
||||||
}
|
|
||||||
+ # Starting with 3.4.0 the double colon in emailAddress has been removed.
|
|
||||||
+ if (Net::SSLeay::SSLeay >= 0x30400000) {
|
|
||||||
+ $ext_data =~ s{emailAddress::}{emailAddress:};
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
elsif ( $nid == 89 ) {
|
|
||||||
# The output formatting for certificate policies has a
|
|
||||||
-32
@@ -1,32 +0,0 @@
|
|||||||
From eac7ac502b02f44a84a67920e9f634cce71ff335 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
||||||
Date: Tue, 18 Feb 2025 18:57:15 +0100
|
|
||||||
Subject: [PATCH] tests: Address another formatting difference in OpenSSL 3.4.1
|
|
||||||
|
|
||||||
Since OpenSSL 3.4.1, commit 8a28bca8ee08 ("x509: add a newline after
|
|
||||||
printing Full Name") to be exact, there is another new line change.
|
|
||||||
|
|
||||||
Adapt the testsuite.
|
|
||||||
|
|
||||||
Fixes: #513
|
|
||||||
|
|
||||||
Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/eac7ac502b02f44a84a67920e9f634cce71ff335]
|
|
||||||
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
||||||
---
|
|
||||||
t/local/32_x509_get_cert_info.t | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t
|
|
||||||
index 0fd1b68..08316bf 100644
|
|
||||||
--- a/t/local/32_x509_get_cert_info.t
|
|
||||||
+++ b/t/local/32_x509_get_cert_info.t
|
|
||||||
@@ -218,6 +218,9 @@ for my $f (keys (%$dump)) {
|
|
||||||
# OpenSSL 1.0.0 to 1.1.1:
|
|
||||||
$ext_data =~ s{(Full Name:\n )}{\n$1}g;
|
|
||||||
$ext_data .= "\n";
|
|
||||||
+ } elsif ( Net::SSLeay::SSLeay > 0x3040000f ) {
|
|
||||||
+ $ext_data =~ s{(\nFull Name:)}{\n$1}g;
|
|
||||||
+ $ext_data .= "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
elsif ( $nid == 126 ) {
|
|
||||||
+1
-3
@@ -24,10 +24,8 @@ RDEPENDS:${PN} += "\
|
|||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "${CPAN_MIRROR}/authors/id/C/CH/CHRISN/Net-SSLeay-${PV}.tar.gz \
|
SRC_URI = "${CPAN_MIRROR}/authors/id/C/CH/CHRISN/Net-SSLeay-${PV}.tar.gz \
|
||||||
file://0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch \
|
|
||||||
file://0001-test-32_x509_get_cert_info-allow-single-colon.patch \
|
|
||||||
file://run-ptest"
|
file://run-ptest"
|
||||||
SRC_URI[sha256sum] = "9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d"
|
SRC_URI[sha256sum] = "ab213691685fb2a576c669cbc8d9266f8165a31563ad15b7c4030b94adfc0753"
|
||||||
|
|
||||||
S = "${UNPACKDIR}/Net-SSLeay-${PV}"
|
S = "${UNPACKDIR}/Net-SSLeay-${PV}"
|
||||||
|
|
||||||
Reference in New Issue
Block a user