@@ -1,33 +1,35 @@

-%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7

-%global with_systemd 0

-%else

-%global with_systemd 1

-%endif

-

-%global need_bootstrap_set 0

+%global need_bootstrap_set 1

 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}

-%ifarch %{arm}

+%ifarch %{arm} %{mips} riscv64 %{ix86}

+# MIPS and RISC-V does not have all dependencies for fop yet.

 # For some reason, fop hangs on arm, so for now don't generate docs by

 # default

 %bcond_with doc

 %else

+# RHEL8 doesn't have fop

+%if 0%{?rhel} > 7

+%bcond_with doc

+%else

 %bcond_without doc

 %endif

-

-%ifarch %{arm} %{ix86} x86_64 ppc %{power64}

-%global __with_hipe 1

 %endif

+# Compile with FIPS support by default

+%bcond_without fips

+

 ##

 ## Optional components

 ##

 %global __with_emacs 1

 %global __with_examples 1

+%ifarch %{java_arches}

 %global __with_java 1

-%global __with_tcltk 1

+%else

+%global __with_java 0

+%endif

 #

 # wxWidgets plugin blocks the following ones:

 #

@@ -42,10 +44,6 @@

 # * common_test

 # * megaco

 #

-# dialyzer blocks:

-#

-# * typer

-#

 # et blocks:

 #

 # * megaco

@@ -53,8 +51,6 @@

 # observer blocks:

 #

 # * common_test

-# * test_server

-# * webtool

 #

 # So finally we have to disable the following plugins:

 #

@@ -65,23 +61,19 @@

 # megaco

 # observer

 # reltool (*)

-# test_server

-# typer

-# webtool

 # wx

 #

 %global __with_wxwidgets 1

 Name:      erlang

-Version:   18.3.4.11

-Release:   2.5%{?dist}

+Version:   25.1.2

+Release:   1%{?dist}

 Summary:   General-purpose programming language and runtime environment

-Group:     Development/Languages

 License:   ASL 2.0

-URL:       http://www.erlang.org

-%if 0%{?el7}%{?fedora}

+URL:       https://www.erlang.org

+%if ! (0%{?rhel} && 0%{?rhel} <= 6)

 VCS:       scm:git:https://github.com/erlang/otp

 %endif

 Source0:   https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz

@@ -107,42 +99,21 @@

 # for some semi-automatic patch update assistance.

 #

 # start of autogenerated patch tag list

-# Fedora specific patch

-#   Do not format man-pages and do not install miscellaneous

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

-# Fedora specific patch

-#   Remove rpath

 Patch2: otp-0002-Remove-rpath.patch

-# Fedora specific patch

-#   Do not install C sources

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

-# Fedora specific patch

-#   Do not install Java sources

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

-# Fedora specific patch

-#   Do not install nteventlog and related doc-files on non-win32

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

-# Fedora specific patch

-#   Do not install erlang sources

 Patch6: otp-0006-Do-not-install-erlang-sources.patch

-# Fedora specific patch

-#   Split off webtool dependency from tools

-Patch7: otp-0007-Split-off-webtool-dependency-from-tools.patch

-# Fedora specific patch

-#   Add patch to crash dump on large distribution

-Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch

-# Fedora specific patch

-#   Don't send unasked for systemd notifications

-Patch9: otp-0009-Don-t-send-unasked-for-systemd-notifications.patch

-# Fedora specific patch

-#   Fix decoding of LLONG_MIN in erl_decode

-Patch10: otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch

-# Fedora specific patch

-#   Respect -proto_dist switch while connection to EPMD

-Patch11: otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch

+Patch7: otp-0007-Add-extra-search-directory.patch

+Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch

+Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch

 # end of autogenerated patch tag list

+BuildRequires: gcc

+BuildRequires: gcc-c++

 BuildRequires: flex

+BuildRequires: make

 %if %{with doc}

 %if 0%{?need_bootstrap} < 1

@@ -151,26 +122,13 @@

 %endif

 %endif

-%if 0%{?with_systemd}

-%if 0%{?suse_version}

-Requires(post):     systemd

-Requires(postun):   systemd

-Requires(preun):    systemd

-%else

-BuildRequires:      systemd-devel

-Requires(post):     systemd-units

-Requires(postun):   systemd-units

-Requires(preun):    coreutils

-Requires(preun):    systemd-units

+%if ! (0%{?rhel} && 0%{?rhel} <= 6)

+# for <systemd/sd-daemon.h>

+BuildRequires: systemd-devel

+BuildRequires: systemd

+%{?systemd_requires}

+Requires:  systemd

 %endif

-%else

-Requires(post):     chkconfig

-Requires(post):     initscripts

-Requires(postun):   initscripts

-Requires(preun):    chkconfig

-Requires(preun):    initscripts

-%endif

-

 BuildRequires: autoconf

 BuildRequires: automake

 #BuildRequires:    erlang-rpm-macros

@@ -178,22 +136,15 @@

 Requires: %{name}-asn1%{?_isa} = %{version}-%{release}

 %if %{__with_wxwidgets}

 Requires: %{name}-common_test%{?_isa} = %{version}-%{release}

-%endif %{__with_wxwidgets}

+%endif # __with_wxwidgets

 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosEventDomain%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosFileTransfer%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosTime%{?_isa} = %{version}-%{release}

-Requires: %{name}-cosTransactions%{?_isa} = %{version}-%{release}

 Requires: %{name}-crypto%{?_isa} = %{version}-%{release}

 %if %{__with_wxwidgets}

 Requires: %{name}-debugger%{?_isa} = %{version}-%{release}

-%endif %{__with_wxwidgets}

+%endif # __with_wxwidgets

 %if %{__with_wxwidgets}

 Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release}

-%endif %{__with_wxwidgets}

​

@@ -6,10 +6,10 @@

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

 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in

-index 8e55fa7..9512faa 100644

+index 42d4395eb2..307ef11828 100644

 --- a/erts/etc/common/Makefile.in

 +++ b/erts/etc/common/Makefile.in

-@@ -551,10 +551,6 @@ endif

+@@ -552,10 +552,6 @@ endif

  ifneq ($(INSTALL_TOP_BIN),)

    $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"

  endif

@@ -21,10 +21,10 @@

    $(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"

    $(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"

 diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src

-index 6634ae3..fa18956 100644

+index b00dd09f1a..2147774f50 100644

 --- a/erts/etc/unix/Install.src

 +++ b/erts/etc/unix/Install.src

-@@ -141,14 +141,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .

+@@ -143,14 +143,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

​

@@ -5,28 +5,15 @@

 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 e66c0ca..574cdf5 100644

+index 25167a8a3a..2345970fa9 100644

 --- a/lib/crypto/c_src/Makefile.in

 +++ b/lib/crypto/c_src/Makefile.in

-@@ -90,7 +90,7 @@ endif

- DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@

+@@ -147,7 +147,7 @@ endif

+ endif

- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)

+ ifeq ($(DYNAMIC_OR_WIN_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 ff9d3e1..d3aba77 100644

---- a/lib/crypto/priv/Makefile

-+++ b/lib/crypto/priv/Makefile

-@@ -61,7 +61,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)

​

@@ -14,86 +14,46 @@

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

 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile

-index 2b72e1a..0522562 100644

+index 82a6b6e87a..5f2fe8ba7d 100644

 --- a/lib/asn1/c_src/Makefile

 +++ b/lib/asn1/c_src/Makefile

-@@ -143,8 +143,6 @@ release_spec: opt

- ifneq ($(findstring ose,$(TARGET)),ose)

+@@ -137,8 +137,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"

- endif

 -  $(INSTALL_DIR) "$(RELSYSDIR)/c_src"

 -  $(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"

  release_docs_spec:

-diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in

-index 574cdf5..428c316 100644

---- a/lib/crypto/c_src/Makefile.in

-+++ b/lib/crypto/c_src/Makefile.in

-@@ -200,14 +200,10 @@ 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"

- ifneq ($(findstring ose,$(TARGET)),ose)

--  $(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

- endif

 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in

-index 777d709..57917ae 100644

+index 0a5ae800be..2cc354c43e 100644

 --- a/lib/erl_interface/src/Makefile.in

 +++ b/lib/erl_interface/src/Makefile.in

-@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),)

-   $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"

+@@ -712,13 +712,11 @@ ifeq (@DYNAMIC_LIB@, yes)

  endif

+   $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"

    $(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) registry/*.ch "$(RELSYSDIR)/src/registry"

--  $(INSTALL_DATA) legacy/*.ch   "$(RELSYSDIR)/src/legacy"

+-  $(INSTALL_DATA) global/*.ch   "$(RELSYSDIR)/src/global"

 -  $(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 b9f92a0..9612f24 100644

---- a/lib/ic/c_src/Makefile.in

-+++ b/lib/ic/c_src/Makefile.in

-@@ -145,12 +145,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 045b6d8..39be02a 100644

+index 3649e2c392..d8c5c68b99 100644

 --- a/lib/megaco/src/flex/Makefile.in

 +++ b/lib/megaco/src/flex/Makefile.in

-@@ -271,7 +271,7 @@ release_spec: opt

+@@ -251,7 +251,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)

@@ -103,7 +63,7 @@

  endif

 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in

-index 685eb5d..6c8a432 100644

+index d1b26743a6..cf8faae1f5 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

@@ -119,7 +79,7 @@

  endif

 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in

-index e9fc5f4..ac9fb73 100644

+index 27b156a2c9..f11ff303b6 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

@@ -131,31 +91,3 @@

    $(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 448b8c6..860d504 100644

---- a/lib/runtime_tools/c_src/Makefile.in

-+++ b/lib/runtime_tools/c_src/Makefile.in

-@@ -157,10 +157,8 @@ docs:

- include $(ERL_TOP)/make/otp_release_targets.mk

- 

- release_spec: opt

--  $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"

-   $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"

- ifneq ($(findstring ose,$(TARGET)),ose)

--  $(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"

-   $(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"

- endif

- 

-diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in

-index 66bba22..eea37fc 100644

---- a/lib/tools/c_src/Makefile.in

-+++ b/lib/tools/c_src/Makefile.in

-@@ -198,8 +198,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"

​

@@ -4,24 +4,11 @@

 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 d9100cf..6886c71 100644

---- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile

-+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile

-@@ -113,8 +113,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 1c8364e..34b64a8 100644

+index 089cf4ab1a..404654a437 100644

 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile

 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile

-@@ -120,8 +120,6 @@ release release_docs release_tests release_html:

+@@ -123,8 +123,6 @@ release release_docs release_tests release_html:

    $(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec

  release_spec: opt

​

@@ -6,10 +6,10 @@

 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 0c5acd9..5f8f1e3 100644

+index 8e3882bfdc..ea999cf9c7 100644

 --- a/lib/os_mon/doc/src/Makefile

 +++ b/lib/os_mon/doc/src/Makefile

-@@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)

+@@ -31,11 +31,16 @@ APPLICATION=os_mon

  # Target Specs

  # ----------------------------------------------------

  XML_APPLICATION_FILES = ref_man.xml

@@ -21,33 +21,32 @@

  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 9aa068c..1003d24 100644

+index e28fb12548..ee32f3946f 100644

 --- a/lib/os_mon/src/Makefile

 +++ b/lib/os_mon/src/Makefile

-@@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)

+@@ -34,7 +34,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 \

--  nteventlog

++MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \

 +   $(NTEVENTLOG)

  INCLUDE=../include

  CSRC=../c_src

-@@ -79,7 +84,11 @@ docs:

+@@ -78,7 +84,11 @@ docs:

  # ----------------------------------------------------

  $(APP_TARGET): $(APP_SRC) ../vsn.mk

​

@@ -8,10 +8,10 @@

 Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>

 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile

-index 52034a0..56d91b9 100644

+index 1994aa1302..007b7d44bd 100644

 --- a/erts/preloaded/src/Makefile

 +++ b/erts/preloaded/src/Makefile

-@@ -86,8 +86,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk

+@@ -117,8 +117,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk

  include $(ERL_TOP)/make/otp_release_targets.mk

  release_spec: $(APP_TARGET)

@@ -21,10 +21,10 @@

    $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"

 diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile

-index 5b34017..d4677d6 100644

+index 9e13d02c8a..77ba98c2f8 100644

 --- a/lib/asn1/src/Makefile

 +++ b/lib/asn1/src/Makefile

-@@ -155,7 +155,7 @@ release_spec: opt

+@@ -157,7 +157,7 @@ release_spec: opt

    $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

    $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

    $(INSTALL_DIR) "$(RELSYSDIR)/src"

@@ -34,10 +34,10 @@

    $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"

 diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile

-index 987345c..f53546a 100644

+index 00f13589f3..5bf4e50f14 100644

 --- a/lib/common_test/src/Makefile

 +++ b/lib/common_test/src/Makefile

-@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

+@@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

  release_spec: opt

    $(INSTALL_DIR) "$(RELSYSDIR)/src"

@@ -46,11 +46,27 @@

    $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

    $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"

    $(INSTALL_DIR) "$(RELSYSDIR)/include"

+diff --git a/lib/common_test/test_server/Makefile b/lib/common_test/test_server/Makefile

+index 4ff5e678ee..4e3fa5c60f 100644

+--- a/lib/common_test/test_server/Makefile

++++ b/lib/common_test/test_server/Makefile

+@@ -83,9 +83,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk

+ 

+ release_tests_spec: opt

+   $(INSTALL_DIR) "$(RELEASE_PATH)/test_server"

+-  $(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \

++  $(INSTALL_DATA) $(TS_HRL_FILES) \

+       $(TS_TARGET_FILES) \

+-      $(AUTOCONF_FILES) $(CONFIG) \

++      $(CONFIG) \

+       "$(RELEASE_PATH)/test_server"

+   $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"

+ 

 diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile

-index 299b289..36a048b 100644

+index d801d6baa0..4eed19b516 100644

 --- a/lib/compiler/src/Makefile

 +++ b/lib/compiler/src/Makefile

-@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk

+@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk

  release_spec: opt

    $(INSTALL_DIR) "$(RELSYSDIR)/src"

@@ -61,107 +77,11 @@

    $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

    $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"

-diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile

-index b79f0ec..30d1a1d 100644

---- a/lib/cosEvent/src/Makefile

-+++ b/lib/cosEvent/src/Makefile

-@@ -203,7 +203,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

-diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile

-index da8dcf0..88b3993 100644

---- a/lib/cosEventDomain/src/Makefile

-+++ b/lib/cosEventDomain/src/Makefile

-@@ -172,7 +172,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

-diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile

-index f9107ff..74d337d 100644

---- a/lib/cosFileTransfer/src/Makefile

-+++ b/lib/cosFileTransfer/src/Makefile

-@@ -180,9 +180,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

--  $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

- release_docs_spec:

-diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile

-index 72b063f..0fdb82e 100644

---- a/lib/cosNotification/src/Makefile

-+++ b/lib/cosNotification/src/Makefile

-@@ -371,8 +371,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

-diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile

-index cd559e1..bdf035e 100644

---- a/lib/cosProperty/src/Makefile

-+++ b/lib/cosProperty/src/Makefile

-@@ -180,8 +180,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

-diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile

-index 7a14db6..4b55398 100644

---- a/lib/cosTime/src/Makefile

-+++ b/lib/cosTime/src/Makefile

-@@ -199,8 +199,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

-diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile

-index 90e1e51..05826e0 100644

---- a/lib/cosTransactions/src/Makefile

-+++ b/lib/cosTransactions/src/Makefile

-@@ -174,7 +174,7 @@ release_spec: opt

-   $(INSTALL_DIR) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

-   $(INSTALL_DIR) "$(RELSYSDIR)/src"

--  $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"

-+  $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"

-   $(INSTALL_DIR) "$(RELSYSDIR)/include"

-   $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"

- 

 diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile

-index 6e4008e..c2d00fc 100644

+index 893f679390..6f8a329421 100644

 --- a/lib/crypto/src/Makefile

 +++ b/lib/crypto/src/Makefile

-@@ -82,8 +82,6 @@ docs:

+@@ -81,8 +81,6 @@ docs:

  include $(ERL_TOP)/make/otp_release_targets.mk

  release_spec: opt

@@ -171,7 +91,7 @@

    $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \

        $(APPUP_TARGET) "$(RELSYSDIR)/ebin"

 diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile

-index f115f49..e7dc360 100644

+index 2fb955b2e3..6ddce27ec1 100644

 --- a/lib/debugger/src/Makefile

 +++ b/lib/debugger/src/Makefile

 @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

@@ -184,10 +104,10 @@

    $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"

 diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile

-index 770af21..4f8a6d8 100644

+index c934ecdc2b..cc266f48e2 100644

 --- a/lib/dialyzer/src/Makefile

 +++ b/lib/dialyzer/src/Makefile

-@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

+@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk

  release_spec: opt

​

@@ -0,0 +1,32 @@

+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 af8531271f..66050d6cdb 100644

+--- a/lib/kernel/src/code_server.erl

++++ b/lib/kernel/src/code_server.erl

+@@ -79,11 +79,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,

​

@@ -1,40 +0,0 @@

-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 ae8b3f2..539ca96 100644

---- a/lib/tools/src/cover_web.erl

-+++ b/lib/tools/src/cover_web.erl

-@@ -51,14 +51,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.

- 

- 

- 

​

@@ -1,31 +0,0 @@

-From: John Eckersberg <jeckersb@redhat.com>

-Date: Wed, 16 Dec 2015 11:03:42 -0500

-Subject: PATCH Add patch to crash dump on large distribution

-

-https://bugzilla.redhat.com/show_bug.cgi?id=1291822

-https://bugzilla.redhat.com/show_bug.cgi?id=1291855

-https://bugzilla.redhat.com/show_bug.cgi?id=1291856

-https://bugzilla.redhat.com/show_bug.cgi?id=1291857

-

-diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c

-index 787241b..069d80a 100644

---- a/erts/emulator/beam/dist.c

-+++ b/erts/emulator/beam/dist.c

-@@ -1980,7 +1980,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf)

-     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));

- 

-     if (size > (Uint) INT_MAX)

--  erts_exit(ERTS_ABORT_EXIT,

-+  erts_exit(ERTS_DUMP_EXIT,

-        "Absurdly large distribution output data buffer "

-        "(%beu bytes) passed.\n",

-        size);

-@@ -2020,7 +2020,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)

-     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));

- 

-     if (size > (Uint) INT_MAX)

--  erts_exit(ERTS_ABORT_EXIT,

-+  erts_exit(ERTS_DUMP_EXIT,

-        "Absurdly large distribution output data buffer "

-        "(%beu bytes) passed.\n",

-        size);

​

@@ -0,0 +1,31 @@

+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

​

@@ -1,56 +0,0 @@

-From: Alexey Lebedeff <alebedev@mirantis.com>

-Date: Tue, 29 Mar 2016 20:30:22 +0300

-Subject: PATCH Don't send unasked for systemd notifications

-

-Suppose we have some erlang system that uses systemd unit with

-Type=notify - so this should send startup confirmation itself. But if

-systemd-enabled epmd will be started as a first step of that system

-startup, empd startup confirmation will be misinterpeted by systemd. And

-our erlang service will be considered 'ready' to early. Also this will

-interefere with systemd MAINPID detection: systemd will be monitoring

-`epmd` process instead of `beam` one.

-

-For example, rabbitmq works around this issue by starting epmd using

-separate short-lived beam process, with NOTIFY_SOCKET environment

-variable reset - only in this way we could be sure that epmd will not

-interfere with rabbit startup sequence.

-

-This patch disables indiscriminate confirmation sending, and does it

-only when it was explicitly asked to do so.

-

-diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c

-index 5513cb2..4740ce8 100644

---- a/erts/epmd/src/epmd.c

-+++ b/erts/epmd/src/epmd.c

-@@ -592,8 +592,10 @@ void epmd_cleanup_exit(EpmdVars *g, int exitval)

-       free(g->argv);

-   }

- #ifdef HAVE_SYSTEMD_DAEMON

--  sd_notifyf(0, "STATUS=Exited.\n"

--                "ERRNO=%i", exitval);

-+  if (g->is_systemd){

-+    sd_notifyf(0, "STATUS=Exited.\n"

-+               "ERRNO=%i", exitval);

-+  }

- #endif /* HAVE_SYSTEMD_DAEMON */

-   exit(exitval);

- }

-diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c

-index e1bac99..59d59ad 100644

---- a/erts/epmd/src/epmd_srv.c

-+++ b/erts/epmd/src/epmd_srv.c

-@@ -452,9 +452,11 @@ void run(EpmdVars *g)

-   num_sockets = bound;

- #ifdef HAVE_SYSTEMD_DAEMON

-     }

--    sd_notifyf(0, "READY=1\n"

--                  "STATUS=Processing port mapping requests...\n"

--                  "MAINPID=%lu", (unsigned long) getpid());

-+    if (g->is_systemd) {

-+      sd_notifyf(0, "READY=1\n"

-+                    "STATUS=Processing port mapping requests...\n"

-+                    "MAINPID=%lu", (unsigned long) getpid());

-+    }

- #endif /* HAVE_SYSTEMD_DAEMON */

- 

-   dbg_tty_printf(g,2,"entering the main select() loop");

​

@@ -0,0 +1,25 @@

+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 3e44ad2b77..d92bf75be0 100644

+--- a/erts/etc/common/erlexec.c

++++ b/erts/etc/common/erlexec.c

+@@ -709,8 +709,10 @@ int main(int argc, char **argv)

+           error("-man not supported on Windows");

+ #else

+           argvi = "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

​

@@ -1,69 +0,0 @@

-From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>

-Date: Fri, 10 Jun 2016 16:40:38 +0200

-Subject: PATCH Fix decoding of LLONG_MIN in erl_decode

-

-Reported-by: Peter Lemenkov

-

-diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c

-index a4216c9..6a1b573 100644

---- a/lib/erl_interface/src/legacy/erl_marshal.c

-+++ b/lib/erl_interface/src/legacy/erl_marshal.c

-@@ -727,6 +727,13 @@ static ETERM *erl_decode_it(unsigned char **ext)

-       ((*ext)2) << 8 |((*ext)3); 

-   *ext += 4;

-     big_cont:

-+

-+#ifdef _MSC_VER

-+#define MAX_TO_NEGATE 0x8000000000000000Ui64

-+#else

-+#define MAX_TO_NEGATE 0x8000000000000000ULL

-+#endif

-+

-   sign = *(*ext)++; 

-   if (arity > 8)             

-       goto big_truncate;

-@@ -763,23 +770,28 @@ static ETERM *erl_decode_it(unsigned char **ext)

-       *ext += arity;

-       return ep;

-   } else {

--      /* Fits in a long long */

--      int x;

--      long long l = 0LL;

--

--      for(x = 0 ; x < arity ; x++) {

--      l |= ((long long)(*ext)x) << ((long long)(8*x));

--      }

--      if (sign) {

--      l = -l;

--      if (l > 0) goto big_truncate;

--      }

--

--      ERL_TYPE(ep) = ERL_LONGLONG;

--      ep->uval.llval.i = l;

--      *ext += arity;

--      return ep;

-+            /* Fits in a signed long long */

-+            int x;

-+            unsigned long long l = 0LL;

-+            long long sl;

-+

-+            for(x = 0 ; x < arity ; x++) {

-+                l |= ((unsigned long long)(*ext)x) << ((unsigned long long)(8*x));

-+            }

-+

-+            sl = (long long)l;

-+

-+            if (sign && l != MAX_TO_NEGATE) {

-+                sl = -sl;

-+                if (sl > 0) goto big_truncate;

-+            }

-+

-+            ERL_TYPE(ep) = ERL_LONGLONG;

-+            ep->uval.llval.i = sl;

-+            *ext += arity;

-+            return ep;

-   }

-+#undef MAX_TO_NEGATE

-     big_truncate: 

-   /* truncate to: (+/-) 1 */

- #ifdef DEBUG

​

@@ -1,47 +0,0 @@

-From: Peter Lemenkov <lemenkov@gmail.com>

-Date: Thu, 14 Jul 2016 17:51:16 +0300

-Subject: PATCH Respect -proto_dist switch while connection to EPMD

-

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

-

-diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl

-index c6202dd..ec2e330 100644

---- a/lib/kernel/src/erl_epmd.erl

-+++ b/lib/kernel/src/erl_epmd.erl

-@@ -103,6 +103,10 @@ names(EpmdAddr) ->

- 

- register_node(Name, PortNo) ->

-     register_node(Name, PortNo, inet).

-+register_node(Name, PortNo, inet_tcp) ->

-+    register_node(Name, PortNo, inet);

-+register_node(Name, PortNo, inet6_tcp) ->

-+    register_node(Name, PortNo, inet6);

- register_node(Name, PortNo, Family) ->

-     gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).

- 

-diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl

-index 64b28bb..ffbd5d5 100644

---- a/lib/kernel/src/inet_tcp_dist.erl

-+++ b/lib/kernel/src/inet_tcp_dist.erl

-@@ -73,7 +73,7 @@ gen_listen(Driver, Name) ->

-   {ok, Socket} ->

-       TcpAddress = get_tcp_address(Driver, Socket),

-       {_,Port} = TcpAddress#net_address.address,

--      case erl_epmd:register_node(Name, Port) of

-+      case erl_epmd:register_node(Name, Port, Driver) of

-       {ok, Creation} ->

-           {ok, {Socket, TcpAddress, Creation}};

-       Error ->

-diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl

-index 4c78979..7c6b14f 100644

---- a/lib/ssl/src/ssl_tls_dist_proxy.erl

-+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl

-@@ -116,7 +116,7 @@ handle_call({listen, Driver, Name}, _From, State) ->

-       {ok, TcpAddress} = get_tcp_address(Socket),

-       {ok, WorldTcpAddress} = get_tcp_address(World),

-       {_,Port} = WorldTcpAddress#net_address.address,

--      case erl_epmd:register_node(Name, Port) of

-+      case erl_epmd:register_node(Name, Port, Driver) of

-       {ok, Creation} ->

-           {reply, {ok, {Socket, TcpAddress, Creation}},

-            State#state{listen={Socket, World}}};

​

@@ -17,18 +17,6 @@

 #

 # # 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'}"

@@ -49,44 +37,29 @@

 # 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/^000-90-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 "$newspec2" "$specfile"

+mv -f "$newspec1" "$specfile"

 git add "$specfile"

 rm -rf "$tmpdir"

​

@@ -1,1986 +0,0 @@

-erlang (1:18.3.4.11+dfsg-1) unstable; urgency=medium

-

-  * New upstream minor release.

-

- -- Chrstian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 04 Jul 2022 11:22:08 +0300

-

-erlang (1:18.3.4.4+dfsg-1~bpo8+1) jessie-backports; urgency=medium

-

-  * Backport for jessie.

-

- -- Sergei Golovan <sgolovan@debian.org>  Sat, 20 Aug 2016 10:04:46 +0300

-

-erlang (1:18.3.4.4+dfsg-1) unstable; urgency=medium

-

-  * New upstream minor release.

-

- -- Sergei Golovan <sgolovan@debian.org>  Sat, 13 Aug 2016 11:22:08 +0300

-

-erlang (1:18.3.4.2+dfsg-1) unstable; urgency=medium

-

-  * New upstream minor release.

-

- -- Sergei Golovan <sgolovan@debian.org>  Mon, 25 Jul 2016 11:57:21 +0300

-

-erlang (1:18.3.4.1+dfsg-1) unstable; urgency=medium

-

-  * New upstream minor release.

-  * Enabled HiPE for the ppc64 and ppc64el architectures (closes: #827447).

-  * Bumped Java bytecode compatibility level to 1.7.

-

- -- Sergei Golovan <sgolovan@debian.org>  Wed, 29 Jun 2016 10:35:57 +0300

-

-erlang (1:18.3.4+dfsg-1) unstable; urgency=medium

-

-  * New upstream minor release (closes: #827363).

-  * Switched to Github for downloading the code because the minor updates

-    haven't been released as tarballs on erlang.org.

-  * Added libxml2-utils to the build dependencies because of xmllint (it

-    is required for building docs).

-  * Bumped standards version to 3.9.8.

-

- -- Sergei Golovan <sgolovan@debian.org>  Wed, 15 Jun 2016 15:19:45 +0300

-

-erlang (1:18.3-dfsg-1) unstable; urgency=medium

-

-  * New upstream release.

-  * Removed patch which fixed FTBFS for GNU/kFreeBSD and GNU/Hurd introduced

-    in 1:18.2-dfsg-2 because the bug is fixed upstream.

-  * Bumped standards version to 3.9.7.

-

- -- Sergei Golovan <sgolovan@debian.org>  Thu, 17 Mar 2016 21:22:08 +0300

-

-erlang (1:18.2-dfsg-2) unstable; urgency=medium

-

-  * Fixed FTBFS for GNU/kFreeBSD and GNU/Hurd due to incorrectly checked

-    presence of gethostname_r() function.

-  * Fixed FTBFS for X32 architecture due to incorrectly used inline assembly.

-

- -- Sergei Golovan <sgolovan@debian.org>  Sun, 27 Dec 2015 12:40:53 +0300

-

-erlang (1:18.2-dfsg-1) unstable; urgency=medium

-

-  * New upstream release.

-

- -- Sergei Golovan <sgolovan@debian.org>  Sun, 20 Dec 2015 21:11:53 +0300

-

-erlang (1:18.1-dfsg-1) unstable; urgency=medium

-

-  * New upstream release.

-

- -- Sergei Golovan <sgolovan@debian.org>  Sat, 07 Nov 2015 10:33:50 +0300

-

-erlang (1:18.0-dfsg-2) unstable; urgency=medium

-

-  * Added a patch from Chris Lamb which allows Erlang compiler to put

-    a specified timestamp into the compiled binaries instead of the

-    current time. This helps with reproducibility of Erlang binaries