summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-03-20 06:11:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:04 (GMT)
commit96dde9513c08430e12f4f1f6e6e54ca2a244bfcd (patch)
tree55203cd875fddee191bb51042dc85851961cdc54 /meta/recipes-connectivity/openssl
parentded4c8eea1e13ade4e07298aef3e1f53487953d7 (diff)
downloadpoky-96dde9513c08430e12f4f1f6e6e54ca2a244bfcd.tar.gz
openssl: upgrade to 1.0.0.h
Removed pkg-config.patch, which was incorporated upstream. Addresses CVE-2012-0884. Fixes bug [YOCTO #2139]. (From OE-Core rev: 50d99fc8c5a158c7f3ce3e72377827f53406d88f) 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')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pkg-config.patch36
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/configure-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/c_rehash-compat.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/ca.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/debian-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/make-targets.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-dir.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-section.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-rpath.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-symbolic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pic.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/version-script.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/engines-install-in-libdir-ssl.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/oe-ldflags.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl-fix-link.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl_fix_for_x32.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch (renamed from meta/recipes-connectivity/openssl/openssl-1.0.0g/shared-libs.patch)0
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.0h.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.0g.bb)5
18 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pkg-config.patch
deleted file mode 100644
index 0f1f392..0000000
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pkg-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-1.0.0c/Makefile.org
4===================================================================
5--- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:13:28.000000000 +0100
6+++ openssl-1.0.0c/Makefile.org 2010-12-12 17:01:49.000000000 +0100
7@@ -323,7 +323,8 @@
8 echo 'Description: OpenSSL cryptography library'; \
9 echo 'Version: '$(VERSION); \
10 echo 'Requires: '; \
11- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
12+ echo 'Libs: -L$${libdir} -lcrypto'; \
13+ echo 'Libs.private: $(EX_LIBS)'; \
14 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
15
16 libssl.pc: Makefile
17@@ -336,7 +337,8 @@
18 echo 'Description: Secure Sockets Layer and cryptography libraries'; \
19 echo 'Version: '$(VERSION); \
20 echo 'Requires: '; \
21- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
22+ echo 'Libs: -L$${libdir} -lssl'; \
23+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
24 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
25
26 openssl.pc: Makefile
27@@ -349,7 +351,8 @@
28 echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
29 echo 'Version: '$(VERSION); \
30 echo 'Requires: '; \
31- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
32+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
33+ echo 'Libs.private: $(EX_LIBS)'; \
34 echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
35
36 Makefile: Makefile.org Configure config
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch
index 6d23771..6d23771 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch
index 8f9a034..8f9a034 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch
index aba4d42..aba4d42 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch
index 9feae38..9feae38 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch
index f7a6dfd..f7a6dfd 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/make-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/make-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch
index 4085e3b..4085e3b 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch
index e8b9268..e8b9268 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch
index 1ccb3b8..1ccb3b8 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch
index cc4408a..cc4408a 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch
index e368241..e368241 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch
index a79c082..a79c082 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch
index d8a6f1a..d8a6f1a 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch
index 292e13d..292e13d 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl-fix-link.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch
index 154106c..154106c 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl-fix-link.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl-fix-link.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch
index 3191ce9..3191ce9 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0g/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch
index 0998673..0998673 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0h.bb
index 8ffe931..744fe2a 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0h.bb
@@ -26,14 +26,13 @@ SRC_URI += "file://configure-targets.patch \
26 file://debian/no-rpath.patch \ 26 file://debian/no-rpath.patch \
27 file://debian/man-dir.patch \ 27 file://debian/man-dir.patch \
28 file://debian/man-section.patch \ 28 file://debian/man-section.patch \
29 file://debian/pkg-config.patch \
30 file://debian/no-symbolic.patch \ 29 file://debian/no-symbolic.patch \
31 file://debian/debian-targets.patch \ 30 file://debian/debian-targets.patch \
32 file://openssl_fix_for_x32.patch \ 31 file://openssl_fix_for_x32.patch \
33 " 32 "
34 33
35SRC_URI[md5sum] = "07ecbe4324f140d157478637d6beccf1" 34SRC_URI[md5sum] = "a5bc483c570f2ac3758ce5c19b667fab"
36SRC_URI[sha256sum] = "905106a1505e7d9f7c36ee81408d3aa3d41aac291a9603d0c290c9530c92fc2c" 35SRC_URI[sha256sum] = "7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d"
37 36
38PACKAGES =+ " \ 37PACKAGES =+ " \
39 ${PN}-engines \ 38 ${PN}-engines \