[arch-commits] Commit in erlang-nox/trunk (PKGBUILD openssl-1.1.0-fixup.patch)

[Jan de Groot]

    Date: Friday, April 28, 2017 @ 12:15:25
  Author: jgc
Revision: 226190

upgpkg: erlang-nox 19.3-3

Revert disable-deprecated.patch, fix one remaining OpenSSL 1.1 issue instead

Added:
  erlang-nox/trunk/openssl-1.1.0-fixup.patch
    (from rev 226182, erlang/trunk/openssl-1.1.0-fixup.patch)
Modified:
  erlang-nox/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 ++++++------
 openssl-1.1.0-fixup.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-28 11:39:55 UTC (rev 226189)
+++ PKGBUILD	2017-04-28 12:15:25 UTC (rev 226190)
@@ -8,7 +8,7 @@
 
 pkgname=erlang-nox
 pkgver=19.3
-pkgrel=2
+pkgrel=3
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
@@ -27,8 +27,8 @@
         'epmd.socket'
         'epmd.conf'
         otp-0007-Fix-CVE-2016-10253.patch
-        disable-deprecated.patch
-        openssl-1.1.0.patch)
+        openssl-1.1.0.patch
+        openssl-1.1.0-fixup.patch)
 sha256sums=('SKIP'
             'f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
@@ -35,8 +35,8 @@
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2'
             'a1361b0fd7b32d8de061f1a985df31f5b37f433b42d46a6a03e2f19c9372b46e'
-            '6bb4501c1ed30df95db97ee2f6ff5cf52d166a6245b4fa67abe3a9402ab51b0d'
-            'dd315047f3ccdad8609a5eb881eb2f312222316e5fcc34ebec2a0b6328d5a7a5')
+            'dd315047f3ccdad8609a5eb881eb2f312222316e5fcc34ebec2a0b6328d5a7a5'
+            '3ca0a3b8426f1ad08b7bb2fb45a243cf17efa7d5db0ed20a934cd8cbf6178b53')
 
 prepare() {
   cd otp
@@ -44,8 +44,8 @@
   git cherry-pick -n e30294f44d02200c20a80f1a3a2bb075afc3747d
   git cherry-pick -n 78a5de9611c25a4e7b5248aa9828f949f3a5c131
   git cherry-pick -n 1cdaf0a6fd8dbbf08fe88dd148424df4da683f48
-  patch -Np1 -i ../disable-deprecated.patch
   patch -Np1 -i ../openssl-1.1.0.patch
+  patch -Np1 -i ../openssl-1.1.0-fixup.patch
 
   patch -Np1 -i ../otp-0007-Fix-CVE-2016-10253.patch
   ./otp_build autoconf

Copied: erlang-nox/trunk/openssl-1.1.0-fixup.patch (from rev 226182, erlang/trunk/openssl-1.1.0-fixup.patch)
===================================================================
--- openssl-1.1.0-fixup.patch	                        (rev 0)
+++ openssl-1.1.0-fixup.patch	2017-04-28 12:15:25 UTC (rev 226190)
@@ -0,0 +1,32 @@
+--- otp/lib/crypto/c_src/crypto.c	2017-04-28 09:39:16.685119582 +0000
++++ otp/lib/crypto/c_src/crypto.c	2017-04-28 09:41:19.371604045 +0000
+@@ -1720,7 +1720,7 @@
+     ErlNifBinary     key, ivec, text;
+ #ifdef HAVE_EVP_AES_CTR
+     const EVP_CIPHER *cipher;
+-    EVP_CIPHER_CTX   ctx;
++    EVP_CIPHER_CTX   *ctx;
+     unsigned char    *out;
+     int              outl = 0;
+ #else
+@@ -1749,15 +1749,15 @@
+     }
+ 
+     out = enif_make_new_binary(env,text.size,&ret);
+-    EVP_CIPHER_CTX_init(&ctx);
+-    EVP_CipherInit_ex(&ctx, cipher, NULL,
++    ctx = EVP_CIPHER_CTX_new();
++    EVP_CipherInit_ex(ctx, cipher, NULL,
+                       key.data, ivec.data, (argv[3] == atom_true));
+     EVP_CIPHER_CTX_set_padding(&ctx, 0);
+-    EVP_CipherUpdate(&ctx, out, &outl, text.data, text.size);
++    EVP_CipherUpdate(ctx, out, &outl, text.data, text.size);
+     ASSERT(outl == text.size);
+-    EVP_CipherFinal_ex(&ctx, out + outl, &outl);
++    EVP_CipherFinal_ex(ctx, out + outl, &outl);
+     ASSERT(outl == 0);
+-    EVP_CIPHER_CTX_cleanup(&ctx);
++    EVP_CIPHER_CTX_free(ctx);
+ #else
+     memcpy(ivec_clone, ivec.data, 16);    
+     memset(ecount_buf, 0, sizeof(ecount_buf));