58/94: openssl: prevent ABI break from earlier krogoth releases
Please revert this, this is actually breaking the ABI compatibility against Krogoth release as reported in pull request.
Quoted 132 lines · On Wed, Jun 29, 2016 at 8:37 PM, <[email protected]> wrote:
rpurdie pushed a commit to branch krogoth
in repository openembedded-core.commit
4d1cb0646eafca44fae5321f48c6114a32fbf164
Author: Joshua Lock <[email protected]>
AuthorDate: Thu May 12 13:06:34 2016 +0100openssl: prevent ABI break from earlier krogoth releases
The backported upgrade to 1.0.2h included an updated GNU LD version-script which results in an ABI change. In order to try and respect ABI for existing binaries built against fido this commit partially reverts the version-script to maintain the existing ABI and instead only add the new symbols required by 1.0.2h.
Suggested-by Martin Jansa <[email protected]>(From OE-Core rev:
480db6be99f9a53d8657b31b846f0079ee1a124f)Signed-off-by Joshua Lock <[email protected]>Signed-off-by Richard Purdie <[email protected]>Signed-off-by Armin Kuster <[email protected]>Signed-off-by Armin Kuster <[email protected]>--- .../openssl/debian1.0.2/version-script.patch | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-)diff --git
a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patchb/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patchindex 29f11a2..f53efdb 100644
---a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
+++b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch(quoted diff) +0
-0@@ -15,8 +15,8 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
===================================================================
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24
22:19:08.601827266 +0100
-@@ -0,0 +1,4608 @@
-+OPENSSL_1.0.2d {
+@@ -0,0 +1,4621 @@
++OPENSSL_1.0.0 {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;(quoted diff) +0
-0@@ -4314,6 +4314,14 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ CRYPTO_cbc128_decrypt; + CRYPTO_cfb128_encrypt; + CRYPTO_cfb128_8_encrypt;++
++ local:
++ *;
++};
++
++
++OPENSSL_1.0.1 {
++ global:+ SSL_renegotiate_abbreviated; + TLSv1_1_method; + TLSv1_1_client_method;(quoted diff) +0
-0@@ -4475,7 +4483,15 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ BIO_s_datagram_sctp; + BIO_dgram_is_sctp; + BIO_dgram_sctp_notification_cb;++} OPENSSL_1.0.0;
++
++OPENSSL_1.0.1d {
++ global:
+CRYPTO_memcmp;
++} OPENSSL_1.0.1;
++
++OPENSSL_1.0.2 {
++ global:+ SSL_CTX_set_alpn_protos; + SSL_set_alpn_protos; + SSL_CTX_set_alpn_select_cb;(quoted diff) +0
-0@@ -4613,23 +4629,20 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ BUF_strnlen; + sk_deep_copy; + SSL_test_functions;-+
-+ local:
-+ *;
-+};
++} OPENSSL_1.0.1d;
+
+OPENSSL_1.0.2g {
+ global:
+SRP_VBASE_get1_by_user;
+SRP_user_pwd_free;
-+} OPENSSL_1.0.2d;
++} OPENSSL_1.0.2;
+
Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
===================================================================
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@-+OPENSSL_1.0.2 {
++OPENSSL_1.0.0 {
+ global:
+bind_engine;
+v_check;(quoted diff) +0
-0@@ -4644,7 +4657,7 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++
openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@-+OPENSSL_1.0.2 {
++OPENSSL_1.0.0 {
+ global:
+bind_engine;
+v_check;--
To stop receiving notification emails like this one, please contact the administrator of this repository.
--
_______________________________________________
Openembedded-commits mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits
Quoted 2 lines · Martin Jansa
Please revert this, this is actually breaking the ABI compatibility against Krogoth release as reported in pull request.
I thought I removed it when you provided feed back the last time.
my apologies,
Armin
Quoted 137 lines · On Wed, Jun 29, 2016 at 8:37 PM, <[email protected]> wrote:
Quoted 133 lines
rpurdie pushed a commit to branch krogoth
in repository openembedded-core.commit
4d1cb0646eafca44fae5321f48c6114a32fbf164
Author: Joshua Lock <[email protected]>
AuthorDate: Thu May 12 13:06:34 2016 +0100openssl: prevent ABI break from earlier krogoth releases
The backported upgrade to 1.0.2h included an updated GNU LD version-script which results in an ABI change. In order to try and respect ABI for existing binaries built against fido this commit partially reverts the version-script to maintain the existing ABI and instead only add the new symbols required by 1.0.2h.
Suggested-by Martin Jansa <[email protected]>(From OE-Core rev:
480db6be99f9a53d8657b31b846f0079ee1a124f)Signed-off-by Joshua Lock <[email protected]>Signed-off-by Richard Purdie <[email protected]>Signed-off-by Armin Kuster <[email protected]>Signed-off-by Armin Kuster <[email protected]>--- .../openssl/debian1.0.2/version-script.patch | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-)diff --git
a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patchb/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patchindex 29f11a2..f53efdb 100644
---a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
+++b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch(quoted diff) +0
-0@@ -15,8 +15,8 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
===================================================================
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24
22:19:08.601827266 +0100
-@@ -0,0 +1,4608 @@
-+OPENSSL_1.0.2d {
+@@ -0,0 +1,4621 @@
++OPENSSL_1.0.0 {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;(quoted diff) +0
-0@@ -4314,6 +4314,14 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ CRYPTO_cbc128_decrypt; + CRYPTO_cfb128_encrypt; + CRYPTO_cfb128_8_encrypt;++
++ local:
++ *;
++};
++
++
++OPENSSL_1.0.1 {
++ global:+ SSL_renegotiate_abbreviated; + TLSv1_1_method; + TLSv1_1_client_method;(quoted diff) +0
-0@@ -4475,7 +4483,15 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ BIO_s_datagram_sctp; + BIO_dgram_is_sctp; + BIO_dgram_sctp_notification_cb;++} OPENSSL_1.0.0;
++
++OPENSSL_1.0.1d {
++ global:
+CRYPTO_memcmp;
++} OPENSSL_1.0.1;
++
++OPENSSL_1.0.2 {
++ global:+ SSL_CTX_set_alpn_protos; + SSL_set_alpn_protos; + SSL_CTX_set_alpn_select_cb;(quoted diff) +0
-0@@ -4613,23 +4629,20 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
+ BUF_strnlen; + sk_deep_copy; + SSL_test_functions;-+
-+ local:
-+ *;
-+};
++} OPENSSL_1.0.1d;
+
+OPENSSL_1.0.2g {
+ global:
+SRP_VBASE_get1_by_user;
+SRP_user_pwd_free;
-+} OPENSSL_1.0.2d;
++} OPENSSL_1.0.2;
+
Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
===================================================================
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@-+OPENSSL_1.0.2 {
++OPENSSL_1.0.0 {
+ global:
+bind_engine;
+v_check;(quoted diff) +0
-0@@ -4644,7 +4657,7 @@ Index:openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
---/dev/null1970-01-01 00:00:00.000000000 +0000
+++
openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld2014-02-24 21:02:30.000000000 +0100 @@ -0,0 +1,10 @@-+OPENSSL_1.0.2 {
++OPENSSL_1.0.0 {
+ global:
+bind_engine;
+v_check;--
To stop receiving notification emails like this one, please contact the administrator of this repository.
--
_______________________________________________
Openembedded-commits mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-commits