summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-16 17:53:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:04 +0000
commit980ba5e77438c3a22c295f56ffb71f1d290db50a (patch)
tree6feb062b3c3c56e960fcddffe7df0ea6bdb67a91 /meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch
parent8953e4a93ce6ad0257a094fdc6f3cd88ac5e89b9 (diff)
downloadopenembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.gz
openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.bz2
openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.xz
openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.zip
openssl-0.9.8: Update to 0.9.8s
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4108 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4109 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4576 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4577 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4619 [YOCTO #1904] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch
new file mode 100644
index 000000000..5b4c7d5f7
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch
@@ -0,0 +1,49 @@
+Upstream-Status: Backport [debian]
+
+Index: openssl-0.9.8m/Makefile.org
+===================================================================
+--- openssl-0.9.8m.orig/Makefile.org 2010-01-27 16:06:36.000000000 +0000
++++ openssl-0.9.8m/Makefile.org 2010-02-27 00:43:04.000000000 +0000
+@@ -620,7 +620,7 @@
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+Index: openssl-0.9.8m/engines/Makefile
+===================================================================
+--- openssl-0.9.8m.orig/engines/Makefile 2009-11-10 01:53:02.000000000 +0000
++++ openssl-0.9.8m/engines/Makefile 2010-02-27 00:45:03.000000000 +0000
+@@ -101,13 +101,13 @@
+ *DSO_DL*) sfx="sl";; \
+ *) sfx="bad";; \
+ esac; \
+- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
++ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
+ else \
+ sfx="so"; \
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
+ fi; \
+- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
+ done; \
+ fi
+
+Index: openssl-0.9.8m/Configure
+===================================================================
+--- openssl-0.9.8m.orig/Configure 2010-02-27 00:40:42.000000000 +0000
++++ openssl-0.9.8m/Configure 2010-02-27 00:46:47.000000000 +0000
+@@ -1738,7 +1738,7 @@
+ # $foo is to become "$prefix/lib$multilib/engines";
+ # as Makefile.org and engines/Makefile are adapted for
+ # $multilib suffix.
+- my $foo = "$prefix/lib/engines";
++ my $foo = "$prefix/lib/ssl/engines";
+ $foo =~ s/\\/\\\\/g;
+ print OUT "#define ENGINESDIR \"$foo\"\n";
+ }