Add openssl 1.1
cover Add openssl 1.1
This patch series introduces the recipe for openssl 1.1 (openssl 1.0 is preserved but renamed to openssl10), and does a few necessary adjustmenets and updates to other recipes.
Openssl 1.1 is an opt-out; it has the same recipe name as openssl 1.0 had, and so all dependencies are compiled with it by default. If there's an API issue, please fix it, or adjust the recipe to depend on 'openssl10' (which is a lesser solution, and subject to openssl 1.0 eventually being removed from oe-core).
The following changes since commit 50af58cedb3153f058d23a0a9584cf69bdcce81b:
systemd: refuse to load units with errors (CVE-2017-1000082) (2017-07-19 11:30:16 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib akanavin/openssl-1.1
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/openssl-1.1
Alexander Kanavin (4):
openssl: add a 1.1 version
openssh: depend on openssl 1.0
cryptodev-tests: depend on openssl 1.0
gstreamer-plugins-bad: replace openssl dependency with nettle for hls
plugin
Otavio Salvador (1):
u-boot: Upgrade to 2017.07 release
meta/conf/distro/include/no-static-libs.inc | 3 +
...ommon_2017.05.inc => u-boot-common_2017.07.inc} | 2 +-
...utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} | 0
...kimage_2017.05.bb => u-boot-mkimage_2017.07.bb} | 0
.../{u-boot_2017.05.bb => u-boot_2017.07.bb} | 0
meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 3 +-
...ve-test-that-requires-running-as-non-root.patch | 49 +++++++
...1-Take-linking-flags-from-LDFLAGS-env-var.patch | 43 ++++++
.../recipes-connectivity/openssl/openssl/run-ptest | 4 +-
.../openssl/{openssl.inc => openssl10.inc} | 14 +-
...build-with-clang-using-external-assembler.patch | 0
.../{openssl => openssl10}/Makefiles-ptest.patch | 0
.../Use-SHA256-not-MD5-as-default-digest.patch | 0
.../configure-musl-target.patch | 0
.../{openssl => openssl10}/configure-targets.patch | 0
.../debian/c_rehash-compat.patch | 0
.../openssl/{openssl => openssl10}/debian/ca.patch | 0
.../debian/debian-targets.patch | 0
.../{openssl => openssl10}/debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../{openssl => openssl10}/debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../{openssl => openssl10}/debian/pic.patch | 0
.../debian/version-script.patch | 0
.../debian1.0.2/block_digicert_malaysia.patch | 0
.../debian1.0.2/block_diginotar.patch | 0
.../debian1.0.2/soname.patch | 0
.../debian1.0.2/version-script.patch | 0
.../engines-install-in-libdir-ssl.patch | 0
.../openssl/{openssl => openssl10}/find.pl | 0
.../{openssl => openssl10}/oe-ldflags.patch | 0
.../openssl-1.0.2a-x32-asm.patch | 0
.../{openssl => openssl10}/openssl-c_rehash.sh | 0
.../openssl-fix-des.pod-error.patch | 0
.../openssl-util-perlpath.pl-cwd.patch | 0
.../openssl_fix_for_x32.patch | 0
.../openssl/{openssl => openssl10}/parallel.patch | 0
.../{openssl => openssl10}/ptest-deps.patch | 0
.../ptest_makefile_deps.patch | 0
.../openssl/openssl10/run-ptest | 2 +
.../{openssl => openssl10}/shared-libs.patch | 0
.../{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} | 4 +-
.../recipes-connectivity/openssl/openssl_1.1.0f.bb | 146 +++++++++++++++++++++
.../cryptodev/cryptodev-tests_1.8.bb | 2 +-
.../gstreamer/gstreamer1.0-plugins-bad.inc | 4 +-
45 files changed, 265 insertions(+), 11 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-common_2017.05.inc => u-boot-common_2017.07.inc} (88%)
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.05.bb => u-boot-mkimage_2017.07.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} (100%)
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch
mode change 100755 => 100644 meta/recipes-connectivity/openssl/openssl/run-ptest
rename meta/recipes-connectivity/openssl/{openssl.inc => openssl10.inc} (95%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/0001-Fix-build-with-clang-using-external-assembler.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Makefiles-ptest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Use-SHA256-not-MD5-as-default-digest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-musl-target.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_digicert_malaysia.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_diginotar.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/soname.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/find.pl (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-1.0.2a-x32-asm.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-c_rehash.sh (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-fix-des.pod-error.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-util-perlpath.pl-cwd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/parallel.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest-deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest_makefile_deps.patch (100%)
create mode 100755 meta/recipes-connectivity/openssl/openssl10/run-ptest
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} (96%)
create mode 100644 meta/recipes-connectivity/openssl/openssl_1.1.0f.bbSignature · 1 line
2.13.2
PATCH 1/5 openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will continue to be provided for as long as upstream supports it (and there are still several recipes which do not work with openssl 1.1 due to API differences).
A few files (such as openssl binary) are no longer installed by openssl 1.0, because they clash with openssl 1.1.
---
meta/conf/distro/include/no-static-libs.inc | 3 +
...ve-test-that-requires-running-as-non-root.patch | 49 +++++++
...1-Take-linking-flags-from-LDFLAGS-env-var.patch | 43 ++++++
.../recipes-connectivity/openssl/openssl/run-ptest | 4 +-
.../openssl/{openssl.inc => openssl10.inc} | 14 +-
...build-with-clang-using-external-assembler.patch | 0
.../{openssl => openssl10}/Makefiles-ptest.patch | 0
.../Use-SHA256-not-MD5-as-default-digest.patch | 0
.../configure-musl-target.patch | 0
.../{openssl => openssl10}/configure-targets.patch | 0
.../debian/c_rehash-compat.patch | 0
.../openssl/{openssl => openssl10}/debian/ca.patch | 0
.../debian/debian-targets.patch | 0
.../{openssl => openssl10}/debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../{openssl => openssl10}/debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../{openssl => openssl10}/debian/pic.patch | 0
.../debian/version-script.patch | 0
.../debian1.0.2/block_digicert_malaysia.patch | 0
.../debian1.0.2/block_diginotar.patch | 0
.../debian1.0.2/soname.patch | 0
.../debian1.0.2/version-script.patch | 0
.../engines-install-in-libdir-ssl.patch | 0
.../openssl/{openssl => openssl10}/find.pl | 0
.../{openssl => openssl10}/oe-ldflags.patch | 0
.../openssl-1.0.2a-x32-asm.patch | 0
.../{openssl => openssl10}/openssl-c_rehash.sh | 0
.../openssl-fix-des.pod-error.patch | 0
.../openssl-util-perlpath.pl-cwd.patch | 0
.../openssl_fix_for_x32.patch | 0
.../openssl/{openssl => openssl10}/parallel.patch | 0
.../{openssl => openssl10}/ptest-deps.patch | 0
.../ptest_makefile_deps.patch | 0
.../openssl/openssl10/run-ptest | 2 +
.../{openssl => openssl10}/shared-libs.patch | 0
.../{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} | 4 +-
.../recipes-connectivity/openssl/openssl_1.1.0f.bb | 146 +++++++++++++++++++++
38 files changed, 260 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch
create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch
mode change 100755 => 100644 meta/recipes-connectivity/openssl/openssl/run-ptest
rename meta/recipes-connectivity/openssl/{openssl.inc => openssl10.inc} (95%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/0001-Fix-build-with-clang-using-external-assembler.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Makefiles-ptest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Use-SHA256-not-MD5-as-default-digest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-musl-target.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_digicert_malaysia.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_diginotar.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/soname.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/find.pl (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-1.0.2a-x32-asm.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-c_rehash.sh (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-fix-des.pod-error.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-util-perlpath.pl-cwd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/parallel.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest-deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest_makefile_deps.patch (100%)
create mode 100755 meta/recipes-connectivity/openssl/openssl10/run-ptest
rename meta/recipes-connectivity/openssl/{openssl => openssl10}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} (96%)
create mode 100644 meta/recipes-connectivity/openssl/openssl_1.1.0f.bbmeta/conf/distro/include/no-static-libs.inc +3 -0
@@ -25,6 +25,9 @@ DISABLE_STATIC_pn-openjade-native = "" DISABLE_STATIC_pn-openssl = "" DISABLE_STATIC_pn-openssl-native = "" DISABLE_STATIC_pn-nativesdk-openssl = "" +DISABLE_STATIC_pn-openssl10 = "" +DISABLE_STATIC_pn-openssl10-native = "" +DISABLE_STATIC_pn-nativesdk-openssl10 = "" # libssp-static-dev included in build-appliance DISABLE_STATIC_pn-gcc-runtime = "" # libusb1-native is used to build static dfu-util-native
meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/run-ptest +3 -1
@@ -1,2 +1,4 @@ #!/bin/sh -make -k runtest +cd test +OPENSSL_ENGINES=../engines BLDTOP=.. SRCTOP=.. perl run_tests.pl +cd ..
meta/recipes-connectivity/openssl/openssl10.inc renamed from meta/recipes-connectivity/openssl/openssl.inc +12 -2
@@ -37,8 +37,6 @@ FILES_${PN} =+ " ${libdir}/ssl/*" FILES_${PN}-misc = "${libdir}/ssl/misc" RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" -PROVIDES += "openssl10" - # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto # package RRECOMMENDS on this package. This will enable the configuration # file to be installed for both the base openssl package and the libcrypto
@@ -252,3 +250,15 @@ do_install_append_class-native() { } BBCLASSEXTEND = "native nativesdk" + +PACKAGE_PREPROCESS_FUNCS += "openssl_package_preprocess" + +openssl_package_preprocess () { + for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do + rm $file + done + rm ${PKGD}/usr/bin/openssl + rm ${PKGD}/usr/bin/c_rehash + rmdir ${PKGD}/usr/bin + +}
meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch renamed from meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/Makefiles-ptest.patch renamed from meta/recipes-connectivity/openssl/openssl/Makefiles-ptest.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/Use-SHA256-not-MD5-as-default-digest.patch renamed from meta/recipes-connectivity/openssl/openssl/Use-SHA256-not-MD5-as-default-digest.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/configure-musl-target.patch renamed from meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/configure-targets.patch renamed from meta/recipes-connectivity/openssl/openssl/configure-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/c_rehash-compat.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/ca.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/debian-targets.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/debian-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/man-dir.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/man-dir.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/man-section.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/man-section.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/no-rpath.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/no-rpath.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/no-symbolic.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/no-symbolic.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/pic.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/pic.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl/debian/version-script.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_digicert_malaysia.patch renamed from meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_diginotar.patch renamed from meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian1.0.2/soname.patch renamed from meta/recipes-connectivity/openssl/openssl/debian1.0.2/soname.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/debian1.0.2/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/engines-install-in-libdir-ssl.patch renamed from meta/recipes-connectivity/openssl/openssl/engines-install-in-libdir-ssl.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/find.pl renamed from meta/recipes-connectivity/openssl/openssl/find.pl +0 -0
meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch renamed from meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/openssl-1.0.2a-x32-asm.patch renamed from meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/openssl-c_rehash.sh renamed from meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh +0 -0
meta/recipes-connectivity/openssl/openssl10/openssl-fix-des.pod-error.patch renamed from meta/recipes-connectivity/openssl/openssl/openssl-fix-des.pod-error.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/openssl-util-perlpath.pl-cwd.patch renamed from meta/recipes-connectivity/openssl/openssl/openssl-util-perlpath.pl-cwd.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/openssl_fix_for_x32.patch renamed from meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/parallel.patch renamed from meta/recipes-connectivity/openssl/openssl/parallel.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/ptest-deps.patch renamed from meta/recipes-connectivity/openssl/openssl/ptest-deps.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/ptest_makefile_deps.patch renamed from meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch +0 -0
meta/recipes-connectivity/openssl/openssl10/run-ptest new file +2 -0
@@ -0,0 +1,2 @@ +#!/bin/sh +make -k runtest
meta/recipes-connectivity/openssl/openssl10/shared-libs.patch renamed from meta/recipes-connectivity/openssl/openssl/shared-libs.patch +0 -0
meta/recipes-connectivity/openssl/openssl10_1.0.2l.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.2l.bb +2 -2
@@ -1,4 +1,4 @@ -require openssl.inc +require openssl10.inc # For target side versions of openssl enable support for OCF Linux driver # if they are available.
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225" export DIRS = "crypto ssl apps engines" export OE_LDFLAGS="${LDFLAGS}" -SRC_URI += "file://find.pl;subdir=${BP}/util/ \ +SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \ file://run-ptest \ file://openssl-c_rehash.sh \ file://configure-targets.patch \
meta/recipes-connectivity/openssl/openssl_1.1.0f.bb new file +146 -0
146 lines not on this page · raw message
Signature · 1 line
2.13.2
PATCH 2/5 openssh: depend on openssl 1.0
In reply to Alexander KanavinThe proposed openssl 1.1 patches are here:
https://github.com/openssh/openssh-portable/pull/48
Openssl maintainers are not in a hurry to get 1.1 support in; if it doesn't show up within reasonable time, we can take a patch from Fedora:
http://lists.mindrot.org/pipermail/openssh-unix-dev/2016-November/035454.html
--- meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-connectivity/openssh/openssh_7.5p1.bb +2 -1
@@ -8,7 +8,8 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -DEPENDS = "zlib openssl" +# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48 +DEPENDS = "zlib openssl10" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
Signature · 1 line
2.13.2
Re: [PATCH 2/5] openssh: depend on openssl 1.0
Quoted 4 lines · Alexander Kanavin
The proposed openssl 1.1 patches are here:
https://github.com/openssh/openssh-portable/pull/48Openssl maintainers are not in a hurry to get 1.1 support in;
Openssh maintainers?
Quoted 31 lines
if it doesn't show up within reasonable time, we can take a patch from Fedora:
http://lists.mindrot.org/pipermail/openssh-unix-dev/2016-November/035454.htmlSigned-off-by Alexander Kanavin <[email protected]>--- meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/recipes-connectivity/openssh/openssh_7.5p1.bb +2
-2@@ -8,7 +8,8 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -DEPENDS = "zlib openssl" +# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48 +DEPENDS = "zlib openssl10" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ --2.13.2
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 2/5] openssh: depend on openssl 1.0
Quoted 3 lines · Andre McCurdy
Quoted 1 line
Openssl maintainers are not in a hurry to get 1.1 support in;
Openssh maintainers?
Yes, them.
Alex
PATCH 3/5 cryptodev-tests: depend on openssl 1.0
In reply to Alexander KanavinUpstream ticket:
https://github.com/cryptodev-linux/cryptodev-linux/issues/22
--- meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb +1 -1
@@ -2,7 +2,7 @@ require cryptodev.inc SUMMARY = "A test suite for /dev/crypto device driver" -DEPENDS += "openssl" +DEPENDS += "openssl10" SRC_URI += " \ file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \
Signature · 1 line
2.13.2
PATCH 4/5 gstreamer-plugins-bad: replace openssl dependency with nettle for hls plugin
In reply to Alexander KanavinIt has not been ported to openssl 1.1 (and there's nothing in upstream git), but it's possible to use nettle or gcrypt intead.
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +1 -3
@@ -40,9 +40,7 @@ PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" -# ensure OpenSSL is used for HLS AES description instead of nettle -# (OpenSSL is a shared dependency with dtls) -PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl" +PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle" PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm" PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
Signature · 1 line
2.13.2
PATCH 5/5 u-boot: Upgrade to 2017.07 release
In reply to Alexander KanavinFrom: Otavio Salvador <[email protected]>
This patch upgrades the U-Boot to the 2017.07 release.
---
.../u-boot/{u-boot-common_2017.05.inc => u-boot-common_2017.07.inc} | 2 +-
.../u-boot/{u-boot-fw-utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} | 0
.../u-boot/{u-boot-mkimage_2017.05.bb => u-boot-mkimage_2017.07.bb} | 0
meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} | 0
4 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-bsp/u-boot/{u-boot-common_2017.05.inc => u-boot-common_2017.07.inc} (88%)
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.05.bb => u-boot-mkimage_2017.07.bb} (100%)
rename meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} (100%)meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc renamed from meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc +1 -1
@@ -7,7 +7,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda" +SRCREV = "d85ca029f257b53a96da6c2fb421e78a003a9943" SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \
meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.07.bb renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb +0 -0
meta/recipes-bsp/u-boot/u-boot-mkimage_2017.07.bb renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb +0 -0
meta/recipes-bsp/u-boot/u-boot_2017.07.bb renamed from meta/recipes-bsp/u-boot/u-boot_2017.05.bb +0 -0
Signature · 1 line
2.13.2
Quoted 8 lines · Alexander Kanavin
This patch series introduces the recipe for openssl 1.1 (openssl 1.0 is preserved but renamed to openssl10), and does a few necessary adjustmenets and updates to other recipes.
Openssl 1.1 is an opt-out; it has the same recipe name as openssl 1.0 had, and so all dependencies are compiled with it by default. If there's an API issue, please fix it, or adjust the recipe to depend on 'openssl10' (which is a lesser solution, and subject to openssl 1.0 eventually being removed from oe-core).
Are there any -native recipes which still need 1.0? Or could support for openssl10-native be dropped as part of this patch set?
Quoted 115 lines
The following changes since commit
50af58cedb3153f058d23a0a9584cf69bdcce81b:systemd: refuse to load units with errors (CVE-2017-1000082) (2017-07-19 11:30:16 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contribakanavin/openssl-1.1
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/openssl-1.1Alexander Kanavin (4):
openssl: add a 1.1 version
openssh: depend on openssl 1.0
cryptodev-tests: depend on openssl 1.0
gstreamer-plugins-bad: replace openssl dependency with nettle for hls
pluginOtavio Salvador (1):
u-boot: Upgrade to 2017.07 releasemeta/conf/distro/include/no-static-libs.inc | 3 + ...ommon_2017.05.inc => u-boot-common_2017.07.inc} | 2 +- ...utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} | 0 ...kimage_2017.05.bb => u-boot-mkimage_2017.07.bb} | 0 .../{u-boot_2017.05.bb => u-boot_2017.07.bb} | 0 meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 3 +- ...ve-test-that-requires-running-as-non-root.patch | 49 +++++++ ...1-Take-linking-flags-from-LDFLAGS-env-var.patch | 43 ++++++ .../recipes-connectivity/openssl/openssl/run-ptest | 4 +- .../openssl/{openssl.inc => openssl10.inc} | 14 +- ...build-with-clang-using-external-assembler.patch | 0 .../{openssl => openssl10}/Makefiles-ptest.patch | 0 .../Use-SHA256-not-MD5-as-default-digest.patch | 0 .../configure-musl-target.patch | 0 .../{openssl => openssl10}/configure-targets.patch | 0 .../debian/c_rehash-compat.patch | 0 .../openssl/{openssl => openssl10}/debian/ca.patch | 0 .../debian/debian-targets.patch | 0 .../{openssl => openssl10}/debian/man-dir.patch | 0 .../debian/man-section.patch | 0 .../{openssl => openssl10}/debian/no-rpath.patch | 0 .../debian/no-symbolic.patch | 0 .../{openssl => openssl10}/debian/pic.patch | 0 .../debian/version-script.patch | 0 .../debian1.0.2/block_digicert_malaysia.patch | 0 .../debian1.0.2/block_diginotar.patch | 0 .../debian1.0.2/soname.patch | 0 .../debian1.0.2/version-script.patch | 0 .../engines-install-in-libdir-ssl.patch | 0 .../openssl/{openssl => openssl10}/find.pl | 0 .../{openssl => openssl10}/oe-ldflags.patch | 0 .../openssl-1.0.2a-x32-asm.patch | 0 .../{openssl => openssl10}/openssl-c_rehash.sh | 0 .../openssl-fix-des.pod-error.patch | 0 .../openssl-util-perlpath.pl-cwd.patch | 0 .../openssl_fix_for_x32.patch | 0 .../openssl/{openssl => openssl10}/parallel.patch | 0 .../{openssl => openssl10}/ptest-deps.patch | 0 .../ptest_makefile_deps.patch | 0 .../openssl/openssl10/run-ptest | 2 + .../{openssl => openssl10}/shared-libs.patch | 0 .../{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} | 4 +- .../recipes-connectivity/openssl/openssl_1.1.0f.bb | 146 +++++++++++++++++++++ .../cryptodev/cryptodev-tests_1.8.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-bad.inc | 4 +- 45 files changed, 265 insertions(+), 11 deletions(-) rename meta/recipes-bsp/u-boot/{u-boot-common_2017.05.inc => u-boot-common_2017.07.inc} (88%) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.05.bb => u-boot-fw-utils_2017.07.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.05.bb => u-boot-mkimage_2017.07.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2017.05.bb => u-boot_2017.07.bb} (100%) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Remove-test-that-requires-running-as-non-root.patch create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch mode change 100755 => 100644 meta/recipes-connectivity/openssl/openssl/run-ptest rename meta/recipes-connectivity/openssl/{openssl.inc => openssl10.inc} (95%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/0001-Fix-build-with-clang-using-external-assembler.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Makefiles-ptest.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/Use-SHA256-not-MD5-as-default-digest.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-musl-target.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/configure-targets.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/c_rehash-compat.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/ca.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/debian-targets.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-dir.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/man-section.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-rpath.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/no-symbolic.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/pic.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian/version-script.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_digicert_malaysia.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/block_diginotar.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/soname.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/debian1.0.2/version-script.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/engines-install-in-libdir-ssl.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/find.pl (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/oe-ldflags.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-1.0.2a-x32-asm.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-c_rehash.sh (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-fix-des.pod-error.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl-util-perlpath.pl-cwd.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/openssl_fix_for_x32.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/parallel.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest-deps.patch (100%) rename meta/recipes-connectivity/openssl/{openssl => openssl10}/ptest_makefile_deps.patch (100%) create mode 100755 meta/recipes-connectivity/openssl/openssl10/run-ptest rename meta/recipes-connectivity/openssl/{openssl => openssl10}/shared-libs.patch (100%) rename meta/recipes-connectivity/openssl/{openssl_1.0.2l.bb => openssl10_1.0.2l.bb} (96%) create mode 100644 meta/recipes-connectivity/openssl/openssl_1.1.0f.bb--
2.13.2--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 7 lines · Andre McCurdy
Quoted 4 lines
Openssl 1.1 is an opt-out; it has the same recipe name as openssl 1.0 had, and so all dependencies are compiled with it by default. If there's an API issue, please fix it, or adjust the recipe to depend on 'openssl10' (which is a lesser solution, and subject to openssl 1.0 eventually being removed from oe-core).
Are there any -native recipes which still need 1.0? Or could support for openssl10-native be dropped as part of this patch set?
There are also other layers out there which may need 1.0-native, and so this would cause unnecessary breakage. Let's just leave 1.0 alone and drop it altogether when time comes.
Alex
Quoted 6 lines · Alexander Kanavin
Quoted 5 lines · Andre McCurdy
Quoted 4 lines
Openssl 1.1 is an opt-out; it has the same recipe name as openssl 1.0 had, and so all dependencies are compiled with it by default. If there's an API issue, please fix it, or adjust the recipe to depend on 'openssl10' (which is a lesser solution, and subject to openssl 1.0 eventually being removed from oe-core).
Quoted 6 lines
Quoted 2 lines
Are there any -native recipes which still need 1.0? Or could support for openssl10-native be dropped as part of this patch set?
There are also other layers out there which may need 1.0-native, and so this would cause unnecessary breakage. Let's just leave 1.0 alone and drop it altogether when time comes.
I would agree with this as well. I've seen various SDK signing apps and such that need to be linked to OpenSSL 1.0, so if it was removed it would like need to be re-added by people to support their custom infrastructures.
--Mark
Quoted 2 lines
Alex