diff --git a/crypto.patch b/crypto.patch index d88b0dc..3189811 100644 --- a/crypto.patch +++ b/crypto.patch @@ -5,10 +5,10 @@ Date: Sat Dec 21 00:13:35 2013 +0400 In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not HAVE_EC. -Index: otp_src_17.0/lib/crypto/c_src/crypto.c +Index: otp_src_17.4/lib/crypto/c_src/crypto.c =================================================================== ---- otp_src_17.0.orig/lib/crypto/c_src/crypto.c -+++ otp_src_17.0/lib/crypto/c_src/crypto.c +--- otp_src_17.4.orig/lib/crypto/c_src/crypto.c ++++ otp_src_17.4/lib/crypto/c_src/crypto.c @@ -77,7 +77,8 @@ #if OPENSSL_VERSION_NUMBER >= 0x009080ffL \ && !defined(OPENSSL_NO_EC) \ diff --git a/erlang-not-install-misc.patch b/erlang-not-install-misc.patch index e0ddf30..254563c 100644 --- a/erlang-not-install-misc.patch +++ b/erlang-not-install-misc.patch @@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov erts/etc/unix/Install.src | 10 ---------- 2 files changed, 14 deletions(-) -Index: otp_src_17.0/erts/etc/common/Makefile.in +Index: otp_src_17.4/erts/etc/common/Makefile.in =================================================================== ---- otp_src_17.0.orig/erts/etc/common/Makefile.in -+++ otp_src_17.0/erts/etc/common/Makefile.in +--- otp_src_17.4.orig/erts/etc/common/Makefile.in ++++ otp_src_17.4/erts/etc/common/Makefile.in @@ -550,10 +550,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" @@ -24,10 +24,10 @@ Index: otp_src_17.0/erts/etc/common/Makefile.in ifneq ($(INSTALL_SRC),) $(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src" $(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src" -Index: otp_src_17.0/erts/etc/unix/Install.src +Index: otp_src_17.4/erts/etc/unix/Install.src =================================================================== ---- otp_src_17.0.orig/erts/etc/unix/Install.src -+++ otp_src_17.0/erts/etc/unix/Install.src +--- otp_src_17.4.orig/erts/etc/unix/Install.src ++++ otp_src_17.4/erts/etc/unix/Install.src @@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_* cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot . cp -p $Name.boot start.boot diff --git a/erlang.changes b/erlang.changes index 041bbe0..36c59ea 100644 --- a/erlang.changes +++ b/erlang.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 13 12:12:16 UTC 2014 - matwey.kornilov@gmail.com + +- Version 17.4: + * eldap: Nearly all TCP options are possible to give in the eldap:open/2 call. + * ssh: Added API functions ptty_alloc/3 and ptty_alloc/4, to allocate a pseudo tty. + * ssl: Handle servers that may send an empty SNI extension to the client. + ------------------------------------------------------------------- Sun Nov 9 08:20:52 UTC 2014 - matwey.kornilov@gmail.com diff --git a/erlang.spec b/erlang.spec index acd7a8e..aa28283 100644 --- a/erlang.spec +++ b/erlang.spec @@ -17,7 +17,7 @@ Name: erlang -Version: 17.3 +Version: 17.4 Release: 0 Summary: General-purpose programming language and runtime environment License: ErlPL-1.1 diff --git a/otp-R16B-rpath.patch b/otp-R16B-rpath.patch index 1b3c196..8bc6b83 100644 --- a/otp-R16B-rpath.patch +++ b/otp-R16B-rpath.patch @@ -1,7 +1,7 @@ -Index: otp_src_17.0/lib/crypto/c_src/Makefile.in +Index: otp_src_17.4/lib/crypto/c_src/Makefile.in =================================================================== ---- otp_src_17.0.orig/lib/crypto/c_src/Makefile.in -+++ otp_src_17.0/lib/crypto/c_src/Makefile.in +--- otp_src_17.4.orig/lib/crypto/c_src/Makefile.in ++++ otp_src_17.4/lib/crypto/c_src/Makefile.in @@ -89,7 +89,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ @@ -11,10 +11,10 @@ Index: otp_src_17.0/lib/crypto/c_src/Makefile.in CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else -Index: otp_src_17.0/lib/crypto/priv/Makefile +Index: otp_src_17.4/lib/crypto/priv/Makefile =================================================================== ---- otp_src_17.0.orig/lib/crypto/priv/Makefile -+++ otp_src_17.0/lib/crypto/priv/Makefile +--- otp_src_17.4.orig/lib/crypto/priv/Makefile ++++ otp_src_17.4/lib/crypto/priv/Makefile @@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o # ---------------------------------------------------- @@ -24,10 +24,10 @@ Index: otp_src_17.0/lib/crypto/priv/Makefile -o $@ $^ -lcrypto $(DLL_NIFLIB): $(OBJS) -Index: otp_src_17.0/lib/odbc/c_src/odbcserver.c +Index: otp_src_17.4/lib/odbc/c_src/odbcserver.c =================================================================== ---- otp_src_17.0.orig/lib/odbc/c_src/odbcserver.c -+++ otp_src_17.0/lib/odbc/c_src/odbcserver.c +--- otp_src_17.4.orig/lib/odbc/c_src/odbcserver.c ++++ otp_src_17.4/lib/odbc/c_src/odbcserver.c @@ -106,6 +106,8 @@ #ifdef UNIX #include diff --git a/otp_doc_html_17.3.tar.gz b/otp_doc_html_17.3.tar.gz deleted file mode 100644 index 9a4299e..0000000 --- a/otp_doc_html_17.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd8278b34f610d6025549640d4e03d79d2a69d7129ea230c0d71d7e6b231f5b3 -size 33444170 diff --git a/otp_doc_html_17.4.tar.gz b/otp_doc_html_17.4.tar.gz new file mode 100644 index 0000000..c463f7a --- /dev/null +++ b/otp_doc_html_17.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd42b0104418de18e2247608a337bcd3bb24c59bbc36294deb5fae73ab6c90d6 +size 33483554 diff --git a/otp_doc_man_17.3.tar.gz b/otp_doc_man_17.3.tar.gz deleted file mode 100644 index a29d34f..0000000 --- a/otp_doc_man_17.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fabdac0b0594432fdd8186fa2c74ff49a629a9bcc4174e3bd605a3d4002dab7 -size 1357195 diff --git a/otp_doc_man_17.4.tar.gz b/otp_doc_man_17.4.tar.gz new file mode 100644 index 0000000..8e7e48d --- /dev/null +++ b/otp_doc_man_17.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c1cdb8e9d367c7b6dc6b20706de9fd0a0f0b7dffd66532663b2a24ed7679a58 +size 1360952 diff --git a/otp_src_17.3.tar.gz b/otp_src_17.3.tar.gz deleted file mode 100644 index 20fced6..0000000 --- a/otp_src_17.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4be03eb346016f4ca95d53eb9437ffaa6106762f153620dd98cd7f7733b76e4 -size 67050599 diff --git a/otp_src_17.4.tar.gz b/otp_src_17.4.tar.gz new file mode 100644 index 0000000..7651aad --- /dev/null +++ b/otp_src_17.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d82eda6ae7ac6f0f860093324e540fa514497068ec3b4177800284e8c761f56 +size 67171182