summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc2
-rw-r--r--meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb1
-rw-r--r--meta-oe/recipes-graphics/lvgl/files/defconfig2
-rw-r--r--meta-perl/conf/include/ptest-packagelists-meta-perl.inc10
-rw-r--r--meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb1
-rw-r--r--meta-perl/recipes-extended/requirements-dynamic/cpan-requirements-dynamic_0.002.bb13
-rw-r--r--meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl/0001-correct-libperl-regex.patch42
-rw-r--r--meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.320.bb16
-rw-r--r--meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.048.bb1
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-dns-perl_1.53.bb (renamed from meta-perl/recipes-perl/libnet/libnet-dns-perl_1.52.bb)18
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb30
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.26.bb46
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-test-32_x509_get_cert_info-allow-single-colon.patch29
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-ssleay-perl/0001-tests-Address-another-formatting-difference-in-OpenSSL-3.4.1.patch32
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch37
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-ssleay-perl/run-ptest27
-rw-r--r--meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.94.bb (renamed from meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb)28
-rw-r--r--meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0134.bb5
-rw-r--r--meta-python/conf/include/ptest-packagelists-meta-python.inc2
-rw-r--r--meta-python/recipes-devtools/python/python3-pyasyncore/run-ptest9
-rw-r--r--meta-python/recipes-devtools/python/python3-pyasyncore_1.0.4.bb7
-rw-r--r--meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.3.bb (renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.2.bb)4
-rw-r--r--meta-webserver/recipes-php/xdebug/xdebug_3.4.6.bb (renamed from meta-webserver/recipes-php/xdebug/xdebug_3.4.5.bb)2
23 files changed, 271 insertions, 93 deletions
diff --git a/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc b/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
index e21ad5766b..be347286fb 100644
--- a/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
+++ b/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc
@@ -7,11 +7,11 @@
7# ptests which take less than ~30s each 7# ptests which take less than ~30s each
8 8
9PTESTS_FAST_META_MULTIMEDIA = "\ 9PTESTS_FAST_META_MULTIMEDIA = "\
10 libopenmpt\
10" 11"
11 12
12PTESTS_SLOW_META_MULTIMEDIA = "\ 13PTESTS_SLOW_META_MULTIMEDIA = "\
13" 14"
14 15
15PTESTS_PROBLEMS_META_MULTIMEDIA = "\ 16PTESTS_PROBLEMS_META_MULTIMEDIA = "\
16 libopenmpt \
17" 17"
diff --git a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb
index 613147598a..dececf7488 100644
--- a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb
+++ b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.10.bb
@@ -58,6 +58,7 @@ do_install_ptest() {
58 install -m 0644 ${S}/test/test.mptm ${D}${PTEST_PATH}/test 58 install -m 0644 ${S}/test/test.mptm ${D}${PTEST_PATH}/test
59 install -m 0644 ${S}/test/test.s3m ${D}${PTEST_PATH}/test 59 install -m 0644 ${S}/test/test.s3m ${D}${PTEST_PATH}/test
60 install -m 0644 ${S}/test/test.xm ${D}${PTEST_PATH}/test 60 install -m 0644 ${S}/test/test.xm ${D}${PTEST_PATH}/test
61 install -m 0644 ${S}/test/test.mod ${D}${PTEST_PATH}/test
61 62
62 install -d ${D}${PTEST_PATH}/libopenmpt 63 install -d ${D}${PTEST_PATH}/libopenmpt
63 install -m 0644 ${S}/libopenmpt/libopenmpt_version.mk ${D}${PTEST_PATH}/libopenmpt 64 install -m 0644 ${S}/libopenmpt/libopenmpt_version.mk ${D}${PTEST_PATH}/libopenmpt
diff --git a/meta-oe/recipes-graphics/lvgl/files/defconfig b/meta-oe/recipes-graphics/lvgl/files/defconfig
index 1f42f11f7a..088b2369e9 100644
--- a/meta-oe/recipes-graphics/lvgl/files/defconfig
+++ b/meta-oe/recipes-graphics/lvgl/files/defconfig
@@ -1 +1,3 @@
1CONFIG_LV_COLOR_DEPTH_32=y 1CONFIG_LV_COLOR_DEPTH_32=y
2# CONFIG_LV_BUILD_EXAMPLES is not set
3# CONFIG_LV_BUILD_DEMOS is not set
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 @@
9PTESTS_FAST_META_PERL = "\ 9PTESTS_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
45PTESTS_PROBLEMS_META_PERL = "\ 50PTESTS_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 @@
1SUMMARY = "Dynamic prerequisites in meta files"
2DESCRIPTION = "This module implements a format for describing dynamic prerequisites \
3of a distribution.cts and (by default) mails MIME messages."
4HOMEPAGE = "https://metacpan.org/pod/CPAN::Requirements::Dynamic"
5LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=818dfe6ef2e2204af6c824ca00e2b485"
7
8SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/CPAN-Requirements-Dynamic-${PV}.tar.gz"
9SRC_URI[sha256sum] = "9e290179fd1ab8574f7a2297baf015ea4fef3703a99d48798f61ec9347b4905b"
10
11S = "${UNPACKDIR}/CPAN-Requirements-Dynamic-${PV}"
12
13inherit 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 @@
1From 5ffd363a7acd4ef794eb265eaf6c42321097cd46 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Sat, 25 Oct 2025 15:48:51 +0200
4Subject: [PATCH] correct libperl regex
5
6The module expects the libperl library's format (from $Config{libperl})
7to be versionless, just simply libperl.so. However this value in the
8OE builds is versioned, causing some issues.
9
10The module transforms this value into a linker flag, and tries to link
11with the library. The transformation is simple: cut off the "lib" from
12the start, and everything after the last dot.
13
14With versionless version, the transformation works: libperl.so -> perl
15
16However with versioned library it looks like this:
17libperl.so.5.99.9 -> perl.so.5.99
18which is just wrong.
19
20This patch changes this transformation in way that throws away everything
21after the first dot (instead of the last one).
22
23Upstream-Status: Submitted [https://github.com/ambs/Config-AutoConf/pull/19]
24
25Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
26---
27 lib/Config/AutoConf.pm | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/lib/Config/AutoConf.pm b/lib/Config/AutoConf.pm
31index 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"
14LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ 14LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \
15file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" 15file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61"
16 16
17SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz" 17SRC_URI = "${CPAN_MIRROR}/authors/id/A/AM/AMBS/Config-AutoConf-${PV}.tar.gz \
18 file://0001-correct-libperl-regex.patch \
19 "
18 20
19SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023" 21SRC_URI[sha256sum] = "bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023"
20RDEPENDS:${PN} += "libcapture-tiny-perl" 22RDEPENDS:${PN} += "libcapture-tiny-perl"
@@ -31,8 +33,20 @@ RDEPENDS:${PN} += "perl-module-scalar-util"
31RDEPENDS:${PN} += "perl-module-strict" 33RDEPENDS:${PN} += "perl-module-strict"
32RDEPENDS:${PN} += "perl-module-text-parsewords" 34RDEPENDS:${PN} += "perl-module-text-parsewords"
33RDEPENDS:${PN} += "perl-module-warnings" 35RDEPENDS:${PN} += "perl-module-warnings"
36
37RDEPENDS:${PN}-ptest += " \
38 packagegroup-core-buildessential \
39 perl-dev \
40 perl-module-file-glob \
41 perl-module-perl-ostype \
42 perl-module-metadata"
43
34RRECOMMENDS:${PN} += "libfile-slurper-perl" 44RRECOMMENDS:${PN} += "libfile-slurper-perl"
35 45
46# One test requires perl headers (perl-dev) to compile some
47# test application.
48INSANE_SKIP:${PN}-ptest += "dev-deps"
49
36S = "${UNPACKDIR}/Config-AutoConf-${PV}" 50S = "${UNPACKDIR}/Config-AutoConf-${PV}"
37 51
38inherit cpan ptest-perl 52inherit 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
63RDEPENDS:${PN}-ptest += " \ 63RDEPENDS:${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
10SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" 10SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
11 11
12SRC_URI[sha256sum] = "c9884fcb08e4d03c23188d4e10836c2382fcb65b69859581a20845a3235a7203" 12SRC_URI[sha256sum] = "04acb4f177d57c147dcedc4bd70e23806af3db75a532f46f95461b2bc9a94959"
13 13
14UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" 14UPSTREAM_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
44do_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
44RDEPENDS:${PN}-ptest += " \ 56RDEPENDS:${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
52python __anonymous () { 67python __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 @@
1DESCRIPTION = "DNSSEC extensions to Net::DNS"
2HOMEPAGE = "http://www.net-dns.org/"
3SECTION = "libs"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://README;beginline=165;endline=192;md5=6ef523fa09e8c272675839e21de16bde"
7
8SRC_URI = "${CPAN_MIRROR}/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz"
9SRC_URI[sha256sum] = "37a47d4def72d7338f3cc7cd807ec19bd9e2ae638ae656fa536cf0314801989e"
10
11DEPENDS += "openssl"
12
13UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
14
15S = "${UNPACKDIR}/Net-DNS-SEC-${PV}"
16
17EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'"
18
19inherit cpan ptest-perl
20
21RDEPENDS:${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 @@
1DESCRIPTION = "DNSSEC extensions to Net::DNS"
2HOMEPAGE = "http://www.net-dns.org/"
3SECTION = "libs"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=2b7e4176275d57d0b036bdccbc01a0e7"
7
8SRC_URI = "${CPAN_MIRROR}/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-${PV}.tar.gz"
9SRC_URI[sha256sum] = "88592c65487fb7b4d05134f2f9c48e649a9cd533a8493c50189b649b4ea711a6"
10
11DEPENDS += "openssl"
12
13UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P<pver>(\d+\.\d+))(?!_\d+).tar"
14
15S = "${UNPACKDIR}/Net-DNS-SEC-${PV}"
16
17EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'"
18
19inherit cpan ptest-perl
20
21RDEPENDS:${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
32do_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
42RDEPENDS:${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 @@
1From 4068d585875d3ba99da2cbe41f60d0dd4f4290d1 Mon Sep 17 00:00:00 2001
2From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
3Date: Wed, 16 Oct 2024 21:48:51 +0200
4Subject: [PATCH] test: 32_x509_get_cert_info allow single colon.
5
6Starting with 3.4.0 the double colon in emailAddress has been removed.
7Adapt the test to allow a single colon in 3.4.0 and later.
8
9Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/4068d585875d3ba99da2cbe41f60d0dd4f4290d1]
10Signed-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
15diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t
16index 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 @@
1From eac7ac502b02f44a84a67920e9f634cce71ff335 Mon Sep 17 00:00:00 2001
2From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
3Date: Tue, 18 Feb 2025 18:57:15 +0100
4Subject: [PATCH] tests: Address another formatting difference in OpenSSL 3.4.1
5
6Since OpenSSL 3.4.1, commit 8a28bca8ee08 ("x509: add a newline after
7printing Full Name") to be exact, there is another new line change.
8
9Adapt the testsuite.
10
11Fixes: #513
12
13Upstream-Status: Backport [https://github.com/radiator-software/p5-net-ssleay/commit/eac7ac502b02f44a84a67920e9f634cce71ff335]
14Signed-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
19diff --git a/t/local/32_x509_get_cert_info.t b/t/local/32_x509_get_cert_info.t
20index 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 @@
1Avoid running target binaries during in cross build
2
3Upstream-Status: Inappropriate [Cross-compile specific]
4Signed-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
3result=0
4
5if ! 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
9fi
10
11for 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
25done
26
27exit $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."
7HOMEPAGE = "https://metacpan.org/dist/Net-SSLeay" 7HOMEPAGE = "https://metacpan.org/dist/Net-SSLeay"
8SECTION = "libs" 8SECTION = "libs"
9 9
10LICENSE = "Artistic-1.0 | GPL-1.0-or-later" 10LICENSE = "Artistic-2.0"
11LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=c49f0a6dd21ce7d8988794dea20b650e"
12 12
13DEPENDS = "openssl zlib openssl-native" 13DEPENDS = "openssl zlib openssl-native"
14RDEPENDS:${PN} += "\ 14RDEPENDS:${PN} += "\
@@ -23,25 +23,31 @@ RDEPENDS:${PN} += "\
23 zlib \ 23 zlib \
24" 24"
25 25
26SRC_URI = "${CPAN_MIRROR}/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ 26SRC_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"
30SRC_URI[sha256sum] = "9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8" 30SRC_URI[sha256sum] = "9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d"
31 31
32S = "${UNPACKDIR}/Net-SSLeay-${PV}" 32S = "${UNPACKDIR}/Net-SSLeay-${PV}"
33 33
34inherit cpan ptest 34inherit cpan ptest-perl
35 35
36do_configure() { 36do_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
41do_install_ptest() { 41do_install_ptest_perl:append(){
42 cp -r ${B}/t ${D}${PTEST_PATH} 42 cp -r ${S}/inc ${D}${PTEST_PATH}
43} 43}
44 44
45FILES:${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" 45FILES:${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/"
46 46
47RDEPENDS:${PN}-ptest = " perl" 47RDEPENDS:${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
77SKIP_RECIPE[libxml-libxml-perl] ?= "Not compatible with latest libxml"
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc
index 0f56c3e300..f0411f269f 100644
--- a/meta-python/conf/include/ptest-packagelists-meta-python.inc
+++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc
@@ -69,6 +69,7 @@ PTESTS_FAST_META_PYTHON = "\
69 python3-ptyprocess \ 69 python3-ptyprocess \
70 python3-py-cpuinfo \ 70 python3-py-cpuinfo \
71 python3-pyasn1-modules \ 71 python3-pyasn1-modules \
72 python3-pyasyncore \
72 python3-pyroute2 \ 73 python3-pyroute2 \
73 python3-pyserial \ 74 python3-pyserial \
74 python3-pytest-mock \ 75 python3-pytest-mock \
@@ -128,5 +129,4 @@ PTESTS_SLOW_META_PYTHON = "\
128" 129"
129 130
130PTESTS_PROBLEMS_META_PYTHON = "\ 131PTESTS_PROBLEMS_META_PYTHON = "\
131 python3-pyasyncore \
132" 132"
diff --git a/meta-python/recipes-devtools/python/python3-pyasyncore/run-ptest b/meta-python/recipes-devtools/python/python3-pyasyncore/run-ptest
new file mode 100644
index 0000000000..52f069c3b9
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyasyncore/run-ptest
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3cd $(dirname $0)/tests
4
5# Failing cases are not transformed, only passing and skipped ones.
6# Unitttest will output a summary at the end for each failing testcase,
7# starting each line with "FAIL: " followed by the testcase name.
8
9python3 -m unittest -v 2>&1 | sed -e 's/\(test_[^ ]*\).*ok$/PASS: \1/' -e 's/\(test_[^ ]*\).*skipped.*/SKIP: \1/'
diff --git a/meta-python/recipes-devtools/python/python3-pyasyncore_1.0.4.bb b/meta-python/recipes-devtools/python/python3-pyasyncore_1.0.4.bb
index 47906cea0b..ecd24c95cf 100644
--- a/meta-python/recipes-devtools/python/python3-pyasyncore_1.0.4.bb
+++ b/meta-python/recipes-devtools/python/python3-pyasyncore_1.0.4.bb
@@ -3,11 +3,16 @@ HOMEPAGE = "https://github.com/simonrob/pyasyncore"
3LICENSE = "Python-2.0" 3LICENSE = "Python-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00"
5 5
6inherit pypi setuptools3 ptest-python-pytest 6inherit pypi setuptools3 ptest
7SRC_URI += "file://run-ptest"
7 8
8SRC_URI[sha256sum] = "2c7a8b9b750ba6260f1e5a061456d61320a80579c6a43d42183417da89c7d5d6" 9SRC_URI[sha256sum] = "2c7a8b9b750ba6260f1e5a061456d61320a80579c6a43d42183417da89c7d5d6"
9 10
10RDEPENDS:${PN} += "python3-core python3-io" 11RDEPENDS:${PN} += "python3-core python3-io"
11RDEPENDS:${PN}-ptest += "python3-tests" 12RDEPENDS:${PN}-ptest += "python3-tests"
12 13
14do_install_ptest:append(){
15 cp -r ${S}/tests ${D}${PTEST_PATH}
16}
17
13BBCLASSEXTEND = "native nativesdk" 18BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.2.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.3.bb
index f0e8b749aa..5b9f306a16 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.2.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.phpmyadmin.net"
3# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT 3# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT
4LICENSE = "GPL-2.0-only & LGPL-3.0-only & MIT" 4LICENSE = "GPL-2.0-only & LGPL-3.0-only & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 5LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=72bda492a00ee8c4121987c6afdefc07 \ 6 file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=06da7ef2f2b2874be8528063198fa994 \
7 file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \ 7 file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \
8" 8"
9 9
@@ -11,7 +11,7 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la
11 file://apache.conf \ 11 file://apache.conf \
12" 12"
13 13
14SRC_URI[sha256sum] = "f881819a3b11e653b0212afaf0cc105db85c767715cb3f5852670f7fc36c9669" 14SRC_URI[sha256sum] = "57881348297c4412f86c410547cf76b4d8a236574dd2c6b7d6a2beebe7fc44e3"
15 15
16UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" 16UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/"
17UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz" 17UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz"
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_3.4.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_3.4.6.bb
index fdde88e44f..5314074fbf 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_3.4.5.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_3.4.6.bb
@@ -6,7 +6,7 @@ DEPENDS = "php re2c-native"
6 6
7SRC_URI = "https://xdebug.org/files/xdebug-${PV}.tgz" 7SRC_URI = "https://xdebug.org/files/xdebug-${PV}.tgz"
8 8
9SRC_URI[sha256sum] = "f58442306ce55fe3b811c31759a247242989164f2a7933f05c8d59b06665b9c9" 9SRC_URI[sha256sum] = "4cd6a2523d9c1576c818eb4d15fe0c1650a25dde4d31d1d20a616e9d9435cc20"
10 10
11UPSTREAM_CHECK_REGEX = "xdebug-(?P<pver>\d+(\.\d+)+)\.tgz" 11UPSTREAM_CHECK_REGEX = "xdebug-(?P<pver>\d+(\.\d+)+)\.tgz"
12 12