From patchwork Thu Dec 18 13:04:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kim.hansen@prevas.dk X-Patchwork-Id: 422565 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 79A2214010F for ; Fri, 19 Dec 2014 00:04:58 +1100 (AEDT) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id F06173F81D for ; Thu, 18 Dec 2014 14:04:55 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 6C7B43F81D for ; Thu, 18 Dec 2014 14:04:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=21580; q=dns/txt; s=ironport1; t=1418907895; x=1450443895; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=LzgF3L1YF3CyQs1h4Y0RF0Bb5VEK5qc710gD2IGtGuk=; b=j7fHXNDUG4ThXE5FT63iamg6QGBwg7Aunm4RVnbeiCORYTAKVPCU3bIs 0L/1Uk4/6oZSEl0/sScsqODZ6PRIUMb/zv7wzsrrzWNETd7tVD9zLSYbh 2yBjxVBzQbj8S1jmK7y1depDq5BeRvXuAGVZs/o42iS3ySDQjlsVysBHH 8=; X-IronPort-AV: E=Sophos;i="5.07,600,1413237600"; d="scan'208";a="5430816" Received: from vmprevas4.prevas.se (HELO smtp.prevas.se) ([172.16.8.104]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 18 Dec 2014 14:04:54 +0100 Received: from VMPREVAS1.prevas.se ([fe80::d582:e193:281c:3bc9]) by VMPREVAS4.prevas.se ([172.16.8.104]) with mapi id 14.02.0387.000; Thu, 18 Dec 2014 14:04:53 +0100 From: =?iso-8859-1?Q?Kim_H=F8jgaard-Hansen?= To: =?iso-8859-1?Q?Sean_Koch_Nyekj=E6r?= , "dev@oe-lite.org" Subject: SV: [PATCH 3/4] openssl: Remove version 1.0.1g Thread-Topic: [PATCH 3/4] openssl: Remove version 1.0.1g Thread-Index: AQHP3j/cTmZGR49TdkSvO485TC3z1JyVya0C Date: Thu, 18 Dec 2014 13:04:53 +0000 Message-ID: References: , <3ec9d29eafe2a468b304b4cdcb2c3043b28205fd.1412253708.git.sean.nyekjaer@prevas.dk> In-Reply-To: <3ec9d29eafe2a468b304b4cdcb2c3043b28205fd.1412253708.git.sean.nyekjaer@prevas.dk> Accept-Language: da-DK, sv-SE, en-US Content-Language: da-DK X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.11.37] MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org merging this now In the future it would be better to just "git mv" the old recipe into the new version, when we do not want to keep the old version around. Makes the patch much easier to review /Kim diff --git a/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch b/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch index b5b72ed..57de54d 100644 --- a/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch +++ b/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch @@ -7,10 +7,10 @@ Author: Peter Michael Green Bug-Debian: http://bugs.debian.org/723954 Bug: http://rt.openssl.org/Ticket/Display.html?id=3146&user=guest&pass=guest -Index: openssl-1.0.1g/doc/apps/smime.pod +Index: openssl-1.0.1i/doc/apps/smime.pod =================================================================== ---- openssl-1.0.1g.orig/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/apps/smime.pod 2014-04-07 23:21:03.985184135 +0200 @@ -308,28 +308,28 @@ =over 4 @@ -46,10 +46,10 @@ Index: openssl-1.0.1g/doc/apps/smime.pod the message was verified correctly but an error occurred writing out the signers certificates. -Index: openssl-1.0.1g/doc/apps/cms.pod +Index: openssl-1.0.1i/doc/apps/cms.pod =================================================================== ---- openssl-1.0.1g.orig/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/apps/cms.pod 2014-04-07 23:21:03.985184135 +0200 @@ -450,28 +450,28 @@ =over 4 @@ -85,10 +85,10 @@ Index: openssl-1.0.1g/doc/apps/cms.pod the message was verified correctly but an error occurred writing out the signers certificates. -Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod +Index: openssl-1.0.1i/doc/ssl/SSL_clear.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_clear.pod 2014-04-07 23:21:03.985184135 +0200 @@ -56,12 +56,12 @@ =over 4 @@ -104,10 +104,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_clear.pod The SSL_clear() operation was successful. -Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod +Index: openssl-1.0.1i/doc/ssl/SSL_session_reused.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_session_reused.pod 2014-04-07 23:21:03.985184135 +0200 @@ -27,11 +27,11 @@ =over 4 @@ -122,10 +122,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_session_reused.pod A session was reused. -Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod +Index: openssl-1.0.1i/doc/ssl/SSL_set_session.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_set_session.pod 2014-04-07 23:21:03.985184135 +0200 @@ -37,11 +37,11 @@ =over 4 @@ -140,10 +140,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_set_session.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod +Index: openssl-1.0.1i/doc/ssl/SSL_connect.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_connect.pod 2014-04-07 23:21:03.985184135 +0200 @@ -41,13 +41,13 @@ =over 4 @@ -160,10 +160,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_connect.pod The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. -Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod +Index: openssl-1.0.1i/doc/ssl/SSL_shutdown.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_shutdown.pod 2014-04-07 23:21:03.985184135 +0200 @@ -92,14 +92,14 @@ =over 4 @@ -181,10 +181,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_shutdown.pod The shutdown was successfully completed. The "close notify" alert was sent and the peer's "close notify" alert was received. -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_set_client_CA_list.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_client_CA_list.pod 2014-04-07 23:21:03.985184135 +0200 @@ -66,13 +66,13 @@ =over 4 @@ -201,10 +201,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_client_CA_list.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod +Index: openssl-1.0.1i/doc/ssl/SSL_accept.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_accept.pod 2014-04-07 23:21:03.985184135 +0200 @@ -44,13 +44,13 @@ =over 4 @@ -221,10 +221,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_accept.pod The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_set_session_id_context.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_session_id_context.pod 2014-04-07 23:21:03.985184135 +0200 @@ -64,13 +64,13 @@ =over 4 @@ -241,10 +241,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_session_id_context.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_write.pod +Index: openssl-1.0.1i/doc/ssl/SSL_write.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_write.pod 2014-04-07 23:21:03.985184135 +0200 @@ -79,7 +79,7 @@ The write operation was successful, the return value is the number of bytes actually written to the TLS/SSL connection. @@ -254,10 +254,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_write.pod The write operation was not successful. Probably the underlying connection was closed. Call SSL_get_error() with the return value B to find out, -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_load_verify_locations.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_load_verify_locations.pod 2014-04-07 23:21:03.985184135 +0200 @@ -100,13 +100,13 @@ =over 4 @@ -274,10 +274,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_CTX_load_verify_locations.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod +Index: openssl-1.0.1i/doc/ssl/SSL_set_fd.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_set_fd.pod 2014-04-07 23:21:03.985184135 +0200 @@ -35,11 +35,11 @@ =over 4 @@ -292,10 +292,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_set_fd.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_use_psk_identity_hint.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2014-04-07 23:21:03.985184135 +0200 @@ -96,7 +96,7 @@ connection will fail with decryption_error before it will be finished completely. @@ -305,10 +305,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_CTX_use_psk_identity_hint.pod PSK identity was not found. An "unknown_psk_identity" alert message will be sent and the connection setup fails. -Index: openssl-1.0.1g/doc/ssl/SSL_read.pod +Index: openssl-1.0.1i/doc/ssl/SSL_read.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_read.pod 2014-04-07 23:21:03.985184135 +0200 @@ -86,7 +86,7 @@ The read operation was successful; the return value is the number of bytes actually read from the TLS/SSL connection. @@ -318,10 +318,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_read.pod The read operation was not successful. The reason may either be a clean shutdown due to a "close notify" alert sent by the peer (in which case -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_add_session.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_add_session.pod 2014-04-07 23:21:03.985184135 +0200 @@ -52,13 +52,13 @@ =over 4 @@ -338,10 +338,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_CTX_add_session.pod The operation succeeded. -Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod +Index: openssl-1.0.1i/doc/ssl/SSL_do_handshake.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_do_handshake.pod 2014-04-07 23:21:03.985184135 +0200 @@ -45,13 +45,13 @@ =over 4 @@ -358,10 +358,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_do_handshake.pod The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been established. -Index: openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod +Index: openssl-1.0.1i/doc/ssl/SSL_COMP_add_compression_method.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_COMP_add_compression_method.pod 2014-04-07 23:21:03.985184135 +0200 @@ -53,11 +53,11 @@ =over 4 @@ -376,10 +376,10 @@ Index: openssl-1.0.1g/doc/ssl/SSL_COMP_add_compression_method.pod The operation failed. Check the error queue to find out the reason. -Index: openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod +Index: openssl-1.0.1i/doc/ssl/SSL_CTX_set_ssl_version.pod =================================================================== ---- openssl-1.0.1g.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200 -+++ openssl-1.0.1g/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200 +--- openssl-1.0.1i.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200 ++++ openssl-1.0.1i/doc/ssl/SSL_CTX_set_ssl_version.pod 2014-04-07 23:21:03.985184135 +0200 @@ -42,11 +42,11 @@ =over 4 diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index 01ea702..02fdf47 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -122,7 +122,6 @@ FILES_${PN}-doc =+ "${libdir}/ssl/man" SRC_URI += "file://engines-install-in-libdir-ssl.patch" SRC_URI += "file://mingw.patch" -SRC_URI += "file://fix-pod-errors.patch" SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch" SRC_URI += "file://no-librpath-rpath.patch" diff --git a/recipes/openssl/openssl_1.0.1g.oe b/recipes/openssl/openssl_1.0.1g.oe deleted file mode 100644 index 492d649..0000000 --- a/recipes/openssl/openssl_1.0.1g.oe +++ /dev/null @@ -1,11 +0,0 @@ -require openssl.inc - -# Parallel make is simply broken for now. -PARALLEL_MAKE = "" - -# Fixup to get openssl to respect ${LDFLAGS}. From OpenEmbedded, thanks :-) -export OE_LDFLAGS="${LDFLAGS}" - -SRC_URI += "file://wincrypt.patch" - -LIBRARY_VERSION = "1" diff --git a/recipes/openssl/openssl_1.0.1g.oe.sig b/recipes/openssl/openssl_1.0.1g.oe.sig deleted file mode 100644 index f6e8990..0000000 --- a/recipes/openssl/openssl_1.0.1g.oe.sig +++ /dev/null @@ -1 +0,0 @@ -b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c openssl-1.0.1g.tar.gz