diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-04-24 22:13:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:15:10 +0100 |
commit | bbf95cae4c009d967fee545d94f809452c215c3f (patch) | |
tree | 4377303d1460e3b567b5e797e8171d61833559d6 /meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch | |
parent | 3df821277dd8111aa5a582885d8d405537c21624 (diff) | |
download | poky-bbf95cae4c009d967fee545d94f809452c215c3f.tar.gz |
openssl: upgrade to 1.0.0i
Addresses CVE-2012-2110
Fixes bug [YOCTO #2368]
(From OE-Core rev: 51a122a5593c62d7ffd07f860e54a2fb0327959c)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch deleted file mode 100644 index 292e13dc5f..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [open-embedded] | ||
2 | |||
3 | Index: openssl-1.0.0/Makefile.shared | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0.orig/Makefile.shared | ||
6 | +++ openssl-1.0.0/Makefile.shared | ||
7 | @@ -92,7 +92,7 @@ | ||
8 | LINK_APP= \ | ||
9 | ( $(SET_X); \ | ||
10 | LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ | ||
11 | - LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ | ||
12 | + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_LDFLAGS) $${LDFLAGS:-$(CFLAGS)}"; \ | ||
13 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
14 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
15 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||
16 | @@ -102,7 +102,7 @@ | ||
17 | ( $(SET_X); \ | ||
18 | LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ | ||
19 | SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ | ||
20 | - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
21 | + SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
22 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
23 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
24 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||