From a97f771d35d85dfa0a428fbeea7405ad9754a5f8 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 11 Jul 2022 16:45:16 +0800 Subject: libcrypt-openssl-rsa-perl: upgrade 0.32 -> 0.33 0001-Fix-for-Issue-31.patch removed since it's included in 0.33 Changelog: ========= - Update for windows github CI - Remove duplicit 'LICENSE' key - Remove EUMM Remove version check - #31 by removing reference to RSA_SSLV23_PADDING (removed from OpenSSL starting from v3.0.0) - support passphase protected private key load - fix 'unsupported encryption' error on old library versions - Clarify croak message for missing passphrase on older cyphers - More structs opaqued in LibreSSL 3.5 - Use a macro for dealing with older SSL lacking macros - more CI fixups. Drop testing for 5.10 and 5.8. Something is broken upstream. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libcrypt/files/0001-Fix-for-Issue-31.patch | 37 -------------------- .../libcrypt/libcrypt-openssl-rsa-perl_0.32.bb | 39 ---------------------- .../libcrypt/libcrypt-openssl-rsa-perl_0.33.bb | 38 +++++++++++++++++++++ 3 files changed, 38 insertions(+), 76 deletions(-) delete mode 100644 meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch delete mode 100644 meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb create mode 100644 meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb (limited to 'meta-perl/recipes-perl') diff --git a/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch b/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch deleted file mode 100644 index a5ea43f88b..0000000000 --- a/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5e8202458e41ba1f7801746c503fe7c60ae340d5 Mon Sep 17 00:00:00 2001 -From: kambe-mikb <77083885+kambe-mikb@users.noreply.github.com> -Date: Tue, 28 Sep 2021 17:40:18 +1000 -Subject: [PATCH] Fix for Issue 31 - -Fix Issue 31 by removing reference to RSA_SSLV23_PADDING (removed from OpenSSL starting from v3.0.0) - -Upstream-Status: Submitted [https://github.com/toddr/Crypt-OpenSSL-RSA/pull/32] -Signed-off-by: Khem Raj ---- - RSA.xs | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/RSA.xs b/RSA.xs -index 46cb199..4f65dfc 100644 ---- a/RSA.xs -+++ b/RSA.xs -@@ -640,12 +640,16 @@ use_pkcs1_oaep_padding(p_rsa) - CODE: - p_rsa->padding = RSA_PKCS1_OAEP_PADDING; - -+#if OPENSSL_VERSION_NUMBER < 0x30000000L -+ - void - use_sslv23_padding(p_rsa) - rsaData* p_rsa; - CODE: - p_rsa->padding = RSA_SSLV23_PADDING; - -+#endif -+ - # Sign text. Returns the signature. - - SV* --- -2.33.1 - diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb deleted file mode 100644 index fd92c8a8db..0000000000 --- a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Crypt Openssl RSA cpan module" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a67ceecc5d9a91a5a0d003ba50c26346" - -SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz \ - file://0001-Fix-for-Issue-31.patch \ -" - -SRC_URI[sha256sum] = "adc74f0ae125c77f65d5dd32abb9c3429300a79543bf263494f333f9c0b62a61" - -DEPENDS += "libcrypt-openssl-guess-perl-native openssl" - -RDEPENDS:${PN} = " \ - libcrypt-openssl-random-perl \ - perl-module-autoloader \ - perl-module-carp \ - perl-module-strict \ - perl-module-warnings \ - perl-module-xsloader \ -" - -EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_DIR_TARGET}${base_libdir} -lcrypto'" - -S = "${WORKDIR}/Crypt-OpenSSL-RSA-${PV}" - -inherit cpan ptest-perl - -do_compile() { - export OTHERLDFLAGS='-Wl,-rpath' - cpan_do_compile -} - -RDEPENDS:${PN}-ptest = " \ - ${PN} \ - perl-module-file-copy \ - perl-module-test \ - perl-module-test-more \ -" diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb new file mode 100644 index 0000000000..aa8d138f2c --- /dev/null +++ b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb @@ -0,0 +1,38 @@ +SUMMARY = "Crypt Openssl RSA cpan module" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a67ceecc5d9a91a5a0d003ba50c26346" + +SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz \ +" + +SRC_URI[sha256sum] = "bdbe630f6d6f540325746ad99977272ac8664ff81bd19f0adaba6d6f45efd864" + +DEPENDS += "libcrypt-openssl-guess-perl-native openssl" + +RDEPENDS:${PN} = " \ + libcrypt-openssl-random-perl \ + perl-module-autoloader \ + perl-module-carp \ + perl-module-strict \ + perl-module-warnings \ + perl-module-xsloader \ +" + +EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_DIR_TARGET}${base_libdir} -lcrypto'" + +S = "${WORKDIR}/Crypt-OpenSSL-RSA-${PV}" + +inherit cpan ptest-perl + +do_compile() { + export OTHERLDFLAGS='-Wl,-rpath' + cpan_do_compile +} + +RDEPENDS:${PN}-ptest = " \ + ${PN} \ + perl-module-file-copy \ + perl-module-test \ + perl-module-test-more \ +" -- cgit v1.2.3-54-g00ecf