<pre style='margin:0'>
ci42 pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0008fb86697251dfd4df584c219550d1aa988d0e">https://github.com/macports/macports-ports/commit/0008fb86697251dfd4df584c219550d1aa988d0e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0008fb8 erlang: update to version 20.3
</span>0008fb8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0008fb86697251dfd4df584c219550d1aa988d0e
</span>Author: ci42 <ciserlohn@macports.org>
AuthorDate: Thu Mar 15 16:26:18 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> erlang: update to version 20.3
</span>---
lang/erlang/Portfile | 25 +++---
.../files/patch-lib_crypto_c_src_crypto.c.diff | 96 ----------------------
2 files changed, 12 insertions(+), 109 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/Portfile b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc2fc32..9496936 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/erlang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name erlang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20.3
</span>
categories lang erlang
maintainers {ciserlohn @ci42}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,22 +41,21 @@ distfiles otp_src_${version}${extract.suffix} \
</span> otp_doc_man_${version}${extract.suffix} \
otp_doc_html_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums otp_src_20.2.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f2d34e6d40214cc470ad7c0190d2c1bda18ccde1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 24d9895e84b800bf0145d6b3042c2f2087eb31780a4a45565206844b41eb8f23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_man_20.2.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ce173069cca6d3fcd1405d8527dce633ecac63ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 950e088f9e47fc10a98e3f67d6420a990650836c648686a2f5dafe331747cbdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- otp_doc_html_20.2.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2a7082d58754c85f00d7f8f51283a12318d79a9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7f5e7d4cd0c58e15d7d29231931c2a710f7f5fdfcb0ff8edb8142969520c4256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums otp_src_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 769c8e98a8e1f55a5e999e90dba154b2a4ebb9bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_man_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 63780bb536982954386942eadb44474b87c14016 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 17e0b2f94f11576a12526614a906ecad629b8804c25e6c18523f7c4346607112 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otp_doc_html_20.3.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 224d21e43818fa12b079ecbf10dbf0f3bcfd1957 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8099b62e9fa24b3f90eaeda151fa23ae729c8297e7d3fd8adaca865b35a3125d
</span>
pre-patch { file rename ${workpath}/otp_src_${version} ${workpath}/${name}-${version} }
# http://www.erlang.org/pipermail/erlang-bugs/2009-January/001171.html
patchfiles patch-erts_emulator_Makefile.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-erts_configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib_crypto_c_src_crypto.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-erts_configure.diff
</span>
configure.args --prefix=${prefix} \
--enable-kernel-poll \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +79,7 @@ post-destroot {
</span> system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_html_${version}${extract.suffix}"
system "tar -C ${destroot}${prefix}/lib/erlang -zxvf ${distpath}/otp_doc_man_${version}${extract.suffix}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set erts_dir erts-9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set erts_dir erts-9.3
</span> set erl_interface_dir erl_interface-3.10.1
set wx_dir wx-1.8.3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/erlang/files/patch-lib_crypto_c_src_crypto.c.diff b/lang/erlang/files/patch-lib_crypto_c_src_crypto.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a0291d3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/erlang/files/patch-lib_crypto_c_src_crypto.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,96 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/crypto/c_src/crypto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/crypto/c_src/crypto.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,6 +179,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define HAVE_ECB_IVEC_BUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAS_LIBRESSL) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && LIBRESSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(2,6,1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# undef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_CMAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <openssl/cmac.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -659,7 +665,9 @@ static ERL_NIF_TERM atom_rsa_oaep_md;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_sslv23_padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_x931_padding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_rsa_pss_saltlen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ERL_NIF_TERM atom_sha224;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1064,7 +1072,9 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_pad = enif_make_atom(env,"rsa_pad"); /* backwards compatibility */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_padding = enif_make_atom(env,"rsa_padding");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_pkcs1_pss_padding = enif_make_atom(env,"rsa_pkcs1_pss_padding");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_sslv23_padding = enif_make_atom(env,"rsa_sslv23_padding");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_x931_padding = enif_make_atom(env,"rsa_x931_padding");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_rsa_pss_saltlen = enif_make_atom(env,"rsa_pss_saltlen");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atom_sha224 = enif_make_atom(env,"sha224");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4449,8 +4459,10 @@ static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt->rsa_padding = RSA_PKCS1_PADDING;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (tpl_terms[1] == atom_rsa_sslv23_padding) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt->rsa_padding = RSA_SSLV23_PADDING;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (tpl_terms[1] == atom_rsa_x931_padding) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt->rsa_padding = RSA_X931_PADDING;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (tpl_terms[1] == atom_rsa_no_padding) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4516,7 +4528,10 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKeyCryptOptions crypt_opt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ErlNifBinary in_bin, out_bin, tmp_bin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t outlen, tmplen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t outlen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t tmplen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int is_private = (argv[4] == atom_true),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is_encrypt = (argv[5] == atom_true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int algo_init = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4596,6 +4611,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crypt_opt.signature_md != NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto badarg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (is_encrypt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSA *rsa = EVP_PKEY_get1_RSA(pkey);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4607,9 +4623,11 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in_bin = tmp_bin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) <= 0) goto badarg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RSA_OAEP_MD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crypt_opt.rsa_oaep_md != NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4728,6 +4746,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_RSA_SSLV23_PADDING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSA *rsa = EVP_PKEY_get1_RSA(pkey);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned char *p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4745,6 +4764,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (tmp_bin.data != NULL) {
</span></pre><pre style='margin:0'>
</pre>