openssl: Update from 1.0.2o to 1.0.2p
PATCH 1/1 openssl: Update from 1.0.2o to 1.0.2p
Refresh parallel.patch.
Remove duplicate LIC_FILES_CHKSUM assignment. The final md5 value is unchanged.
Signed-off-by Robert Joslyn <[email protected]>
---
...-with-clang-using-external-assembler.patch | 0
...l-force-soft-link-to-avoid-rare-race.patch | 0
.../Makefiles-ptest.patch | 0
...Use-SHA256-not-MD5-as-default-digest.patch | 0
.../configure-musl-target.patch | 0
.../configure-targets.patch | 0
.../debian/c_rehash-compat.patch | 0
.../debian/ca.patch | 0
.../debian/debian-targets.patch | 0
.../debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../debian/pic.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
.../find.pl | 0
.../oe-ldflags.patch | 0
.../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
.../parallel.patch | 40 +++++++++----------
.../ptest-deps.patch | 0
.../ptest_makefile_deps.patch | 0
.../reproducible-cflags.patch | 0
.../reproducible-mkbuildinf.patch | 0
.../run-ptest | 0
.../shared-libs.patch | 0
.../openssl/openssl10.inc | 2 +-
.../{openssl_1.0.2o.bb => openssl_1.0.2p.bb} | 6 +--
34 files changed, 22 insertions(+), 26 deletions(-)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/0001-Fix-build-with-clang-using-external-assembler.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/0001-openssl-force-soft-link-to-avoid-rare-race.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/Makefiles-ptest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/Use-SHA256-not-MD5-as-default-digest.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/configure-musl-target.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian1.0.2/block_digicert_malaysia.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian1.0.2/block_diginotar.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian1.0.2/soname.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/debian1.0.2/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/find.pl (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/openssl-c_rehash.sh (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/openssl-fix-des.pod-error.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/openssl-util-perlpath.pl-cwd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/parallel.patch (92%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/ptest-deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/ptest_makefile_deps.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/reproducible-cflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/reproducible-mkbuildinf.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/run-ptest (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.2o => openssl-1.0.2p}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.2o.bb => openssl_1.0.2p.bb} (91%)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 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/Makefiles-ptest.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch +0 -0
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 -0
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 -0
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 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch +0 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/find.pl renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl +0 -0
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 -0
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 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/openssl-util-perlpath.pl-cwd.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch +0 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/parallel.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch +19 -21
@@ -13,24 +13,18 @@ Refreshed for 1.0.2i Signed-off-by: Patrick Ohly <[email protected]> --- - Makefile.org | 14 +- - Makefile.org.orig | 10 +- - Makefile.shared | 2 + - Makefile.shared.orig | 655 ++++++++++++++++++++++++++++++++++++++++++++++++++ - crypto/Makefile | 10 +- - engines/Makefile | 6 +- - engines/Makefile.orig | 338 ++++++++++++++++++++++++++ - test/Makefile | 92 +++---- - test/Makefile.orig | 88 ++++--- - 9 files changed, 1108 insertions(+), 107 deletions(-) - create mode 100644 Makefile.shared.orig - create mode 100644 engines/Makefile.orig + Makefile.org | 14 ++-- + Makefile.shared | 2 + + crypto/Makefile | 10 +-- + engines/Makefile | 6 +- + test/Makefile | 94 +++++++++++----------- + 5 files changed, 64 insertions(+), 62 deletions(-) diff --git a/Makefile.org b/Makefile.org -index 8e7936c..ed98d2a 100644 +index efcfafb..82eab91 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -283,17 +283,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc +@@ -282,17 +282,17 @@ build_libcrypto: build_crypto build_engines libcrypto.pc build_libssl: build_ssl libssl.pc build_crypto:
@@ -54,7 +48,7 @@ index 8e7936c..ed98d2a 100644 all_testapps: build_libs build_testapps build_testapps: -@@ -565,7 +565,7 @@ install_sw: +@@ -564,7 +564,7 @@ install_sw: (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ done;
@@ -64,7 +58,7 @@ index 8e7936c..ed98d2a 100644 do \ if [ -f "$$i" ]; then \ diff --git a/Makefile.shared b/Makefile.shared -index f6f92e7..8164186 100644 +index bbefb2b..18013a9 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -105,6 +105,7 @@ LINK_SO= \
@@ -84,7 +78,7 @@ index f6f92e7..8164186 100644 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ fi; \ diff --git a/crypto/Makefile b/crypto/Makefile -index 17a87f8..29c2dcf 100644 +index 875ea1a..c22b683 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -85,11 +85,11 @@ testapps:
@@ -160,7 +154,7 @@ index fe8e9ca..a43d21b 100644 tags: ctags $(SRC) diff --git a/test/Makefile b/test/Makefile -index 40abd60..78d3788 100644 +index 36506cf..c69af8b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -145,7 +145,7 @@ install:
@@ -172,7 +166,7 @@ index 40abd60..78d3788 100644 apps: @(cd ..; $(MAKE) DIRS=apps all) -@@ -444,139 +444,139 @@ BUILD_CMD_STATIC=shlib_target=; \ +@@ -448,142 +448,142 @@ BUILD_CMD_STATIC=shlib_target=; \ link_app.$${shlib_target} $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
@@ -345,7 +339,11 @@ index 40abd60..78d3788 100644 $(FATALERRTEST)$(EXE_EXT): $(FATALERRTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) @target=$(FATALERRTEST); exobj=ssltestlib.o; $(BUILD_CMD) - + + $(X509TIMETEST)$(EXE_EXT): $(X509TIMETEST).o +- @target=$(X509TIMETEST) $(BUILD_CMD) ++ +@target=$(X509TIMETEST) $(BUILD_CMD) + $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o - @target=$(SSLV2CONFTEST) $(BUILD_CMD) + +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
@@ -356,7 +354,7 @@ index 40abd60..78d3788 100644 #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c -@@ -589,7 +589,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) +@@ -596,7 +596,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) # fi dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
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 -0
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 -0
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 -0
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 -0
meta/recipes-connectivity/openssl/openssl-1.0.2p/run-ptest renamed from meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest +0 -0
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 -0
meta/recipes-connectivity/openssl/openssl10.inc +1 -1
@@ -6,7 +6,7 @@ SECTION = "libs/network" # "openssl | SSLeay" dual license LICENSE = "openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f475368924827d06d4b416111c8bdb77" DEPENDS = "makedepend-native hostperl-runtime-native" DEPENDS_append_class-target = " openssl-native"
meta/recipes-connectivity/openssl/openssl_1.0.2p.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.2o.bb +2 -4
@@ -6,8 +6,6 @@ require openssl10.inc CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" CFLAG_append_class-native = " -fPIC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f475368924827d06d4b416111c8bdb77" - export DIRS = "crypto ssl apps engines" export OE_LDFLAGS="${LDFLAGS}"
@@ -47,8 +45,8 @@ SRC_URI_append_class-target = "\ file://reproducible-cflags.patch \ file://reproducible-mkbuildinf.patch \ " -SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114" -SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" +SRC_URI[md5sum] = "ac5eb30bf5798aa14b1ae6d0e7da58df" +SRC_URI[sha256sum] = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00" PACKAGES =+ "${PN}-engines" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
Signature · 1 line
2.18.1