Disable SSLv3

Disable SSLv3 (see rhbz #1169375). Also backport useful os:getenv/2 from
master (see https://github.com/erlang/otp/pull/535 )

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

.gitignore

@@ -1,7 +1,52 @@
-/*.src.rpm
-/*~
-/otp-OTP-*.tar.gz
-/otp_doc_html_R*.tar.gz
-/otp_doc_man_R*.tar.gz
-/otp_src_R*.readme
-/otp_src_R*.tar.gz
+otp_src_R14A.tar.gz
+/otp_src_R14B.tar.gz
+/otp_doc_html_R14B.tar.gz
+/otp_doc_man_R14B.tar.gz
+/otp_doc_html_R14B01.tar.gz
+/otp_doc_man_R14B01.tar.gz
+/otp_src_R14B01.tar.gz
+/otp_doc_html_R14B02.tar.gz
+/otp_doc_man_R14B02.tar.gz
+/otp_src_R14B02.tar.gz
+/otp_src_R14B03.tar.gz
+/otp_doc_html_R14B03.tar.gz
+/otp_doc_man_R14B03.tar.gz
+/otp_src_R14B04.tar.gz
+/otp_doc_html_R14B04.tar.gz
+/otp_doc_man_R14B04.tar.gz
+/otp_doc_html_R15B.tar.gz
+/otp_doc_man_R15B.tar.gz
+/otp_src_R15B.tar.gz
+/otp_doc_html_R15B01.tar.gz
+/otp_doc_man_R15B01.tar.gz
+/otp_src_R15B01.tar.gz
+/otp_doc_html_R15B02.tar.gz
+/otp_doc_man_R15B02.tar.gz
+/otp_src_R15B02.tar.gz
+/otp_doc_html_R15B03-1.tar.gz
+/otp_doc_man_R15B03-1.tar.gz
+/otp_src_R15B03-1.readme
+/otp_src_R15B03-1.tar.gz
+/otp_doc_html_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_doc_man_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_src_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_src_R16A_RELEASE_CANDIDATE.readme
+/otp_src_R16B.tar.gz
+/otp_doc_html_R16B.tar.gz
+/otp_doc_man_R16B.tar.gz
+/otp_src_R16B01.tar.gz
+/otp_doc_html_R16B01.tar.gz
+/otp_doc_man_R16B01.tar.gz
+/otp_src_R16B01.readme
+/otp_src_R16B02.tar.gz
+/otp_doc_html_R16B02.tar.gz
+/otp_doc_man_R16B02.tar.gz
+/otp_src_R16B02.readme
+/otp_src_R16B03.tar.gz
+/otp_doc_html_R16B03.tar.gz
+/otp_doc_man_R16B03.tar.gz
+/otp_src_R16B03.readme
+/otp_src_R16B03-1.readme
+/otp_doc_html_R16B03-1.tar.gz
+/otp_doc_man_R16B03-1.tar.gz
+/otp_src_R16B03-1.tar.gz

epmd.socket

@@ -2,7 +2,7 @@
 Description=Erlang Port Mapper Daemon Activation Socket
 
 [Socket]
-ListenStream=4369
+ListenStream=127.0.0.1:4369
 Accept=false
 
 [Install]

epmd@.socket

@@ -2,7 +2,7 @@
 Description=Erlang Port Mapper Daemon Activation Socket
 
 [Socket]
-ListenStream=%I
+ListenStream=%i:4369
 Accept=false
 
 [Install]

otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 42af9c87dc..c017e0a4ed 100644
+index 5c1ce51..5a07855 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -552,10 +552,6 @@ endif
+@@ -474,10 +474,6 @@ endif
  ifneq ($(INSTALL_TOP_BIN),)
  	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
  endif
@@ -17,14 +17,14 @@ index 42af9c87dc..c017e0a4ed 100644
 -	$(INSTALL_DIR) "$(RELEASE_PATH)/misc"
 -	$(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc"
 -endif
- ifneq ($(INSTALL_SRC),)
- 	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
- 	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
+ ifneq ($(INSTALL_ERL_OSE),)
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose"
+ 	cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
 diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
-index b00dd09f1a..2147774f50 100644
+index 8eb1db7..9e340bb 100644
 --- a/erts/etc/unix/Install.src
 +++ b/erts/etc/unix/Install.src
-@@ -143,14 +143,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+@@ -140,14 +140,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
  cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
  cp -p $Name.boot start.boot
  cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script

otp-0002-Remove-rpath.patch

@@ -5,15 +5,28 @@ Subject: [PATCH] Remove rpath
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index aedc9e7a13..b27c2aa01b 100644
+index a20ddff..e890927 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -147,7 +147,7 @@ endif
- endif
+@@ -85,7 +85,7 @@ endif
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
  
- ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
+ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
 +SSL_DED_LD_RUNTIME_LIBRARY_PATH =
  CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
  EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
  else
+diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
+index 0989f14..0d29444 100644
+--- a/lib/crypto/priv/Makefile
++++ b/lib/crypto/priv/Makefile
+@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
+ # ----------------------------------------------------
+ 
+ $(SO_NIFLIB): $(OBJS)
+-	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
++	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
+ 	-o $@ $^ -lcrypto
+ 
+ $(DLL_NIFLIB): $(OBJS)

otp-0003-Do-not-install-C-sources.patch

@@ -14,10 +14,10 @@ https://bugzilla.redhat.com/818419
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 82a6b6e87a..5f2fe8ba7d 100644
+index 7023833..8bf8eb9 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
-@@ -137,8 +137,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -107,8 +107,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
  	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
@@ -26,34 +26,73 @@ index 82a6b6e87a..5f2fe8ba7d 100644
  
  release_docs_spec:
  
+diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
+index e890927..1377654 100644
+--- a/lib/crypto/c_src/Makefile.in
++++ b/lib/crypto/c_src/Makefile.in
+@@ -160,13 +160,9 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
+-	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
+ ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+-	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index fa1ea3cd39..b977b6afe5 100644
+index e36b39c..fd377bb 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -715,13 +715,11 @@ ifeq (@DYNAMIC_LIB@, yes)
- endif
+@@ -876,14 +876,14 @@ ifneq ($(EXE_TARGETS),)
  	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+ endif
  	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
 -	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
 -	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
 -	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
 -	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
--	$(INSTALL_DATA) global/*.[ch]   "$(RELSYSDIR)/src/global"
+-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
 -	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
 +	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
 +	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
 +	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
 +	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
 +	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
++	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
++	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
++	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
  
  release_docs:
  
+diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
+index ed860ab..96206ae 100644
+--- a/lib/ic/c_src/Makefile.in
++++ b/lib/ic/c_src/Makefile.in
+@@ -144,12 +144,10 @@ $(OBJDIR)/%.o: %.c
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
+-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 3649e2c392..d8c5c68b99 100644
+index 6111cf2..bd62e8b 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -251,7 +251,7 @@ release_spec: opt
+@@ -270,7 +270,7 @@ release_spec: opt
  	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
  	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
  ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
@@ -63,10 +102,10 @@ index 3649e2c392..d8c5c68b99 100644
  endif
  
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index d1b26743a6..cf8faae1f5 100644
+index 6572d28..c7093ae 100644
 --- a/lib/odbc/c_src/Makefile.in
 +++ b/lib/odbc/c_src/Makefile.in
-@@ -129,11 +129,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
  ifdef EXE_TARGET
@@ -79,10 +118,10 @@ index d1b26743a6..cf8faae1f5 100644
  endif
  
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index 27b156a2c9..f11ff303b6 100644
+index f84ccf7..05d194f 100644
 --- a/lib/os_mon/c_src/Makefile.in
 +++ b/lib/os_mon/c_src/Makefile.in
-@@ -126,8 +126,6 @@ $(OBJDIR)/memsup.o: memsup.h
+@@ -125,8 +125,6 @@ $(OBJDIR)/memsup.o: memsup.h
  include $(ERL_TOP)/make/otp_release_targets.mk
  
  release_spec: opt
@@ -91,3 +130,30 @@ index 27b156a2c9..f11ff303b6 100644
  	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
  	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
  
+diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
+index d315a90..7b4b9fb 100644
+--- a/lib/runtime_tools/c_src/Makefile.in
++++ b/lib/runtime_tools/c_src/Makefile.in
+@@ -177,9 +177,7 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ 
+ release_docs_spec:
+diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
+index aea5686..a0c8883 100644
+--- a/lib/tools/c_src/Makefile.in
++++ b/lib/tools/c_src/Makefile.in
+@@ -189,8 +189,6 @@ include ../vsn.mk
+ RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
+ 
+ release_spec: all
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+-	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
+ ifneq ($(PROGS),)
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
+ 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"

otp-0004-Do-not-install-Java-sources.patch

@@ -4,11 +4,24 @@ Subject: [PATCH] Do not install Java sources
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
+diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+index 273614e..5b1fb57 100644
+--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
++++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+@@ -112,8 +112,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(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 089cf4ab1a..404654a437 100644
+index f476d45..44429a4 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -123,8 +123,6 @@ release release_docs release_tests release_html:
+@@ -102,8 +102,6 @@ release release_docs release_tests release_html:
  	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
  
  release_spec: opt
@@ -16,4 +29,4 @@ index 089cf4ab1a..404654a437 100644
 -	$(V_at)$(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang"
  	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/priv"
  	$(V_at)$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
- 	$(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 

otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index 8e3882bfdc..ea999cf9c7 100644
+index 08fd23e..5606cfc 100644
 --- a/lib/os_mon/doc/src/Makefile
 +++ b/lib/os_mon/doc/src/Makefile
-@@ -31,11 +31,16 @@ APPLICATION=os_mon
+@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
  # Target Specs
  # ----------------------------------------------------
  XML_APPLICATION_FILES = ref_man.xml
@@ -21,32 +21,33 @@ index 8e3882bfdc..ea999cf9c7 100644
  XML_REF3_FILES = cpu_sup.xml \
  	disksup.xml \
  	memsup.xml \
+ 	os_mon_mib.xml \
  	os_sup.xml \
 -	nteventlog.xml
 +	$(NTEVENTLOG_DOCFILE)
  
- XML_REF6_FILES = os_mon_app.xml
+ XML_REF6_FILES = os_mon_app.xml 
  
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index e28fb12548..ee32f3946f 100644
+index cd2dade..4e78cf8 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
-@@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
+@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
  # ----------------------------------------------------
  # Target Specs
  # ----------------------------------------------------
--MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo nteventlog
 +ifeq ($(findstring win32,$(TARGET)),win32)
 +NTEVENTLOG=nteventlog
 +else
 +NTEVENTLOG=
 +endif
-+MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
+ MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
+-	nteventlog
 +	 $(NTEVENTLOG)
  
  INCLUDE=../include
  CSRC=../c_src
-@@ -78,7 +84,11 @@ docs:
+@@ -78,7 +83,11 @@ docs:
  # ----------------------------------------------------
  
  $(APP_TARGET): $(APP_SRC) ../vsn.mk

otp-0006-Add-extra-search-directory.patch

@@ -1,32 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 2 Aug 2017 16:12:19 +0300
-Subject: [PATCH] Add extra search directory
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
-index 7327636751..2e92e77598 100644
---- a/lib/kernel/src/code_server.erl
-+++ b/lib/kernel/src/code_server.erl
-@@ -90,11 +90,17 @@ init(Ref, Parent, [Root,Mode]) ->
-     IPath =
- 	case Mode of
- 	    interactive ->
--		LibDir = filename:append(Root, "lib"),
--		{ok,Dirs} = erl_prim_loader:list_dir(LibDir),
--		Paths = make_path(LibDir, Dirs),
-+		F = fun(R) ->
-+			LD = filename:append(R, "lib"),
-+			case erl_prim_loader:list_dir(LD) of
-+				    error -> [];
-+				    {ok, D} -> make_path(LD, D)
-+			end
-+		    end,
-+		Paths = F(Root),
-+		SharedPaths = F("/usr/share/erlang"),
- 		UserLibPaths = get_user_lib_dirs(),
--		["."] ++ UserLibPaths ++ Paths;
-+		["."] ++ UserLibPaths ++ Paths ++ SharedPaths;
- 	    _ ->
- 		[]
- 	end,

otp-0007-Avoid-forking-sed-to-get-basename.patch

@@ -1,31 +0,0 @@
-From: Jan Pazdziora <jpazdziora@redhat.com>
-Date: Thu, 10 May 2018 18:35:02 +0200
-Subject: [PATCH] Avoid forking sed to get basename.
-
-
-diff --git a/erts/etc/unix/erl.src.src b/erts/etc/unix/erl.src.src
-index 536fa139d9..4dcffbc4c8 100644
---- a/erts/etc/unix/erl.src.src
-+++ b/erts/etc/unix/erl.src.src
-@@ -49,7 +49,7 @@ else
- fi
- BINDIR="$ROOTDIR/erts-%VSN%/bin"
- EMU=%EMULATOR%%EMULATOR_NUMBER%
--PROGNAME=`basename "$0"`
-+PROGNAME=${0##*/}
- export EMU
- export ROOTDIR
- export BINDIR
-diff --git a/erts/etc/unix/start_erl.src b/erts/etc/unix/start_erl.src
-index 34e0369710..62e613bba1 100644
---- a/erts/etc/unix/start_erl.src
-+++ b/erts/etc/unix/start_erl.src
-@@ -37,7 +37,7 @@ VSN=`awk '{print $2}' $DataFile`
- 
- BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
- EMU=beam
--PROGNAME=`echo $0 | sed 's/.*\///'`
-+PROGNAME=${0##*/}
- export EMU
- export ROOTDIR
- export BINDIR

otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch

@@ -0,0 +1,61 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sun, 21 Nov 2010 00:17:49 +0300
+Subject: [PATCH] Ugly workaround for java-1.5.0-gcj which doesn't support
+ UNICODE fully
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+Fedora-Spec-Comment: Required only for el5, el6 on PowerPC
+Fedora-Spec-Before: %if 0%{?el4}%{?el5}%{?el6}
+Fedora-Spec-Before: %ifnarch %{ix86} x86_64
+Fedora-Spec-After: %endif
+Fedora-Spec-After: %endif
+
+diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
+index 3456fd7..86cd411 100644
+--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
++++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java
+@@ -389,19 +389,7 @@ public class OtpErlangList extends OtpErlangObject implements
+      */
+ 
+     public String stringValue() throws OtpErlangException {
+-	if (! isProper()) {
+-	    throw new OtpErlangException("Non-proper list: " + this);
+-	}
+-	final int[] values = new int[arity()];
+-	for (int i = 0; i < values.length; ++i) {
+-	    final OtpErlangObject o = elementAt(i);
+-	    if (! (o instanceof OtpErlangLong)) {
+-		throw new OtpErlangException("Non-integer term: " + o);
+-	    }
+-	    final OtpErlangLong l = (OtpErlangLong) o;
+-	    values[i] = l.intValue();
+-	}
+-	return new String(values, 0, values.length);
++	throw new OtpErlangException("No UNICODE support in java-1.5.0-gcj");
+     }
+ 
+ 
+diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+index 9dc1728..76e380d 100644
+--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
++++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+@@ -1112,17 +1112,8 @@ public class OtpInputStream extends ByteArrayInputStream {
+ 	case OtpExternal.nilTag:
+ 	    return "";
+ 	case OtpExternal.listTag: // List when unicode +
+-	    len = read4BE();
+-	    intbuf = new int[len];
+-	    for (int i = 0; i < len; i++) {
+-		intbuf[i] = read_int();
+-		if (! OtpErlangString.isValidCodePoint(intbuf[i])) {
+-		    throw new OtpErlangDecodeException
+-			("Invalid CodePoint: " + intbuf[i]);
+-		}
+-	    }
+-	    read_nil();
+-	    return new String(intbuf, 0, intbuf.length);
++	    throw new OtpErlangDecodeException(
++		    "No UNICODE support in java-1.5.0-gcj");
+ 	default:
+ 	    throw new OtpErlangDecodeException(
+ 		    "Wrong tag encountered, expected " + OtpExternal.stringTag

otp-0008-Fix-for-armv7hl-architecture.patch

@@ -0,0 +1,22 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 26 Sep 2013 22:01:03 +0400
+Subject: [PATCH] Fix for armv7hl architecture
+
+Taken from openSUSE:
+
+* https://build.opensuse.org/package/view_file/devel:languages:erlang:Factory/erlang/fix-armv7hl.patch?expand=1
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/erts/configure.in b/erts/configure.in
+index bad748d..230f27a 100644
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -621,6 +621,7 @@ case $chk_arch_ in
+     armv5tejl)	ARCH=arm;;
+     armv6l) ARCH=arm;;
+     armv7l)	ARCH=arm;;
++    armv7hl)	ARCH=arm;;
+     tile)	ARCH=tile;;
+     *)	 	ARCH=noarch;;
+ esac

otp-0008-Load-man-pages-from-system-wide-directory.patch

@@ -1,25 +0,0 @@
-From: Francois-Denis Gonthier <neumann@lostwebsite.net>
-Date: Thu, 20 Sep 2018 15:01:18 +0300
-Subject: [PATCH] Load man-pages from system-wide directory
-
-Patch allows one to use standard man path with erl -man command.
-(Erlang manual pages are placed to /usr/share/man/ hierarchy
-as required by Debian policy.)
-
-diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
-index 888df87e35..14272f06c6 100644
---- a/erts/etc/common/erlexec.c
-+++ b/erts/etc/common/erlexec.c
-@@ -716,8 +716,10 @@ int main(int argc, char **argv)
- 			error("-man not supported on Windows");
- #else
- 			argv[i] = "man";
--			erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
--			set_env("MANPATH", tmpStr);
-+			/*
-+			* Conform to erlang-manpages content.
-+			*/
-+			putenv(strsave("MANSECT=3erl:1:5:7"));
- 			execvp("man", argv+i);
- 			error("Could not execute the 'man' command.");
- #endif

otp-0009-Add-GDB-tools.patch

@@ -1,464 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Thu, 19 Jun 2025 13:17:52 +0200
-Subject: [PATCH] Add GDB tools
-
-* https://github.com/erlang/otp-gdb-tools
-* Commit 7b864f58c534699e4124e31ecfda86041b941037.
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/erts/etc/unix/gdb-tools/README.md b/erts/etc/unix/gdb-tools/README.md
-new file mode 100644
-index 0000000000..8a6cf92b1d
---- /dev/null
-+++ b/erts/etc/unix/gdb-tools/README.md
-@@ -0,0 +1,42 @@
-+# Erlang/OTP GDB Tools
-+
-+This repository contains GDB tools that cannot
-+be part of the main Erlang/OTP repository for licensing
-+reasons. The tools are used when building and debugging
-+Erlang/OTP with gdb and are installed as needed by the
-+Erlang/OTP build system.
-+
-+Right now the only tool in this repository is the jit-reader
-+which is a plugin to gdb that allows it to read the stack of
-+Erlang processes when using the JIT. This allows commands
-+such as `backtrace` to show Erlang stackframes. For example:
-+
-+```
-+(gdb) bt
-+#0  0x00007fffa40005ee in global::call_bif_shared ()
-+#1  0x00007fffa411eaac in erl_eval:eval_lc1/7 () at erl_eval.erl:929
-+#2  0x00007fffa411e7bc in erl_eval:eval_lc/7 () at erl_eval.erl:917
-+#3  0x00007fffa4296528 in lists:map_1/2 () at lists.erl:2082
-+#4  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+#5  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+#6  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+.....
-+#98 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+#99 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+#100 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
-+#101 0x00007fffa42963d4 in lists:map/2 () at lists.erl:2077
-+#102 0x00007fffa411e45c in erl_eval:do_apply/7 () at erl_eval.erl:904
-+#103 0x00007fffa45f4c58 in shell:exprs/7 () at shell.erl:893
-+#104 0x00007fffa45f42c4 in shell:eval_exprs/7 () at shell.erl:849
-+#105 0x00007fffa45f3dac in shell:eval_loop/4 () at shell.erl:834
-+#106 0x00007fffa40024b8 in erts_beamasm:normal_exit/0-CodeInfoPrologue ()
-+Backtrace stopped: previous frame inner to this frame (corrupt stack?)
-+(gdb) 
-+```
-+
-+## Updates of jit-reader
-+
-+When updating jit-reader you first need to update this repository
-+and push the new version here. Then you need to run
-+`./otp_build update_gdb_tools` in the Erlang/OTP repo for
-+it to use the correct commit.
-diff --git a/erts/etc/unix/gdb-tools/jit-reader.c b/erts/etc/unix/gdb-tools/jit-reader.c
-new file mode 100644
-index 0000000000..3c39c5540d
---- /dev/null
-+++ b/erts/etc/unix/gdb-tools/jit-reader.c
-@@ -0,0 +1,386 @@
-+#include <gdb/jit-reader.h>
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+/* Useful links
-+ * - https://pwparchive.wordpress.com/2011/11/20/new-jit-interface-for-gdb/
-+ * - https://sourceware.org/gdb/current/onlinedocs/gdb/Custom-Debug-Info.html
-+ * - https://github.com/tetzank/asmjit-utilities
-+ * - https://github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/gdb.base/jitreader.c
-+ */
-+
-+GDB_DECLARE_GPL_COMPATIBLE_READER
-+
-+#if 0
-+#define HARD_DEBUG
-+static FILE *log = NULL;
-+#define LOG(...) do { fprintf(log, ##__VA_ARGS__); fflush(log); } while(0)
-+#else
-+#define LOG(...)
-+#endif
-+
-+typedef enum {
-+    X64_RBP = 6,  /* Frame pointer iff native frames are enabled */
-+    X64_RSP = 7,  /* Stack pointer when using native stack */
-+    X64_R12 = 12, /* Stack pointer when using non-native stack */
-+    X64_R13 = 13, /* Current process */
-+    X64_RIP = 16
-+} X64Register;
-+
-+typedef enum {
-+    /* Return address only */
-+    ERTS_FRAME_LAYOUT_RA,
-+    /* Frame pointer, return address */
-+    ERTS_FRAME_LAYOUT_FP_RA
-+} ErtsFrameLayout;
-+
-+struct emulator_info {
-+    /* 0 = regular, 1 = frame pointers */
-+    int frame_layout;
-+    const void *normal_exit;
-+};
-+
-+struct erlang_module_info {
-+    uint64_t base_address;
-+    uint32_t range_count;
-+    uint32_t code_size;
-+    /* Module name, including null terminator. */
-+    uint16_t name_length;
-+    char name[];
-+    /* array of range_info structures */
-+};
-+
-+struct range_info {
-+    uint32_t start_offset;
-+    uint32_t end_offset;
-+    uint32_t line_count;
-+    /* Range name, including null terminator. */
-+    uint16_t name_length;
-+    char name[];
-+    /* array of line_info structures */
-+};
-+
-+struct line_info {
-+    uint32_t start_offset;
-+    uint32_t line_number;
-+    /* File name, including null terminator. */
-+    uint16_t file_length;
-+    char file[];
-+};
-+
-+enum debug_info_header {
-+    DEBUG_INFO_HEADER_EMULATOR = 0,
-+    DEBUG_INFO_HEADER_MODULE = 1,
-+};
-+
-+struct debug_info {
-+    enum debug_info_header header;
-+    union {
-+        struct emulator_info emu;
-+        struct erlang_module_info mod;
-+    } payload;
-+};
-+
-+typedef struct range {
-+    GDB_CORE_ADDR start;
-+    GDB_CORE_ADDR end;
-+#ifdef HARD_DEBUG
-+    char *name;
-+#endif
-+} range;
-+
-+typedef struct priv {
-+    range *ranges;
-+    int num_ranges;
-+    ErtsFrameLayout frame_layout;
-+    const void *normal_exit;
-+} priv;
-+
-+static enum gdb_status read_module_info(struct gdb_reader_funcs *self,
-+                                        struct gdb_symbol_callbacks *cb,
-+                                        struct erlang_module_info *module_info) {
-+    struct gdb_object *obj = cb->object_open(cb);
-+    GDB_CORE_ADDR mod_start, mod_end;
-+    char *symfile = (char*)module_info;
-+    priv *priv = self->priv_data;
-+
-+    symfile += sizeof(*module_info) + module_info->name_length;
-+
-+    mod_start = module_info->base_address;
-+    mod_end = mod_start + module_info->code_size;
-+
-+    priv->ranges = realloc(priv->ranges, (priv->num_ranges + 1) * sizeof(range));
-+    priv->ranges[priv->num_ranges].start = mod_start;
-+    priv->ranges[priv->num_ranges].end = mod_end;
-+#ifdef HARD_DEBUG
-+    priv->ranges[priv->num_ranges].name = strdup(module_info->name);
-+#endif
-+    priv->num_ranges += 1;
-+
-+    LOG("Add module `%s` (0x%lx, 0x%lx)\r\n",
-+        module_info->name, mod_start, mod_end);
-+
-+    for (int range = 0; range < module_info->range_count; range++) {
-+        struct range_info *range_info;
-+        struct gdb_symtab *symtab;
-+        GDB_CORE_ADDR begin, end;
-+
-+        range_info = (struct range_info *)symfile;
-+        symfile += sizeof(*range_info) + range_info->name_length;
-+
-+        begin = mod_start + range_info->start_offset;
-+        end = mod_start + range_info->end_offset;
-+
-+        LOG("Add range `%s` (0x%lx, 0x%lx), %u lines\r\n",
-+            range_info->name,
-+            begin, end,
-+            range_info->line_count);
-+
-+        /* A bug in GDB < 9 forces us to open and close the symtab for each
-+         * iteration. */
-+        symtab = cb->symtab_open(cb, obj, module_info->name);
-+        cb->block_open(cb, symtab, NULL, begin, end, range_info->name);
-+        cb->symtab_close(cb, symtab);
-+
-+        for (int line = 0; line < range_info->line_count; line++) {
-+            struct gdb_line_mapping line_mapping;
-+            struct line_info *line_info;
-+
-+            line_info = (struct line_info *)symfile;
-+            symfile += sizeof(*line_info) + line_info->file_length;
-+
-+            line_mapping.pc = mod_start + line_info->start_offset;
-+            line_mapping.line = line_info->line_number;
-+
-+            LOG("\t%s:%u\r\n", line_info->file, line_info->line_number);
-+
-+            /* The symbol table must be opened and closed on every single line
-+             * for file names to work properly, as there is no other way to
-+             * tell GDB that a certain line belongs to a different file than
-+             * the rest of the table. Sigh. */
-+            symtab = cb->symtab_open(cb, obj, line_info->file);
-+
-+            cb->block_open(cb, symtab, NULL, line_mapping.pc, end,
-+                           range_info->name);
-+            cb->line_mapping_add(cb, symtab, 1, &line_mapping);
-+            cb->symtab_close(cb, symtab);
-+        }
-+    }
-+
-+    cb->object_close(cb, obj);
-+
-+    return GDB_SUCCESS;
-+}
-+
-+static enum gdb_status read_emulator_info(struct gdb_reader_funcs *self,
-+                                          struct gdb_symbol_callbacks *cb,
-+                                          struct emulator_info *emulator_info) {
-+    priv *priv = self->priv_data;
-+
-+    priv->frame_layout = emulator_info->frame_layout;
-+    priv->normal_exit = emulator_info->normal_exit;
-+
-+    LOG("initialize: frame layout = %i\r\n", priv->frame_layout);
-+
-+    return GDB_SUCCESS;
-+}
-+
-+static enum gdb_status read_debug_info(struct gdb_reader_funcs *self,
-+                                       struct gdb_symbol_callbacks *cb,
-+                                       void *memory, long memory_sz) {
-+    struct debug_info *debug_info = memory;
-+
-+    (void)memory_sz;
-+
-+    switch (debug_info->header) {
-+    case DEBUG_INFO_HEADER_EMULATOR:
-+        return read_emulator_info(self, cb, &debug_info->payload.emu);
-+    case DEBUG_INFO_HEADER_MODULE:
-+        return read_module_info(self, cb, &debug_info->payload.mod);
-+    }
-+
-+    return GDB_FAIL;
-+}
-+
-+static void regfree(struct gdb_reg_value *reg) {
-+    free(reg);
-+}
-+
-+static struct range *get_range(priv *priv, GDB_CORE_ADDR rip) {
-+    for (int i = 0; i < priv->num_ranges; i++) {
-+        if (rip >= priv->ranges[i].start && rip < priv->ranges[i].end) {
-+            return &priv->ranges[i];
-+        }
-+    }
-+
-+    return NULL;
-+}
-+
-+static enum gdb_status unwind(struct gdb_reader_funcs *self,
-+                              struct gdb_unwind_callbacks *cb) {
-+    GDB_CORE_ADDR rbp, rsp, rip;
-+    struct range *range;
-+    priv *priv;
-+
-+    rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value;
-+    rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value;
-+    rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value;
-+
-+    priv = self->priv_data;
-+    range = get_range(priv, rip);
-+
-+    /* Check that rip points to one of the addresses that we handle */
-+    if (range) {
-+        struct gdb_reg_value *prev_rbp, *prev_rsp, *prev_rip;
-+
-+        prev_rbp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
-+        prev_rsp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
-+        prev_rip = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
-+
-+        LOG("UNWIND match %s: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx  \r\n",
-+            range->name, rbp, rsp, rip);
-+
-+        prev_rbp->free = &regfree;
-+        prev_rbp->defined = 1;
-+        prev_rbp->size = sizeof(char*);
-+        prev_rsp->free = &regfree;
-+        prev_rsp->defined = 1;
-+        prev_rsp->size = sizeof(char*);
-+        prev_rip->free = &regfree;
-+        prev_rip->defined = 1;
-+        prev_rip->size = sizeof(char*);
-+
-+        if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) {
-+            /* Frame pointers are enabled, which means that rbp will point to
-+             * where we stored the previous frames rbp. Also the previous
-+             * frames address will be at rbp + 8 and the previous frames rsp
-+             * will be rbp + 16.
-+             *
-+             *  0x00:                <- prev_rsp
-+             *  0x08: prev call addr
-+             *  0x10: prev rbp       <- curr rbp
-+             *  0x18: current frame
-+             *  0x20:                <- curr rip */
-+            cb->target_read(rbp + 1 * sizeof(char*), &prev_rip->value,
-+                            sizeof(char*));
-+            cb->target_read(rbp + 0 * sizeof(char*), &prev_rbp->value,
-+                            sizeof(char*));
-+            *(GDB_CORE_ADDR*)prev_rsp->value = rbp + sizeof(char*[2]);
-+        } else {
-+            /* Normal frame layout, we need to scan the stack. */
-+            cb->target_read(rsp, &prev_rip->value, sizeof(char*));
-+
-+            for (rsp += sizeof(char*); ; rsp += sizeof(char*)) {
-+                cb->target_read(rsp, &prev_rip->value, sizeof(char*));
-+
-+                LOG("rsp: 0x%lx rip: 0x%lx\r\n",
-+                    rsp, *(GDB_CORE_ADDR*)prev_rip->value);
-+
-+                /* Check if it is a cp */
-+                if ((*(GDB_CORE_ADDR*)prev_rip->value & 0x3) == 0) {
-+                    break;
-+                }
-+            }
-+
-+            *(GDB_CORE_ADDR*)prev_rsp->value = rsp;
-+            *(GDB_CORE_ADDR*)prev_rbp->value = rsp - sizeof(char*);
-+        }
-+
-+        if (*(GDB_CORE_ADDR*)prev_rip->value == (uintptr_t)priv->normal_exit) {
-+            LOG("Normal exit\r\n");
-+            *(GDB_CORE_ADDR*)prev_rsp->value = 0;
-+            *(GDB_CORE_ADDR*)prev_rbp->value = 0;
-+        } else {
-+            LOG("UNWIND prev: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n",
-+                *(GDB_CORE_ADDR*)prev_rbp->value,
-+                *(GDB_CORE_ADDR*)prev_rsp->value,
-+                *(GDB_CORE_ADDR*)prev_rip->value);
-+        }
-+
-+        cb->reg_set(cb, X64_RIP, prev_rip);
-+        cb->reg_set(cb, X64_RSP, prev_rsp);
-+        cb->reg_set(cb, X64_RBP, prev_rbp);
-+
-+        return GDB_SUCCESS;
-+    }
-+
-+    LOG("UNWIND no match: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n", rbp, rsp, rip);
-+    return GDB_FAIL;
-+}
-+
-+static struct gdb_frame_id get_frame_id(struct gdb_reader_funcs *self,
-+                                        struct gdb_unwind_callbacks *cb){
-+    struct gdb_frame_id frame = {0, 0};
-+    GDB_CORE_ADDR rbp, rsp, rip;
-+    struct range *range;
-+    priv *priv;
-+
-+    rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value;
-+    rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value;
-+    rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value;
-+
-+    priv = self->priv_data;
-+    range = get_range(priv, rip);
-+
-+    LOG("FRAME: rip: 0x%lx rsp: 0x%lx rbp: 0x%lx \r\n", rip, rsp, rbp);
-+
-+    if (range) {
-+        frame.code_address = rip;
-+
-+        if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) {
-+            frame.stack_address = rbp + sizeof(char*);
-+        } else {
-+            GDB_CORE_ADDR prev_rip;
-+
-+            for (rsp += sizeof(char*); ; rsp += sizeof(char*)) {
-+                cb->target_read(rsp, &prev_rip, sizeof(char*));
-+
-+                LOG("rsp: 0x%lx rip: 0x%lx\r\n", rsp, prev_rip);
-+
-+                /* Check if it is a cp */
-+                if ((prev_rip & 0x3) == 0) {
-+                    break;
-+                }
-+            }
-+
-+            frame.stack_address = rsp;
-+        }
-+    }
-+
-+    LOG("FRAME: code_address: 0x%lx stack_address: 0x%lx\r\n",
-+        frame.code_address, frame.stack_address);
-+
-+    return frame;
-+}
-+
-+static void destroy(struct gdb_reader_funcs *self){
-+    free(self);
-+}
-+
-+struct gdb_reader_funcs *gdb_init_reader(void){
-+    struct gdb_reader_funcs *funcs = malloc(sizeof(struct gdb_reader_funcs));
-+    priv *priv_data = malloc(sizeof(priv));
-+
-+    priv_data->num_ranges = 1;
-+    priv_data->ranges = malloc(sizeof(range));
-+    priv_data->ranges[0].start = 0;
-+    priv_data->ranges[0].end = 0;
-+
-+    funcs->reader_version = GDB_READER_INTERFACE_VERSION;
-+    funcs->priv_data = priv_data;
-+
-+    funcs->read = read_debug_info;
-+    funcs->unwind = unwind;
-+    funcs->get_frame_id = get_frame_id;
-+    funcs->destroy = destroy;
-+
-+#ifdef HARD_DEBUG
-+    log = fopen("/tmp/jit-reader.log","w+");
-+    if (!log) fprintf(stderr,"Could not open /tmp/jit-reader.log");
-+#endif
-+
-+    return funcs;
-+}
-diff --git a/erts/etc/unix/gdb-tools/jit-reader.mk b/erts/etc/unix/gdb-tools/jit-reader.mk
-new file mode 100644
-index 0000000000..8ef0bccec2
---- /dev/null
-+++ b/erts/etc/unix/gdb-tools/jit-reader.mk
-@@ -0,0 +1,9 @@
-+EXTRA_LIBS = $(BINDIR)/jit-reader.so
-+
-+jit-reader: $(EXTRA_LIBS)
-+
-+$(OBJDIR)/jit-reader.o: $(GDB_TOOLS)/jit-reader.c $(GDB_TOOLS)/jit-reader.h
-+	$(V_CC) $(DED_CFLAGS) -I$(ETC) -o $@ -c $<
-+
-+$(BINDIR)/jit-reader.so: $(OBJDIR)/jit-reader.o
-+	$(V_LD) $(DED_LDFLAGS) -o $@ $^

otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch

@@ -0,0 +1,24 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 24 Oct 2013 16:44:22 +0400
+Subject: [PATCH] TEMPORARILY disable ECC until dust settles
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
+index 42fb172..eb99719 100644
+--- a/lib/crypto/c_src/crypto.c
++++ b/lib/crypto/c_src/crypto.c
+@@ -74,13 +74,6 @@
+ # define HAVE_DES_ede3_cfb_encrypt
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x009080ffL \
+-	&& !defined(OPENSSL_NO_EC) \
+-	&& !defined(OPENSSL_NO_ECDH) \
+-	&& !defined(OPENSSL_NO_ECDSA)
+-# define HAVE_EC
+-#endif
+-
+ #if defined(HAVE_EC)
+ #include <openssl/ec.h>
+ #include <openssl/ecdh.h>

otp-0010-Fix-for-powerpc-architecture.patch

@@ -0,0 +1,26 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Mon, 28 Oct 2013 17:11:11 +0400
+Subject: [PATCH] Fix for powerpc architecture
+
+Taken from openSUSE:
+
+* https://build.opensuse.org/package/view_file/devel:languages:erlang:Factory/erlang/erlang-ppc.patch?expand=1
+
+See also:
+
+* https://bugzilla.redhat.com/1023960
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/erts/configure.in b/erts/configure.in
+index 230f27a..9ad3671 100644
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -612,6 +612,7 @@ case $chk_arch_ in
+     x86_64)	ARCH=amd64;;
+     amd64)	ARCH=amd64;;
+     macppc)	ARCH=ppc;;
++    powerpc)	ARCH=ppc;;
+     ppc)	ARCH=ppc;;
+     ppc64)	ARCH=ppc64;;
+     "Power Macintosh")	ARCH=ppc;;

otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch

@@ -0,0 +1,74 @@
+From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
+Date: Tue, 17 Dec 2013 18:16:56 +0400
+Subject: [PATCH] Add -systemd option to empd. Check for include
+ systemd/sd-daemon.h and wrap systemd code into ifdef-s.
+
+
+diff --git a/erts/configure.in b/erts/configure.in
+index 9ad3671..125e579 100644
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -1565,6 +1565,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr], [], [],
+ 	 #endif
+ 	])
+ 
++AC_CHECK_HEADERS(systemd/sd-daemon.h)
++
+ dnl ----------------------------------------------------------------------
+ dnl Check the availability for libdlpi
+ dnl ----------------------------------------------------------------------
+diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
+index 2d55b37..fc58882 100644
+--- a/erts/epmd/src/epmd.c
++++ b/erts/epmd/src/epmd.c
+@@ -175,6 +175,9 @@ int main(int argc, char** argv)
+     g->nodes.reg = g->nodes.unreg = g->nodes.unreg_tail = NULL;
+     g->nodes.unreg_count = 0;
+     g->active_conn    = 0;
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++    g->is_systemd     = 0;
++#endif
+ 
+     for (i = 0; i < MAX_LISTEN_SOCKETS; i++)
+ 	g->listenfd[i] = -1;
+@@ -248,8 +251,12 @@ int main(int argc, char** argv)
+ 	    else
+ 		usage(g);
+ 	    epmd_cleanup_exit(g,0);
+-	}
+-	else
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++	} else if (strcmp(argv[0], "-systemd") == 0) {
++            g->is_systemd = 1;
++            argv++; argc--;
++#endif
++	} else
+ 	    usage(g);
+     }
+     dbg_printf(g,1,"epmd running - daemon = %d",g->is_daemon);
+@@ -454,6 +461,11 @@ static void usage(EpmdVars *g)
+     fprintf(stderr, "        Forcibly unregisters a name with epmd\n");
+     fprintf(stderr, "        (only allowed if -relaxed_command_check was given when \n");
+     fprintf(stderr, "        epmd was started).\n");
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++    fprintf(stderr, "    -systemd\n");
++    fprintf(stderr, "        Wait for socket from systemd. The option makes sense\n");
++    fprintf(stderr, "        when started from .socket unit.\n");
++#endif
+     epmd_cleanup_exit(g,1);
+ }
+ 
+diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
+index 656dbd1..bf1ddd8 100644
+--- a/erts/epmd/src/epmd_int.h
++++ b/erts/epmd/src/epmd_int.h
+@@ -321,6 +321,9 @@ typedef struct {
+   int listenfd[MAX_LISTEN_SOCKETS];
+   char *addresses;
+   char **argv;
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++  int is_systemd;
++#endif
+ } EpmdVars;
+ 
+ void dbg_printf(EpmdVars*,int,const char*,...);

otp-0012-Add-systemd-support-to-epmd.patch

@@ -0,0 +1,111 @@
+From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
+Date: Tue, 17 Dec 2013 18:57:54 +0400
+Subject: [PATCH] Add systemd support to epmd
+
+
+diff --git a/erts/configure.in b/erts/configure.in
+index 125e579..d9bc1ec 100644
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -969,6 +969,8 @@ AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(inet, main)
+ AC_CHECK_LIB(util, openpty)
+ 
++AC_CHECK_LIB(systemd-daemon, sd_listen_fds)
++
+ dnl Try to find a thread library.
+ dnl
+ dnl ETHR_LIB_NAME, ETHR_LIBS, ETHR_X_LIBS, ETHR_THR_LIB_BASE and ETHR_DEFS
+diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
+index bf1ddd8..363923e 100644
+--- a/erts/epmd/src/epmd_int.h
++++ b/erts/epmd/src/epmd_int.h
+@@ -110,6 +110,10 @@
+ 
+ #include <stdarg.h>
+ 
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++#  include <systemd/sd-daemon.h>
++#endif
++
+ /* ************************************************************************ */
+ /* Replace some functions by others by making the function name a macro */
+ 
+diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
+index 90df7cc..cb8ca96 100644
+--- a/erts/epmd/src/epmd_srv.c
++++ b/erts/epmd/src/epmd_srv.c
+@@ -208,6 +208,39 @@ void run(EpmdVars *g)
+   node_init(g);
+   g->conn = conn_init(g);
+ 
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++  if (g->is_systemd)
++    {
++      int n;
++      
++      dbg_printf(g,2,"try to obtain sockets from systemd");
++
++      n = sd_listen_fds(0);
++      if (n < 0)
++        {
++          dbg_perror(g,"cannot obtain sockets from systemd");
++          epmd_cleanup_exit(g,1);
++        }
++      else if (n == 0)
++        {
++          dbg_tty_printf(g,0,"systemd provides no sockets");
++          epmd_cleanup_exit(g,1);
++      }
++      else if (n > MAX_LISTEN_SOCKETS)
++      {
++          dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses", MAX_LISTEN_SOCKETS);
++          epmd_cleanup_exit(g,1);
++      } 
++      num_sockets = n;
++      for (i = 0; i < num_sockets; i++)
++        {
++          g->listenfd[i] = listensock[i] = SD_LISTEN_FDS_START + i;
++        }
++    }
++  else
++    {
++#endif
++
+   dbg_printf(g,2,"try to initiate listening port %d", g->port);
+ 
+   if (g->addresses != NULL && /* String contains non-separator characters if: */
+@@ -272,6 +305,9 @@ void run(EpmdVars *g)
+       SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
+       num_sockets = 1;
+     }
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++    }
++#endif
+ 
+ #if !defined(__WIN32__)
+   /* We ignore the SIGPIPE signal that is raised when we call write
+@@ -289,6 +325,13 @@ void run(EpmdVars *g)
+   FD_ZERO(&g->orig_read_mask);
+   g->select_fd_top = 0;
+ 
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++  if (g->is_systemd)
++      for (i = 0; i < num_sockets; i++)
++          select_fd_set(g, listensock[i]);
++  else
++    {
++#endif
+   for (i = 0; i < num_sockets; i++)
+     {
+       if ((listensock[i] = socket(FAMILY,SOCK_STREAM,0)) < 0)
+@@ -351,6 +394,9 @@ void run(EpmdVars *g)
+       }
+       select_fd_set(g, listensock[i]);
+     }
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H 
++    }
++#endif
+ 
+   dbg_tty_printf(g,2,"entering the main select() loop");
+ 

otp-0013-Added-systemd-notify-support-to-EPMD.patch

@@ -0,0 +1,45 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Fri, 6 Jun 2014 15:29:49 +0400
+Subject: [PATCH] Added systemd notify support to EPMD
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+Conflicts:
+	erts/configure.in
+
+diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
+index fc58882..1757fa9 100644
+--- a/erts/epmd/src/epmd.c
++++ b/erts/epmd/src/epmd.c
+@@ -589,9 +589,11 @@ void epmd_cleanup_exit(EpmdVars *g, int exitval)
+       for(i=0; g->argv[i] != NULL; ++i)
+ 	  free(g->argv[i]);
+       free(g->argv);
+-  }      
+-      
+-
++  }
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
++  sd_notifyf(0, "STATUS=Exited.\n"
++                "ERRNO=%i", exitval);
++#endif // HAVE_SYSTEMD_SD_DAEMON_H
+   exit(exitval);
+ }
+ 
+diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
+index cb8ca96..78524a6 100644
+--- a/erts/epmd/src/epmd_srv.c
++++ b/erts/epmd/src/epmd_srv.c
+@@ -394,8 +394,11 @@ void run(EpmdVars *g)
+       }
+       select_fd_set(g, listensock[i]);
+     }
+-#ifdef HAVE_SYSTEMD_SD_DAEMON_H 
++#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+     }
++    sd_notifyf(0, "READY=1\n"
++                  "STATUS=Processing port mapping requests...\n"
++                  "MAINPID=%lu", (unsigned long) getpid());
+ #endif
+ 
+   dbg_tty_printf(g,2,"entering the main select() loop");

otp-0014-Install-internal-hrl-files-when-necessary.patch

@@ -0,0 +1,97 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Tue, 26 Aug 2014 13:53:49 +0400
+Subject: [PATCH] Install internal hrl files when necessary
+
+Sometimes we install *.erl files. Some these files include a private
+*.hrl files, so in order to make these *.erl files usable we have to
+install these private includes as well.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+Conflicts:
+	lib/eunit/src/Makefile
+	lib/percept/src/Makefile
+	lib/test_server/src/Makefile
+
+diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
+index 5a6f298..b40ef23 100644
+--- a/lib/debugger/src/Makefile
++++ b/lib/debugger/src/Makefile
+@@ -77,7 +77,7 @@ MODULES= \
+ 
+ HRL_FILES=
+ 
+-INTERNAL_HRL_FILES= dbg_ieval.hrl
++INTERNAL_HRL_FILES= dbg_ieval.hrl dbg_wx_filedialog_win.hrl
+ 
+ ERL_FILES= $(MODULES:%=%.erl)
+ 
+diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
+index a5e147d..8483e28 100644
+--- a/lib/eunit/src/Makefile
++++ b/lib/eunit/src/Makefile
+@@ -46,6 +46,8 @@ SOURCES= \
+ 
+ INCLUDE_FILES = eunit.hrl
+ 
++INTERNAL_HRL_FILES= eunit_internal.hrl
++
+ PARSE_TRANSFORM_BIN = $(PARSE_TRANSFORM:%.erl=$(EBIN)/%.$(EMULATOR))
+ 
+ TARGET_FILES= $(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR))
+@@ -117,6 +119,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
++	$(INSTALL_DIR) "$(RELSYSDIR)/src"
++	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
+index dbda2a2..3e1792f 100644
+--- a/lib/kernel/src/Makefile
++++ b/lib/kernel/src/Makefile
+@@ -122,6 +122,7 @@ HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
+ 	../include/net_address.hrl 
+ 
+ INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
++        erl_epmd.hrl hipe_ext_format.hrl \
+         inet_dns.hrl inet_res.hrl \
+         inet_boot.hrl inet_config.hrl inet_int.hrl \
+ 	inet_dns_record_adts.hrl
+diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile
+index e501539..5902da3 100644
+--- a/lib/percept/src/Makefile
++++ b/lib/percept/src/Makefile
+@@ -50,6 +50,8 @@ MODULES= \
+ 
+ #HRL_FILES= ../include/
+ 
++INTERNAL_HRL_FILES= egd.hrl percept.hrl
++
+ ERL_FILES= $(MODULES:%=%.erl)
+ 
+ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+@@ -93,6 +95,8 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
++	$(INSTALL_DIR) "$(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/test_server/src/Makefile b/lib/test_server/src/Makefile
+index bcb1bc3..deb7caf 100644
+--- a/lib/test_server/src/Makefile
++++ b/lib/test_server/src/Makefile
+@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(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"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"

otp-0015-Expose-NIF-version.patch

@@ -0,0 +1,90 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sun, 2 Nov 2014 19:49:55 +0300
+Subject: [PATCH] Expose NIF version
+
+This patch allows checking for NIF API version in a way similar to
+driver version. E.g. by calling erlang:system_info(nif_version).
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+Conflicts:
+	erts/emulator/test/driver_SUITE.erl
+
+diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
+index e3ef48a..b9d7230 100644
+--- a/erts/doc/src/erlang.xml
++++ b/erts/doc/src/erlang.xml
+@@ -5903,6 +5903,11 @@ ok
+               <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>, and
+               <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
+           </item>
++          <tag><c>nif_version</c></tag>
++          <item>
++            <p>Returns a string containing the erlang NIF version
++              used by the runtime system. It will be on the form "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
++          </item>
+           <tag><marker id="system_info_otp_release"><c>otp_release</c></marker></tag>
+           <item>
+             <p>Returns a string containing the OTP release number.</p>
+diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
+index d7f1e2d..7a7f23e 100755
+--- a/erts/emulator/beam/erl_bif_info.c
++++ b/erts/emulator/beam/erl_bif_info.c
+@@ -27,6 +27,7 @@
+ #include "erl_process.h"
+ #include "error.h"
+ #include "erl_driver.h"
++#include "erl_nif.h"
+ #include "bif.h"
+ #include "big.h"
+ #include "erl_version.h"
+@@ -2428,6 +2429,13 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
+ 			      ERL_DRV_EXTENDED_MINOR_VERSION);
+ 	hp = HAlloc(BIF_P, 2*n);
+ 	BIF_RET(buf_to_intlist(&hp, buf, n, NIL));
++    } else if (ERTS_IS_ATOM_STR("nif_version", BIF_ARG_1)) {
++	char buf[42];
++	int n = erts_snprintf(buf, 42, "%d.%d",
++			      ERL_NIF_MAJOR_VERSION,
++			      ERL_NIF_MINOR_VERSION);
++	hp = HAlloc(BIF_P, 2*n);
++	BIF_RET(buf_to_intlist(&hp, buf, n, NIL));
+     } else if (ERTS_IS_ATOM_STR("smp_support", BIF_ARG_1)) {
+ #ifdef ERTS_SMP
+ 	BIF_RET(am_true);
+diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
+index 2919265..c0f14ad 100644
+--- a/erts/preloaded/src/erlang.erl
++++ b/erts/preloaded/src/erlang.erl
+@@ -2124,6 +2124,7 @@ tuple_to_list(_Tuple) ->
+          (modified_timing_level) -> integer() | undefined;
+          (multi_scheduling) -> disabled | blocked | enabled;
+          (multi_scheduling_blockers) -> [PID :: pid()];
++         (nif_version) -> string();
+          (otp_release) -> string();
+          (port_count) -> non_neg_integer();
+          (port_limit) -> pos_integer();
+diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
+index 1d4b878..64f1b82 100644
+--- a/lib/runtime_tools/src/system_information.erl
++++ b/lib/runtime_tools/src/system_information.erl
+@@ -344,6 +344,7 @@ erlang_system_info() ->
+ 	    logical_processors_online,
+ 	    logical_processors_available,
+ 	    driver_version,
++	    nif_version,
+ 	    emu_args,
+ 	    ethread_info,
+ 	    beam_jump_table,
+diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
+index 0900ead..9ded5a1 100644
+--- a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
++++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
+@@ -9720,6 +9720,7 @@
+                  {logical_processors_online,4},
+                  {logical_processors_available,4},
+                  {driver_version,"2.1"},
++                 {nif_version,"1.1"},
+                  {taints,[]}]},
+                {erts_compile_info,
+                 [{ldflags,[]},

otp-0016-Split-off-webtool-dependency-from-tools.patch

@@ -0,0 +1,40 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 8 Nov 2014 22:54:57 +0300
+Subject: [PATCH] Split off webtool dependency from tools
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl
+index 69f2f3b..9085300 100644
+--- a/lib/tools/src/cover_web.erl
++++ b/lib/tools/src/cover_web.erl
+@@ -50,14 +50,25 @@
+ %%%----------------------------------------------------------------------
+ %% Start webtool and webcover from erlang shell
+ start() ->
+-    webtool:start(),
+-    webtool:start_tools([],"app=webcover"),
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, start, []),
++        erlang:apply(webtool, start_tools, [[],"app=webcover"])
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
+     ok.
+ 
+ %% Stop webtool and webcover from erlang shell
+ stop() ->
+-    webtool:stop_tools([],"app=webcover"),
+-    webtool:stop().
++    try
++        % Disable automatic dependency picking up
++        erlang:apply(webtool, stop_tools, [[],"app=webcover"]),
++        erlang:apply(webtool, stop, [])
++    catch
++        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
++    end,
++    ok.
+ 
+ 
+ 

otp-0017-lib-inets-src-ftp-ftp.erl-Check-the-filenames-userna.patch

@@ -0,0 +1,430 @@
+From: Sergei Golovan <sgolovan@gmail.com>
+Date: Sun, 9 Feb 2014 23:06:25 +0400
+Subject: [PATCH] lib/inets/src/ftp/ftp.erl: Check the filenames, usernames,
+ passwords etc.     for <CR> and <LF> in them and return error if these
+ offending chars     are found. See
+ http://erlang.org/pipermail/erlang-bugs/2014-January/003998.html     for
+ details. lib/inets/test/ftp_suite_lib.erl: Added checks for <CR><LF> in file
+ and directory     names.
+
+
+diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
+index 520db1b..5674599 100644
+--- a/lib/inets/src/ftp/ftp.erl
++++ b/lib/inets/src/ftp/ftp.erl
+@@ -192,7 +192,12 @@ do_open(Pid, OpenOptions, TLSOpts) ->
+     'ok' | {'error', Reason :: 'euser' | common_reason()}.
+ 
+ user(Pid, User, Pass) ->
+-    call(Pid, {user, User, Pass}, atom).
++    case {is_name_sane(User), is_name_sane(Pass)} of
++	{true, true} ->
++	    call(Pid, {user, User, Pass}, atom);
++	_ ->
++	    {error, euser}
++    end.
+ 
+ -spec user(Pid  :: pid(), 
+ 	   User :: string(), 
+@@ -201,7 +206,12 @@ user(Pid, User, Pass) ->
+     'ok' | {'error', Reason :: 'euser' | common_reason()}.
+ 
+ user(Pid, User, Pass, Acc) ->
+-    call(Pid, {user, User, Pass, Acc}, atom).
++    case {is_name_sane(User), is_name_sane(Pass), is_name_sane(Acc)} of
++	{true, true, true} ->
++	    call(Pid, {user, User, Pass, Acc}, atom);
++	_ ->
++	    {error, euser}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -216,7 +226,12 @@ user(Pid, User, Pass, Acc) ->
+     'ok' | {'error', Reason :: 'eacct' | common_reason()}.
+ 
+ account(Pid, Acc) ->
+-    call(Pid, {account, Acc}, atom).
++    case is_name_sane(Acc) of
++	true ->
++	    call(Pid, {account, Acc}, atom);
++	_ ->
++	    {error, eacct}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -262,7 +277,12 @@ lpwd(Pid) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ cd(Pid, Dir) ->
+-    call(Pid, {cd, Dir}, atom).
++    case is_name_sane(Dir) of
++	true ->
++	    call(Pid, {cd, Dir}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -305,7 +325,12 @@ ls(Pid) ->
+ 	{'error', Reason ::  restriction_reason() | common_reason()}.
+ 
+ ls(Pid, Dir) ->
+-    call(Pid, {dir, long, Dir}, string).
++    case is_name_sane(Dir) of
++	true ->
++	    call(Pid, {dir, long, Dir}, string);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -333,7 +358,12 @@ nlist(Pid) ->
+ 	{'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ nlist(Pid, Dir) ->
+-    call(Pid, {dir, short, Dir}, string).
++    case is_name_sane(Dir) of
++	true ->
++	    call(Pid, {dir, short, Dir}, string);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -349,7 +379,12 @@ nlist(Pid, Dir) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ rename(Pid, Old, New) ->
+-    call(Pid, {rename, Old, New}, string).
++    case {is_name_sane(Old), is_name_sane(New)} of
++	{true, true} ->
++	    call(Pid, {rename, Old, New}, string);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -365,7 +400,12 @@ rename(Pid, Old, New) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ delete(Pid, File) ->
+-    call(Pid, {delete, File}, string).
++    case is_name_sane(File) of
++	true ->
++	    call(Pid, {delete, File}, string);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -380,7 +420,12 @@ delete(Pid, File) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ mkdir(Pid, Dir) ->
+-    call(Pid, {mkdir, Dir}, atom).
++    case is_name_sane(Dir) of
++	true ->
++	    call(Pid, {mkdir, Dir}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -395,7 +440,12 @@ mkdir(Pid, Dir) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ rmdir(Pid, Dir) ->
+-    call(Pid, {rmdir, Dir}, atom).
++    case is_name_sane(Dir) of
++	true ->
++	    call(Pid, {rmdir, Dir}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -437,7 +487,12 @@ recv(Pid, RemotFileName) ->
+     'ok' | {'error', Reason :: term()}.
+ 
+ recv(Pid, RemotFileName, LocalFileName) ->
+-    call(Pid, {recv, RemotFileName, LocalFileName}, atom).
++    case is_name_sane(RemotFileName) of
++	true ->
++	    call(Pid, {recv, RemotFileName, LocalFileName}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -456,7 +511,12 @@ recv(Pid, RemotFileName, LocalFileName) ->
+ 	{'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ recv_bin(Pid, RemoteFile) ->
+-    call(Pid, {recv_bin, RemoteFile}, bin).
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {recv_bin, RemoteFile}, bin);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -473,7 +533,12 @@ recv_bin(Pid, RemoteFile) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ recv_chunk_start(Pid, RemoteFile) ->
+-    call(Pid, {recv_chunk_start, RemoteFile}, atom).
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {recv_chunk_start, RemoteFile}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -521,7 +586,12 @@ send(Pid, LocalFileName) ->
+                             shortage_reason()}.
+ 
+ send(Pid, LocalFileName, RemotFileName) ->
+-    call(Pid, {send, LocalFileName, RemotFileName}, atom).
++    case is_name_sane(RemotFileName) of
++	true ->
++	    call(Pid, {send, LocalFileName, RemotFileName}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -541,7 +611,12 @@ send(Pid, LocalFileName, RemotFileName) ->
+                             shortage_reason()}.
+ 
+ send_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
+-    call(Pid, {send_bin, Bin, RemoteFile}, atom);
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {send_bin, Bin, RemoteFile}, atom);
++	_ ->
++	    {error, efnamena}
++    end;
+ send_bin(_Pid, _Bin, _RemoteFile) ->
+   {error, enotbinary}.
+ 
+@@ -559,7 +634,12 @@ send_bin(_Pid, _Bin, _RemoteFile) ->
+     'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+ 
+ send_chunk_start(Pid, RemoteFile) ->
+-    call(Pid, {send_chunk_start, RemoteFile}, atom).
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {send_chunk_start, RemoteFile}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -575,7 +655,12 @@ send_chunk_start(Pid, RemoteFile) ->
+     'ok' | {'error', Reason :: term()}.
+ 
+ append_chunk_start(Pid, RemoteFile) ->
+-    call(Pid, {append_chunk_start, RemoteFile}, atom).
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {append_chunk_start, RemoteFile}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -683,7 +768,12 @@ append(Pid, LocalFileName) ->
+     'ok' | {'error', Reason :: term()}.
+ 
+ append(Pid, LocalFileName, RemotFileName) ->
+-    call(Pid, {append, LocalFileName, RemotFileName}, atom).
++    case is_name_sane(RemotFileName) of
++	true ->
++	    call(Pid, {append, LocalFileName, RemotFileName}, atom);
++	_ ->
++	    {error, efnamena}
++    end.
+ 
+ 
+ %%--------------------------------------------------------------------------
+@@ -705,7 +795,12 @@ append(Pid, LocalFileName, RemotFileName) ->
+                             shortage_reason()}.
+ 
+ append_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
+-    call(Pid, {append_bin, Bin, RemoteFile}, atom);
++    case is_name_sane(RemoteFile) of
++	true ->
++	    call(Pid, {append_bin, Bin, RemoteFile}, atom);
++	_ ->
++	    {error, efnamena}
++    end;
+ append_bin(_Pid, _Bin, _RemoteFile) ->
+     {error, enotbinary}.
+ 
+@@ -2302,6 +2397,15 @@ send_bin(State, Bin) ->
+ mk_cmd(Fmt, Args) ->
+     [io_lib:format(Fmt, Args)| [?CR, ?LF]].		% Deep list ok.
+ 
++is_name_sane([]) ->
++    true;
++is_name_sane([?CR| _]) ->
++    false;
++is_name_sane([?LF| _]) ->
++    false;
++is_name_sane([_| Rest]) ->
++    is_name_sane(Rest).
++
+ pwd_result(Lines) ->
+     {_, [?DOUBLE_QUOTE | Rest]} = 
+ 	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Lines),
+diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
+index 35f21cc..daee1bd 100644
+--- a/lib/inets/test/ftp_suite_lib.erl
++++ b/lib/inets/test/ftp_suite_lib.erl
+@@ -1266,6 +1266,8 @@ read_log_6035([]) ->
+ %%--------------------------------------------------------------------
+ do_user(Pid) ->
+     {error, euser} = ftp:user(Pid, ?BAD_USER, ?FTP_PASS),
++    {error, euser} = ftp:user(Pid, ?FTP_USER++"\r\nPASS "++?FTP_PASS, ?FTP_PASS),
++    {error, euser} = ftp:user(Pid, ?FTP_USER, ?FTP_PASS++"\r\nCWD ."),
+     ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS),
+     ok.
+ 
+@@ -1278,6 +1280,7 @@ do_pwd(Pid) ->
+ do_cd(Pid) ->
+     ok = ftp:cd(Pid, "/pub"),
+     {error, epath} = ftp:cd(Pid, ?BAD_DIR),
++    {error, efnamena} = ftp:cd(Pid, "/pub\r\nCWD ."),
+     ok.
+ 
+ do_lcd(Pid, Dir) ->
+@@ -1294,11 +1297,14 @@ do_ls(Pid) ->
+     %% directory, but can also be a filename or a group 
+     %% of files (including wildcards).
+     {ok, _} = ftp:ls(Pid, "incom*"),
++    %% but \r\n can't be in the wildcard
++    {error, efnamena} = ftp:ls(Pid, "incoming\r\nCWD ."),
+     ok.
+ 
+ do_nlist(Pid, WildcardSupport) ->
+     {ok, _} = ftp:nlist(Pid),
+     {ok, _} = ftp:nlist(Pid, "incoming"),
++    {error, efnamena} = ftp:ls(Pid, "incoming\r\nCWD ."),
+     %% neither nlist nor ls operates on a directory
+     %% they operate on a pathname, which *can* be a 
+     %% directory, but can also be a filename or a group 
+@@ -1324,6 +1330,8 @@ do_rename(Pid, Config) ->
+     ftp:delete(Pid, NewLFile),		% reset
+     ok = ftp:send(Pid, LFile), 
+     {error, epath} = ftp:rename(Pid, NewLFile, LFile),
++    {error, efnamena} = ftp:rename(Pid, NewLFile++"\r\nRNTO "++LFile++"\r\nRNFR "++NewLFile, LFile),
++    {error, efnamena} = ftp:rename(Pid, NewLFile, LFile++"\r\nCWD ."),
+     ok = ftp:rename(Pid, LFile, NewLFile),
+     ftp:delete(Pid, LFile),		% cleanup
+     ftp:delete(Pid, NewLFile),		% cleanup
+@@ -1338,6 +1346,7 @@ do_delete(Pid, Config) ->
+     ok = ftp:cd(Pid, "incoming"),
+     ok = ftp:lcd(Pid, PrivDir),
+     ftp:delete(Pid,LFile),		% reset
++    {error, efnamena} = ftp:delete(Pid,LFile++"\r\nCWD ."),
+     ok = ftp:send(Pid, LFile),
+     ok = ftp:delete(Pid,LFile),
+     ok.
+@@ -1348,6 +1357,8 @@ do_mkdir(Pid) ->
+ 	integer_to_list(B) ++ "_" ++ integer_to_list(C),
+     ok = ftp:cd(Pid, "incoming"),
+     {ok, CurrDir} = ftp:pwd(Pid),
++    {error, efnamena} = ftp:mkdir(Pid, NewDir++"\r\nCWD ."),
++    {error, efnamena} = ftp:rmdir(Pid, NewDir++"\r\nCWD ."),
+     ok = ftp:mkdir(Pid, NewDir),
+     ok = ftp:cd(Pid, NewDir),
+     ok = ftp:cd(Pid, CurrDir),
+@@ -1363,6 +1374,7 @@ do_send(Pid, Config) ->
+     ok = file:write_file(AbsLFile, list_to_binary(Contents)),
+     ok = ftp:cd(Pid, "incoming"),
+     ok = ftp:lcd(Pid, PrivDir),
++    {error, efnamena} = ftp:send(Pid, LFile, RFile++"1\r\nCWD ."),
+     ok = ftp:send(Pid, LFile, RFile),
+     {ok, RFilesString} = ftp:nlist(Pid),
+     RFiles = split(RFilesString),
+@@ -1392,6 +1404,7 @@ do_append(Pid, Config) ->
+     ftp:delete(Pid, RFile),
+     ftp:delete(Pid, LFile),
+ 
++    {error, efnamena} = ftp:append(Pid, LFile, RFile++"1\r\nCWD ."),
+     ok = ftp:append(Pid, LFile, RFile),
+     ok = ftp:append(Pid, LFile, RFile),
+     ok = ftp:append(Pid, LFile),
+@@ -1413,6 +1426,7 @@ do_send_bin(Pid, Config) ->
+     Bin = list_to_binary(Contents),
+     ok = ftp:cd(Pid, "incoming"),
+     {error, enotbinary} = ftp:send_bin(Pid, Contents, File),
++    {error, efnamena} = ftp:send_bin(Pid, Bin, File++"1\r\nCWD ."),
+     ok = ftp:send_bin(Pid, Bin, File),
+     {ok, RFilesString} = ftp:nlist(Pid),
+     RFiles = split(RFilesString),
+@@ -1426,6 +1440,7 @@ do_append_bin(Pid, Config) ->
+     Bin = list_to_binary(Contents),
+     ok = ftp:cd(Pid, "incoming"),
+     {error, enotbinary} = ftp:append_bin(Pid, Contents, File),
++    {error, efnamena} = ftp:append_bin(Pid, Bin, File++"1\r\nCWD ."),
+     ok = ftp:append_bin(Pid, Bin, File),
+     ok = ftp:append_bin(Pid, Bin, File),
+     %% Control the contents of the file
+@@ -1438,6 +1453,7 @@ do_send_chunk(Pid, Config) ->
+     Contents = "ftp_SUITE test ...",
+     Bin = list_to_binary(Contents),
+     ok = ftp:cd(Pid, "incoming"),
++    {error, efnamena} = ftp:send_chunk_start(Pid, File++"1\r\nCWD ."),
+     ok = ftp:send_chunk_start(Pid, File),
+     {error, echunk} = ftp:cd(Pid, "incoming"),
+     {error, enotbinary} = ftp:send_chunk(Pid, Contents),
+@@ -1454,6 +1470,7 @@ do_append_chunk(Pid, Config) ->
+     File = ?config(file, Config),
+     Contents = ["ER","LE","RL"],
+     ok = ftp:cd(Pid, "incoming"),
++    {error, efnamena} = ftp:append_chunk_start(Pid, File++"1\r\nCWD ."),
+     ok = ftp:append_chunk_start(Pid, File),
+     {error, enotbinary} = ftp:append_chunk(Pid, lists:nth(1,Contents)),
+     ok = ftp:append_chunk(Pid,list_to_binary(lists:nth(1,Contents))),
+@@ -1480,6 +1497,7 @@ do_recv(Pid, Config) ->
+     ok = file:delete(AbsFile),		% cleanup
+     test_server:sleep(100),
+     ok = ftp:lcd(Pid, PrivDir),
++    {error, efnamena} = ftp:recv(Pid, File++"\r\nCWD ."),
+     ok = ftp:recv(Pid, File),
+     {ok, Files} = file:list_dir(PrivDir),
+     true = lists:member(File, Files),
+@@ -1495,6 +1513,7 @@ do_recv_bin(Pid, Config) ->
+     ok = ftp:cd(Pid, "incoming"),
+     ok = ftp:send_bin(Pid, Bin1, File),
+     test_server:sleep(100),
++    {error, efnamena} = ftp:recv_bin(Pid, File++"\r\nCWD ."),
+     {ok, Bin2}  = ftp:recv_bin(Pid, File),
+     ok = ftp:delete(Pid, File),		% cleanup
+     Contents2 = binary_to_list(Bin2),
+@@ -1520,6 +1539,7 @@ do_recv_chunk(Pid, Config) ->
+     ok = ftp:send_bin(Pid, Bin1, File),
+     test_server:sleep(100),
+     {error, "ftp:recv_chunk_start/2 not called"} = recv_chunk(Pid, <<>>),
++    {error, efnamena} = ftp:recv_chunk_start(Pid, File++"\r\nCWD ."),
+     ok = ftp:recv_chunk_start(Pid, File),
+     {ok, Contents2} = recv_chunk(Pid, <<>>),
+     ok = ftp:delete(Pid, File),		% cleanup

otp-0018-Introduce-os-getenv-2.patch

@@ -0,0 +1,63 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 8 Nov 2014 15:11:04 +0300
+Subject: [PATCH] Introduce os:getenv/2
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
+index 9122267..7ec1f8e 100644
+--- a/lib/kernel/doc/src/os.xml
++++ b/lib/kernel/doc/src/os.xml
+@@ -100,6 +100,19 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
+       </desc>
+     </func>
+     <func>
++      <name name="getenv" arity="2"/>
++      <fsummary>Get the value of an environment variable</fsummary>
++      <desc>
++        <p>Returns the <c><anno>Value</anno></c> of the environment variable
++          <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the environment variable
++          is undefined.</p>
++	<p>If Unicode file name encoding is in effect (see the <seealso
++	marker="erts:erl#file_name_encoding">erl manual
++	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
++	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
++      </desc>
++    </func>
++    <func>
+       <name name="getpid" arity="0"/>
+       <fsummary>Return the process identifier of the emulator process</fsummary>
+       <desc>
+diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
+index 9415593..d5ef994 100644
+--- a/lib/kernel/src/os.erl
++++ b/lib/kernel/src/os.erl
+@@ -26,7 +26,7 @@
+ 
+ %%% BIFs
+ 
+--export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
++-export([getenv/0, getenv/1, getenv/2, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
+ 
+ -spec getenv() -> [string()].
+ 
+@@ -39,6 +39,19 @@ getenv() -> erlang:nif_error(undef).
+ getenv(_) ->
+     erlang:nif_error(undef).
+ 
++-spec getenv(VarName, DefaultValue) -> Value when
++      VarName :: string(),
++      DefaultValue :: string(),
++      Value :: string().
++
++getenv(VarName, DefaultValue) ->
++    case os:getenv(VarName) of
++        false ->
++           DefaultValue;
++        Value ->
++            Value
++    end.
++
+ -spec getpid() -> Value when
+       Value :: string().
+ 

otp-0019-Patch-removes-support-for-SSLv3-protocol-because-it-.patch

@@ -0,0 +1,99 @@
+From: Sergei Golovan <sgolovan@debian.org>
+Date: Sun, 30 Nov 2014 20:20:41 +0300
+Subject: [PATCH] Patch removes support for SSLv3 protocol because it is proved
+ to be insecure and nobody should use it anymore.
+
+
+diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
+index 1d74faf..912acc2 100644
+--- a/lib/ssl/doc/src/ssl.xml
++++ b/lib/ssl/doc/src/ssl.xml
+@@ -123,7 +123,7 @@
+ 
+     <p><c>sslsocket() - opaque to the user. </c></p>
+     
+-    <p><c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
++    <p><c>protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
+     
+     <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
+     
+diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
+index 0ee5b23..c65f8a3 100644
+--- a/lib/ssl/doc/src/ssl_app.xml
++++ b/lib/ssl/doc/src/ssl_app.xml
+@@ -47,10 +47,10 @@
+       </p>
+     <p>Note that the environment parameters can be set on the command line,
+       for instance,</p>
+-    <p><c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
++    <p><c>erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' ...</c>.
+       </p>
+     <taglist>
+-      <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
++      <tag><c><![CDATA[protocol_version = [tlsv1|tlsv1.1|tlsv1.2] <optional>]]></c>.</tag>
+       <item>
+ 	<p>Protocol that will be supported by started clients and
+ 	servers. If this option is not set it will default to all
+@@ -58,6 +58,9 @@
+ 	Note that this option may be overridden by the version option
+ 	to ssl:connect/[2,3] and ssl:listen/2.
+ 	</p>
++	<p>For Debian GNU/Linux distribution the sslv3 protocol was
++	disabled due to its security issues.
++	</p>
+       </item>
+ 
+       <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 0186f9f..6f84830 100644
+--- a/lib/ssl/src/ssl_internal.hrl
++++ b/lib/ssl/src/ssl_internal.hrl
+@@ -67,8 +67,8 @@
+ -define(TRUE, 0).
+ -define(FALSE, 1).
+ 
+--define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+--define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
++-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
++-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
+ -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
+ -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
+ 
+diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
+index c17fa53..f4be9be 100644
+--- a/lib/ssl/src/ssl_record.hrl
++++ b/lib/ssl/src/ssl_record.hrl
+@@ -144,6 +144,7 @@
+ %% 	 }).
+ 
+ -define(LOWEST_MAJOR_SUPPORTED_VERSION, 3).
++-define(LOWEST_MINOR_SUPPORTED_VERSION, 1).
+ 	
+ 
+ -record(generic_stream_cipher, {
+diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
+index 8810755..3c5c7e9 100644
+--- a/lib/ssl/src/tls_record.erl
++++ b/lib/ssl/src/tls_record.erl
+@@ -269,13 +269,19 @@ supported_protocol_versions([_|_] = Vsns) ->
+ %% 
+ %%--------------------------------------------------------------------
+ is_acceptable_version({N,_}) 
+-  when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++  when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++    true;
++is_acceptable_version({N,M}) 
++  when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
+     true;
+ is_acceptable_version(_) ->
+     false.
+ 
+ is_acceptable_version({N,_} = Version, Versions)   
+-  when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++  when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
++    lists:member(Version, Versions);
++is_acceptable_version({N,M} = Version, Versions)   
++  when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
+     lists:member(Version, Versions);
+ is_acceptable_version(_,_) ->
+     false.

otp-get-patches.sh

@@ -17,6 +17,18 @@
 #
 # # start of autogenerated patch tag list
 # # end of autogenerated patch tag list
+# # start of autogenerated prep patch list
+# # end of autogenerated prep patch list
+#
+# The following special comment lines in the git commit messages
+# will be interpreted:
+#
+#    Fedora-Spec-Comment: This patch only applies to EL6 builds
+#    Fedora-Spec-Before: %if 0%?el6}
+#    Fedora-Spec-After: %endif
+#
+# If there is no "Fedora-Spec-Comment:" line, we will use
+# "Fedora specific patch".
 
 # Command line parsing
 otp_dir="${1:?'Fatal: otp git repo dir required'}"
@@ -37,29 +49,44 @@ test -s "$tmpdir/patch-list.txt"
 
 # Process patch files
 echo "# start of autogenerated patch tag list" > "$tmpdir/patch-list-tags.txt"
+echo "# start of autogenerated prep patch list" > "$tmpdir/patch-list-prep.txt"
 n=1
 while read patch
 do
 	otppatch="$(dirname "$patch")/otp-$(basename "$patch")"
 	${SED-sed} -e '1d' -e '/^-- $/,$d' "$patch" > "$otppatch"
 	rm -f "$patch"
+	comment="$(sed -n 's/^Fedora-Spec-Comment:\s*//p' "$otppatch")"
+	if test "x$comment" = "x"; then comment="Fedora specific patch"; fi
+	echo "# ${comment}" >> "$tmpdir/patch-list-tags.txt"
+	echo "#   $(sed -n 's/^Subject: \[PATCH\] //p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
 	echo "Patch$n: $(basename "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
+	base="$(basename "$patch" ".patch" | sed 's/^00[0-9][0-9]-//')"
+	backupext=".$(echo -n "$base" | tr -c -s '[:alnum:]' '_')"
+	sed -n 's/^Fedora-Spec-Before:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
+	echo "%patch$n -p1 -b ${backupext}" >> "$tmpdir/patch-list-prep.txt"
+	sed -n 's/^Fedora-Spec-After:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
 	n=$(($n + 1))
 done < "$tmpdir/patch-list.txt"
 echo "# end of autogenerated patch tag list" >> "$tmpdir/patch-list-tags.txt"
+echo "# end of autogenerated prep patch list" >> "$tmpdir/patch-list-prep.txt"
 
 # Create updated spec file
 specfile="erlang.spec"
 newspec1="${tmpdir}/${specfile}.new1"
+newspec2="${tmpdir}/${specfile}.new2"
 sed '/^# start of autogenerated patch tag list$/,$d' "$specfile" > "$newspec1"
 cat "$tmpdir/patch-list-tags.txt" >> "$newspec1"
 sed '1,/^# end of autogenerated patch tag list/d' "$specfile" >> "$newspec1"
+sed '/^# start of autogenerated prep patch list$/,$d' "$newspec1" > "$newspec2"
+cat "$tmpdir/patch-list-prep.txt" >> "$newspec2"
+sed '1,/^# end of autogenerated prep patch list/d' "$newspec1" >> "$newspec2"
 
 # Actually put all changes into git index
 git rm -f otp-00*.patch
 mv "$tmpdir/otp-00"*.patch .
 git add otp-00*.patch
-mv -f "$newspec1" "$specfile"
+mv -f "$newspec2" "$specfile"
 git add "$specfile"
 
 rm -rf "$tmpdir"

otp-make-subpackages.py

@@ -1,174 +0,0 @@
-import glob
-import os
-import re
-import rpm
-import sys
-
-ts = rpm.TransactionSet()
-
-packages = []
-for arg in sys.argv[1:]:
-	packages += glob.glob(arg)
-
-erlang_provides = {}
-erlang_requires = {}
-
-package_names = []
-package_headers = {}
-
-##
-## Custom tweaks begins here
-##
-
-# These packages should be marked as noarch
-package_noarch = [
-		"emacs-erlang",
-		"emacs-erlang-el",
-		"erlang-doc"]
-
-# These are additional Requires which cannot be picked up automatically (yet).
-# TODO these should be added automatically
-package_additional_requires = {
-		"emacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "emacs(bin) >= %{_emacs_version}" ],
-		"emacs-erlang-el": ["emacs-erlang = %{version}-%{release}"],
-		"erlang-dialyzer": ["graphviz"],
-		"erlang-erl_interface": ["%{name}-erts%{?_isa} = %{version}-%{release}"],
-		# This library (lksctp-tools) is dlopened so it can't be picked
-		# up automatically by the RPM dependency checker
-		"erlang-erts": ["lksctp-tools"],
-		"erlang-gs": ["tk"],
-		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
-		"erlang-ic": ["jpackage-utils"],
-		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
-		"erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils"],
-		"erlang-wx": ["mesa-libGL", "mesa-libGLU"],
-		}
-
-package_additional_buildrequires = {
-		"emacs-erlang": ["emacs", "emacs-el"],
-		"erlang-crypto": ["openssl-devel"],
-		"erlang-diameter": ["ed"],
-
-		# BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6,
-		# so we cannot regenerate docs here. (Un)Fortunately we dropped
-		# support for EPEL6 and older versions.
-		# FIXME add bootstrap condition first.
-		"erlang-doc": ["fop", "libxslt"],
-
-		"erlang-erts": ["lksctp-tools-devel", "m4", "ncurses-devel", "zlib-devel"],
-		"erlang-gs": ["tcl-devel", "tk-devel"],
-
-		# in EPEL6 on arches different from %{ix86} x86_64 we have to
-		# use java-devel-gcj, so technically this requirement makes it
-		# impossible to build Java support there. (Un)Fortunately we
-		# already dropped full support for EPEL6 and older versions.
-		"erlang-ic": ["java-devel"],
-		"erlang-jinterface": ["java-devel"],
-
-		"erlang-odbc": ["unixODBC-devel"],
-		}
-
-package_additional_obsoletes = {
-		"erlang-erts": [
-			"erlang-appmon",
-			"erlang-docbuilder",
-			"erlang-inviso",
-			"erlang-pman",
-			"erlang-toolbar",
-			"erlang-tv"],
-		}
-
-##
-## Custom tweaks ends here
-##
-
-# To match 'erlang(asn1ct_eval_ext:transform_to_EXTERNAL1994/1)'
-prog = re.compile("^erlang(.*:.*/\d+)")
-rpmmask = re.compile(".*\.rpm")
-
-# iterate over all rpms
-for package in sorted([p for p in packages if rpmmask.match(p)]):
-
-	# A tricky part. We are processing packages, rebuilt with
-	# %{__erlang_provides_requires}. Otherwise we won't get information
-	# about imports/exports (until we learn how to parse Erlang BEAM file
-	# headers with Python.
-	fd = os.open(package, os.O_RDONLY)
-	h = ts.hdrFromFdno(fd)
-	os.close(fd)
-
-	rpm_name = h[rpm.RPMTAG_NAME]
-
-	# Let's calculate provides
-	# We'll create dictionary to speedup future use
-	# FIXME duplicate provides
-	local_provides = [p for p in h[rpm.RPMTAG_PROVIDENAME] if prog.match(p)]
-	erlang_provides.update({k: rpm_name for k in local_provides})
-
-	# Let's calculate requires
-	erlang_requires.update({rpm_name: [r for r in h[rpm.RPMTAG_REQUIRENAME] if prog.match(r) and not r in local_provides]})
-
-	package_headers.update({rpm_name: h})
-
-	package_names.append(rpm_name)
-
-namemask = re.compile("^erlang-[a-zA-Z0-9_]*$")
-
-print "### BEGIN OF AUTOGENERATED LIST ###"
-print ""
-
-for name in package_names:
-	h = package_headers[name]
-
-	if name == "erlang-doc":
-		# Additional ifdef just for this sub-package (see below)
-		print "%if %{with doc}"
-
-	if namemask.match(name):
-		print "%%package %s" % name.replace("erlang-", "")
-	else:
-		print "%%package -n %s" % name
-
-	print "Summary: %s" % h[rpm.RPMTAG_SUMMARY]
-	print "Group: %s" % h[rpm.RPMTAG_GROUP]
-
-	rawdeps = [erlang_provides.get(r, "Error: missing requires: %s" % r) for r in erlang_requires[name]]
-
-	deps = set()
-	dependency_add = deps.add
-	[x for x in rawdeps if not (x in deps or dependency_add(x))]
-
-	# Additional BuildRequires (if any):
-	for br in package_additional_buildrequires.get(name, []):
-		print "BuildRequires: %s" % br
-
-	# Add basic autogenerated Requires:
-	for r in sorted(deps):
-		#Requires: %{name}-stdlib%{?_isa} = %{version}-%{release}
-		print "Requires: %s%%{?_isa} = %%{version}-%%{release}" % r.replace("erlang-", "%{name}-")
-
-	# Add custom additional Requires (if any):
-	for r in package_additional_requires.get(name, []):
-		print "Requires: %s" % r
-
-	# Add custom additional Obsoletes (if any):
-	for os in package_additional_obsoletes.get(name, []):
-		print "Obsoletes: %s" % os
-
-	if name in package_noarch:
-		print "BuildArch: noarch"
-
-	print ""
-	if namemask.match(name):
-		print "%%description %s" % name.replace("erlang-", "")
-	else:
-		print "%%description -n %s" % name
-	print "%s" % h[rpm.RPMTAG_DESCRIPTION]
-
-	if name == "erlang-doc":
-		# Additional ifdef just for this sub-package (see above)
-		print "%endif"
-
-	print ""
-
-print "### END OF AUTOGENERATED LIST ###"

sources

@@ -1 +1 @@
-SHA512 (otp-OTP-26.2.5.16.tar.gz) = 4e973be7e8ccad196d59759108a521535b0f046268eb0406f789a50f411fa27c9c11fcfb61a7218605bf1b32921bb52c52fc7c99917e1acfc0d3ed09437129b2
+e5ece977375197338c1b93b3d88514f8  otp_src_R16B03-1.tar.gz