summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-08-10 16:06:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:27:34 (GMT)
commit4ca81d6af9045bf9d2da35073f623dbae528eabb (patch)
treeb3ff4c853b235e75dba64d59595a15fdbcd22a7f /meta/recipes-connectivity
parent2c175fcf8532b33c8d005d5ed019a131cb4e0859 (diff)
downloadpoky-4ca81d6af9045bf9d2da35073f623dbae528eabb.tar.gz
openssl: upgrade to 1.0.1i
Removed one patch merged upstream. (From OE-Core rev: fc1d2b4ec7e7f5c5e2b3434bc8208967ead6f336) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch45
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1i.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.1h.bb)5
2 files changed, 2 insertions, 48 deletions
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 3c77dfc..0000000
--- a/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001
2From: Kurt Roeckx <kurt@roeckx.be>
3Date: Sat, 7 Jun 2014 13:32:23 +0200
4Subject: [PATCH] Link heartbeat_test with the static version of the libraries
5
6It's using an internal API that that might not be available in the shared
7library.
8
9Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/125]
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11
12---
13 test/Makefile | 9 ++++++++-
14 1 file changed, 8 insertions(+), 1 deletion(-)
15
16diff --git a/test/Makefile b/test/Makefile
17index f1816ac..1dd7bb9 100644
18--- a/test/Makefile
19+++ b/test/Makefile
20@@ -420,6 +420,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
21 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
22 link_app.$${shlib_target}
23
24+BUILD_CMD_STATIC=shlib_target=; \
25+ LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \
26+ $(MAKE) -f $(TOP)/Makefile.shared -e \
27+ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
28+ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
29+ link_app.$${shlib_target}
30+
31 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
32 @target=$(RSATEST); $(BUILD_CMD)
33
34@@ -618,7 +625,7 @@ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
35 @target=$(V3NAMETEST); $(BUILD_CMD)
36
37 $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
38- @target=$(HEARTBEATTEST); $(BUILD_CMD)
39+ @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
40
41 #$(AESTEST).o: $(AESTEST).c
42 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
43--
441.9.3
45
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1i.bb
index ddaaba8..4f88784 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1i.bb
@@ -34,13 +34,12 @@ SRC_URI += "file://configure-targets.patch \
34 file://find.pl \ 34 file://find.pl \
35 file://openssl-fix-des.pod-error.patch \ 35 file://openssl-fix-des.pod-error.patch \
36 file://Makefiles-ptest.patch \ 36 file://Makefiles-ptest.patch \
37 file://heartbeat-test-private-api.patch \
38 file://ptest-deps.patch \ 37 file://ptest-deps.patch \
39 file://run-ptest \ 38 file://run-ptest \
40 " 39 "
41 40
42SRC_URI[md5sum] = "8d6d684a9430d5cc98a62a5d8fbda8cf" 41SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972"
43SRC_URI[sha256sum] = "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093" 42SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"
44 43
45PACKAGES =+ " \ 44PACKAGES =+ " \
46 ${PN}-engines \ 45 ${PN}-engines \