diff options
author | Qing He <qing.he@intel.com> | 2011-04-15 16:11:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-18 05:51:20 +0100 |
commit | 47cb36d1c897ac72718ce67f0acdf118da894228 (patch) | |
tree | d51755484ba02aecc8d63283e53b0e958eb712b1 /meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch | |
parent | 2f3c46d953da38193fc2255b442b3f4903f48036 (diff) | |
download | poky-47cb36d1c897ac72718ce67f0acdf118da894228.tar.gz |
openssl: upgrade to version 0.9.8r
[YOCTO #979]
from 0.9.8p
fixes CVE-2010-4180, CVE-2010-4252, CVE-2010-0014
(From OE-Core rev: e28e11930a22a4e89075e7e026e58c081f984ddf)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch new file mode 100644 index 0000000000..49400ff6e1 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Index: openssl-0.9.8m/Makefile.org | ||
2 | =================================================================== | ||
3 | --- openssl-0.9.8m.orig/Makefile.org 2010-01-27 16:06:36.000000000 +0000 | ||
4 | +++ openssl-0.9.8m/Makefile.org 2010-02-27 00:43:04.000000000 +0000 | ||
5 | @@ -620,7 +620,7 @@ | ||
6 | install_sw: | ||
7 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ | ||
8 | $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ | ||
9 | - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ | ||
10 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \ | ||
11 | $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ | ||
12 | $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ | ||
13 | $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ | ||
14 | Index: openssl-0.9.8m/engines/Makefile | ||
15 | =================================================================== | ||
16 | --- openssl-0.9.8m.orig/engines/Makefile 2009-11-10 01:53:02.000000000 +0000 | ||
17 | +++ openssl-0.9.8m/engines/Makefile 2010-02-27 00:45:03.000000000 +0000 | ||
18 | @@ -101,13 +101,13 @@ | ||
19 | *DSO_DL*) sfx="sl";; \ | ||
20 | *) sfx="bad";; \ | ||
21 | esac; \ | ||
22 | - cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ | ||
23 | + cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \ | ||
24 | else \ | ||
25 | sfx="so"; \ | ||
26 | cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ | ||
27 | fi; \ | ||
28 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ | ||
29 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \ | ||
30 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \ | ||
31 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \ | ||
32 | done; \ | ||
33 | fi | ||
34 | |||
35 | Index: openssl-0.9.8m/Configure | ||
36 | =================================================================== | ||
37 | --- openssl-0.9.8m.orig/Configure 2010-02-27 00:40:42.000000000 +0000 | ||
38 | +++ openssl-0.9.8m/Configure 2010-02-27 00:46:47.000000000 +0000 | ||
39 | @@ -1738,7 +1738,7 @@ | ||
40 | # $foo is to become "$prefix/lib$multilib/engines"; | ||
41 | # as Makefile.org and engines/Makefile are adapted for | ||
42 | # $multilib suffix. | ||
43 | - my $foo = "$prefix/lib/engines"; | ||
44 | + my $foo = "$prefix/lib/ssl/engines"; | ||
45 | $foo =~ s/\\/\\\\/g; | ||
46 | print OUT "#define ENGINESDIR \"$foo\"\n"; | ||
47 | } | ||