* Re: [oe-commits] [openembedded-core] 58/94: openssl: prevent ABI break from earlier krogoth releases [not found] ` <20160629183638.306C4503CA@opal.openembedded.org> @ 2016-06-29 19:02 ` Martin Jansa 2016-06-29 19:59 ` akuster808 0 siblings, 1 reply; 2+ messages in thread From: Martin Jansa @ 2016-06-29 19:02 UTC (permalink / raw) To: openembedded-devel, Joshua Lock Cc: Patches and discussions about the oe-core layer, openembedded-commits@lists.openembedded.org [-- Attachment #1: Type: text/plain, Size: 4930 bytes --] Please revert this, this is actually breaking the ABI compatibility against Krogoth release as reported in pull request. On Wed, Jun 29, 2016 at 8:37 PM, <git@git.openembedded.org> wrote: > rpurdie pushed a commit to branch krogoth > in repository openembedded-core. > > commit 4d1cb0646eafca44fae5321f48c6114a32fbf164 > Author: Joshua Lock <joshua.g.lock@intel.com> > AuthorDate: Thu May 12 13:06:34 2016 +0100 > > openssl: 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 <martin.jansa@gmail.com> > (From OE-Core rev: 480db6be99f9a53d8657b31b846f0079ee1a124f) > > Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > Signed-off-by: Armin Kuster <akuster@mvista.com> > Signed-off-by: Armin Kuster <akuster808@gmail.com> > --- > .../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.patch > b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch > index 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 > @@ -15,8 +15,8 @@ Index: > openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld > =================================================================== > --- /dev/null 1970-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; > @@ -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; > @@ -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; > @@ -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/null 1970-01-01 00:00:00.000000000 +0000 > +++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld > 2014-02-24 21:02:30.000000000 +0100 > @@ -0,0 +1,10 @@ > -+OPENSSL_1.0.2 { > ++OPENSSL_1.0.0 { > + global: > + bind_engine; > + v_check; > @@ -4644,7 +4657,7 @@ Index: > openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld > --- /dev/null 1970-01-01 00:00:00.000000000 +0000 > +++ > openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld > 2014-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 > Openembedded-commits@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-commits > [-- Attachment #2: Type: text/html, Size: 6255 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [oe-commits] [openembedded-core] 58/94: openssl: prevent ABI break from earlier krogoth releases 2016-06-29 19:02 ` [oe-commits] [openembedded-core] 58/94: openssl: prevent ABI break from earlier krogoth releases Martin Jansa @ 2016-06-29 19:59 ` akuster808 0 siblings, 0 replies; 2+ messages in thread From: akuster808 @ 2016-06-29 19:59 UTC (permalink / raw) To: Martin Jansa, openembedded-devel, Joshua Lock Cc: openembedded-commits@lists.openembedded.org, Patches and discussions about the oe-core layer On 06/29/2016 12:02 PM, Martin Jansa wrote: > 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 > On Wed, Jun 29, 2016 at 8:37 PM, <git@git.openembedded.org> wrote: > >> rpurdie pushed a commit to branch krogoth >> in repository openembedded-core. >> >> commit 4d1cb0646eafca44fae5321f48c6114a32fbf164 >> Author: Joshua Lock <joshua.g.lock@intel.com> >> AuthorDate: Thu May 12 13:06:34 2016 +0100 >> >> openssl: 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 <martin.jansa@gmail.com> >> (From OE-Core rev: 480db6be99f9a53d8657b31b846f0079ee1a124f) >> >> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> >> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> >> Signed-off-by: Armin Kuster <akuster@mvista.com> >> Signed-off-by: Armin Kuster <akuster808@gmail.com> >> --- >> .../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.patch >> b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch >> index 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 >> @@ -15,8 +15,8 @@ Index: >> openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld >> =================================================================== >> --- /dev/null 1970-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; >> @@ -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; >> @@ -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; >> @@ -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/null 1970-01-01 00:00:00.000000000 +0000 >> +++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld >> 2014-02-24 21:02:30.000000000 +0100 >> @@ -0,0 +1,10 @@ >> -+OPENSSL_1.0.2 { >> ++OPENSSL_1.0.0 { >> + global: >> + bind_engine; >> + v_check; >> @@ -4644,7 +4657,7 @@ Index: >> openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld >> --- /dev/null 1970-01-01 00:00:00.000000000 +0000 >> +++ >> openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld >> 2014-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 >> Openembedded-commits@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-commits >> > > > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-29 19:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160629183624.878.59989@opal.openembedded.org>
[not found] ` <20160629183638.306C4503CA@opal.openembedded.org>
2016-06-29 19:02 ` [oe-commits] [openembedded-core] 58/94: openssl: prevent ABI break from earlier krogoth releases Martin Jansa
2016-06-29 19:59 ` akuster808
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox