From fc1d2b4ec7e7f5c5e2b3434bc8208967ead6f336 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 10 Aug 2014 17:06:58 +0100 Subject: openssl: upgrade to 1.0.1i Removed one patch merged upstream. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../openssl/heartbeat-test-private-api.patch | 45 ----------------- .../recipes-connectivity/openssl/openssl_1.0.1h.bb | 58 ---------------------- .../recipes-connectivity/openssl/openssl_1.0.1i.bb | 57 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 103 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch delete mode 100644 meta/recipes-connectivity/openssl/openssl_1.0.1h.bb create mode 100644 meta/recipes-connectivity/openssl/openssl_1.0.1i.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch b/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch deleted file mode 100644 index 3c77dfcdf0..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx -Date: Sat, 7 Jun 2014 13:32:23 +0200 -Subject: [PATCH] Link heartbeat_test with the static version of the libraries - -It's using an internal API that that might not be available in the shared -library. - -Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/125] -Signed-off-by: Paul Eggleton - ---- - test/Makefile | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/test/Makefile b/test/Makefile -index f1816ac..1dd7bb9 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -420,6 +420,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -+BUILD_CMD_STATIC=shlib_target=; \ -+ LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \ -+ $(MAKE) -f $(TOP)/Makefile.shared -e \ -+ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ -+ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ -+ link_app.$${shlib_target} -+ - $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) - @target=$(RSATEST); $(BUILD_CMD) - -@@ -618,7 +625,7 @@ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) - @target=$(V3NAMETEST); $(BUILD_CMD) - - $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) -- @target=$(HEARTBEATTEST); $(BUILD_CMD) -+ @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) - - #$(AESTEST).o: $(AESTEST).c - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c --- -1.9.3 - diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb deleted file mode 100644 index ddaaba8836..0000000000 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb +++ /dev/null @@ -1,58 +0,0 @@ -require openssl.inc - -# For target side versions of openssl enable support for OCF Linux driver -# if they are available. -DEPENDS += "cryptodev-linux" - -CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" - -export DIRS = "crypto ssl apps engines" -export OE_LDFLAGS="${LDFLAGS}" - -SRC_URI += "file://configure-targets.patch \ - file://shared-libs.patch \ - file://oe-ldflags.patch \ - file://engines-install-in-libdir-ssl.patch \ - file://openssl-fix-link.patch \ - file://debian/version-script.patch \ - file://debian/pic.patch \ - file://debian/c_rehash-compat.patch \ - file://debian/ca.patch \ - file://debian/make-targets.patch \ - file://debian/no-rpath.patch \ - file://debian/man-dir.patch \ - file://debian/man-section.patch \ - file://debian/no-symbolic.patch \ - file://debian/debian-targets.patch \ - file://openssl_fix_for_x32.patch \ - file://fix-cipher-des-ede3-cfb1.patch \ - file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ - file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ - file://initial-aarch64-bits.patch \ - file://find.pl \ - file://openssl-fix-des.pod-error.patch \ - file://Makefiles-ptest.patch \ - file://heartbeat-test-private-api.patch \ - file://ptest-deps.patch \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "8d6d684a9430d5cc98a62a5d8fbda8cf" -SRC_URI[sha256sum] = "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093" - -PACKAGES =+ " \ - ${PN}-engines \ - ${PN}-engines-dbg \ - " - -FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" -FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" - -PARALLEL_MAKE = "" -PARALLEL_MAKEINST = "" - -do_configure_prepend() { - cp ${WORKDIR}/find.pl ${S}/util/find.pl -} diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1i.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1i.bb new file mode 100644 index 0000000000..4f88784056 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1i.bb @@ -0,0 +1,57 @@ +require openssl.inc + +# For target side versions of openssl enable support for OCF Linux driver +# if they are available. +DEPENDS += "cryptodev-linux" + +CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" + +export DIRS = "crypto ssl apps engines" +export OE_LDFLAGS="${LDFLAGS}" + +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://oe-ldflags.patch \ + file://engines-install-in-libdir-ssl.patch \ + file://openssl-fix-link.patch \ + file://debian/version-script.patch \ + file://debian/pic.patch \ + file://debian/c_rehash-compat.patch \ + file://debian/ca.patch \ + file://debian/make-targets.patch \ + file://debian/no-rpath.patch \ + file://debian/man-dir.patch \ + file://debian/man-section.patch \ + file://debian/no-symbolic.patch \ + file://debian/debian-targets.patch \ + file://openssl_fix_for_x32.patch \ + file://fix-cipher-des-ede3-cfb1.patch \ + file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ + file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \ + file://initial-aarch64-bits.patch \ + file://find.pl \ + file://openssl-fix-des.pod-error.patch \ + file://Makefiles-ptest.patch \ + file://ptest-deps.patch \ + file://run-ptest \ + " + +SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972" +SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7" + +PACKAGES =+ " \ + ${PN}-engines \ + ${PN}-engines-dbg \ + " + +FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" +FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" + +PARALLEL_MAKE = "" +PARALLEL_MAKEINST = "" + +do_configure_prepend() { + cp ${WORKDIR}/find.pl ${S}/util/find.pl +} -- cgit 1.2.3-korg