diff options
Diffstat (limited to 'meta-perl')
15 files changed, 248 insertions, 87 deletions
diff --git a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc index fff99cab2b..ef0c59dc2f 100644 --- a/meta-perl/conf/include/ptest-packagelists-meta-perl.inc +++ b/meta-perl/conf/include/ptest-packagelists-meta-perl.inc | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | PTESTS_FAST_META_PERL = "\ | 9 | PTESTS_FAST_META_PERL = "\ |
| 10 | libauthen-sasl-perl \ | 10 | libauthen-sasl-perl \ |
| 11 | libcapture-tiny-perl \ | 11 | libcapture-tiny-perl \ |
| 12 | libconfig-autoconf-perl \ | ||
| 12 | libcrypt-openssl-guess-perl \ | 13 | libcrypt-openssl-guess-perl \ |
| 13 | libcrypt-openssl-random-perl \ | 14 | libcrypt-openssl-random-perl \ |
| 14 | libcrypt-openssl-rsa-perl \ | 15 | libcrypt-openssl-rsa-perl \ |
| @@ -24,8 +25,12 @@ PTESTS_FAST_META_PERL = "\ | |||
| 24 | libhtml-tagset-perl \ | 25 | libhtml-tagset-perl \ |
| 25 | libmime-base32-perl \ | 26 | libmime-base32-perl \ |
| 26 | libmime-types-perl \ | 27 | libmime-types-perl \ |
| 28 | libmodule-build-tiny-perl \ | ||
| 27 | libmozilla-ca-perl \ | 29 | libmozilla-ca-perl \ |
| 30 | libnet-dns-perl \ | ||
| 31 | libnet-dns-sec-perl \ | ||
| 28 | libnet-ldap-perl \ | 32 | libnet-ldap-perl \ |
| 33 | libnet-ssleay-perl \ | ||
| 29 | libstrictures-perl \ | 34 | libstrictures-perl \ |
| 30 | libsub-uplevel-perl \ | 35 | libsub-uplevel-perl \ |
| 31 | libterm-readkey-perl \ | 36 | libterm-readkey-perl \ |
| @@ -43,12 +48,7 @@ PTESTS_SLOW_META_PERL = "\ | |||
| 43 | " | 48 | " |
| 44 | 49 | ||
| 45 | PTESTS_PROBLEMS_META_PERL = "\ | 50 | PTESTS_PROBLEMS_META_PERL = "\ |
| 46 | libconfig-autoconf-perl \ | ||
| 47 | libhtml-parser-perl \ | 51 | libhtml-parser-perl \ |
| 48 | libmodule-build-tiny-perl \ | ||
| 49 | libnet-dns-perl \ | ||
| 50 | libnet-dns-sec-perl \ | ||
| 51 | libnet-ssleay-perl \ | ||
| 52 | libunix-statgrab \ | 52 | libunix-statgrab \ |
| 53 | libxml-libxml-perl \ | 53 | libxml-libxml-perl \ |
| 54 | " | 54 | " |
diff --git a/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb b/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb index c49b3b5a27..9c45a8dad3 100644 --- a/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb +++ b/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb | |||
| @@ -58,7 +58,6 @@ RDEPENDS:packagegroup-meta-perl = "\ | |||
| 58 | libtext-diff-perl \ | 58 | libtext-diff-perl \ |
| 59 | libtext-charwidth-perl \ | 59 | libtext-charwidth-perl \ |
| 60 | libtext-wrapi18n-perl \ | 60 | libtext-wrapi18n-perl \ |
| 61 | libxml-libxml-perl \ | ||
| 62 | libxml-filter-buffertext-perl \ | 61 | libxml-filter-buffertext-perl \ |
| 63 | libxml-sax-writer-perl \ | 62 | libxml-sax-writer-perl \ |
| 64 | libextutils-config-perl \ | 63 | libextutils-config-perl \ |
diff --git a/meta-perl/recipes-extended/requirements-dynamic/cpan-requirements-dynamic_0.002.bb b/meta-perl/recipes-extended/requirements-dynamic/cpan-requirements-dynamic_0.002.bb new file mode 100644 index 0000000000..4ee221a8a0 --- /dev/null +++ b/meta-perl/recipes-extended/requirements-dynamic/cpan-requirements-dynamic_0.002.bb | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | SUMMARY = "Dynamic prerequisites in meta files" | ||
| 2 | DESCRIPTION = "This module implements a format for describing dynamic prerequisites \ | ||
| 3 | of a distribution.cts and (by default) mails MIME messages." | ||
| 4 | HOMEPAGE = "https://metacpan.org/pod/CPAN::Requirements::Dynamic" | ||
| 5 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=818dfe6ef2e2204af6c824ca00e2b485" | ||
| 7 | |||
| 8 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/CPAN-Requirements-Dynamic-${PV}.tar.gz" | ||
| 9 | SRC_URI[sha256sum] = "9e290179fd1ab8574f7a2297baf015ea4fef3703a99d48798f61ec9347b4905b" | ||
| 10 | |||
| 11 | S = "${UNPACKDIR}/CPAN-Requirements-Dynamic-${PV}" | ||
| 12 | |||
| 13 | inherit cpan | ||
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch new file mode 100644 index 0000000000..373f773070 --- /dev/null +++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | From 5ffd363a7acd4ef794eb265eaf6c42321097cd46 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 3 | Date: Sat, 25 Oct 2025 15:48:51 +0200 | ||
| 4 | Subject: [PATCH] correct libperl regex | ||
| 5 | |||
| 6 | The module expects the libperl library's format (from $Config{libperl}) | ||
| 7 | to be versionless, just simply libperl.so. However this value in the | ||
| 8 | OE builds is versioned, causing some issues. | ||
| 9 | |||
| 10 | The module transforms this value into a linker flag, and tries to link | ||
| 11 | with the library. The transformation is simple: cut off the "lib" from | ||
| 12 | the start, and everything after the last dot. | ||
| 13 | |||
| 14 | With versionless version, the transformation works: libperl.so -> perl | ||
| 15 | |||
| 16 | However with versioned library it looks like this: | ||
| 17 | libperl.so.5.99.9 -> perl.so.5.99 | ||
| 18 | which is just wrong. | ||
| 19 | |||
| 20 | This patch changes this transformation in way that throws away everything | ||
| 21 | after the first dot (instead of the last one). | ||
| 22 | |||
| 23 | Upstream-Status: Submitted [https://github.com/ambs/Config-AutoConf/pull/19] | ||
| 24 | |||
| 25 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 26 | --- | ||
| 27 | lib/Config/AutoConf.pm | 2 +- | ||
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 29 | |||
| 30 | diff --git a/lib/Config/AutoConf.pm b/lib/Config/AutoConf.pm | ||
| 31 | index 0bba5a4..a2e7099 100644 | ||
| 32 | --- a/lib/Config/AutoConf.pm | ||
| 33 | +++ b/lib/Config/AutoConf.pm | ||
| 34 | @@ -3001,7 +3001,7 @@ sub _check_link_perlapi | ||
| 35 | |||
| 36 | my $libperl = $Config{libperl}; | ||
| 37 | $libperl =~ s/^lib//; | ||
| 38 | - $libperl =~ s/\.[^\.]*$//; | ||
| 39 | + $libperl =~ s/^([^\.]*)\..*$/$1/; | ||
| 40 | |||
| 41 | push @{$self->{extra_link_flags}}, "-L" . File::Spec->catdir($Config{installarchlib}, "CORE"); | ||
| 42 | push @{$self->{extra_libs}}, "$libperl"; | ||
diff --git a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb index d8ca2ae247..5c233ed22d 100644 --- a/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb +++ b/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb | |||
| @@ -14,7 +14,9 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | |||
| 14 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ | 14 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ |
| 15 | file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" | 15 | file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" |
| 16 | 16 | ||
| 17 | SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz" | 17 | SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz \ |
| 18 | file://0001-correct-libperl-regex.patch \ | ||
| 19 | " | ||
| 18 | 20 | ||
| 19 | SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" | 21 | SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" |
| 20 | RDEPENDS:${PN} += "libcapture-tiny-perl" | 22 | RDEPENDS:${PN} += "libcapture-tiny-perl" |
| @@ -31,8 +33,20 @@ RDEPENDS:${PN} += "perl-module-scalar-util" | |||
| 31 | RDEPENDS:${PN} += "perl-module-strict" | 33 | RDEPENDS:${PN} += "perl-module-strict" |
| 32 | RDEPENDS:${PN} += "perl-module-text-parsewords" | 34 | RDEPENDS:${PN} += "perl-module-text-parsewords" |
| 33 | RDEPENDS:${PN} += "perl-module-warnings" | 35 | RDEPENDS:${PN} += "perl-module-warnings" |
| 36 | |||
| 37 | RDEPENDS:${PN}-ptest += " \ | ||
| 38 | packagegroup-core-buildessential \ | ||
| 39 | perl-dev \ | ||
| 40 | perl-module-file-glob \ | ||
| 41 | perl-module-perl-ostype \ | ||
| 42 | perl-module-metadata" | ||
| 43 | |||
| 34 | RRECOMMENDS:${PN} += "libfile-slurper-perl" | 44 | RRECOMMENDS:${PN} += "libfile-slurper-perl" |
| 35 | 45 | ||
| 46 | # One test requires perl headers (perl-dev) to compile some | ||
| 47 | # test application. | ||
| 48 | INSANE_SKIP:${PN}-ptest += "dev-deps" | ||
| 49 | |||
| 36 | S = "${UNPACKDIR}/Config-AutoConf-${PV}" | 50 | S = "${UNPACKDIR}/Config-AutoConf-${PV}" |
| 37 | 51 | ||
| 38 | inherit cpan ptest-perl | 52 | inherit cpan ptest-perl |
diff --git a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb index f3c6e1a016..52c6088b51 100644 --- a/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb +++ b/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb | |||
| @@ -61,6 +61,7 @@ RDEPENDS:${PN} += " \ | |||
| 61 | " | 61 | " |
| 62 | 62 | ||
| 63 | RDEPENDS:${PN}-ptest += " \ | 63 | RDEPENDS:${PN}-ptest += " \ |
| 64 | cpan-requirements-dynamic \ | ||
| 64 | packagegroup-core-buildessential \ | 65 | packagegroup-core-buildessential \ |
| 65 | perl-dev \ | 66 | perl-dev \ |
| 66 | perl-module-blib \ | 67 | perl-module-blib \ |
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.52.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.53.bb index d0f8141794..cccbb16a59 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.52.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.53.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS += "perl" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" |
| 11 | 11 | ||
| 12 | SRC_URI[sha256sum] = "c9884fcb08e4d03c23188d4e10836c2382fcb65b69859581a20845a3235a7203" | 12 | SRC_URI[sha256sum] = "04acb4f177d57c147dcedc4bd70e23806af3db75a532f46f95461b2bc9a94959" |
| 13 | 13 | ||
| 14 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" | 14 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" |
| 15 | 15 | ||
| @@ -41,12 +41,27 @@ RRECOMMENDS:${PN} += " \ | |||
| 41 | libnet-dns-sec-perl \ | 41 | libnet-dns-sec-perl \ |
| 42 | " | 42 | " |
| 43 | 43 | ||
| 44 | do_install_ptest_perl:append(){ | ||
| 45 | install ${S}/MANIFEST ${D}${PTEST_PATH} | ||
| 46 | cp -r ${S}/lib ${D}${PTEST_PATH} | ||
| 47 | cp ${D}${PTEST_PATH}/t/TestToolkit.pm ${D}${PTEST_PATH} | ||
| 48 | |||
| 49 | # This test tries to reconcile the MANIFEST file content with the actual | ||
| 50 | # package content. While this might be useful for package integrity | ||
| 51 | # verification, it is not much for runtime testing. It also requires the | ||
| 52 | # whole source package to be installed. Rather just drop this test. | ||
| 53 | rm ${D}${PTEST_PATH}/t/00-install.t | ||
| 54 | } | ||
| 55 | |||
| 44 | RDEPENDS:${PN}-ptest += " \ | 56 | RDEPENDS:${PN}-ptest += " \ |
| 45 | perl-module-encode \ | 57 | perl-module-encode \ |
| 58 | perl-module-encode-encoding \ | ||
| 46 | perl-module-encode-byte \ | 59 | perl-module-encode-byte \ |
| 47 | perl-module-extutils-mm \ | 60 | perl-module-extutils-mm \ |
| 48 | perl-module-extutils-mm-unix \ | 61 | perl-module-extutils-mm-unix \ |
| 49 | perl-module-overload \ | 62 | perl-module-overload \ |
| 63 | perl-module-perlio \ | ||
| 64 | perl-module-perlio-encoding \ | ||
| 50 | " | 65 | " |
| 51 | 66 | ||
| 52 | python __anonymous () { | 67 | python __anonymous () { |
| @@ -61,4 +76,3 @@ python __anonymous () { | |||
| 61 | raise bb.parse.SkipRecipe("incompatible with %s C library" % | 76 | raise bb.parse.SkipRecipe("incompatible with %s C library" % |
| 62 | d.getVar('TCLIBC')) | 77 | d.getVar('TCLIBC')) |
| 63 | } | 78 | } |
| 64 | |||
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb deleted file mode 100644 index ee365f9328..0000000000 --- a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | DESCRIPTION = "DNSSEC extensions to Net::DNS" | ||
| 2 | HOMEPAGE = "http://www.net-dns.org/" | ||
| 3 | SECTION = "libs" | ||
| 4 | |||
| 5 | LICENSE = "MIT" | ||
| 6 | LIC_FILES_CHKSUM = "file://README;beginline=165;endline=192;md5=6ef523fa09e8c272675839e21de16bde" | ||
| 7 | |||
| 8 | SRC_URI = "${CPAN_MIRROR}/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz" | ||
| 9 | SRC_URI[sha256sum] = "37a47d4def72d7338f3cc7cd807ec19bd9e2ae638ae656fa536cf0314801989e" | ||
| 10 | |||
| 11 | DEPENDS += "openssl" | ||
| 12 | |||
| 13 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" | ||
| 14 | |||
| 15 | S = "${UNPACKDIR}/Net-DNS-SEC-${PV}" | ||
| 16 | |||
| 17 | EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'" | ||
| 18 | |||
| 19 | inherit cpan ptest-perl | ||
| 20 | |||
| 21 | RDEPENDS:${PN} = " \ | ||
| 22 | libnet-dns-perl \ | ||
| 23 | libcrypto \ | ||
| 24 | perl-module-dynaloader \ | ||
| 25 | perl-module-file-find \ | ||
| 26 | perl-module-file-spec \ | ||
| 27 | perl-module-io-file \ | ||
| 28 | perl-module-mime-base64 \ | ||
| 29 | perl-module-test-more \ | ||
| 30 | " | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb new file mode 100644 index 0000000000..d0e46783d5 --- /dev/null +++ b/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | DESCRIPTION = "DNSSEC extensions to Net::DNS" | ||
| 2 | HOMEPAGE = "http://www.net-dns.org/" | ||
| 3 | SECTION = "libs" | ||
| 4 | |||
| 5 | LICENSE = "MIT" | ||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b7e4176275d57d0b036bdccbc01a0e7" | ||
| 7 | |||
| 8 | SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-${PV}.tar.gz" | ||
| 9 | SRC_URI[sha256sum] = "88592c65487fb7b4d05134f2f9c48e649a9cd533a8493c50189b649b4ea711a6" | ||
| 10 | |||
| 11 | DEPENDS += "openssl" | ||
| 12 | |||
| 13 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" | ||
| 14 | |||
| 15 | S = "${UNPACKDIR}/Net-DNS-SEC-${PV}" | ||
| 16 | |||
| 17 | EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'" | ||
| 18 | |||
| 19 | inherit cpan ptest-perl | ||
| 20 | |||
| 21 | RDEPENDS:${PN} = " \ | ||
| 22 | libnet-dns-perl \ | ||
| 23 | libcrypto \ | ||
| 24 | perl-module-dynaloader \ | ||
| 25 | perl-module-file-find \ | ||
| 26 | perl-module-file-spec \ | ||
| 27 | perl-module-io-file \ | ||
| 28 | perl-module-mime-base64 \ | ||
| 29 | perl-module-test-more \ | ||
| 30 | " | ||
| 31 | |||
| 32 | do_install_ptest_perl:append(){ | ||
| 33 | cp ${D}${PTEST_PATH}/t/TestToolkit.pm ${D}${PTEST_PATH} | ||
| 34 | |||
| 35 | # This test reconciles the perl module's MANIFEST file with the actual files | ||
| 36 | # in the module. This might be useful for package integrity check, but not so | ||
| 37 | # much for runtime testing - and it also requires the whole source tree to | ||
| 38 | # be installed. Rather just remove it. | ||
| 39 | rm ${D}${PTEST_PATH}/t/00-install.t | ||
| 40 | } | ||
| 41 | |||
| 42 | RDEPENDS:${PN}-ptest += "\ | ||
| 43 | libnet-dns-perl \ | ||
| 44 | perl-module-extutils-mm-unix \ | ||
| 45 | perl-module-file-spec-functions \ | ||
| 46 | perl-module-perlio" | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-test-32_x509_get_cert_info-allow-single-colon.patch b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-test-32_x509_get_cert_info-allow-single-colon.patch new file mode 100644 index 0000000000..805a16d6c9 --- /dev/null +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-test-32_x509_get_cert_info-allow-single-colon.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 4068d585875d3ba99da2cbe41f60d0dd4f4290d1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | ||
| 3 | Date: Wed, 16 Oct 2024 21:48:51 +0200 | ||
| 4 | Subject: [PATCH] test: 32_x509_get_cert_info allow single colon. | ||
| 5 | |||
| 6 | Starting with 3.4.0 the double colon in emailAddress has been removed. | ||
| 7 | Adapt the test to allow a single colon in 3.4.0 and later. | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/4068d585875d3ba99da2cbe41f60d0dd4f4290d1] | ||
| 10 | Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | ||
| 11 | --- | ||
| 12 | t/local/32_x509_get_cert_info.t | 4 ++++ | ||
| 13 | 1 file changed, 4 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t | ||
| 16 | index 0f7e2d5a..0fd1b689 100644 | ||
| 17 | --- a/t/local/32_x509_get_cert_info.t | ||
| 18 | +++ b/t/local/32_x509_get_cert_info.t | ||
| 19 | @@ -188,6 +188,10 @@ for my $f (keys (%$dump)) { | ||
| 20 | ) { | ||
| 21 | $ext_data =~ s{(othername:) [^, ]+}{$1<unsupported>}g; | ||
| 22 | } | ||
| 23 | + # Starting with 3.4.0 the double colon in emailAddress has been removed. | ||
| 24 | + if (Net::SSLeay::SSLeay >= 0x30400000) { | ||
| 25 | + $ext_data =~ s{emailAddress::}{emailAddress:}; | ||
| 26 | + } | ||
| 27 | } | ||
| 28 | elsif ( $nid == 89 ) { | ||
| 29 | # The output formatting for certificate policies has a | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch new file mode 100644 index 0000000000..17310908c1 --- /dev/null +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From eac7ac502b02f44a84a67920e9f634cce71ff335 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | ||
| 3 | Date: Tue, 18 Feb 2025 18:57:15 +0100 | ||
| 4 | Subject: [PATCH] tests: Address another formatting difference in OpenSSL 3.4.1 | ||
| 5 | |||
| 6 | Since OpenSSL 3.4.1, commit 8a28bca8ee08 ("x509: add a newline after | ||
| 7 | printing Full Name") to be exact, there is another new line change. | ||
| 8 | |||
| 9 | Adapt the testsuite. | ||
| 10 | |||
| 11 | Fixes: #513 | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/eac7ac502b02f44a84a67920e9f634cce71ff335] | ||
| 14 | Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | ||
| 15 | --- | ||
| 16 | t/local/32_x509_get_cert_info.t | 3 +++ | ||
| 17 | 1 file changed, 3 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t | ||
| 20 | index 0fd1b68..08316bf 100644 | ||
| 21 | --- a/t/local/32_x509_get_cert_info.t | ||
| 22 | +++ b/t/local/32_x509_get_cert_info.t | ||
| 23 | @@ -218,6 +218,9 @@ for my $f (keys (%$dump)) { | ||
| 24 | # OpenSSL 1.0.0 to 1.1.1: | ||
| 25 | $ext_data =~ s{(Full Name:\n )}{\n$1}g; | ||
| 26 | $ext_data .= "\n"; | ||
| 27 | + } elsif ( Net::SSLeay::SSLeay > 0x3040000f ) { | ||
| 28 | + $ext_data =~ s{(\nFull Name:)}{\n$1}g; | ||
| 29 | + $ext_data .= "\n"; | ||
| 30 | } | ||
| 31 | } | ||
| 32 | elsif ( $nid == 126 ) { | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch deleted file mode 100644 index 9620df5ece..0000000000 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | Avoid running target binaries during in cross build | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [Cross-compile specific] | ||
| 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 5 | --- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 14:56:24.788544991 +0200 | ||
| 6 | +++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 15:00:12.847266331 +0200 | ||
| 7 | @@ -24,20 +24,7 @@ | ||
| 8 | $self->requires_external_cc; | ||
| 9 | |||
| 10 | my $prefix = $self->find_openssl_prefix; | ||
| 11 | - my $exec = $self->find_openssl_exec($prefix); | ||
| 12 | - | ||
| 13 | - unless (-x $exec) { | ||
| 14 | - print <<EOM; | ||
| 15 | -*** Could not find OpenSSL | ||
| 16 | - If it's already installed, please set the OPENSSL_PREFIX environment | ||
| 17 | - variable accordingly. If it isn't installed yet, get the latest version | ||
| 18 | - from http://www.openssl.org/. | ||
| 19 | -EOM | ||
| 20 | - exit 0; # according http://wiki.cpantesters.org/wiki/CPANAuthorNotes this is best-practice when "missing library" | ||
| 21 | - } | ||
| 22 | - | ||
| 23 | - $self->check_openssl_version($prefix, $exec); | ||
| 24 | - my $opts = $self->ssleay_get_build_opts($prefix, $exec); | ||
| 25 | + my $opts = $self->ssleay_get_build_opts($prefix); | ||
| 26 | |||
| 27 | $self->makemaker_args( | ||
| 28 | CCCDLFLAGS => $opts->{cccdlflags}, | ||
| 29 | @@ -58,7 +45,7 @@ | ||
| 30 | } | ||
| 31 | |||
| 32 | sub ssleay_get_build_opts { | ||
| 33 | - my ($self, $prefix, $exec) = @_; | ||
| 34 | + my ($self, $prefix) = @_; | ||
| 35 | |||
| 36 | my $opts = { | ||
| 37 | lib_links => [], | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/run-ptest b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/run-ptest new file mode 100644 index 0000000000..03e3172e3b --- /dev/null +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/run-ptest | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | result=0 | ||
| 4 | |||
| 5 | if ! nslookup example.com; then | ||
| 6 | mv /etc/resolv.conf /etc/resolv.conf.bak | ||
| 7 | echo "nameserver 8.8.8.8" > /etc/resolv.conf | ||
| 8 | trap "mv /etc/resolv.conf.bak /etc/resolv.conf" INT EXIT | ||
| 9 | fi | ||
| 10 | |||
| 11 | for case in `find t -type f -name '*.t'`; do | ||
| 12 | perl -I . $case >$case.output 2>&1 | ||
| 13 | ret=$? | ||
| 14 | cat $case.output | ||
| 15 | if [ $ret -ne 0 ]; then | ||
| 16 | result=1 | ||
| 17 | echo "FAIL: ${case%.t}" | ||
| 18 | elif grep -i 'SKIP' $case.output; then | ||
| 19 | echo "SKIP: ${case%.t}" | ||
| 20 | else | ||
| 21 | echo "PASS: ${case%.t}" | ||
| 22 | fi | ||
| 23 | |||
| 24 | rm -f $case.output | ||
| 25 | done | ||
| 26 | |||
| 27 | exit $result | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.94.bb index daf07baa22..532744456d 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.94.bb | |||
| @@ -7,8 +7,8 @@ so you can write servers or clients for more complicated applications." | |||
| 7 | HOMEPAGE = "https://metacpan.org/dist/Net-SSLeay" | 7 | HOMEPAGE = "https://metacpan.org/dist/Net-SSLeay" |
| 8 | SECTION = "libs" | 8 | SECTION = "libs" |
| 9 | 9 | ||
| 10 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 10 | LICENSE = "Artistic-2.0" |
| 11 | LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c49f0a6dd21ce7d8988794dea20b650e" |
| 12 | 12 | ||
| 13 | DEPENDS = "openssl zlib openssl-native" | 13 | DEPENDS = "openssl zlib openssl-native" |
| 14 | RDEPENDS:${PN} += "\ | 14 | RDEPENDS:${PN} += "\ |
| @@ -23,25 +23,31 @@ RDEPENDS:${PN} += "\ | |||
| 23 | zlib \ | 23 | zlib \ |
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | SRC_URI = "${CPAN_MIRROR}/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ | 26 | SRC_URI = "${CPAN_MIRROR}/authors/id/C/CH/CHRISN/Net-SSLeay-${PV}.tar.gz \ |
| 27 | file://no-exec-on-configure.patch \ | 27 | file://0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch \ |
| 28 | file://run-ptest \ | 28 | file://0001-test-32_x509_get_cert_info-allow-single-colon.patch \ |
| 29 | " | 29 | file://run-ptest" |
| 30 | SRC_URI[sha256sum] = "9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8" | 30 | SRC_URI[sha256sum] = "9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d" |
| 31 | 31 | ||
| 32 | S = "${UNPACKDIR}/Net-SSLeay-${PV}" | 32 | S = "${UNPACKDIR}/Net-SSLeay-${PV}" |
| 33 | 33 | ||
| 34 | inherit cpan ptest | 34 | inherit cpan ptest-perl |
| 35 | 35 | ||
| 36 | do_configure() { | 36 | do_configure() { |
| 37 | export OPENSSL_PREFIX="${STAGING_EXECPREFIXDIR}" | 37 | export OPENSSL_PREFIX="${STAGING_EXECPREFIXDIR}" |
| 38 | cpan_do_configure | 38 | cpan_do_configure |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | do_install_ptest() { | 41 | do_install_ptest_perl:append(){ |
| 42 | cp -r ${B}/t ${D}${PTEST_PATH} | 42 | cp -r ${S}/inc ${D}${PTEST_PATH} |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | FILES:${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" | 45 | FILES:${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" |
| 46 | 46 | ||
| 47 | RDEPENDS:${PN}-ptest = " perl" | 47 | RDEPENDS:${PN}-ptest += "\ |
| 48 | perl-module-english \ | ||
| 49 | perl-module-file-spec-functions \ | ||
| 50 | perl-module-findbin \ | ||
| 51 | perl-module-perlio \ | ||
| 52 | perl-module-test-more \ | ||
| 53 | perl-module-threads" | ||
diff --git a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb index 6450111da9..935601fe84 100644 --- a/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb +++ b/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb | |||
| @@ -70,3 +70,8 @@ do_install_ptest() { | |||
| 70 | cp -r ${B}/test ${D}${PTEST_PATH} | 70 | cp -r ${B}/test ${D}${PTEST_PATH} |
| 71 | chown -R root:root ${D}${PTEST_PATH} | 71 | chown -R root:root ${D}${PTEST_PATH} |
| 72 | } | 72 | } |
| 73 | |||
| 74 | # See issues: | ||
| 75 | # https://github.com/shlomif/perl-XML-LibXML/issues/84 - libxml incompatibility | ||
| 76 | # https://github.com/shlomif/perl-XML-LibXML/issues/91 - looking for new maintainer | ||
| 77 | SKIP_RECIPE[libxml-libxml-perl] ?= "Not compatible with latest libxml" | ||
