summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-08-16 14:27:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-19 16:35:22 +0100
commit06b5355b9d4c75e3d8b8f6cfa0f83a505eb07934 (patch)
treea9df16f7086916f206f5586b3f356b211bf80bf5 /meta/recipes-connectivity
parent4c8780f6de45c7c5a767d8dba8fd35a87d720549 (diff)
downloadpoky-06b5355b9d4c75e3d8b8f6cfa0f83a505eb07934.tar.gz
openssl: update 1.0.2o -> 1.0.2p
Please see this security advisory: https://www.openssl.org/news/secadv/20180612.txt Refresh patches (From OE-Core rev: ff3db93e53c4f9d56807d3755c799459944e9a87) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-Fix-build-with-clang-using-external-assembler.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-allow-manpages-to-be-disabled.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-openssl-force-soft-link-to-avoid-rare-race.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch)18
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/Use-SHA256-not-MD5-as-default-digest.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-musl-target.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_digicert_malaysia.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_diginotar.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/soname.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/engines-install-in-libdir-ssl.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/oe-ldflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-c_rehash.sh (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-fix-des.pod-error.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl_fix_for_x32.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch)40
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest-deps.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest_makefile_deps.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-cflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-mkbuildinf.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch)0
-rwxr-xr-xmeta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2p/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2p.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2o.bb)4
31 files changed, 28 insertions, 34 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-Fix-build-with-clang-using-external-assembler.patch
index 2270962a6f..2270962a6f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-Fix-build-with-clang-using-external-assembler.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-allow-manpages-to-be-disabled.patch
index 3f7d649955..3f7d649955 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-allow-manpages-to-be-disabled.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-openssl-force-soft-link-to-avoid-rare-race.patch
index dd1a9b1dd2..dd1a9b1dd2 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/0001-openssl-force-soft-link-to-avoid-rare-race.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch
index 2122fa1fb4..1b8402af97 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch
@@ -11,18 +11,15 @@ Signed-off-by: Maxin B. John <maxin.john@enea.com>
11Upstream-Status: Pending 11Upstream-Status: Pending
12 12
13--- 13---
14 Makefile.org | 10 +- 14 Makefile.org | 10 +++++++++-
15 Makefile.org.orig | 7 +- 15 test/Makefile | 13 +++++++++----
16 test/Makefile | 13 +- 16 2 files changed, 18 insertions(+), 5 deletions(-)
17 test/Makefile.orig | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 17
18 4 files changed, 1009 insertions(+), 8 deletions(-)
19 create mode 100644 test/Makefile.orig
20
21diff --git a/Makefile.org b/Makefile.org 18diff --git a/Makefile.org b/Makefile.org
22index 111fbba..8e7936c 100644 19index 111fbba..8e7936c 100644
23--- a/Makefile.org 20--- a/Makefile.org
24+++ b/Makefile.org 21+++ b/Makefile.org
25@@ -468,8 +468,16 @@ rehash.time: certs apps 22@@ -467,8 +467,16 @@ rehash.time: certs apps
26 test: tests 23 test: tests
27 24
28 tests: rehash 25 tests: rehash
@@ -41,7 +38,7 @@ index 111fbba..8e7936c 100644
41 38
42 report: 39 report:
43diff --git a/test/Makefile b/test/Makefile 40diff --git a/test/Makefile b/test/Makefile
44index a1f7eeb..b2984c4 100644 41index 55a6b50..d46b4d1 100644
45--- a/test/Makefile 42--- a/test/Makefile
46+++ b/test/Makefile 43+++ b/test/Makefile
47@@ -150,7 +150,7 @@ tests: exe apps $(TESTS) 44@@ -150,7 +150,7 @@ tests: exe apps $(TESTS)
@@ -55,7 +52,7 @@ index a1f7eeb..b2984c4 100644
55 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ 52 test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \
56@@ -162,6 +162,11 @@ alltests: \ 53@@ -162,6 +162,11 @@ alltests: \
57 test_constant_time test_verify_extra test_clienthello test_sslv2conftest \ 54 test_constant_time test_verify_extra test_clienthello test_sslv2conftest \
58 test_dtls test_bad_dtls test_fatalerr 55 test_dtls test_bad_dtls test_fatalerr test_x509_time
59 56
60+alltests: 57+alltests:
61+ @(for i in $(all-tests); do \ 58+ @(for i in $(all-tests); do \
@@ -90,4 +87,3 @@ index a1f7eeb..b2984c4 100644
90 87
91-- 88--
922.15.1 892.15.1
93
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/Use-SHA256-not-MD5-as-default-digest.patch
index 58c9ee7844..58c9ee7844 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/Use-SHA256-not-MD5-as-default-digest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-musl-target.patch
index f357b3f59f..f357b3f59f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-musl-target.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-targets.patch
index 1e01589722..1e01589722 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch
index 3820e3e306..3820e3e306 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch
index 35d92bedb7..35d92bedb7 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch
index 4085e3b1d7..4085e3b1d7 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch
index 21c1d1a4eb..21c1d1a4eb 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch
index 1ccb3b86ee..1ccb3b86ee 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch
index cc4408ab7d..cc4408ab7d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch
index bfda3888bf..bfda3888bf 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_digicert_malaysia.patch
index c43bcd1c77..c43bcd1c77 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_digicert_malaysia.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_diginotar.patch
index d81e22cd8d..d81e22cd8d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/block_diginotar.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/soname.patch
index 09dd9eaf86..09dd9eaf86 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/soname.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/version-script.patch
index e404ee3312..e404ee3312 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/debian1.0.2/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/engines-install-in-libdir-ssl.patch
index a5746483e6..a5746483e6 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/oe-ldflags.patch
index 292e13dc5f..292e13dc5f 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-c_rehash.sh
index 6620fdcb53..6620fdcb53 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-c_rehash.sh
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-fix-des.pod-error.patch
index de49729e5e..de49729e5e 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-fix-des.pod-error.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl_fix_for_x32.patch
index 0f08a642f6..0f08a642f6 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch
index e5413bf389..41abf3d6bd 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch
@@ -13,24 +13,18 @@ Refreshed for 1.0.2i
13Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> 13Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
14 14
15--- 15---
16 Makefile.org | 14 +- 16 Makefile.org | 14 ++--
17 Makefile.org.orig | 10 +- 17 Makefile.shared | 2 +
18 Makefile.shared | 2 + 18 crypto/Makefile | 10 +--
19 Makefile.shared.orig | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++ 19 engines/Makefile | 6 +-
20 crypto/Makefile | 10 +- 20 test/Makefile | 94 +++++++++++-----------
21 engines/Makefile | 6 +- 21 5 files changed, 64 insertions(+), 62 deletions(-)
22 engines/Makefile.orig | 338 ++++++++++++++++++++++++++
23 test/Makefile | 92 +++----
24 test/Makefile.orig | 88 ++++---
25 9 files changed, 1108 insertions(+), 107 deletions(-)
26 create mode 100644 Makefile.shared.orig
27 create mode 100644 engines/Makefile.orig
28 22
29diff --git a/Makefile.org b/Makefile.org 23diff --git a/Makefile.org b/Makefile.org
30index 8e7936c..ed98d2a 100644 24index efcfafb..82eab91 100644
31--- a/Makefile.org 25--- a/Makefile.org
32+++ b/Makefile.org 26+++ b/Makefile.org
33@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc 27@@ -282,17 +282,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc
34 build_libssl: build_ssl libssl.pc 28 build_libssl: build_ssl libssl.pc
35 29
36 build_crypto: 30 build_crypto:
@@ -54,7 +48,7 @@ index 8e7936c..ed98d2a 100644
54 48
55 all_testapps: build_libs build_testapps 49 all_testapps: build_libs build_testapps
56 build_testapps: 50 build_testapps:
57@@ -565,7 +565,7 @@ install_sw: 51@@ -564,7 +564,7 @@ install_sw:
58 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 52 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
59 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 53 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
60 done; 54 done;
@@ -64,7 +58,7 @@ index 8e7936c..ed98d2a 100644
64 do \ 58 do \
65 if [ -f "$$i" ]; then \ 59 if [ -f "$$i" ]; then \
66diff --git a/Makefile.shared b/Makefile.shared 60diff --git a/Makefile.shared b/Makefile.shared
67index f6f92e7..8164186 100644 61index bbefb2b..18013a9 100644
68--- a/Makefile.shared 62--- a/Makefile.shared
69+++ b/Makefile.shared 63+++ b/Makefile.shared
70@@ -105,6 +105,7 @@ LINK_SO= \ 64@@ -105,6 +105,7 @@ LINK_SO= \
@@ -84,7 +78,7 @@ index f6f92e7..8164186 100644
84 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ 78 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
85 fi; \ 79 fi; \
86diff --git a/crypto/Makefile b/crypto/Makefile 80diff --git a/crypto/Makefile b/crypto/Makefile
87index 17a87f8..29c2dcf 100644 81index 875ea1a..c22b683 100644
88--- a/crypto/Makefile 82--- a/crypto/Makefile
89+++ b/crypto/Makefile 83+++ b/crypto/Makefile
90@@ -85,11 +85,11 @@ testapps: 84@@ -85,11 +85,11 @@ testapps:
@@ -160,7 +154,7 @@ index fe8e9ca..a43d21b 100644
160 tags: 154 tags:
161 ctags $(SRC) 155 ctags $(SRC)
162diff --git a/test/Makefile b/test/Makefile 156diff --git a/test/Makefile b/test/Makefile
163index 40abd60..78d3788 100644 157index 36506cf..c69af8b 100644
164--- a/test/Makefile 158--- a/test/Makefile
165+++ b/test/Makefile 159+++ b/test/Makefile
166@@ -145,7 +145,7 @@ install: 160@@ -145,7 +145,7 @@ install:
@@ -172,7 +166,7 @@ index 40abd60..78d3788 100644
172 166
173 apps: 167 apps:
174 @(cd ..; $(MAKE) DIRS=apps all) 168 @(cd ..; $(MAKE) DIRS=apps all)
175@@ -444,139 +444,139 @@ BUILD_CMD_STATIC=shlib_target=; \ 169@@ -448,142 +448,142 @@ BUILD_CMD_STATIC=shlib_target=; \
176 link_app.$${shlib_target} 170 link_app.$${shlib_target}
177 171
178 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) 172 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -345,7 +339,11 @@ index 40abd60..78d3788 100644
345 339
346 $(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) 340 $(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
347 @target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD) 341 @target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD)
348 342
343 $(X509TIMETEST)$(EXE_EXT): $(X509TIMETEST).o
344- @target=$(X509TIMETEST) $(BUILD_CMD)
345+ +@target=$(X509TIMETEST) $(BUILD_CMD)
346
349 $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o 347 $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
350- @target=$(SSLV2CONFTEST) $(BUILD_CMD) 348- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
351+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD) 349+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
@@ -356,7 +354,7 @@ index 40abd60..78d3788 100644
356 354
357 #$(AESTEST).o: $(AESTEST).c 355 #$(AESTEST).o: $(AESTEST).c
358 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c 356 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
359@@ -589,7 +589,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) 357@@ -596,7 +596,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
360 # fi 358 # fi
361 359
362 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) 360 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest-deps.patch
index ef6d17934d..ef6d17934d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest-deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest_makefile_deps.patch
index 4202e61d1e..4202e61d1e 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/ptest_makefile_deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-cflags.patch
index 2803cb0393..2803cb0393 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-cflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-mkbuildinf.patch
index b556731219..b556731219 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/reproducible-mkbuildinf.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest b/meta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest
index 3b20fce1ee..3b20fce1ee 100755
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2p/shared-libs.patch
index a7ca0a3078..a7ca0a3078 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2p/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
index 8ba03b603c..5d419772f9 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2p.bb
@@ -53,8 +53,8 @@ SRC_URI_append_class-nativesdk = " \
53 file://environment.d-openssl.sh \ 53 file://environment.d-openssl.sh \
54 " 54 "
55 55
56SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114" 56SRC_URI[md5sum] = "ac5eb30bf5798aa14b1ae6d0e7da58df"
57SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" 57SRC_URI[sha256sum] = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"
58 58
59UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" 59UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
60 60