[erlang] Ver. 17.4

[Peter Lemenkov]

commit 2893cc56878af6eea87d7adc70d1772258c2676a
Author: Peter Lemenkov <lemenkov(a)gmail.com&gt;
Date:   Sat Dec 13 11:50:53 2014 +0300

    Ver. 17.4
    
    Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com&gt;

 .gitignore                                         |    1 +
 erlang.spec                                        |   31 ++----
 otp-0003-Do-not-install-C-sources.patch            |    4 +-
 otp-0004-Do-not-install-Java-sources.patch         |    4 +-
 otp-0006-Do-not-install-erlang-sources.patch       |   34 +++----
 ...0007-Added-systemd-notify-support-to-EPMD.patch |   45 ---------
 ...7-Split-off-webtool-dependency-from-tools.patch |    0
 ...Install-internal-hrl-files-when-necessary.patch |   97 -------------------
 ...2.patch => otp-0008-Introduce-os-getenv-2.patch |    0
 otp-0009-Expose-NIF-version.patch                  |  102 --------------------
 ...es-support-for-SSLv3-protocol-because-it-.patch |    6 +-
 sources                                            |    2 +-
 12 files changed, 36 insertions(+), 290 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2861be6..72cea5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ otp_src_R14A.tar.gz
 /otp-OTP-17.2.2.tar.gz
 /otp-OTP-17.3.3.tar.gz
 /otp-OTP-17.3.4.tar.gz
+/otp-OTP-17.4.tar.gz
diff --git a/erlang.spec b/erlang.spec
index 66fdfd8..6892e02 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -9,8 +9,8 @@
 %endif
 
 Name:		erlang
-Version:	17.3.4
-Release:	3%{?dist}
+Version:	17.4
+Release:	1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -60,23 +60,14 @@ Patch5:
otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 #   Do not install erlang sources
 Patch6: otp-0006-Do-not-install-erlang-sources.patch
 # Fedora specific patch
-#   Added systemd notify support to EPMD
-Patch7: otp-0007-Added-systemd-notify-support-to-EPMD.patch
-# Fedora specific patch
-#   Install internal hrl files when necessary
-Patch8: otp-0008-Install-internal-hrl-files-when-necessary.patch
-# Fedora specific patch
-#   Expose NIF version
-Patch9: otp-0009-Expose-NIF-version.patch
-# Fedora specific patch
 #   Split off webtool dependency from tools
-Patch10: otp-0010-Split-off-webtool-dependency-from-tools.patch
+Patch7: otp-0007-Split-off-webtool-dependency-from-tools.patch
 # Fedora specific patch
 #   Introduce os:getenv/2
-Patch11: otp-0011-Introduce-os-getenv-2.patch
+Patch8: otp-0008-Introduce-os-getenv-2.patch
 # Fedora specific patch
 #   Patch removes support for SSLv3 protocol because it is proved
-Patch12: otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
+Patch9: otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
 # end of autogenerated patch tag list
 
 BuildRequires:	lksctp-tools-devel
@@ -902,12 +893,9 @@ Erlang mode for XEmacs (source lisp files).
 %patch4 -p1 -b .Do_not_install_Java_sources
 %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
 %patch6 -p1 -b .Do_not_install_erlang_sources
-%patch7 -p1 -b .Added_systemd_notify_support_to_EPMD
-%patch8 -p1 -b .Install_internal_hrl_files_when_necessary
-%patch9 -p1 -b .Expose_NIF_version
-%patch10 -p1 -b .Split_off_webtool_dependency_from_tools
-%patch11 -p1 -b .Introduce_os_getenv_2
-%patch12 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_
+%patch7 -p1 -b .Split_off_webtool_dependency_from_tools
+%patch8 -p1 -b .Introduce_os_getenv_2
+%patch9 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_
 # end of autogenerated prep patch list
 
 # FIXME we should come up with a better solution
@@ -2228,6 +2216,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \
 
 
 %changelog
+* Fri Dec 12 2014 Peter Lemenkov <lemenkov(a)gmail.com&gt; - 17.4-1
+- Ver. 17.4
+
 * Mon Dec 01 2014 Peter Lemenkov <lemenkov(a)gmail.com&gt; - 17.3.4-3
 - Disable SSLv3 (see rhbz #1169375)
 
diff --git a/otp-0003-Do-not-install-C-sources.patch
b/otp-0003-Do-not-install-C-sources.patch
index 6499e4c..f89bcb7 100644
--- a/otp-0003-Do-not-install-C-sources.patch
+++ b/otp-0003-Do-not-install-C-sources.patch
@@ -46,10 +46,10 @@ index 5b36c19..470821e 100644
  endif
  endif
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index 7d914a0..b013939 100644
+index 7c09b60..2c14f9e 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -892,14 +892,14 @@ ifneq ($(EXE_TARGETS),)
+@@ -904,14 +904,14 @@ ifneq ($(EXE_TARGETS),)
  	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
  endif
  	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
diff --git a/otp-0004-Do-not-install-Java-sources.patch
b/otp-0004-Do-not-install-Java-sources.patch
index b5a48ff..65323fa 100644
--- a/otp-0004-Do-not-install-Java-sources.patch
+++ b/otp-0004-Do-not-install-Java-sources.patch
@@ -18,10 +18,10 @@ index 273614e..5b1fb57 100644
  	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
  
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-index 8ae1ca0..adaaf55 100644
+index ea3ab77..e95757e 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -114,8 +114,6 @@ release release_docs release_tests release_html:
+@@ -119,8 +119,6 @@ release release_docs release_tests release_html:
  	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) 
$@_spec
  
  release_spec: opt
diff --git a/otp-0006-Do-not-install-erlang-sources.patch
b/otp-0006-Do-not-install-erlang-sources.patch
index cc923fb..9e0e3a9 100644
--- a/otp-0006-Do-not-install-erlang-sources.patch
+++ b/otp-0006-Do-not-install-erlang-sources.patch
@@ -171,7 +171,7 @@ index c185c15..68bacba 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
  		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index 90189dd..1e8f51d 100644
+index d61519f..bfdb0c9 100644
 --- a/lib/debugger/src/Makefile
 +++ b/lib/debugger/src/Makefile
 @@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -268,18 +268,17 @@ index 377e593..668e278 100644
  	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index e6dab67..a5e147d 100644
+index 47aef10..78ddc74 100644
 --- a/lib/eunit/src/Makefile
 +++ b/lib/eunit/src/Makefile
-@@ -117,8 +117,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
+@@ -120,7 +120,6 @@ release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/include"
  	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
- 
 diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
 index f0200ca..86d3f74 100644
 --- a/lib/gs/src/Makefile
@@ -499,10 +498,10 @@ index b368b12..5eddaf0 100644
  	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES)
"$(RELSYSDIR)/ebin"
  
 diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index cb3c0a4..dbda2a2 100644
+index c7c70ad..3e1792f 100644
 --- a/lib/kernel/src/Makefile
 +++ b/lib/kernel/src/Makefile
-@@ -198,7 +198,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
@@ -694,7 +693,7 @@ index 88f8957..ab08a88 100644
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  
 diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
-index 4f03d02..756db7b 100644
+index 6096240..cbc41e6 100644
 --- a/lib/otp_mibs/src/Makefile
 +++ b/lib/otp_mibs/src/Makefile
 @@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
@@ -720,18 +719,17 @@ index 2ee2285..ea075ed 100644
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
-index 6bf0af9..e501539 100644
+index 0282d63..5902da3 100644
 --- a/lib/percept/src/Makefile
 +++ b/lib/percept/src/Makefile
-@@ -93,8 +93,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -96,7 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
  #	$(INSTALL_DIR) "$(RELSYSDIR)/include"
  #	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
 diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
 index c1b3bc8..3d021cf 100644
 --- a/lib/public_key/asn1/Makefile
@@ -873,7 +871,7 @@ index 698c341..3344a0c 100644
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 04ce750..ef55c37 100644
+index 90d7110..e725c6c 100644
 --- a/lib/ssh/src/Makefile
 +++ b/lib/ssh/src/Makefile
 @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -886,7 +884,7 @@ index 04ce750..ef55c37 100644
  	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
  	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
-index 7c4c8ec..99efbe4 100644
+index 0c00a65..acec405 100644
 --- a/lib/ssl/src/Makefile
 +++ b/lib/ssl/src/Makefile
 @@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -924,7 +922,7 @@ index c9fbad8..2fc7f18 100644
  release_docs_spec:
  
 diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
-index ab4dd4d..bcb1bc3 100644
+index 35bbad3..deb7caf 100644
 --- a/lib/test_server/src/Makefile
 +++ b/lib/test_server/src/Makefile
 @@ -123,7 +123,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -932,7 +930,7 @@ index ab4dd4d..bcb1bc3 100644
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
  	$(INSTALL_DIR) "$(RELSYSDIR)/include"
  	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
 diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
diff --git a/otp-0010-Split-off-webtool-dependency-from-tools.patch
b/otp-0007-Split-off-webtool-dependency-from-tools.patch
similarity index 100%
rename from otp-0010-Split-off-webtool-dependency-from-tools.patch
rename to otp-0007-Split-off-webtool-dependency-from-tools.patch
diff --git a/otp-0011-Introduce-os-getenv-2.patch b/otp-0008-Introduce-os-getenv-2.patch
similarity index 100%
rename from otp-0011-Introduce-os-getenv-2.patch
rename to otp-0008-Introduce-os-getenv-2.patch
diff --git a/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
b/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
similarity index 98%
rename from otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
rename to otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
index 584fa59..fa55663 100644
--- a/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
+++ b/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Patch removes support for SSLv3 protocol because it is
proved
 
 
 diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
-index f14d0b8..3a768e9 100644
+index b53344e..b245621 100644
 --- a/lib/ssl/doc/src/ssl.xml
 +++ b/lib/ssl/doc/src/ssl.xml
 @@ -123,7 +123,7 @@
@@ -45,10 +45,10 @@ index 43cb393..ff12e04 100644
  
        <tag><c><![CDATA[session_lifetime = integer()
<optional>]]></c></tag>
 diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
-index 85724de..14013a4 100644
+index 75efb64..155fa81 100644
 --- a/lib/ssl/src/ssl_internal.hrl
 +++ b/lib/ssl/src/ssl_internal.hrl
-@@ -64,8 +64,8 @@
+@@ -67,8 +67,8 @@
  -define(TRUE, 0).
  -define(FALSE, 1).
  
diff --git a/sources b/sources
index 6327b7c..b22e8a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81aa75b5613b7db6f3761f848695e816  otp-OTP-17.3.4.tar.gz
+0d06e7d3802d63992535116e4d37c1a4  otp-OTP-17.4.tar.gz