openssl: use version script from jessie-backports

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

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 29f11a288e826835306be6a84d7d398048bee409..4c963f1c8711bb8f46aebf8125176f2e870c3287 100644 (file)
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
@@ -1,8 +1,15 @@
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
-===================================================================
---- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure     2014-02-24 21:02:30.000000000 +0100
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure  2014-02-24 21:02:30.000000000 +0100
-@@ -1651,6 +1651,8 @@
+https://anonscm.debian.org/viewvc/pkg-openssl/openssl/branches/jessie_backports/debian/patches/version-script.patch?revision=823&view=co
+
+---
+ Configure                 |    2 
+ engines/ccgost/openssl.ld |   10 
+ engines/openssl.ld        |   10 
+ openssl.ld                | 4620 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 4642 insertions(+)
+
+--- a/Configure
++++ b/Configure
+@@ -1730,6 +1730,8 @@ if ($strict_warnings)
                }
        }
  
@@ -11,12 +18,36 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
  open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
  unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
  open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-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 {
+--- /dev/null
++++ b/engines/ccgost/openssl.ld
+@@ -0,0 +1,10 @@
++OPENSSL_1.0.0 {
++      global:
++              bind_engine;
++              v_check;
++              OPENSSL_init;
++              OPENSSL_finish;
++      local:
++              *;
++};
++
+--- /dev/null
++++ b/engines/openssl.ld
+@@ -0,0 +1,10 @@
++OPENSSL_1.0.0 {
++      global:
++              bind_engine;
++              v_check;
++              OPENSSL_init;
++              OPENSSL_finish;
++      local:
++              *;
++};
++
+--- /dev/null
++++ b/openssl.ld
+@@ -0,0 +1,4620 @@
++OPENSSL_1.0.0 {
 +      global:
 +              BIO_f_ssl;
 +              BIO_new_buffer_ssl_connect;
@@ -4314,6 +4345,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 +4514,21 @@ 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.1s {
++      global:
++              SRP_VBASE_get1_by_user;
++              SRP_user_pwd_free;
++} OPENSSL_1.0.1d;
++
++OPENSSL_1.0.2 {
++      global:
 +              SSL_CTX_set_alpn_protos;
 +              SSL_set_alpn_protos;
 +              SSL_CTX_set_alpn_select_cb;
@@ -4613,44 +4666,4 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
 +              BUF_strnlen;
 +              sk_deep_copy;
 +              SSL_test_functions;
-+
-+      local:
-+              *;
-+};
-+
-+OPENSSL_1.0.2g {
-+       global:
-+               SRP_VBASE_get1_by_user;
-+               SRP_user_pwd_free;
-+} OPENSSL_1.0.2d;
-+
-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 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
-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 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
++} OPENSSL_1.0.1d;