From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-perl/adduser/adduser_3.116.bb | 54 ------------------ .../recipes-perl/adduser/adduser_3.118.bb | 54 ++++++++++++++++++ .../libcrypt/libcrypt-openssl-guess_0.11.bb | 21 +++++++ .../libcrypt/libcrypt-openssl-rsa-perl_0.28.bb | 24 -------- .../libcrypt/libcrypt-openssl-rsa-perl_0.30.bb | 24 ++++++++ .../libio/libio-socket-ssl-perl_2.054.bb | 47 --------------- .../libio/libio-socket-ssl-perl_2.060.bb | 47 +++++++++++++++ .../recipes-perl/libnet/libnet-dns-perl_1.14.bb | 27 --------- .../recipes-perl/libnet/libnet-dns-perl_1.18.bb | 66 ++++++++++++++++++++++ .../libnet/libnet-dns-sec-perl_1.10.bb | 33 +++++++++++ .../libnet-ssleay-perl/no-exec-on-configure.patch | 33 +++++++++++ .../recipes-perl/libnet/libnet-ssleay-perl_1.84.bb | 47 --------------- .../recipes-perl/libnet/libnet-ssleay-perl_1.85.bb | 49 ++++++++++++++++ 13 files changed, 327 insertions(+), 199 deletions(-) delete mode 100644 meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess_0.11.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.30.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb (limited to 'meta-openembedded/meta-perl/recipes-perl') diff --git a/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb deleted file mode 100644 index 112a5f022a..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "a utility to add users/groups to the system" -DESCRIPTION = "adduser, addgroup - add a user or group to the system" -HOMEPAGE = "http://alioth.debian.org/projects/adduser/" -SECTION = "base/utils" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef" - -SRC_URI = "http://ftp.de.debian.org/debian/pool/main/a/${BPN}/${BPN}_${PV}.tar.xz \ - file://adduser-add-M-option-for-useradd.patch \ -" - -SRC_URI[md5sum] = "e042a5842b8f24312d6f5a99a1af8f2c" -SRC_URI[sha256sum] = "72d811ad3ba17d2794b14d19acd1d6b57f9dd31d9250d51e786895dee2daeac0" - -inherit cpan-base update-alternatives - -S = "${WORKDIR}/${BPN}" - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/adduser ${D}${sbindir} - install -m 0755 ${S}/deluser ${D}${sbindir} - - install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${@get_perl_version(d)}/Debian/AdduserCommon.pm - sed -i -e "s/VERSION/${PV}/" ${D}${sbindir}/* - - install -d ${D}/${sysconfdir} - install -m 0644 ${S}/*.conf ${D}/${sysconfdir} - - install -d ${D}${mandir}/man5 - install -m 0644 ${S}/doc/*.conf.5 ${D}${mandir}/man5 - install -d ${D}${mandir}/man8 - install -m 0644 ${S}/doc/*.8 ${D}${mandir}/man8 - install -d ${D}${docdir}/${BPN} - cp -rf ${S}/examples ${D}${docdir}/${BPN} -} - -RDEPENDS_${PN} += "\ - shadow \ - perl-module-getopt-long \ - perl-module-overloading \ - perl-module-file-find \ - perl-module-file-temp \ -" - -ALTERNATIVE_${PN} = "adduser deluser addgroup delgroup" -ALTERNATIVE_PRIORITY = "60" -ALTERNATIVE_LINK_NAME[adduser] = "${sbindir}/adduser" -ALTERNATIVE_LINK_NAME[deluser] = "${sbindir}/deluser" -ALTERNATIVE_LINK_NAME[addgroup] = "${sbindir}/addgroup" -ALTERNATIVE_LINK_NAME[delgroup] = "${sbindir}/delgroup" -ALTERNATIVE_TARGET[addgroup] = "${sbindir}/adduser.${BPN}" -ALTERNATIVE_TARGET[delgroup] = "${sbindir}/deluser.${BPN}" diff --git a/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb new file mode 100644 index 0000000000..660a7f777b --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.118.bb @@ -0,0 +1,54 @@ +SUMMARY = "a utility to add users/groups to the system" +DESCRIPTION = "adduser, addgroup - add a user or group to the system" +HOMEPAGE = "https://salsa.debian.org/debian/adduser" +SECTION = "base/utils" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef" + +SRC_URI = "https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${PV}/${BPN}_${PV}.tar.xz \ + file://adduser-add-M-option-for-useradd.patch \ +" + +SRC_URI[md5sum] = "44ba2475ebdaafc9613236bdda321c97" +SRC_URI[sha256sum] = "3e9eea661c9aac6b2c791bfcc1de3a9c6a422d45c8f3d38ed417737ed3166ffc" + +S = "${WORKDIR}/${BPN}" + +inherit cpan-base update-alternatives + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/adduser ${D}${sbindir} + install -m 0755 ${S}/deluser ${D}${sbindir} + + install -D -m 0644 ${S}/AdduserCommon.pm ${D}${libdir}/perl/${@get_perl_version(d)}/Debian/AdduserCommon.pm + sed -i -e "s/VERSION/${PV}/" ${D}${sbindir}/* + + install -d ${D}/${sysconfdir} + install -m 0644 ${S}/*.conf ${D}/${sysconfdir} + + install -d ${D}${mandir}/man5 + install -m 0644 ${S}/doc/*.conf.5 ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 + install -m 0644 ${S}/doc/*.8 ${D}${mandir}/man8 + install -d ${D}${docdir}/${BPN} + cp -rf ${S}/examples ${D}${docdir}/${BPN} +} + +RDEPENDS_${PN} += "\ + shadow \ + perl-module-getopt-long \ + perl-module-overloading \ + perl-module-file-find \ + perl-module-file-temp \ +" + +ALTERNATIVE_${PN} = "adduser deluser addgroup delgroup" +ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_LINK_NAME[adduser] = "${sbindir}/adduser" +ALTERNATIVE_LINK_NAME[deluser] = "${sbindir}/deluser" +ALTERNATIVE_LINK_NAME[addgroup] = "${sbindir}/addgroup" +ALTERNATIVE_LINK_NAME[delgroup] = "${sbindir}/delgroup" +ALTERNATIVE_TARGET[addgroup] = "${sbindir}/adduser.${BPN}" +ALTERNATIVE_TARGET[delgroup] = "${sbindir}/deluser.${BPN}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess_0.11.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess_0.11.bb new file mode 100644 index 0000000000..21be047206 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess_0.11.bb @@ -0,0 +1,21 @@ +SUMMARY = "Guess OpenSSL include path" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea914cc2718e8d53bd7744d96e66c03c" + +SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Guess-${PV}.tar.gz " + +SRC_URI[md5sum] = "e768fe2c07826b0ac9ea604c79f93032" +SRC_URI[sha256sum] = "aa6b18e38cb852cbad80a58cd90c395b40819d4d01e0ab37e7703149094d7167" + +DEPENDS += "openssl" + +RDEPENDS_${PN}="perl-module-config perl-module-exporter perl-module-symbol perl-module-file-spec" + +EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_DIR_TARGET}${base_libdir} -lcrypto'" + +S = "${WORKDIR}/Crypt-OpenSSL-Guess-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb deleted file mode 100644 index f0c610f3ae..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Crypt Openssl RSA cpan module" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3" - -SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz " - -SRC_URI[md5sum] = "86217a5036fc63779c30420b5fd84129" -SRC_URI[sha256sum] = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be" - -DEPENDS += "openssl" - -RDEPENDS_${PN}="libcrypt-openssl-random-perl" - -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 - -do_compile() { - export OTHERLDFLAGS='-Wl,-rpath' - cpan_do_compile -} diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.30.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.30.bb new file mode 100644 index 0000000000..0a2ad8aa44 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.30.bb @@ -0,0 +1,24 @@ +SUMMARY = "Crypt Openssl RSA cpan module" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +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[md5sum] = "10bca2fc6d0ba1aa329f227424ae87d5" +SRC_URI[sha256sum] = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac" + +DEPENDS += "libcrypt-openssl-guess-native openssl" + +RDEPENDS_${PN}="libcrypt-openssl-random-perl" + +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 + +do_compile() { + export OTHERLDFLAGS='-Wl,-rpath' + cpan_do_compile +} diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb deleted file mode 100644 index ea78bc4e00..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Perl library for transparent SSL" -DESCRIPTION = "This module is a true drop-in replacement for IO::Socket::INET that \ -uses SSL to encrypt data before it is transferred to a remote server \ -or client. IO::Socket::SSL supports all the extra features that one \ -needs to write a full-featured SSL client or server application: \ -multiple SSL contexts, cipher selection, certificate verification, and \ -SSL version selection. As an extra bonus, it works perfectly with \ -mod_perl." -HOMEPAGE = "http://search.cpan.org/dist/IO-Socket-SSL/" -SECTION = "libs" - -LICENSE = "Artistic-1.0|GPLv1+" -LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8" - -RDEPENDS_${PN} += "\ - libnet-ssleay-perl \ - perl-module-autoloader \ - perl-module-scalar-util \ - perl-module-io-socket \ -" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ - file://run-ptest \ - " -SRC_URI[md5sum] = "e1b412e28d107c716e7ca637e2b7f8bd" -SRC_URI[sha256sum] = "02ea04e9a336a7d3ca9aa604c0c5b5aaf3efa513cefecfc73cc79ceeb5131e4b" - -S = "${WORKDIR}/IO-Socket-SSL-${PV}" - -inherit cpan ptest - -do_install_append () { - mkdir -p ${D}${docdir}/${PN}/ - cp ${S}/BUGS ${D}${docdir}/${PN}/ - cp ${S}/Changes ${D}${docdir}/${PN}/ - cp ${S}/README ${D}${docdir}/${PN}/ - cp -pRP ${S}/docs ${D}${docdir}/${PN}/ - cp -pRP ${S}/certs ${D}${docdir}/${PN}/ - cp -pRP ${S}/example ${D}${docdir}/${PN}/ -} - -do_install_ptest () { - cp -r ${B}/t ${D}${PTEST_PATH} - cp -r ${B}/certs ${D}${PTEST_PATH} -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb new file mode 100644 index 0000000000..20f8808291 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.060.bb @@ -0,0 +1,47 @@ +SUMMARY = "Perl library for transparent SSL" +DESCRIPTION = "This module is a true drop-in replacement for IO::Socket::INET that \ +uses SSL to encrypt data before it is transferred to a remote server \ +or client. IO::Socket::SSL supports all the extra features that one \ +needs to write a full-featured SSL client or server application: \ +multiple SSL contexts, cipher selection, certificate verification, and \ +SSL version selection. As an extra bonus, it works perfectly with \ +mod_perl." +HOMEPAGE = "http://search.cpan.org/dist/IO-Socket-SSL/" +SECTION = "libs" + +LICENSE = "Artistic-1.0|GPLv1+" +LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875ace682de56eef8e8" + +RDEPENDS_${PN} += "\ + libnet-ssleay-perl \ + perl-module-autoloader \ + perl-module-scalar-util \ + perl-module-io-socket \ +" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ + file://run-ptest \ + " +SRC_URI[md5sum] = "97fa6cd64f15db60f810cd8ab02d57fc" +SRC_URI[sha256sum] = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c" + +S = "${WORKDIR}/IO-Socket-SSL-${PV}" + +inherit cpan ptest + +do_install_append () { + mkdir -p ${D}${docdir}/${PN}/ + cp ${S}/BUGS ${D}${docdir}/${PN}/ + cp ${S}/Changes ${D}${docdir}/${PN}/ + cp ${S}/README ${D}${docdir}/${PN}/ + cp -pRP ${S}/docs ${D}${docdir}/${PN}/ + cp -pRP ${S}/certs ${D}${docdir}/${PN}/ + cp -pRP ${S}/example ${D}${docdir}/${PN}/ +} + +do_install_ptest () { + cp -r ${B}/t ${D}${PTEST_PATH} + cp -r ${B}/certs ${D}${PTEST_PATH} +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb deleted file mode 100644 index efaa7f7b1d..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "This package contains the DNS.pm module with friends." -HOMEPAGE = "http://www.net-dns.org/" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" - -LIC_FILES_CHKSUM = "file://README;md5=92d93d8c5bf22de77578531e283dd219" - -DEPENDS += "perl" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" - -SRC_URI[md5sum] = "0da1099c0a3548d36ea9e31d5bb9e122" -SRC_URI[sha256sum] = "83c38a594eeb2c85d66e60047a0f5b403f34bd92a5d13606f02e828d450299fc" - -S = "${WORKDIR}/Net-DNS-${PV}" - -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" - -inherit cpan - -RDEPENDS_${PN} = "perl-module-integer" - -do_compile() { - export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" - cpan_do_compile -} -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb new file mode 100644 index 0000000000..4e0c9c446b --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.18.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "This package contains the DNS.pm module with friends." +HOMEPAGE = "http://www.net-dns.org/" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://README;beginline=252;endline=269;md5=27db37b42cd1a5173a53922d67072bcb" + +DEPENDS += "perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" + +SRC_URI[md5sum] = "67af7e5c1c339f60c45c1054374bd8ee" +SRC_URI[sha256sum] = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3" + +UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/Net-DNS-${PV}" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan ptest-perl + +RDEPENDS_${PN} = " \ + libdigest-hmac-perl \ + perl-module-base \ + perl-module-constant \ + perl-module-digest-md5 \ + perl-module-digest-sha \ + perl-module-file-spec \ + perl-module-integer \ + perl-module-io-file \ + perl-module-io-select \ + perl-module-io-socket \ + perl-module-io-socket-ip \ + perl-module-mime-base64 \ + perl-module-scalar-util \ + perl-module-test-more \ + perl-module-time-local \ +" + +RRECOMMENDS_${PN} += " \ + libnet-dns-sec-perl \ +" + +RDEPENDS_${PN}-ptest += " \ + perl-module-encode \ + perl-module-encode-byte \ + perl-module-extutils-mm \ + perl-module-extutils-mm-unix \ + perl-module-overload \ +" + +python __anonymous () { + # rather than use "find" to determine libc-*.so, + # statically export the known paths for glibc and musl + import os + if d.getVar('TCLIBC') == "glibc": + os.environ["LIBC"] = "${STAGING_BASELIBDIR}/libc.so.6" + elif d.getVar('TCLIBC') == "musl": + os.environ["LIBC"] = "${STAGING_LIBDIR}/libc.so" + else: + raise bb.parse.SkipRecipe("incompatible with %s C library" % + d.getVar('TCLIBC')) +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb new file mode 100644 index 0000000000..3fa6294f1c --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-sec-perl_1.10.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "DNSSEC extensions to Net::DNS" +HOMEPAGE = "http://www.net-dns.org/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README;beginline=165;endline=192;md5=6ef523fa09e8c272675839e21de16bde" + +SRC_URI = "https://cpan.metacpan.org/authors/id/W/WI/WILLEM/Net-DNS-SEC-${PV}.tar.gz" +SRC_URI[md5sum] = "ffa55a9898192c9d4c623cb1357eba9b" +SRC_URI[sha256sum] = "37a47d4def72d7338f3cc7cd807ec19bd9e2ae638ae656fa536cf0314801989e" + +DEPENDS += "openssl" + +UPSTREAM_CHECK_REGEX = "Net\-DNS\-SEC\-(?P(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/Net-DNS-SEC-${PV}" + +EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_BASELIBDIR} -lcrypto'" + +inherit cpan ptest-perl + +RDEPENDS_${PN} = " \ + libnet-dns-perl \ + libcrypto \ + perl-module-dynaloader \ + perl-module-file-find \ + perl-module-file-spec \ + perl-module-io-file \ + perl-module-mime-base64 \ + perl-module-test-more \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch new file mode 100644 index 0000000000..6efa7d8f95 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl/no-exec-on-configure.patch @@ -0,0 +1,33 @@ +--- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 14:56:24.788544991 +0200 ++++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2018-08-27 15:00:12.847266331 +0200 +@@ -24,20 +24,7 @@ + $self->requires_external_cc; + + my $prefix = $self->find_openssl_prefix; +- my $exec = $self->find_openssl_exec($prefix); +- +- unless (-x $exec) { +- print <check_openssl_version($prefix, $exec); +- my $opts = $self->ssleay_get_build_opts($prefix, $exec); ++ my $opts = $self->ssleay_get_build_opts($prefix); + + $self->makemaker_args( + CCCDLFLAGS => $opts->{cccdlflags}, +@@ -58,7 +45,7 @@ + } + + sub ssleay_get_build_opts { +- my ($self, $prefix, $exec) = @_; ++ my ($self, $prefix) = @_; + + my $opts = { + lib_links => [], diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb deleted file mode 100644 index cfecef9cfd..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Net::SSLeay - Perl extension for using OpenSSL" -DESCRIPTION = "This module offers some high level convenience functions for accessing \ -web pages on SSL servers (for symmetry, same API is offered for \ -accessing http servers, too), a sslcat() function for writing your own \ -clients, and finally access to the SSL api of SSLeay/OpenSSL package \ -so you can write servers or clients for more complicated applications." -HOMEPAGE = "http://search.cpan.org/dist/Net-SSLeay/" -SECTION = "libs" - -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" - -DEPENDS = "openssl zlib openssl-native" -RDEPENDS_${PN} += "\ - libssl \ - libcrypto \ - perl-module-carp \ - perl-module-errno \ - perl-module-extutils-makemaker \ - perl-module-mime-base64 \ - perl-module-socket \ - zlib \ -" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ - file://run-ptest \ - " -SRC_URI[md5sum] = "cfbe968487149626978f427cc9fb8c77" -SRC_URI[sha256sum] = "823ec3cbb428309d6a9e56f362a9300693ce3215b7fede109adb7be361fff177" - -S = "${WORKDIR}/Net-SSLeay-${PV}" - -inherit cpan ptest - -export OPENSSL_PREFIX="${STAGING_LIBDIR}" - -EXTRA_CPANFLAGS = "INC=-I${STAGING_INCDIR} LIBS='-L${STAGING_LIBDIR} -lcrypto -lssl -L${STAGING_BASELIBDIR} -lz'" - -do_install_ptest() { - cp -r ${B}/t ${D}${PTEST_PATH} -} - -BBCLASSEXTEND = "native" - -FILES_${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" - -RDEPENDS_${PN}-ptest = " perl" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb new file mode 100644 index 0000000000..dccef16404 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb @@ -0,0 +1,49 @@ +SUMMARY = "Net::SSLeay - Perl extension for using OpenSSL" +DESCRIPTION = "This module offers some high level convenience functions for accessing \ +web pages on SSL servers (for symmetry, same API is offered for \ +accessing http servers, too), a sslcat() function for writing your own \ +clients, and finally access to the SSL api of SSLeay/OpenSSL package \ +so you can write servers or clients for more complicated applications." +HOMEPAGE = "http://search.cpan.org/dist/Net-SSLeay/" +SECTION = "libs" + +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://README;beginline=274;endline=294;md5=67d67095d83e339da538a082fad5f38e" + +DEPENDS = "openssl zlib openssl-native" +RDEPENDS_${PN} += "\ + libssl \ + libcrypto \ + perl-module-carp \ + perl-module-errno \ + perl-module-extutils-makemaker \ + perl-module-mime-base64 \ + perl-module-socket \ + zlib \ +" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ + file://no-exec-on-configure.patch \ + file://run-ptest \ + " +SRC_URI[md5sum] = "d602bdce4e0531c6efc276e3e429ca69" +SRC_URI[sha256sum] = "9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8" + +S = "${WORKDIR}/Net-SSLeay-${PV}" + +inherit cpan ptest + +do_configure() { + export OPENSSL_PREFIX="${STAGING_EXECPREFIXDIR}" + cpan_do_configure +} + +do_install_ptest() { + cp -r ${B}/t ${D}${PTEST_PATH} +} + +BBCLASSEXTEND = "native" + +FILES_${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/Net/SSLeay/.debug/" + +RDEPENDS_${PN}-ptest = " perl" -- cgit v1.2.3