From: Scott Garman Date: Tue, 20 Mar 2012 06:11:25 +0000 (-0700) Subject: openssl: upgrade to 1.0.0.h X-Git-Tag: 2015-4~11245 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=50d99fc8c5a158c7f3ce3e72377827f53406d88f;p=openembedded-core.git openssl: upgrade to 1.0.0.h Removed pkg-config.patch, which was incorporated upstream. Addresses CVE-2012-0884. Fixes bug [YOCTO #2139]. Signed-off-by: Scott Garman --- 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 0f1f392472..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pkg-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Backport [debian] - -Index: openssl-1.0.0c/Makefile.org -=================================================================== ---- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:13:28.000000000 +0100 -+++ openssl-1.0.0c/Makefile.org 2010-12-12 17:01:49.000000000 +0100 -@@ -323,7 +323,8 @@ - echo 'Description: OpenSSL cryptography library'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ -+ echo 'Libs: -L$${libdir} -lcrypto'; \ -+ echo 'Libs.private: $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc - - libssl.pc: Makefile -@@ -336,7 +337,8 @@ - echo 'Description: Secure Sockets Layer and cryptography libraries'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ -+ echo 'Libs: -L$${libdir} -lssl'; \ -+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc - - openssl.pc: Makefile -@@ -349,7 +351,8 @@ - echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ - echo 'Version: '$(VERSION); \ - echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ -+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ -+ echo 'Libs.private: $(EX_LIBS)'; \ - echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc - - 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/configure-targets.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/c_rehash-compat.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/ca.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/debian-targets.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/make-targets.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-dir.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/man-section.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-rpath.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/no-symbolic.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/pic.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/debian/version-script.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/engines-install-in-libdir-ssl.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/oe-ldflags.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl-fix-link.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/openssl_fix_for_x32.patch rename to 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 similarity index 100% rename from meta/recipes-connectivity/openssl/openssl-1.0.0g/shared-libs.patch rename to 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 similarity index 87% rename from meta/recipes-connectivity/openssl/openssl_1.0.0g.bb rename to meta/recipes-connectivity/openssl/openssl_1.0.0h.bb index 8ffe931921..744fe2a6b7 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 \ file://debian/no-rpath.patch \ file://debian/man-dir.patch \ file://debian/man-section.patch \ - file://debian/pkg-config.patch \ file://debian/no-symbolic.patch \ file://debian/debian-targets.patch \ file://openssl_fix_for_x32.patch \ " -SRC_URI[md5sum] = "07ecbe4324f140d157478637d6beccf1" -SRC_URI[sha256sum] = "905106a1505e7d9f7c36ee81408d3aa3d41aac291a9603d0c290c9530c92fc2c" +SRC_URI[md5sum] = "a5bc483c570f2ac3758ce5c19b667fab" +SRC_URI[sha256sum] = "7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d" PACKAGES =+ " \ ${PN}-engines \