linux-libc-headers: refresh 0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch

index a3fa59001d2..064a39193de 100644
@@ -80,12 +80,11 @@ Index: linux-4.15/include/uapi/linux/libc-compat.h
  
  /* Definitions for if.h */
  #ifndef __UAPI_DEF_IF_IFCONF
-@@ -262,7 +253,7 @@
+@@ -262,6 +253,6 @@
  #define __UAPI_DEF_XATTR		1
  #endif
  
 -#endif /* __GLIBC__ */
 +#endif /* __KERNEL__ */
  
- /* Definitions for if_ether.h */
- /* allow libcs like musl to deactivate this, glibc does not implement this. */
+ #endif /* _UAPI_LIBC_COMPAT_H */

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-Fix-build-with-clang-using-external-assembler.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/0001-openssl-force-soft-link-to-avoid-rare-race.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/Makefiles-ptest.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/Use-SHA256-not-MD5-as-default-digest.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-musl-target.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/configure-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/c_rehash-compat.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/ca.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/debian-targets.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-dir.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/man-section.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-rpath.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/no-symbolic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian/pic.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_digicert_malaysia.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/block_diginotar.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/soname.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/debian1.0.2/version-script.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/engines-install-in-libdir-ssl.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/find.pl
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/oe-ldflags.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-c_rehash.sh
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-fix-des.pod-error.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl-util-perlpath.pl-cwd.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/openssl_fix_for_x32.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/parallel.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest-deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/ptest_makefile_deps.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/reproducible-cflags.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/reproducible-mkbuildinf.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/run-ptest
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest

similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl-1.0.2n/shared-libs.patch
rename to meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch

similarity index 91%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2n.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index ae851067f91..413ebf37f4c 100644
@@ -6,7 +6,7 @@ require openssl10.inc
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 CFLAG_append_class-native = " -fPIC"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=057d9218c6180e1d9ee407572b2dd225"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f475368924827d06d4b416111c8bdb77"
 
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"

@@ -47,8 +47,8 @@ SRC_URI_append_class-target = "\
            file://reproducible-cflags.patch \
            file://reproducible-mkbuildinf.patch \
            "
-SRC_URI[md5sum] = "13bdc1b1d1ff39b6fd42a255e74676a4"
-SRC_URI[sha256sum] = "370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe"
+SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114"
+SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"
 
 PACKAGES =+ "${PN}-engines"
 FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"

deleted file mode 100644
index 736bb39acd1..00000000000
@@ -1,49 +0,0 @@
-From 3fdb1e2a16ea405c6731447a8994f222808ef7e6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 7 Apr 2017 18:01:52 +0300
-Subject: [PATCH] Remove test that requires running as non-root
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- test/recipes/40-test_rehash.t | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/test/recipes/40-test_rehash.t b/test/recipes/40-test_rehash.t
-index f902c23..c7567c1 100644
---- a/test/recipes/40-test_rehash.t
-+++ b/test/recipes/40-test_rehash.t
-@@ -23,7 +23,7 @@ setup("test_rehash");
- plan skip_all => "test_rehash is not available on this platform"
-     unless run(app(["openssl", "rehash", "-help"]));
- 
--plan tests => 5;
-+plan tests => 3;
- 
- indir "rehash.$$" => sub {
-     prepare();
-@@ -42,21 +42,6 @@ indir "rehash.$$" => sub {
-        'Testing rehash operations on empty directory');
- }, create => 1, cleanup => 1;
- 
--indir "rehash.$$" => sub {
--    prepare();
--    chmod 0500, curdir();
--  SKIP: {
--      if (!ok(!open(FOO, ">unwritable.txt"),
--              "Testing that we aren't running as a privileged user, such as root")) {
--          close FOO;
--          skip "It's pointless to run the next test as root", 1;
--      }
--      isnt(run(app(["openssl", "rehash", curdir()])), 1,
--           'Testing rehash operations on readonly directory');
--    }
--    chmod 0700, curdir();       # make it writable again, so cleanup works
--}, create => 1, cleanup => 1;
--
- sub prepare {
-     my @pemsourcefiles = sort glob(srctop_file('test', "*.pem"));
-     my @destfiles = ();
--- 
-2.11.0
-

88 lines not on this page · raw message

similarity index 91%
rename from meta/recipes-connectivity/openssl/openssl_1.1.0g.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 0fd6819fff1..94b75eb92a8 100644
@@ -6,20 +6,18 @@ SECTION = "libs/network"
 
 # "openssl | SSLeay" dual license
 LICENSE = "openssl"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cae6da10f4ffd9703214776d2aabce32"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "ba5f1b8b835b88cadbce9b35ed9531a6"
-SRC_URI[sha256sum] = "de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"
+SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24"
+SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
            file://run-ptest \
            file://openssl-c_rehash.sh \
            file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \
-           file://0001-Remove-test-that-requires-running-as-non-root.patch \
-           file://0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch \
-          "
+           "
 
 S = "${WORKDIR}/openssl-${PV}"