From cd180d852da7f02ba8cc32ad994886a2fbdbd7a7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 7 Oct 2011 17:23:20 +0400 Subject: [PATCH 001/340] Restore accidentally removed script Signed-off-by: Peter Lemenkov --- otp-get-patches.sh | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 otp-get-patches.sh diff --git a/otp-get-patches.sh b/otp-get-patches.sh new file mode 100755 index 0000000..5033e60 --- /dev/null +++ b/otp-get-patches.sh @@ -0,0 +1,92 @@ +#!/bin/bash +# Usage: +# ./otp-get-patches.sh /path/to/otp OTP_R14B02 fedora-R14B02 +# +# otp-get-patches.sh - update erlang.spec and otp-00*.patch files +# +# otp-get-patches.sh updates the erlang.spec and otp-00*.patch +# files in the git index. After an otp-get-patches.sh run, you +# will need to review the stage git changes, possibly adapt the +# Release: and %changelog parts of erlang spec, and can then +# "git commit" everything. +# +# Caution: Leave the four special comment lines untouched in the +# spec file, as otp-get-patches.sh requires them and will only +# touch erlang.spec between the respective start/end pair: +# +# # 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'}" +otp_upstream="${2:?'Fatal: git ref to upstream release required'}" +otp_fedora="${3:?'Fatal: git ref to branch with fedora patches required'}" + +# Setup +set -e +# set -x +tmpdir="$(mktemp -d --tmpdir="$PWD")" + +# Generate patch files +pushd "$otp_dir" +git format-patch -N -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" +popd + +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 "$newspec2" "$specfile" +git add "$specfile" + +rm -rf "$tmpdir" +# End of file. From 1b75fa0c1053bda97f5976d4289d66bae2fc7d35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 19:55:37 -0600 Subject: [PATCH 002/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 17719d0..8a8bdec 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2378,6 +2378,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - R14B-04.1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Aug 07 2011 Peter Lemenkov - R14B-04.1 - Ver. R14B04 From 5d2c8835ef0223b3939eb372189625c2a88692b4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 7 Feb 2012 18:42:57 +0400 Subject: [PATCH 003/340] Ver. R15B Signed-off-by: Peter Lemenkov --- .gitignore | 3 + erlang.spec | 78 ++-- ...n-pages-and-do-not-install-miscellan.patch | 2 +- otp-0002-Remove-rpath.patch | 36 +- ...=> otp-0003-Do-not-install-C-sources.patch | 57 +-- ...3-Fix-for-dlopening-libGL-and-libGLU.patch | 24 -- ...otp-0004-Do-not-install-Java-sources.patch | 12 +- ...teventlog-and-related-doc-files-on-n.patch | 0 ...Do-not-install-VxWorks-specific-docs.patch | 0 ...p-0007-Do-not-install-erlang-sources.patch | 335 ++++++++---------- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 0 otp-0010-Remove-rpath-from-esock_ssl.patch | 23 -- sources | 6 +- 13 files changed, 206 insertions(+), 370 deletions(-) rename otp-0004-Do-not-install-C-sources.patch => otp-0003-Do-not-install-C-sources.patch (77%) delete mode 100644 otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch rename otp-0005-Do-not-install-Java-sources.patch => otp-0004-Do-not-install-Java-sources.patch (76%) rename otp-0006-Do-not-install-nteventlog-and-related-doc-files-on-n.patch => otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch (100%) rename otp-0007-Do-not-install-VxWorks-specific-docs.patch => otp-0006-Do-not-install-VxWorks-specific-docs.patch (100%) rename otp-0008-Do-not-install-erlang-sources.patch => otp-0007-Do-not-install-erlang-sources.patch (82%) rename otp-0009-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch => otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch (100%) delete mode 100644 otp-0010-Remove-rpath-from-esock_ssl.patch diff --git a/.gitignore b/.gitignore index ccb57e2..c546419 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 8a8bdec..fdfdfb4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ -%global upstream_ver R14B +%global upstream_ver R15B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 04 -#global upstream_rel %{nil} +#%global upstream_rel 01 +%global upstream_rel %{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -15,7 +15,7 @@ # Change this back to include all Fedora versions (not just those < # 15) when the fop package has been fixed on fc15 (bug 689930). -%if 0%{?el5}%{?el6}%{?fc15} +%if 0%{?el5}%{?el6}%{?fc15}%{?fc17} %define use_prebuilt_docs 1 %else %define use_prebuilt_docs 0 @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist}.1 +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -61,29 +61,23 @@ Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch # Remove rpath Patch2: otp-0002-Remove-rpath.patch # Fedora specific patch -# Fix for dlopening libGL and libGLU -Patch3: otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch -# Fedora specific patch # Do not install C sources -Patch4: otp-0004-Do-not-install-C-sources.patch +Patch3: otp-0003-Do-not-install-C-sources.patch # Fedora specific patch # Do not install Java sources -Patch5: otp-0005-Do-not-install-Java-sources.patch +Patch4: otp-0004-Do-not-install-Java-sources.patch # Fedora specific patch # Do not install nteventlog and related doc-files on non-win32 -Patch6: otp-0006-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch # Fedora specific patch # Do not install VxWorks-specific docs -Patch7: otp-0007-Do-not-install-VxWorks-specific-docs.patch +Patch6: otp-0006-Do-not-install-VxWorks-specific-docs.patch # Fedora specific patch # Do not install erlang sources -Patch8: otp-0008-Do-not-install-erlang-sources.patch +Patch7: otp-0007-Do-not-install-erlang-sources.patch # Required only for el5, el6 on PowerPC # Ugly workaround for java-1.5.0-gcj which doesn't support -Patch9: otp-0009-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch -# Fedora specific patch -# Remove rpath from esock_ssl -Patch10: otp-0010-Remove-rpath-from-esock_ssl.patch +Patch8: otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -126,7 +120,6 @@ Requires: erlang-crypto%{?_isa} = %{version}-%{release} Requires: erlang-debugger%{?_isa} = %{version}-%{release} Requires: erlang-dialyzer%{?_isa} = %{version}-%{release} Requires: erlang-diameter%{?_isa} = %{version}-%{release} -Requires: erlang-docbuilder%{?_isa} = %{version}-%{release} Requires: erlang-edoc%{?_isa} = %{version}-%{release} Requires: erlang-erl_docgen%{?_isa} = %{version}-%{release} Requires: erlang-erl_interface%{?_isa} = %{version}-%{release} @@ -168,6 +161,7 @@ Requires: erlang-typer%{?_isa} = %{version}-%{release} Requires: erlang-webtool%{?_isa} = %{version}-%{release} Requires: erlang-wx%{?_isa} = %{version}-%{release} Requires: erlang-xmerl%{?_isa} = %{version}-%{release} +Obsoletes: erlang-docbuilder %description Erlang is a general-purpose programming language and runtime @@ -398,19 +392,6 @@ Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. -%package docbuilder -Summary: Tool for generating HTML documentation for applications -Group: Development/Languages -Requires: %{name}-edoc%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 - -%description docbuilder -Tool for generating HTML documentation for applications. - %package edoc Summary: A utility used to generate documentation out of tags in source files Group: Development/Languages @@ -991,18 +972,16 @@ Erlang mode for XEmacs (source lisp files). # start of autogenerated prep patch list %patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan %patch2 -p1 -b .Remove_rpath -%patch3 -p1 -b .Fix_for_dlopening_libGL_and_libGLU -%patch4 -p1 -b .Do_not_install_C_sources -%patch5 -p1 -b .Do_not_install_Java_sources -%patch6 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n -%patch7 -p1 -b .Do_not_install_VxWorks_specific_docs -%patch8 -p1 -b .Do_not_install_erlang_sources +%patch3 -p1 -b .Do_not_install_C_sources +%patch4 -p1 -b .Do_not_install_Java_sources +%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n +%patch6 -p1 -b .Do_not_install_VxWorks_specific_docs +%patch7 -p1 -b .Do_not_install_erlang_sources %if 0%{?el4}%{?el5}%{?el6} %ifnarch %{ix86} x86_64 -%patch9 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup +%patch8 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif -%patch10 -p1 -b .Remove_rpath_from_esock_ssl # end of autogenerated prep patch list # remove shipped zlib sources @@ -1417,7 +1396,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man4/diameter_dict.* %endif - %files doc %defattr(-,root,root) %if %{with doc} @@ -1426,17 +1404,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{n_uvr}/lib/ %endif - -%files docbuilder -%defattr(-,root,root) -%{_libdir}/erlang/lib/docbuilder-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/docb_gen.* -%{_libdir}/erlang/man/man3/docb_transform.* -%{_libdir}/erlang/man/man3/docb_xml_check.* -%{_libdir}/erlang/man/man6/docbuilder.* -%endif - %files edoc %defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ @@ -1452,6 +1419,7 @@ rm -rf $RPM_BUILD_ROOT %files erl_docgen %defattr(-,root,root) %{_libdir}/erlang/lib/erl_docgen-*/ +%{_libdir}/erlang/man/man6/erl_docgen.* %files erl_interface %defattr(-,root,root) @@ -1753,6 +1721,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/observer-*/ %if %{with doc} %{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/observer.* %{_libdir}/erlang/man/man3/ttb.* %{_libdir}/erlang/man/man6/observer.* %endif @@ -1959,10 +1928,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir %{_libdir}/erlang/lib/ssl-*/ %{_libdir}/erlang/lib/ssl-*/ebin -%{_libdir}/erlang/lib/ssl-*/priv %{_libdir}/erlang/lib/ssl-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/old_ssl.* %{_libdir}/erlang/man/man3/ssl.* %{_libdir}/erlang/man/man3/ssl_session_cache_api.* %{_libdir}/erlang/man/man6/ssl.* @@ -2021,7 +1988,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/queue.* %{_libdir}/erlang/man/man3/random.* %{_libdir}/erlang/man/man3/re.* -%{_libdir}/erlang/man/man3/regexp.* %{_libdir}/erlang/man/man3/sets.* %{_libdir}/erlang/man/man3/shell.* %{_libdir}/erlang/man/man3/shell_default.* @@ -2318,6 +2284,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxStyledTextCtrl.* %{_libdir}/erlang/man/man3/wxStyledTextEvent.* %{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* +%{_libdir}/erlang/man/man3/wxSystemOptions.* %{_libdir}/erlang/man/man3/wxSystemSettings.* %{_libdir}/erlang/man/man3/wxTextAttr.* %{_libdir}/erlang/man/man3/wxTextCtrl.* @@ -2378,6 +2345,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 07 2012 Peter Lemenkov - R15B-00.1 +- Ver. R15B + * Fri Jan 13 2012 Fedora Release Engineering - R14B-04.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 9916682..ebdc00b 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 4754328..080cac6 100644 +index c3c242b..1fc47a1 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -537,10 +537,6 @@ endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 6df4f61..d9b240d 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -6,11 +6,10 @@ Signed-off-by: Peter Lemenkov --- lib/crypto/c_src/Makefile.in | 2 +- lib/crypto/priv/Makefile | 2 +- - lib/ssl/c_src/Makefile.in | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c2a986c..48ba130 100644 +index 2855376..3f0f5c4 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -84,7 +84,7 @@ endif @@ -35,34 +34,3 @@ index 0989f14..0d29444 100644 -o $@ $^ -lcrypto $(DLL_NIFLIB): $(OBJS) -diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index 6e413e7..cf2d267 100644 ---- a/lib/ssl/c_src/Makefile.in -+++ b/lib/ssl/c_src/Makefile.in -@@ -107,7 +107,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; -@@ -119,7 +119,7 @@ else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, - CC_R_FLAG = -Wl,-rpath, - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif -@@ -127,7 +127,7 @@ endif - ifeq ($(strip $(CC_R_FLAG)),) - CC_R_OPT = - else --CC_R_OPT = $(CC_R_FLAG)$(SSL_LIBDIR) -+CC_R_OPT = - endif - - SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ diff --git a/otp-0004-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch similarity index 77% rename from otp-0004-Do-not-install-C-sources.patch rename to otp-0003-Do-not-install-C-sources.patch index c53558e..ce14a75 100644 --- a/otp-0004-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -11,28 +11,27 @@ Signed-off-by: Peter Lemenkov lib/megaco/src/flex/Makefile.in | 2 +- lib/odbc/c_src/Makefile.in | 3 --- lib/os_mon/c_src/Makefile.in | 1 - - lib/ssl/c_src/Makefile.in | 9 --------- lib/tools/c_src/Makefile.in | 2 -- - 9 files changed, 1 insertions(+), 41 deletions(-) + 8 files changed, 1 insertions(+), 32 deletions(-) diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 9e9cb18..1d73d3c 100644 +index 8c06be5..7013289 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -125,8 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -112,8 +112,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/priv/lib - $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) $(C_FILES) $(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 48ba130..553195b 100644 +index 3f0f5c4..ba7ab1c 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -137,10 +137,7 @@ docs: +@@ -133,10 +133,7 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -44,10 +43,10 @@ index 48ba130..553195b 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 8ff142a..d785902 100644 +index d6b0ca1..91a2cc9 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -876,29 +876,11 @@ release: opt +@@ -846,29 +846,11 @@ release: opt $(INSTALL_DIR) $(RELSYSDIR)/include $(INSTALL_DIR) $(RELSYSDIR)/lib $(INSTALL_DIR) $(RELSYSDIR)/bin @@ -78,10 +77,10 @@ index 8ff142a..d785902 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index 6eef782..091895b 100644 +index 5e034c4..c101201 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in -@@ -144,10 +144,8 @@ $(OBJDIR)/%.o: %.c +@@ -140,10 +140,8 @@ $(OBJDIR)/%.o: %.c include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -93,7 +92,7 @@ index 6eef782..091895b 100644 $(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 5af651d..2ccf2a9 100644 +index 7d82644..27275f2 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -279,7 +279,7 @@ release_spec: opt @@ -106,10 +105,10 @@ index 5af651d..2ccf2a9 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index ed3eeb1..c01d9bf 100644 +index 3a96a53..bbf0d7b 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in -@@ -131,11 +131,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 @@ -122,10 +121,10 @@ index ed3eeb1..c01d9bf 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index 1a371eb..62eac66 100644 +index bac0413..5c32296 100644 --- a/lib/os_mon/c_src/Makefile.in +++ b/lib/os_mon/c_src/Makefile.in -@@ -136,7 +136,6 @@ release_spec: +@@ -132,7 +132,6 @@ release_spec: else release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -133,31 +132,11 @@ index 1a371eb..62eac66 100644 $(INSTALL_DIR) $(RELSYSDIR)/priv/bin $(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin endif -diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index cf2d267..502c127 100644 ---- a/lib/ssl/c_src/Makefile.in -+++ b/lib/ssl/c_src/Makefile.in -@@ -201,15 +201,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_PROGRAM) $(PORT_PROGRAM) $(RELSYSDIR)/priv/bin --ifneq ($(SSL_MAKEFILE),) -- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj -- $(INSTALL_DATA) $(OBJS) $(RELSYSDIR)/priv/obj -- sed -e "s;%BINDIR%;../bin;" \ -- -e "s;%SSL_LIBDIR%;$(SSL_LIBDIR);" \ -- -e "s;%OBJS;$(OBJS);" \ -- -e "s;%LIBS%;$(LIBS);" ./Makefile.dist \ -- > $(RELSYSDIR)/priv/obj/Makefile --endif - - release_docs_spec: - diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 65a7f5f..144c1ba 100644 +index 604332a..f9648b23 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -190,8 +190,6 @@ include ../vsn.mk +@@ -185,8 +185,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index d17998f..0000000 --- a/otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/egl_impl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp -index 6d873ab..18916c0 100644 ---- a/lib/wx/c_src/egl_impl.cpp -+++ b/lib/wx/c_src/egl_impl.cpp -@@ -70,8 +70,8 @@ typedef char DL_CHAR; - # define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" - # define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib" - # else --# define OPENGL_LIB "libGL.so" --# define OPENGLU_LIB "libGLU.so" -+# define OPENGL_LIB "libGL.so.1" -+# define OPENGLU_LIB "libGLU.so.1" - # endif - #endif - extern "C" { diff --git a/otp-0005-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch similarity index 76% rename from otp-0005-Do-not-install-Java-sources.patch rename to otp-0004-Do-not-install-Java-sources.patch index 028fa0b..007c871 100644 --- a/otp-0005-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov --- lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- - .../java_src/com/ericsson/otp/erlang/Makefile.otp | 2 -- + .../java_src/com/ericsson/otp/erlang/Makefile | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile @@ -21,12 +21,12 @@ index f730749..f7ec624 100644 $(INSTALL_DIR) $(RELSYSDIR)/priv $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv -diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp -index d0ff9cd..9990d2b 100644 ---- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp -+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile.otp +diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +index 365798e..68deb9c 100644 +--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile ++++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -99,8 +99,6 @@ release release_docs release_tests release_html: - $(MAKE) -f Makefile.otp $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec + $(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang diff --git a/otp-0006-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch similarity index 100% rename from otp-0006-Do-not-install-nteventlog-and-related-doc-files-on-n.patch rename to otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch diff --git a/otp-0007-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch similarity index 100% rename from otp-0007-Do-not-install-VxWorks-specific-docs.patch rename to otp-0006-Do-not-install-VxWorks-specific-docs.patch diff --git a/otp-0008-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch similarity index 82% rename from otp-0008-Do-not-install-erlang-sources.patch rename to otp-0007-Do-not-install-erlang-sources.patch index 3e46889..d91778d 100644 --- a/otp-0008-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -5,85 +5,82 @@ Subject: [PATCH] Do not install erlang sources Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann --- - erts/preloaded/src/Makefile | 2 -- - lib/appmon/src/Makefile | 2 +- - lib/asn1/src/Makefile | 2 +- - lib/common_test/src/Makefile | 2 +- - lib/compiler/src/Makefile | 4 ++-- - lib/cosEvent/src/Makefile | 2 +- - lib/cosEventDomain/src/Makefile | 2 +- - lib/cosFileTransfer/src/Makefile | 3 +-- - lib/cosNotification/src/Makefile | 3 +-- - lib/cosProperty/src/Makefile | 3 +-- - lib/cosTime/src/Makefile | 3 +-- - lib/cosTransactions/src/Makefile | 2 +- - lib/crypto/src/Makefile | 2 -- - lib/debugger/src/Makefile | 2 +- - lib/dialyzer/src/Makefile | 2 +- - lib/diameter/src/app/Makefile | 1 - - lib/diameter/src/compiler/Makefile | 2 +- - lib/diameter/src/transport/Makefile | 2 -- - lib/docbuilder/src/Makefile | 2 +- - lib/edoc/src/Makefile | 2 +- - lib/erl_docgen/src/Makefile | 2 -- - lib/et/src/Makefile | 1 - - lib/eunit/src/Makefile | 2 -- - lib/gs/src/Makefile | 4 ++-- - lib/hipe/cerl/Makefile | 2 +- - lib/hipe/flow/Makefile | 2 +- - lib/hipe/icode/Makefile | 2 +- - lib/hipe/main/Makefile | 2 +- - lib/hipe/misc/Makefile | 2 +- - lib/hipe/rtl/Makefile | 2 +- - lib/hipe/util/Makefile | 3 --- - lib/ic/src/Makefile | 2 +- - lib/inets/src/ftp/Makefile | 2 +- - lib/inets/src/http_client/Makefile | 2 +- - lib/inets/src/http_lib/Makefile | 2 +- - lib/inets/src/http_server/Makefile | 2 +- - lib/inets/src/inets_app/Makefile | 2 +- - lib/inets/src/tftp/Makefile | 2 +- - lib/inviso/src/Makefile | 2 -- - lib/kernel/src/Makefile | 1 - - lib/megaco/src/app/Makefile | 2 +- - lib/megaco/src/binary/Makefile | 2 +- - lib/megaco/src/engine/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 1 - - lib/megaco/src/tcp/Makefile | 2 +- - lib/megaco/src/text/Makefile | 2 +- - lib/megaco/src/udp/Makefile | 2 +- - lib/mnesia/src/Makefile | 2 +- - lib/observer/src/Makefile | 1 - - lib/odbc/src/Makefile | 2 +- - lib/orber/COSS/CosNaming/Makefile | 4 ++-- - lib/orber/src/Makefile | 2 +- - lib/os_mon/src/Makefile | 1 - - lib/otp_mibs/src/Makefile | 2 -- - lib/parsetools/src/Makefile | 2 -- - lib/percept/src/Makefile | 2 -- - lib/pman/src/Makefile | 2 +- - lib/public_key/src/Makefile | 4 ---- - lib/reltool/src/Makefile | 2 +- - lib/runtime_tools/src/Makefile | 2 -- - lib/sasl/src/Makefile | 1 - - lib/snmp/src/agent/Makefile | 2 +- - lib/snmp/src/app/Makefile | 2 +- - lib/snmp/src/compile/Makefile | 2 +- - lib/snmp/src/manager/Makefile | 2 +- - lib/snmp/src/misc/Makefile | 2 +- - lib/ssh/src/Makefile | 2 +- - lib/ssl/src/Makefile | 2 +- - lib/stdlib/src/Makefile | 1 - - lib/syntax_tools/src/Makefile | 2 -- - lib/test_server/src/Makefile | 1 - - lib/toolbar/src/Makefile | 2 +- - lib/tools/src/Makefile | 2 +- - lib/tv/src/Makefile | 2 +- - lib/typer/src/Makefile | 2 -- - lib/webtool/src/Makefile | 2 -- - lib/wx/src/Makefile | 4 ++-- - lib/xmerl/src/Makefile | 4 +--- - 78 files changed, 58 insertions(+), 106 deletions(-) + erts/preloaded/src/Makefile | 2 -- + lib/appmon/src/Makefile | 2 +- + lib/asn1/src/Makefile | 2 +- + lib/common_test/src/Makefile | 2 +- + lib/compiler/src/Makefile | 4 ++-- + lib/cosEvent/src/Makefile | 2 +- + lib/cosEventDomain/src/Makefile | 2 +- + lib/cosFileTransfer/src/Makefile | 3 +-- + lib/cosNotification/src/Makefile | 3 +-- + lib/cosProperty/src/Makefile | 3 +-- + lib/cosTime/src/Makefile | 3 +-- + lib/cosTransactions/src/Makefile | 2 +- + lib/crypto/src/Makefile | 2 -- + lib/debugger/src/Makefile | 2 +- + lib/dialyzer/src/Makefile | 2 +- + lib/diameter/src/Makefile | 6 ++---- + lib/edoc/src/Makefile | 2 +- + lib/erl_docgen/src/Makefile | 2 -- + lib/et/src/Makefile | 1 - + lib/eunit/src/Makefile | 2 -- + lib/gs/src/Makefile | 4 ++-- + lib/hipe/cerl/Makefile | 2 +- + lib/hipe/flow/Makefile | 2 +- + lib/hipe/icode/Makefile | 2 +- + lib/hipe/main/Makefile | 2 +- + lib/hipe/misc/Makefile | 2 +- + lib/hipe/rtl/Makefile | 2 +- + lib/hipe/util/Makefile | 3 --- + lib/ic/src/Makefile | 2 +- + lib/inets/src/ftp/Makefile | 2 +- + lib/inets/src/http_client/Makefile | 2 +- + lib/inets/src/http_lib/Makefile | 2 +- + lib/inets/src/http_server/Makefile | 2 +- + lib/inets/src/inets_app/Makefile | 2 +- + lib/inets/src/tftp/Makefile | 2 +- + lib/inviso/src/Makefile | 2 -- + lib/kernel/src/Makefile | 1 - + lib/megaco/src/app/Makefile | 2 +- + lib/megaco/src/binary/Makefile | 2 +- + lib/megaco/src/engine/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 1 - + lib/megaco/src/tcp/Makefile | 2 +- + lib/megaco/src/text/Makefile | 2 +- + lib/megaco/src/udp/Makefile | 2 +- + lib/mnesia/src/Makefile | 2 +- + lib/observer/src/Makefile | 1 - + lib/odbc/src/Makefile | 2 +- + lib/orber/COSS/CosNaming/Makefile | 4 ++-- + lib/orber/src/Makefile | 2 +- + lib/os_mon/src/Makefile | 1 - + lib/otp_mibs/src/Makefile | 2 -- + lib/parsetools/src/Makefile | 2 -- + lib/percept/src/Makefile | 2 -- + lib/pman/src/Makefile | 2 +- + lib/public_key/src/Makefile | 4 ---- + lib/reltool/src/Makefile | 2 +- + lib/runtime_tools/src/Makefile | 2 -- + lib/sasl/src/Makefile | 1 - + lib/snmp/src/agent/Makefile | 2 +- + lib/snmp/src/app/Makefile | 2 +- + lib/snmp/src/compile/Makefile | 2 +- + lib/snmp/src/manager/Makefile | 2 +- + lib/snmp/src/misc/Makefile | 2 +- + lib/ssh/src/Makefile | 2 +- + lib/ssl/src/Makefile | 2 +- + lib/stdlib/src/Makefile | 1 - + lib/syntax_tools/src/Makefile | 2 -- + lib/test_server/src/Makefile | 1 - + lib/toolbar/src/Makefile | 2 +- + lib/tools/src/Makefile | 2 +- + lib/tv/src/Makefile | 2 +- + lib/typer/src/Makefile | 2 -- + lib/webtool/src/Makefile | 2 -- + lib/wx/src/Makefile | 4 ++-- + lib/xmerl/src/Makefile | 4 +--- + 75 files changed, 58 insertions(+), 105 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 1456388..81db627 100644 @@ -112,7 +109,7 @@ index 43f4f08..7e2d9b1 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 2733cde..42a674e 100644 +index 3a59773..17ebb53 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ release_spec: opt @@ -125,10 +122,10 @@ index 2733cde..42a674e 100644 $(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 84b122b..5c01656 100644 +index 125aa82..b62fe0f 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -138,10 +135,10 @@ index 84b122b..5c01656 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 1238d11..93747f6 100644 +index 7a23760..20fea4e 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -162,8 +162,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -163,8 +163,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -153,10 +150,10 @@ index 1238d11..93747f6 100644 $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index a62d47c..66ce6d9 100644 +index f8e751f..369ad08 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile -@@ -200,7 +200,7 @@ release_spec: opt +@@ -202,7 +202,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -166,10 +163,10 @@ index a62d47c..66ce6d9 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index 56a67cd..19933c9 100644 +index 409cac4..722ec46 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile -@@ -166,7 +166,7 @@ release_spec: opt +@@ -171,7 +171,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -179,10 +176,10 @@ index 56a67cd..19933c9 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index 773ed7f..8f79d8c 100644 +index 1d51304..c5cb87a 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile -@@ -174,8 +174,7 @@ release_spec: opt +@@ -179,8 +179,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -193,10 +190,10 @@ index 773ed7f..8f79d8c 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index 637c633..659b780 100644 +index 92225c6..4568cd7 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile -@@ -361,8 +361,7 @@ release_spec: opt +@@ -370,8 +370,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -207,10 +204,10 @@ index 637c633..659b780 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index 1d2119d..a210fec 100644 +index 8060421..2a83d28 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile -@@ -175,8 +175,7 @@ release_spec: opt +@@ -179,8 +179,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -221,10 +218,10 @@ index 1d2119d..a210fec 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index 3b6f7ba..f66e548 100644 +index 18c25ca..c3df6a0 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile -@@ -197,8 +197,7 @@ release_spec: opt +@@ -198,8 +198,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -235,10 +232,10 @@ index 3b6f7ba..f66e548 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 7e10ec1..4485209 100644 +index 3c799ca..3b35bac 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile -@@ -168,7 +168,7 @@ release_spec: opt +@@ -173,7 +173,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -261,10 +258,10 @@ index 0e886ce..d24ab24 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) $(RELSYSDIR)/ebin diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 8551fe8..244d169 100644 +index be9a2d1..073c3aa 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile -@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -286,57 +283,23 @@ index 810f86d..f3f2b22 100644 $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin -diff --git a/lib/diameter/src/app/Makefile b/lib/diameter/src/app/Makefile -index a75c70d..ba3d10e 100644 ---- a/lib/diameter/src/app/Makefile -+++ b/lib/diameter/src/app/Makefile -@@ -177,7 +177,6 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/examples - $(INSTALL_SCRIPT) $(ESCRIPT_FILES) $(RELSYSDIR)/bin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin -- $(INSTALL_DATA) $(MODULES:%=%.erl) $(SPEC_ERL_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DATA) $(SPEC_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(SPEC_HRL_FILES) $(RELSYSDIR)/include -diff --git a/lib/diameter/src/compiler/Makefile b/lib/diameter/src/compiler/Makefile -index 779013b..edc7a3d 100644 ---- a/lib/diameter/src/compiler/Makefile -+++ b/lib/diameter/src/compiler/Makefile -@@ -107,7 +107,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/compiler -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/compiler -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/compiler +diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile +index 2ec016e..d86733a 100644 +--- a/lib/diameter/src/Makefile ++++ b/lib/diameter/src/Makefile +@@ -201,10 +201,8 @@ release_spec: opt + $(MAKE) $(TARGET_DIRS:%/=release_src_%) + + $(TARGET_DIRS:%/=release_src_%): release_src_%: +- $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ +- $(INTERNAL_HRLS)) \ +- $(filter $*/%, compiler/$(DICT_YRL).yrl) \ +- $(RELSYSDIR)/src/$* ++ $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ ++ $(RELSYSDIR)/src/$* || true release_docs_spec: -diff --git a/lib/diameter/src/transport/Makefile b/lib/diameter/src/transport/Makefile -index 4b53100..7bcc1b9 100644 ---- a/lib/diameter/src/transport/Makefile -+++ b/lib/diameter/src/transport/Makefile -@@ -116,8 +116,6 @@ endif - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin -- $(INSTALL_DIR) $(RELSYSDIR)/src/transport -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/transport - - release_docs_spec: - -diff --git a/lib/docbuilder/src/Makefile b/lib/docbuilder/src/Makefile -index e8a07a5..d0ac3a9 100644 ---- a/lib/docbuilder/src/Makefile -+++ b/lib/docbuilder/src/Makefile -@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile index fcb0b61..2082ca6 100644 --- a/lib/edoc/src/Makefile @@ -351,10 +314,10 @@ index fcb0b61..2082ca6 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 8e81bcc..c636b87 100644 +index cbaf6e4..d3cdbd6 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile -@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -376,23 +339,23 @@ index bb6632e..3e71e02 100644 $(INSTALL_DIR) $(RELSYSDIR)/include $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 4897c20..f3d69e9 100644 +index bec2fdb..0814f12 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile -@@ -104,8 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -109,8 +109,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src +- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/include $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index a648d3c..3757ac1 100644 +index 43b5302..37e836a 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile -@@ -106,8 +106,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -469,7 +432,7 @@ index 98a69d6..23073cd 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 55d20af..04d667c 100644 +index 690045b..70fb146 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -529,10 +492,10 @@ index 19b9387..f3ff8bf 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index 0397b48..2692c7c 100644 +index d490e59..961324e 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile -@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/http_client @@ -568,10 +531,10 @@ index 55cc68d..78e46ae 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 20e2291..a4e4763 100644 +index d99e33b..5ddf947 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/inets_app @@ -607,10 +570,10 @@ index 1f2f8b1..9f7652d 100644 # $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include $(INSTALL_DIR) $(RELSYSDIR)/ebin diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 9db6014..55e0085 100644 +index 54f21eb..9b6e3eb 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -196,7 +196,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -658,7 +621,7 @@ index 3943f4b..879abff 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 2ccf2a9..985bec2 100644 +index 27275f2..a45b7c3 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -276,7 +276,6 @@ release_spec: opt @@ -722,10 +685,10 @@ index 1c8ec54..cc00b60 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 3875b62..cebfbab 100644 +index ca26afc..dd43454 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -114,7 +114,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -129,7 +129,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -747,10 +710,10 @@ index b48dd76..deb9947 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include $(INSTALL_DIR) $(RELSYSDIR)/ebin diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index d3deec7..80be6e9 100644 +index 064447f..b464b55 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile -@@ -142,8 +142,8 @@ release_spec: opt +@@ -144,8 +144,8 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming @@ -762,10 +725,10 @@ index d3deec7..80be6e9 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index ccc4493..41e7972 100644 +index d2e9868..5ff5803 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile -@@ -258,7 +258,7 @@ release_spec: opt +@@ -257,7 +257,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -839,19 +802,19 @@ index e573e57..bdbced1 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 5a24b02..5fe76ab 100644 +index 062c495..954bf7c 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -47,8 +47,6 @@ MODULES = \ +@@ -48,8 +48,6 @@ MODULES = \ - HRL_FILES = $(INCLUDE)/public_key.hrl + HRL_FILES = $(INCLUDE)/public_key.hrl -INTERNAL_HRL_FILES = - ERL_FILES = $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -@@ -101,8 +99,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -102,8 +100,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -874,10 +837,10 @@ index 4e6a112..cef22b5 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 4f831f3..c8bd229 100644 +index 946409b..da82d79 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -92,8 +92,6 @@ docs: +@@ -93,8 +93,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -964,10 +927,10 @@ index 48d76bd..9f1f868 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin # $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 42880fa..d657098 100644 +index da31d87..e08e4e1 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -977,10 +940,10 @@ index 42880fa..d657098 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 7514ad2..c8be1ae 100644 +index dc69b53..63ac81e 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -990,10 +953,10 @@ index 7514ad2..c8be1ae 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) $(RELSYSDIR)/ebin diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 600303d..c335586 100644 +index 90e239b..31cb268 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -1015,10 +978,10 @@ index 50369e6..12c6db4 100644 release_docs_spec: diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 63a585d..4855056 100644 +index 4bc5187..90419de 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile -@@ -126,7 +126,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -1092,10 +1055,10 @@ index 62845cd..841cf11 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ $(RELSYSDIR)/ebin diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 46bc062..486b623 100644 +index 4e5971d..888b6f2 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -111,9 +111,9 @@ ifeq ($(INSIDE_ERLSRC), true) +@@ -123,9 +123,9 @@ ifeq ($(INSIDE_ERLSRC), true) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src diff --git a/otp-0009-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch similarity index 100% rename from otp-0009-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch rename to otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch diff --git a/otp-0010-Remove-rpath-from-esock_ssl.patch b/otp-0010-Remove-rpath-from-esock_ssl.patch deleted file mode 100644 index c58a7a9..0000000 --- a/otp-0010-Remove-rpath-from-esock_ssl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Hans Ulrich Niedermann -Date: Mon, 31 Jan 2011 13:33:28 +0100 -Subject: [PATCH] Remove rpath from esock_ssl - -Unset SSL_CC_RUNTIME_LIBRARY_PATH to build esock_ssl -without rpathes. ---- - lib/ssl/c_src/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in -index 502c127..e111950 100644 ---- a/lib/ssl/c_src/Makefile.in -+++ b/lib/ssl/c_src/Makefile.in -@@ -130,7 +130,7 @@ else - CC_R_OPT = - endif - --SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ -+SSL_CC_RUNTIME_LIBRARY_PATH= - # Sigh... - ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@) - SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT) diff --git a/sources b/sources index 1be92ac..203970d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4b469729f103f52702bfb1fb24529dc0 otp_src_R14B04.tar.gz -2a440aa8c1242dd0c79785d69f0d97ca otp_doc_html_R14B04.tar.gz -f31e72518daae4007f595c0b224dd59f otp_doc_man_R14B04.tar.gz +80553f4730b04aad4c9994590bad3fe6 otp_doc_html_R15B.tar.gz +9738da523737712a9db87db0dee05338 otp_doc_man_R15B.tar.gz +dd6c2a4807551b4a8a536067bde31d73 otp_src_R15B.tar.gz From 5203c4fd2bd4c0c19a217e5fad95f65de1168010 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 May 2012 15:40:47 +0400 Subject: [PATCH 004/340] Ver. R15B01 Signed-off-by: Peter Lemenkov --- .gitignore | 3 + erlang.spec | 64 ++++++++--- ...n-pages-and-do-not-install-miscellan.patch | 6 +- otp-0003-Do-not-install-C-sources.patch | 39 +++++-- otp-0004-Do-not-install-Java-sources.patch | 6 +- ...Do-not-install-VxWorks-specific-docs.patch | 2 +- otp-0007-Do-not-install-erlang-sources.patch | 103 +++++++++++------- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 4 +- sources | 3 + 9 files changed, 154 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index c546419..472c090 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index fdfdfb4..a8e813b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ %global upstream_ver R15B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -#%global upstream_rel 01 -%global upstream_rel %{nil} +%global upstream_rel 01 +#%%global upstream_rel %%{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -121,6 +121,7 @@ Requires: erlang-debugger%{?_isa} = %{version}-%{release} Requires: erlang-dialyzer%{?_isa} = %{version}-%{release} Requires: erlang-diameter%{?_isa} = %{version}-%{release} Requires: erlang-edoc%{?_isa} = %{version}-%{release} +Requires: erlang-eldap%{?_isa} = %{version}-%{release} Requires: erlang-erl_docgen%{?_isa} = %{version}-%{release} Requires: erlang-erl_interface%{?_isa} = %{version}-%{release} Requires: erlang-erts%{?_isa} = %{version}-%{release} @@ -204,6 +205,7 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -367,14 +369,12 @@ A DIscrepany AnaLYZer for ERlang programs. Summary: Diameter (RFC 3588) library Group: Development/Languages BuildRequires: ed -#Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -#Requires: %{name}-gs%{?_isa} = %{version}-%{release} -#Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -#Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -#Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description diameter @@ -395,7 +395,6 @@ Documentation for Erlang. %package edoc Summary: A utility used to generate documentation out of tags in source files Group: Development/Languages -Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -407,10 +406,26 @@ Obsoletes: %{name} < R13B-04.5 %description edoc A utility used to generate documentation out of tags in source files. +%package eldap +Summary: Erlang LDAP library +Group: Development/Languages +Requires: %{name}-asn1%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Obsoletes: %{name} < R13B-04.5 + +%description eldap +Erlang LDAP library. + %package erl_docgen Summary: A utility used to generate erlang HTML documentation Group: Development/Languages +Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erl_docgen @@ -539,12 +554,12 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %if 0%{?fedora} -BuildRequires: java-1.6.0-openjdk-devel +BuildRequires: java-devel %else %ifarch %{ix86} x86_64 -BuildRequires: java-1.6.0-openjdk-devel +BuildRequires: java-devel %else -BuildRequires: java-1.5.0-gcj-devel +BuildRequires: java-devel-gcj %endif %endif @@ -592,6 +607,7 @@ A heavy duty real-time distributed database. %package observer Summary: A set of tools for tracing and investigation of distributed systems Group: Development/Languages +Requires: %{name}-appmon%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-gs%{?_isa} = %{version}-%{release} @@ -600,6 +616,7 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-webtool%{?_isa} = %{version}-%{release} +Requires: %{name}-wx%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description observer @@ -699,6 +716,7 @@ A graphical process manager used to inspect Erlang processes. %package public_key Summary: API to public key infrastructure Group: Development/Languages +Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -733,6 +751,7 @@ Summary: A set of tools to include in a production system Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 @@ -1204,6 +1223,7 @@ rm -rf $RPM_BUILD_ROOT %files common_test %defattr(-,root,root) +%{_bindir}/ct_run %{_libdir}/erlang/lib/common_test-*/ %if %{with doc} %{_libdir}/erlang/man/man3/ct.* @@ -1416,6 +1436,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/edoc_run.* %endif +%files eldap +%defattr(-,root,root) +%{_libdir}/erlang/lib/eldap-*/ +%if %{with doc} +%{_libdir}/erlang/man/man3/eldap.* +%endif + %files erl_docgen %defattr(-,root,root) %{_libdir}/erlang/lib/erl_docgen-*/ @@ -1476,7 +1503,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/bin/start_erl %{_libdir}/erlang/bin/start_sasl.boot %{_libdir}/erlang/bin/to_erl -%dir %{_libdir}/erlang/erts-*/bin +%dir %{_libdir}/erlang/erts-*/ +%dir %{_libdir}/erlang/erts-*/bin/ %{_libdir}/erlang/erts-*/bin/beam %{_libdir}/erlang/erts-*/bin/beam.smp %{_libdir}/erlang/erts-*/bin/child_setup @@ -1496,8 +1524,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/erts-*/bin/start_erl.src %{_libdir}/erlang/erts-*/bin/to_erl %{_libdir}/erlang/erts-*/include -%{_libdir}/erlang/erts-*/lib -%{_libdir}/erlang/erts-*/src +%{_libdir}/erlang/erts-*/lib/ +%{_libdir}/erlang/erts-*/src/ %{_libdir}/erlang/lib/erts-*/ %if %{with doc} %{_libdir}/erlang/man/man1/ct_run.* @@ -1610,6 +1638,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/inets-*/src %if %{with doc} %{_libdir}/erlang/man/man3/ftp.* +%{_libdir}/erlang/man/man3/http_uri.* %{_libdir}/erlang/man/man3/httpc.* %{_libdir}/erlang/man/man3/httpd.* %{_libdir}/erlang/man/man3/httpd_conf.* @@ -1827,6 +1856,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/runtime_tools-*/ %if %{with doc} %{_libdir}/erlang/man/man3/dbg.* +%{_libdir}/erlang/man/man3/dyntrace.* %{_libdir}/erlang/man/man3/erts_alloc_config.* %{_libdir}/erlang/man/man6/runtime_tools.* %endif @@ -2286,6 +2316,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* %{_libdir}/erlang/man/man3/wxSystemOptions.* %{_libdir}/erlang/man/man3/wxSystemSettings.* +%{_libdir}/erlang/man/man3/wxTaskBarIcon.* +%{_libdir}/erlang/man/man3/wxTaskBarIconEvent.* %{_libdir}/erlang/man/man3/wxTextAttr.* %{_libdir}/erlang/man/man3/wxTextCtrl.* %{_libdir}/erlang/man/man3/wxTextDataObject.* @@ -2345,6 +2377,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 07 2012 Peter Lemenkov - R15B-01.1 +- Ver. R15B01 +- New sub-package - eldap + * Tue Feb 07 2012 Peter Lemenkov - R15B-00.1 - Ver. R15B diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index ebdc00b..82fb476 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -7,13 +7,13 @@ Signed-off-by: Peter Lemenkov --- erts/etc/common/Makefile.in | 4 ---- erts/etc/unix/Install.src | 10 ---------- - 2 files changed, 0 insertions(+), 14 deletions(-) + 2 files changed, 14 deletions(-) diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index c3c242b..1fc47a1 100644 +index 28c5e5c..5f7aaf1 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -537,10 +537,6 @@ endif +@@ -565,10 +565,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH) endif diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index ce14a75..ce673a0 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -2,17 +2,20 @@ From: Peter Lemenkov Date: Fri, 18 Jun 2010 23:41:33 +0400 Subject: [PATCH] Do not install C sources +Don't install *.c and *.o files at all. + Signed-off-by: Peter Lemenkov --- - lib/asn1/c_src/Makefile | 2 -- - lib/crypto/c_src/Makefile.in | 3 --- - lib/erl_interface/src/Makefile.in | 18 ------------------ - lib/ic/c_src/Makefile.in | 2 -- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/odbc/c_src/Makefile.in | 3 --- - lib/os_mon/c_src/Makefile.in | 1 - - lib/tools/c_src/Makefile.in | 2 -- - 8 files changed, 1 insertions(+), 32 deletions(-) + lib/asn1/c_src/Makefile | 2 -- + lib/crypto/c_src/Makefile.in | 3 --- + lib/erl_interface/src/Makefile.in | 18 ------------------ + lib/ic/c_src/Makefile.in | 2 -- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/odbc/c_src/Makefile.in | 3 --- + lib/os_mon/c_src/Makefile.in | 1 - + lib/runtime_tools/c_src/Makefile.in | 2 -- + lib/tools/c_src/Makefile.in | 2 -- + 9 files changed, 1 insertion(+), 34 deletions(-) diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile index 8c06be5..7013289 100644 @@ -132,11 +135,25 @@ index bac0413..5c32296 100644 $(INSTALL_DIR) $(RELSYSDIR)/priv/bin $(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin endif +diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in +index cbbcfa2..20f1ca6 100644 +--- a/lib/runtime_tools/c_src/Makefile.in ++++ b/lib/runtime_tools/c_src/Makefile.in +@@ -193,9 +193,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 604332a..f9648b23 100644 +index b8c4aed..f7f5dff 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -185,8 +185,6 @@ include ../vsn.mk +@@ -188,8 +188,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 007c871..3804969 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -4,9 +4,9 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov --- - lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- - .../java_src/com/ericsson/otp/erlang/Makefile | 2 -- - 2 files changed, 0 insertions(+), 4 deletions(-) + lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- + lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 2 -- + 2 files changed, 4 deletions(-) diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile index f730749..f7ec624 100644 diff --git a/otp-0006-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch index 8bfd141..76a8803 100644 --- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch +++ b/otp-0006-Do-not-install-VxWorks-specific-docs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install VxWorks-specific docs Signed-off-by: Peter Lemenkov --- erts/doc/src/Makefile | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 file changed, 1 deletion(-) diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index cfa5527..d18b615 100644 diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index d91778d..4c97f1f 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -2,6 +2,8 @@ From: Hans Ulrich Niedermann Date: Mon, 21 Mar 2011 15:41:49 +0100 Subject: [PATCH] Do not install erlang sources +Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. + Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann --- @@ -20,8 +22,9 @@ Signed-off-by: Hans Ulrich Niedermann lib/crypto/src/Makefile | 2 -- lib/debugger/src/Makefile | 2 +- lib/dialyzer/src/Makefile | 2 +- - lib/diameter/src/Makefile | 6 ++---- + lib/diameter/src/Makefile | 7 ++----- lib/edoc/src/Makefile | 2 +- + lib/eldap/src/Makefile | 4 ---- lib/erl_docgen/src/Makefile | 2 -- lib/et/src/Makefile | 1 - lib/eunit/src/Makefile | 2 -- @@ -80,7 +83,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 75 files changed, 58 insertions(+), 105 deletions(-) + 76 files changed, 58 insertions(+), 110 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 1456388..81db627 100644 @@ -109,10 +112,10 @@ index 43f4f08..7e2d9b1 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 3a59773..17ebb53 100644 +index 5614cbe..1857cbf 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -155,7 +155,7 @@ release_spec: opt +@@ -156,7 +156,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src @@ -122,10 +125,10 @@ index 3a59773..17ebb53 100644 $(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 125aa82..b62fe0f 100644 +index 6a16c6f..7547e47 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -135,10 +138,10 @@ index 125aa82..b62fe0f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 7a23760..20fea4e 100644 +index 3415517..9aea1f3 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -163,8 +163,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -164,8 +164,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -271,7 +274,7 @@ index be9a2d1..073c3aa 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 810f86d..f3f2b22 100644 +index 04f3b84..083a568 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -284,13 +287,14 @@ index 810f86d..f3f2b22 100644 $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 2ec016e..d86733a 100644 +index dbfaa4e..51db955 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -201,10 +201,8 @@ release_spec: opt - $(MAKE) $(TARGET_DIRS:%/=release_src_%) +@@ -206,11 +206,8 @@ release_spec: opt + $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: +- $(INSTALL_DIR) $(RELSYSDIR)/src/$* - $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ - $(INTERNAL_HRLS)) \ - $(filter $*/%, compiler/$(DICT_YRL).yrl) \ @@ -298,8 +302,8 @@ index 2ec016e..d86733a 100644 + $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ + $(RELSYSDIR)/src/$* || true - release_docs_spec: - + $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: + $(INSTALL_DIR) $(RELSYSDIR)/examples/$* diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile index fcb0b61..2082ca6 100644 --- a/lib/edoc/src/Makefile @@ -313,6 +317,21 @@ index fcb0b61..2082ca6 100644 release_docs_spec: +diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile +index 4ddb808..02072fa 100644 +--- a/lib/eldap/src/Makefile ++++ b/lib/eldap/src/Makefile +@@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + 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) $(RELSYSDIR)/src +- $(INSTALL_DIR) $(RELSYSDIR)/asn1 +- $(INSTALL_DATA) ../asn1/$(ASN1_FILES) $(RELSYSDIR)/asn1 + $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include + diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile index cbaf6e4..d3cdbd6 100644 --- a/lib/erl_docgen/src/Makefile @@ -367,10 +386,10 @@ index 43b5302..37e836a 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 7fcc44d..6e41e6b 100644 +index 14e68f5..2828bc7 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile -@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/cerl @@ -380,10 +399,10 @@ index 7fcc44d..6e41e6b 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index 02f6105..9fa7078 100644 +index 1a531fd..9f1a098 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile -@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/flow @@ -393,10 +412,10 @@ index 02f6105..9fa7078 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index eced90b..e48c64e 100644 +index 0d940d4..54c4263 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/icode @@ -406,10 +425,10 @@ index eced90b..e48c64e 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index a14c9c3..163bded 100644 +index fc8923d..5b94d90 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DATA) ../vsn.mk $(RELSYSDIR) $(INSTALL_DIR) $(RELSYSDIR)/main @@ -432,10 +451,10 @@ index 98a69d6..23073cd 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 690045b..70fb146 100644 +index 3002683..40efb6f 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/rtl @@ -445,7 +464,7 @@ index 690045b..70fb146 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 85719ec..ae2cbc0 100644 +index 2f17eee..083933b 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -49,7 +49,6 @@ HIPE_MODULES = @@ -456,7 +475,7 @@ index 85719ec..ae2cbc0 100644 ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -100,8 +99,6 @@ $(DOCS)/%.html:%.erl +@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -518,10 +537,10 @@ index aaf3cfb..0236a49 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 55cc68d..78e46ae 100644 +index 60bb0d2..bfc2986 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/http_server @@ -531,10 +550,10 @@ index 55cc68d..78e46ae 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index d99e33b..5ddf947 100644 +index 6da6a1d..5e9951a 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/src/inets_app @@ -685,10 +704,10 @@ index 1c8ec54..cc00b60 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index ca26afc..dd43454 100644 +index 91a4c65..b14dc4b 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -129,7 +129,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -130,7 +130,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -837,10 +856,10 @@ index 4e6a112..cef22b5 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 946409b..da82d79 100644 +index cb302b7..0cd12ba 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -93,8 +93,6 @@ docs: +@@ -99,8 +99,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -848,7 +867,7 @@ index 946409b..da82d79 100644 - $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src $(INSTALL_DIR) $(RELSYSDIR)/include $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) $(RELSYSDIR)/examples diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile index 9a5d1e4..4dd511f 100644 --- a/lib/sasl/src/Makefile @@ -927,10 +946,10 @@ index 48d76bd..9f1f868 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin # $(INSTALL_DIR) $(RELSYSDIR)/include diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index da31d87..e08e4e1 100644 +index 1734ae4..99eb3a4 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -128,7 +128,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -965,7 +984,7 @@ index 90e239b..31cb268 100644 $(INSTALL_DIR) $(RELSYSDIR)/include $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index 50369e6..12c6db4 100644 +index bac138e..2cce48c 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -1055,10 +1074,10 @@ index 62845cd..841cf11 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ $(RELSYSDIR)/ebin diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 4e5971d..888b6f2 100644 +index 16b425e..f42521a 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -123,9 +123,9 @@ ifeq ($(INSIDE_ERLSRC), true) +@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/src @@ -1071,10 +1090,10 @@ index 4e5971d..888b6f2 100644 $(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include $(INSTALL_DIR) $(RELSYSDIR)/ebin diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 7009b50..c9c7303 100644 +index a5dbe45..52fe190 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile -@@ -218,9 +218,7 @@ release_spec: opt +@@ -217,9 +217,7 @@ release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin $(INSTALL_DIR) $(RELSYSDIR)/src diff --git a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch index 2eb3dd5..1062a4c 100644 --- a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch @@ -10,8 +10,8 @@ Fedora-Spec-Before: %ifnarch %{ix86} x86_64 Fedora-Spec-After: %endif Fedora-Spec-After: %endif --- - .../com/ericsson/otp/erlang/OtpErlangList.java | 14 +------------- - .../com/ericsson/otp/erlang/OtpInputStream.java | 13 ++----------- + .../java_src/com/ericsson/otp/erlang/OtpErlangList.java | 14 +------------- + .../java_src/com/ericsson/otp/erlang/OtpInputStream.java | 13 ++----------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java diff --git a/sources b/sources index 203970d..14e9e70 100644 --- a/sources +++ b/sources @@ -1,3 +1,6 @@ 80553f4730b04aad4c9994590bad3fe6 otp_doc_html_R15B.tar.gz 9738da523737712a9db87db0dee05338 otp_doc_man_R15B.tar.gz dd6c2a4807551b4a8a536067bde31d73 otp_src_R15B.tar.gz +7569cae680eecd64e7e5d952be788ee5 otp_doc_html_R15B01.tar.gz +d87412c2a1e6005bbe29dfe642a9ca20 otp_doc_man_R15B01.tar.gz +f12d00f6e62b36ad027d6c0c08905fad otp_src_R15B01.tar.gz From ffc6e44f8496c9f6f245ec1c9f729861abe1f3b5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 May 2012 17:13:06 +0400 Subject: [PATCH 005/340] Fixed examples packaging Signed-off-by: Peter Lemenkov --- erlang.spec | 75 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/erlang.spec b/erlang.spec index a8e813b..98750d7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1573,32 +1573,33 @@ rm -rf $RPM_BUILD_ROOT %files examples %defattr(-,root,root) -%{_libdir}/erlang/lib/asn1-*/examples -#%{_libdir}/erlang/lib/cosFileTransfer-*/examples -#%{_libdir}/erlang/lib/cosNotification-*/examples -#%{_libdir}/erlang/lib/cosProperty-*/examples -#%{_libdir}/erlang/lib/cosTime-*/examples -#%{_libdir}/erlang/lib/cosTransactions-*/examples -%{_libdir}/erlang/lib/diameter-*/examples -%{_libdir}/erlang/lib/et-*/examples -%{_libdir}/erlang/lib/eunit-*/examples -%{_libdir}/erlang/lib/gs-*/examples -%{_libdir}/erlang/lib/ic-*/examples -%{_libdir}/erlang/lib/inets-*/examples -%{_libdir}/erlang/lib/kernel-*/examples -%{_libdir}/erlang/lib/megaco-*/examples -%{_libdir}/erlang/lib/mnesia-*/examples -%{_libdir}/erlang/lib/observer-*/examples -%{_libdir}/erlang/lib/orber-*/examples -%{_libdir}/erlang/lib/reltool-*/examples -%{_libdir}/erlang/lib/sasl-*/examples -%{_libdir}/erlang/lib/snmp-*/examples -#%{_libdir}/erlang/lib/ssh-*/examples -%{_libdir}/erlang/lib/ssl-*/examples -%{_libdir}/erlang/lib/stdlib-*/examples -%{_libdir}/erlang/lib/syntax_tools-*/examples -%{_libdir}/erlang/lib/tools-*/examples -%{_libdir}/erlang/lib/wx-*/examples +%{_libdir}/erlang/lib/asn1-*/examples/ +#%{_libdir}/erlang/lib/cosFileTransfer-*/examples/ +#%{_libdir}/erlang/lib/cosNotification-*/examples/ +#%{_libdir}/erlang/lib/cosProperty-*/examples/ +#%{_libdir}/erlang/lib/cosTime-*/examples/ +#%{_libdir}/erlang/lib/cosTransactions-*/examples/ +%{_libdir}/erlang/lib/diameter-*/examples/ +%{_libdir}/erlang/lib/et-*/examples/ +%{_libdir}/erlang/lib/eunit-*/examples/ +%{_libdir}/erlang/lib/gs-*/examples/ +%{_libdir}/erlang/lib/ic-*/examples/ +%{_libdir}/erlang/lib/inets-*/examples/ +%{_libdir}/erlang/lib/kernel-*/examples/ +%{_libdir}/erlang/lib/megaco-*/examples/ +%{_libdir}/erlang/lib/mnesia-*/examples/ +%{_libdir}/erlang/lib/observer-*/examples/ +%{_libdir}/erlang/lib/orber-*/examples/ +%{_libdir}/erlang/lib/reltool-*/examples/ +%{_libdir}/erlang/lib/runtime_tools-*/examples/ +%{_libdir}/erlang/lib/sasl-*/examples/ +%{_libdir}/erlang/lib/snmp-*/examples/ +#%{_libdir}/erlang/lib/ssh-*/examples/ +%{_libdir}/erlang/lib/ssl-*/examples/ +%{_libdir}/erlang/lib/stdlib-*/examples/ +%{_libdir}/erlang/lib/syntax_tools-*/examples/ +%{_libdir}/erlang/lib/tools-*/examples/ +%{_libdir}/erlang/lib/wx-*/examples/ %files gs %defattr(-,root,root) @@ -1737,7 +1738,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir %{_libdir}/erlang/lib/mnesia-*/ %{_libdir}/erlang/lib/mnesia-*/ebin -%{_libdir}/erlang/lib/mnesia-*/include +#%{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src %if %{with doc} %{_libdir}/erlang/man/man3/mnesia.* @@ -1747,7 +1748,11 @@ rm -rf $RPM_BUILD_ROOT %files observer %defattr(-,root,root) -%{_libdir}/erlang/lib/observer-*/ +%dir %{_libdir}/erlang/lib/observer-*/ +%{_libdir}/erlang/lib/observer-*/ebin/ +%{_libdir}/erlang/lib/observer-*/include/ +%{_libdir}/erlang/lib/observer-*/priv/ +%{_libdir}/erlang/lib/observer-*/src/ %if %{with doc} %{_libdir}/erlang/man/man3/crashdump.* %{_libdir}/erlang/man/man3/observer.* @@ -1853,7 +1858,10 @@ rm -rf $RPM_BUILD_ROOT %files runtime_tools %defattr(-,root,root) -%{_libdir}/erlang/lib/runtime_tools-*/ +%dir %{_libdir}/erlang/lib/runtime_tools-*/ +%{_libdir}/erlang/lib/runtime_tools-*/ebin/ +%{_libdir}/erlang/lib/runtime_tools-*/include/ +%{_libdir}/erlang/lib/runtime_tools-*/priv/ %if %{with doc} %{_libdir}/erlang/man/man3/dbg.* %{_libdir}/erlang/man/man3/dyntrace.* @@ -2098,7 +2106,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/typer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/typer -%{_libdir}/erlang/lib/typer-*/ +%dir %{_libdir}/erlang/lib/typer-*/ +%{_libdir}/erlang/lib/typer-*/ebin/ +#%{_libdir}/erlang/lib/typer-*/src/ %files webtool %defattr(-,root,root) @@ -2377,6 +2387,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 07 2012 Peter Lemenkov - R15B-01.2 +- Fixed examples packaging + * Mon May 07 2012 Peter Lemenkov - R15B-01.1 - Ver. R15B01 - New sub-package - eldap From a4a408cafe9cd9824ae031b140e9f1270c55a43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 15 Jun 2012 04:07:17 -0400 Subject: [PATCH 006/340] resolve OOM condition when generating docs --- erlang.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 98750d7..ee6fe0b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1063,6 +1063,8 @@ make %if %{with doc} %if %{use_prebuilt_docs} %else +# should use FOP_OPTS after #832323 is resolved +export BASE_OPTIONS=-Xmx1024m make docs %endif %endif @@ -2387,6 +2389,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 15 2012 Dan Horák - R15B-01.2 - Fixed examples packaging From 1386754913f1b66ade8b6abe4a8ca9a09cf4e721 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 26 Jun 2012 15:29:32 +0400 Subject: [PATCH 007/340] Return back erl_interface private API headers (rhbz #818419) Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +++- ...tion-of-a-n-internal-erl_interface-A.patch | 49 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch diff --git a/erlang.spec b/erlang.spec index ee6fe0b..7a6f314 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.3%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -78,6 +78,9 @@ Patch7: otp-0007-Do-not-install-erlang-sources.patch # Required only for el5, el6 on PowerPC # Ugly workaround for java-1.5.0-gcj which doesn't support Patch8: otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +# Fedora specific patch +# Restore installation of a n internal erl_interface API +Patch9: otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -1001,6 +1004,7 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif +%patch9 -p1 -b .Restore_installation_of_a_n_internal_erl_interface_A # end of autogenerated prep patch list # remove shipped zlib sources @@ -2389,6 +2393,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 26 2012 Peter Lemenkov - R15B-01.3 +- Return back erl_interface' private API headers (rhbz #818419) + * Fri Jun 15 2012 Dan Horák +Date: Tue, 26 Jun 2012 15:16:39 +0400 +Subject: [PATCH] Restore installation of a n internal erl_interface API + headers + +See rhbz #818419 for the explanation why they're necessary for low-level +interaction with Erlang nodes: + +https://bugzilla.redhat.com/818419 + +Signed-off-by: Peter Lemenkov +--- + lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in +index 91a2cc9..99ad8b7 100644 +--- a/lib/erl_interface/src/Makefile.in ++++ b/lib/erl_interface/src/Makefile.in +@@ -846,11 +846,29 @@ release: opt + $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) $(RELSYSDIR)/lib + $(INSTALL_DIR) $(RELSYSDIR)/bin ++ $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir ++ $(INSTALL_DIR) $(RELSYSDIR)/src/connect ++ $(INSTALL_DIR) $(RELSYSDIR)/src/decode ++ $(INSTALL_DIR) $(RELSYSDIR)/src/encode ++ $(INSTALL_DIR) $(RELSYSDIR)/src/epmd ++ $(INSTALL_DIR) $(RELSYSDIR)/src/legacy ++ $(INSTALL_DIR) $(RELSYSDIR)/src/misc ++ $(INSTALL_DIR) $(RELSYSDIR)/src/prog ++ $(INSTALL_DIR) $(RELSYSDIR)/src/registry + $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include + $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib + ifneq ($(EXE_TARGETS),) + $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin + endif ++ $(INSTALL_DATA) $(EXTRA) $(RELSYSDIR)/src ++ $(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: + From 6d33a2ea4142c59650b662ff24be1028fa456d19 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 18:39:46 -0500 Subject: [PATCH 008/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 7a6f314..9bfb72c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2393,6 +2393,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - R15B-01.4.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jun 26 2012 Peter Lemenkov - R15B-01.3 - Return back erl_interface' private API headers (rhbz #818419) From befe37283624e6c393975afa4a8aa01b59f971f8 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 16 Aug 2012 11:11:30 +0200 Subject: [PATCH 009/340] set BASE_OPTIONS to -Xmx1536m on ppc* --- erlang.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 9bfb72c..73f6ff0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist}.1 +Release: %{upstream_rel_for_rpm}.4%{?dist}.2 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1068,7 +1068,11 @@ make %if %{use_prebuilt_docs} %else # should use FOP_OPTS after #832323 is resolved +%ifnarch ppc %{power64} export BASE_OPTIONS=-Xmx1024m +%else +export BASE_OPTIONS=-Xmx1536m +%endif make docs %endif %endif @@ -2393,6 +2397,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 15 2012 Karsten Hopp R15B-01.4.2 +- set BASE_OPTIONS to -Xmx1536m on ppc* + * Wed Jul 18 2012 Fedora Release Engineering - R15B-01.4.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 61833acd62acf885b1b4c5adf9a4e412577823f1 Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 17:47:14 +0400 Subject: [PATCH 010/340] Ver. R15B02 Signed-off-by: Fedora Build --- .gitignore | 3 + erlang.spec | 7 +- ...n-pages-and-do-not-install-miscellan.patch | 24 +- otp-0002-Remove-rpath.patch | 8 +- otp-0003-Do-not-install-C-sources.patch | 165 +-- otp-0004-Do-not-install-Java-sources.patch | 26 +- ...teventlog-and-related-doc-files-on-n.patch | 8 +- ...Do-not-install-VxWorks-specific-docs.patch | 4 +- otp-0007-Do-not-install-erlang-sources.patch | 1216 +++++++++-------- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 4 +- ...tion-of-a-n-internal-erl_interface-A.patch | 60 +- sources | 3 + 12 files changed, 772 insertions(+), 756 deletions(-) diff --git a/.gitignore b/.gitignore index 472c090..082e3bc 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 73f6ff0..89f0818 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ %global upstream_ver R15B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 01 +%global upstream_rel 02 #%%global upstream_rel %%{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist}.2 +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2397,6 +2397,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 10 2012 Peter Lemenkov - R15B-02.1 +- Ver. R15B02 + * Wed Aug 15 2012 Karsten Hopp R15B-01.4.2 - set BASE_OPTIONS to -Xmx1536m on ppc* diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 82fb476..524ad7f 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -5,27 +5,27 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov --- - erts/etc/common/Makefile.in | 4 ---- - erts/etc/unix/Install.src | 10 ---------- + erts/etc/common/Makefile.in | 4 ---- + erts/etc/unix/Install.src | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 28c5e5c..5f7aaf1 100644 +index 83fe97d..f77b485 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -565,10 +565,6 @@ endif +@@ -568,10 +568,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) - $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) $(RELEASE_PATH) + $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif -ifneq ($(INSTALL_MISC),) -- $(INSTALL_DIR) $(RELEASE_PATH)/misc -- $(INSTALL_SCRIPT) $(INSTALL_MISC) $(RELEASE_PATH)/misc +- $(INSTALL_DIR) "$(RELEASE_PATH)/misc" +- $(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc" -endif ifneq ($(INSTALL_ERL_OSE),) - $(INSTALL_DIR) $(RELEASE_PATH)/build_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 8f40c43..7f354cf 100644 +index 2dcd070..0bf82f1 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -143,14 +143,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . @@ -36,10 +36,10 @@ index 8f40c43..7f354cf 100644 -# Fixing the man pages -# - --if [ -d $ERL_ROOT/man ] +-if [ -d "$ERL_ROOT/man" ] -then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT +- cd "$ERL_ROOT" +- ./misc/format_man_pages "$ERL_ROOT" -fi - exit 0 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index d9b240d..03fc5eb 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -4,12 +4,12 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov --- - lib/crypto/c_src/Makefile.in | 2 +- - lib/crypto/priv/Makefile | 2 +- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 2855376..3f0f5c4 100644 +index ffd556c..80e95ef 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -84,7 +84,7 @@ endif @@ -18,7 +18,7 @@ index 2855376..3f0f5c4 100644 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) -l$(SSL_SSL_LIBNAME) + CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) else SSL_DED_LD_RUNTIME_LIBRARY_PATH= diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index ce673a0..9e6a72d 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -6,159 +6,160 @@ Don't install *.c and *.o files at all. Signed-off-by: Peter Lemenkov --- - lib/asn1/c_src/Makefile | 2 -- - lib/crypto/c_src/Makefile.in | 3 --- - lib/erl_interface/src/Makefile.in | 18 ------------------ - lib/ic/c_src/Makefile.in | 2 -- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/odbc/c_src/Makefile.in | 3 --- - lib/os_mon/c_src/Makefile.in | 1 - - lib/runtime_tools/c_src/Makefile.in | 2 -- - lib/tools/c_src/Makefile.in | 2 -- - 9 files changed, 1 insertion(+), 34 deletions(-) + lib/asn1/c_src/Makefile | 2 -- + lib/crypto/c_src/Makefile.in | 3 --- + lib/erl_interface/src/Makefile.in | 18 ------------------ + lib/ic/c_src/Makefile.in | 2 -- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/odbc/c_src/Makefile.in | 3 --- + lib/os_mon/c_src/Makefile.in | 2 -- + lib/runtime_tools/c_src/Makefile.in | 2 -- + lib/tools/c_src/Makefile.in | 2 -- + 9 files changed, 1 insertion(+), 35 deletions(-) diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 8c06be5..7013289 100644 +index a73d01a..102d4fb 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile @@ -112,8 +112,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 -- $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) *.c $(RELSYSDIR)/c_src + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib" +- $(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 3f0f5c4..ba7ab1c 100644 +index 80e95ef..c644ad2 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -133,10 +133,7 @@ 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) $(OBJS) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(NIF_LIB) $(RELSYSDIR)/priv/lib +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +- $(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj" +- $(INSTALL_PROGRAM) $(OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib" release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index d6b0ca1..91a2cc9 100644 +index cb41391..9aeba86 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -846,29 +846,11 @@ release: opt - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/lib - $(INSTALL_DIR) $(RELSYSDIR)/bin -- $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir -- $(INSTALL_DIR) $(RELSYSDIR)/src/connect -- $(INSTALL_DIR) $(RELSYSDIR)/src/decode -- $(INSTALL_DIR) $(RELSYSDIR)/src/encode -- $(INSTALL_DIR) $(RELSYSDIR)/src/epmd -- $(INSTALL_DIR) $(RELSYSDIR)/src/legacy -- $(INSTALL_DIR) $(RELSYSDIR)/src/misc -- $(INSTALL_DIR) $(RELSYSDIR)/src/prog -- $(INSTALL_DIR) $(RELSYSDIR)/src/registry - $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include - $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/lib" + $(INSTALL_DIR) "$(RELSYSDIR)/bin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/connect" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/decode" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/encode" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/epmd" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/legacy" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/prog" +- $(INSTALL_DIR) "$(RELSYSDIR)/src/registry" + $(INSTALL_DATA) $(HEADERS) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib" ifneq ($(EXE_TARGETS),) - $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin + $(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) registry/*.[ch] $(RELSYSDIR)/src/registry -- $(INSTALL_DATA) legacy/*.[ch] $(RELSYSDIR)/src/legacy -- $(INSTALL_DATA) prog/*.[ch] $(RELSYSDIR)/src/prog +- $(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) prog/*.[ch] "$(RELSYSDIR)/src/prog" release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index 5e034c4..c101201 100644 +index de46ead..b30ce1e 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in @@ -140,10 +140,8 @@ $(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_DATA) ic.c ic_tmo.c $(RELSYSDIR)/c_src - $(INSTALL_DATA) $(IDL_FILES) $(H_FILES) $(RELSYSDIR)/include - $(INSTALL_DATA) $(LIBRARY) $(RELSYSDIR)/priv/lib +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/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" diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 7d82644..27275f2 100644 +index 69c2425..b36ef26 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -279,7 +279,7 @@ release_spec: opt - $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) -- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -+ $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex - $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex" ++ $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 3a96a53..bbf0d7b 100644 +index 026da39..3a568e4 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt ifdef EXE_TARGET -- $(INSTALL_DIR) $(RELSYSDIR)/c_src -- $(INSTALL_DATA) $(C_FILES) $(H_FILES) $(RELSYSDIR)/c_src - $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin -- $(INSTALL_DIR) $(RELSYSDIR)/priv/obj - $(INSTALL_PROGRAM) $(EXE_TARGET) $(RELSYSDIR)/priv/bin +- $(INSTALL_DIR) "$(RELSYSDIR)/c_src" +- $(INSTALL_DATA) $(C_FILES) $(H_FILES) "$(RELSYSDIR)/c_src" + $(INSTALL_DIR) "$(RELSYSDIR)/priv" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" +- $(INSTALL_DIR) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(EXE_TARGET) "$(RELSYSDIR)/priv/bin" endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index bac0413..5c32296 100644 +index 2b16789..1241014 100644 --- a/lib/os_mon/c_src/Makefile.in +++ b/lib/os_mon/c_src/Makefile.in -@@ -132,7 +132,6 @@ release_spec: +@@ -131,8 +131,6 @@ ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso) + release_spec: else release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_PROGRAM) $(TARGET_FILES) $(RELSYSDIR)/priv/bin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" + $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" endif diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in -index cbbcfa2..20f1ca6 100644 +index 754e6cc..1c367ef 100644 --- a/lib/runtime_tools/c_src/Makefile.in +++ b/lib/runtime_tools/c_src/Makefile.in @@ -193,9 +193,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 +- $(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 b8c4aed..f7f5dff 100644 +index 0382d32..f74eb5a 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -188,8 +188,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 +- $(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 + $(INSTALL_DIR) "$(RELSYSDIR)/bin" + $(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin" diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 3804969..301d66b 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -4,33 +4,33 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov --- - lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- - lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 2 -- + lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- + lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -index f730749..f7ec624 100644 +index cf4c353..57f64d9 100644 --- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile +++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile @@ -109,8 +109,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 +- $(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 365798e..68deb9c 100644 +index 8ae63a1..8605a20 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -99,8 +99,6 @@ release release_docs release_tests release_html: - $(MAKE) $(MFLAGS) RELEASE_PATH=$(RELEASE_PATH) $(TARGET_MAKEFILE) $@_spec + $(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) $@_spec release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang -- $(INSTALL_DATA) $(JAVA_SRC) $(RELSYSDIR)/java_src/com/ericsson/otp/erlang - $(INSTALL_DIR) $(RELSYSDIR)/priv - $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv +- $(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang" +- $(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang" + $(INSTALL_DIR) "$(RELSYSDIR)/priv" + $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 7f5dc25..988069e 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov --- - lib/os_mon/doc/src/Makefile | 7 ++++++- - lib/os_mon/src/Makefile | 11 ++++++++++- + lib/os_mon/doc/src/Makefile | 7 ++++++- + lib/os_mon/src/Makefile | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index c976574..6267378 100644 +index 08fd23e..5606cfc 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile @@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) @@ -33,7 +33,7 @@ index c976574..6267378 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 9a75446..a492a63 100644 +index 864d7a0..79a4076 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch index 76a8803..4be897b 100644 --- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch +++ b/otp-0006-Do-not-install-VxWorks-specific-docs.patch @@ -4,11 +4,11 @@ Subject: [PATCH] Do not install VxWorks-specific docs Signed-off-by: Peter Lemenkov --- - erts/doc/src/Makefile | 1 - + erts/doc/src/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile -index cfa5527..d18b615 100644 +index da245d7..a494b3a 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -55,7 +55,6 @@ XML_REF3_EFILES = \ diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index 4c97f1f..732de80 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -7,464 +7,465 @@ Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann --- - erts/preloaded/src/Makefile | 2 -- - lib/appmon/src/Makefile | 2 +- - lib/asn1/src/Makefile | 2 +- - lib/common_test/src/Makefile | 2 +- - lib/compiler/src/Makefile | 4 ++-- - lib/cosEvent/src/Makefile | 2 +- - lib/cosEventDomain/src/Makefile | 2 +- - lib/cosFileTransfer/src/Makefile | 3 +-- - lib/cosNotification/src/Makefile | 3 +-- - lib/cosProperty/src/Makefile | 3 +-- - lib/cosTime/src/Makefile | 3 +-- - lib/cosTransactions/src/Makefile | 2 +- - lib/crypto/src/Makefile | 2 -- - lib/debugger/src/Makefile | 2 +- - lib/dialyzer/src/Makefile | 2 +- - lib/diameter/src/Makefile | 7 ++----- - lib/edoc/src/Makefile | 2 +- - lib/eldap/src/Makefile | 4 ---- - lib/erl_docgen/src/Makefile | 2 -- - lib/et/src/Makefile | 1 - - lib/eunit/src/Makefile | 2 -- - lib/gs/src/Makefile | 4 ++-- - lib/hipe/cerl/Makefile | 2 +- - lib/hipe/flow/Makefile | 2 +- - lib/hipe/icode/Makefile | 2 +- - lib/hipe/main/Makefile | 2 +- - lib/hipe/misc/Makefile | 2 +- - lib/hipe/rtl/Makefile | 2 +- - lib/hipe/util/Makefile | 3 --- - lib/ic/src/Makefile | 2 +- - lib/inets/src/ftp/Makefile | 2 +- - lib/inets/src/http_client/Makefile | 2 +- - lib/inets/src/http_lib/Makefile | 2 +- - lib/inets/src/http_server/Makefile | 2 +- - lib/inets/src/inets_app/Makefile | 2 +- - lib/inets/src/tftp/Makefile | 2 +- - lib/inviso/src/Makefile | 2 -- - lib/kernel/src/Makefile | 1 - - lib/megaco/src/app/Makefile | 2 +- - lib/megaco/src/binary/Makefile | 2 +- - lib/megaco/src/engine/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 1 - - lib/megaco/src/tcp/Makefile | 2 +- - lib/megaco/src/text/Makefile | 2 +- - lib/megaco/src/udp/Makefile | 2 +- - lib/mnesia/src/Makefile | 2 +- - lib/observer/src/Makefile | 1 - - lib/odbc/src/Makefile | 2 +- - lib/orber/COSS/CosNaming/Makefile | 4 ++-- - lib/orber/src/Makefile | 2 +- - lib/os_mon/src/Makefile | 1 - - lib/otp_mibs/src/Makefile | 2 -- - lib/parsetools/src/Makefile | 2 -- - lib/percept/src/Makefile | 2 -- - lib/pman/src/Makefile | 2 +- - lib/public_key/src/Makefile | 4 ---- - lib/reltool/src/Makefile | 2 +- - lib/runtime_tools/src/Makefile | 2 -- - lib/sasl/src/Makefile | 1 - - lib/snmp/src/agent/Makefile | 2 +- - lib/snmp/src/app/Makefile | 2 +- - lib/snmp/src/compile/Makefile | 2 +- - lib/snmp/src/manager/Makefile | 2 +- - lib/snmp/src/misc/Makefile | 2 +- - lib/ssh/src/Makefile | 2 +- - lib/ssl/src/Makefile | 2 +- - lib/stdlib/src/Makefile | 1 - - lib/syntax_tools/src/Makefile | 2 -- - lib/test_server/src/Makefile | 1 - - lib/toolbar/src/Makefile | 2 +- - lib/tools/src/Makefile | 2 +- - lib/tv/src/Makefile | 2 +- - lib/typer/src/Makefile | 2 -- - lib/webtool/src/Makefile | 2 -- - lib/wx/src/Makefile | 4 ++-- - lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 58 insertions(+), 110 deletions(-) + erts/preloaded/src/Makefile | 2 -- + lib/appmon/src/Makefile | 2 +- + lib/asn1/src/Makefile | 2 +- + lib/common_test/src/Makefile | 2 +- + lib/compiler/src/Makefile | 4 ++-- + lib/cosEvent/src/Makefile | 2 +- + lib/cosEventDomain/src/Makefile | 2 +- + lib/cosFileTransfer/src/Makefile | 4 +--- + lib/cosNotification/src/Makefile | 3 +-- + lib/cosProperty/src/Makefile | 3 +-- + lib/cosTime/src/Makefile | 3 +-- + lib/cosTransactions/src/Makefile | 2 +- + lib/crypto/src/Makefile | 2 -- + lib/debugger/src/Makefile | 2 +- + lib/dialyzer/src/Makefile | 2 +- + lib/diameter/src/Makefile | 7 ++----- + lib/edoc/src/Makefile | 2 +- + lib/eldap/src/Makefile | 4 ---- + lib/erl_docgen/src/Makefile | 2 -- + lib/et/src/Makefile | 1 - + lib/eunit/src/Makefile | 2 -- + lib/gs/src/Makefile | 4 ++-- + lib/hipe/cerl/Makefile | 2 +- + lib/hipe/flow/Makefile | 2 +- + lib/hipe/icode/Makefile | 2 +- + lib/hipe/main/Makefile | 2 +- + lib/hipe/misc/Makefile | 2 +- + lib/hipe/rtl/Makefile | 2 +- + lib/hipe/util/Makefile | 3 +-- + lib/ic/src/Makefile | 2 +- + lib/inets/src/ftp/Makefile | 2 +- + lib/inets/src/http_client/Makefile | 2 +- + lib/inets/src/http_lib/Makefile | 2 +- + lib/inets/src/http_server/Makefile | 2 +- + lib/inets/src/inets_app/Makefile | 2 +- + lib/inets/src/tftp/Makefile | 2 +- + lib/inviso/src/Makefile | 2 -- + lib/kernel/src/Makefile | 1 - + lib/megaco/src/app/Makefile | 2 +- + lib/megaco/src/binary/Makefile | 2 +- + lib/megaco/src/engine/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/megaco/src/tcp/Makefile | 2 +- + lib/megaco/src/text/Makefile | 2 +- + lib/megaco/src/udp/Makefile | 2 +- + lib/mnesia/src/Makefile | 2 +- + lib/observer/src/Makefile | 1 - + lib/odbc/src/Makefile | 2 +- + lib/orber/COSS/CosNaming/Makefile | 2 +- + lib/orber/src/Makefile | 2 +- + lib/os_mon/src/Makefile | 1 - + lib/otp_mibs/src/Makefile | 2 -- + lib/parsetools/src/Makefile | 2 -- + lib/percept/src/Makefile | 2 -- + lib/pman/src/Makefile | 2 +- + lib/public_key/src/Makefile | 4 ---- + lib/reltool/src/Makefile | 2 +- + lib/runtime_tools/src/Makefile | 2 -- + lib/sasl/src/Makefile | 2 +- + lib/snmp/src/agent/Makefile | 2 +- + lib/snmp/src/app/Makefile | 2 +- + lib/snmp/src/compile/Makefile | 2 +- + lib/snmp/src/manager/Makefile | 2 +- + lib/snmp/src/misc/Makefile | 2 +- + lib/ssh/src/Makefile | 2 +- + lib/ssl/src/Makefile | 2 +- + lib/stdlib/src/Makefile | 1 - + lib/syntax_tools/src/Makefile | 2 -- + lib/test_server/src/Makefile | 1 - + lib/toolbar/src/Makefile | 2 +- + lib/tools/src/Makefile | 2 +- + lib/tv/src/Makefile | 2 +- + lib/typer/src/Makefile | 3 --- + lib/webtool/src/Makefile | 2 -- + lib/wx/src/Makefile | 4 ++-- + lib/xmerl/src/Makefile | 4 +--- + 76 files changed, 60 insertions(+), 110 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 1456388..81db627 100644 +index 5bcc2eb..c87dc9e 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -68,8 +68,6 @@ copy: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile -index 43f4f08..7e2d9b1 100644 +index 06e61b7..cae409b 100644 --- a/lib/appmon/src/Makefile +++ b/lib/appmon/src/Makefile @@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 5614cbe..1857cbf 100644 +index 4bd49aa..b6d4880 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -156,7 +156,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) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/examples - $(INSTALL_DATA) $(EXAMPLES) $(RELSYSDIR)/examples + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 6a16c6f..7547e47 100644 +index f7dce19..ee75f6e 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -138,7 +138,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 3415517..9aea1f3 100644 +index 958d350..312ddfa 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -164,8 +164,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src + $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -- $(YRL_FILE) $(RELSYSDIR)/src +- $(YRL_FILE) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin ++ "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index f8e751f..369ad08 100644 +index 7787fad..0bf29fb 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile @@ -202,7 +202,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 + $(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 409cac4..722ec46 100644 +index 213d433..f1efdac 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile @@ -171,7 +171,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 + $(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 1d51304..c5cb87a 100644 +index d552349..6aa53b7 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile -@@ -179,8 +179,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 +@@ -179,9 +179,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 92225c6..4568cd7 100644 +index decf598..3c3423f 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile @@ -370,8 +370,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 + $(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 8060421..2a83d28 100644 +index 54d1b60..25d3d43 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile @@ -179,8 +179,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 + $(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 18c25ca..c3df6a0 100644 +index e8536a3..3872160 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile @@ -198,8 +198,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 + $(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 3c799ca..3b35bac 100644 +index 1d935c4..0dd00c1 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile @@ -173,7 +173,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 + $(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 0e886ce..d24ab24 100644 +index 910e893..2baf92d 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -83,8 +83,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) $(RELSYSDIR)/ebin + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index be9a2d1..073c3aa 100644 +index e8b350c..85da380 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile @@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 04f3b84..083a568 100644 +index 63cc1c9..af956d9 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -156,7 +156,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src + $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ + $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ - $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin + "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index dbfaa4e..51db955 100644 +index 99c3432..d79b3af 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -206,11 +206,8 @@ release_spec: opt +@@ -231,11 +231,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: -- $(INSTALL_DIR) $(RELSYSDIR)/src/$* +- $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" - $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ - $(INTERNAL_HRLS)) \ - $(filter $*/%, compiler/$(DICT_YRL).yrl) \ -- $(RELSYSDIR)/src/$* +- "$(RELSYSDIR)/src/$*" + $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ -+ $(RELSYSDIR)/src/$* || true ++ "$(RELSYSDIR)/src/$*" || true $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: - $(INSTALL_DIR) $(RELSYSDIR)/examples/$* + $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index fcb0b61..2082ca6 100644 +index 72354ac..f6ed199 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -88,7 +88,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index 4ddb808..02072fa 100644 +index 39a41d0..30b0b17 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile @@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk 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) $(RELSYSDIR)/src -- $(INSTALL_DIR) $(RELSYSDIR)/asn1 -- $(INSTALL_DATA) ../asn1/$(ASN1_FILES) $(RELSYSDIR)/asn1 - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DIR) "$(RELSYSDIR)/asn1" +- $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index cbaf6e4..d3cdbd6 100644 +index 6c8b438..5f918a9 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index bb6632e..3e71e02 100644 +index c68a3f4..4d8e93f 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -108,7 +108,6 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index bec2fdb..0814f12 100644 +index 0a2e71c..18db0f4 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile -@@ -109,8 +109,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -117,8 +117,6 @@ 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) $(PARSE_TRANSFORM) $(SOURCES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index 43b5302..37e836a 100644 +index 4b7a452..ada9464 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src + $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \ -- $(GSTK_GENERIC) $(RELSYSDIR)/src +- $(GSTK_GENERIC) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \ -+ $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/priv/bitmap ++ "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 14e68f5..2828bc7 100644 +index 506e993..d74b75c 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/cerl -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/cerl -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/cerl - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/cerl" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index 1a531fd..9f1a098 100644 +index 75e156b..5e394ca 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/flow -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow -+ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) $(RELSYSDIR)/flow - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/flow" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" ++ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index 0d940d4..54c4263 100644 +index 0f2d6db..4e267f9 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/icode -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/icode -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/icode - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/icode" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index fc8923d..5b94d90 100644 +index 673431a..c372a37 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DATA) ../vsn.mk $(RELSYSDIR) - $(INSTALL_DIR) $(RELSYSDIR)/main -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/main -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/main - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" + $(INSTALL_DIR) "$(RELSYSDIR)/main" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index 98a69d6..23073cd 100644 +index 16166f5..0ba5845 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/misc -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/misc -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/misc - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/misc" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 3002683..40efb6f 100644 +index 426d1bd..44238b9 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/rtl -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/rtl -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/rtl - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/rtl" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 2f17eee..083933b 100644 +index a5ee232..e46ece0 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -49,7 +49,6 @@ HIPE_MODULES = @@ -475,353 +476,352 @@ index 2f17eee..083933b 100644 ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl - include $(ERL_TOP)/make/otp_release_targets.mk +@@ -104,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/util -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/util - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/util" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/util" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index 5dac304..381cafe 100644 +index 280d86a..3cd19f4 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile @@ -199,7 +199,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/examples - $(INSTALL_DIR) $(RELSYSDIR)/examples/c-client - $(INSTALL_DATA) $(CCL_EX_FILES) $(RELSYSDIR)/examples/c-client + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" + $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile -index 19b9387..f3ff8bf 100644 +index 2c3d2b6..de0450e 100644 --- a/lib/inets/src/ftp/Makefile +++ b/lib/inets/src/ftp/Makefile @@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/ftp -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/ftp - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/ftp" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index d490e59..961324e 100644 +index f0d4ce1..35c4ffc 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile @@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/http_client -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_client - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index aaf3cfb..0236a49 100644 +index 51167b3..a623824 100644 --- a/lib/inets/src/http_lib/Makefile +++ b/lib/inets/src/http_lib/Makefile @@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/http_lib -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_lib - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 60bb0d2..bfc2986 100644 +index 67555d5..0620f3a 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/http_server -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/http_server - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 6da6a1d..5e9951a 100644 +index 7d68145..71885ef 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/inets_app -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/inets_app - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile -index 759b70c..9e4f769 100644 +index b368b12..5eddaf0 100644 --- a/lib/inets/src/tftp/Makefile +++ b/lib/inets/src/tftp/Makefile -@@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/tftp -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/tftp - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/tftp" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inviso/src/Makefile b/lib/inviso/src/Makefile -index 1f2f8b1..9f7652d 100644 +index 292a2be..b1c9a1f 100644 --- a/lib/inviso/src/Makefile +++ b/lib/inviso/src/Makefile @@ -87,8 +87,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - # $(INSTALL_DIR) $(RELSYSDIR)/include - # $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" + # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 54f21eb..9b6e3eb 100644 +index c76ff9e..7706204 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile @@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index 01dfb9b..c6a631d 100644 +index 42030c5..282419f 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -113,7 +113,7 @@ release_spec: opt - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/app -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index d594f34..6614599 100644 +index 695599b..187ccac 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -198,7 +198,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/binary -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) $(RELSYSDIR)/src/binary -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/binary + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary" release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 3943f4b..879abff 100644 +index 7cecef1..841a88a 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile -@@ -92,7 +92,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/engine -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/engine - $(INSTALL_DIR) $(RELSYSDIR)/include +@@ -101,7 +101,7 @@ release_spec: opt + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" + $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 27275f2..a45b7c3 100644 +index b36ef26..5b5042d 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -276,7 +276,6 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src/flex - $(INSTALL_DIR) $(RELSYSDIR)/priv/lib - $(INSTALL_DIR) $(RELSYSDIR)/include -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/flex - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin +@@ -276,7 +276,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex + $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index 0bd4b7c..8675d1b 100644 +index 0c30aba..aa553ff 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile @@ -93,7 +93,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/tcp -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/tcp + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index b2e8e76..bdb9c00 100644 +index cab4256..d5cf217 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -134,7 +134,7 @@ release_spec: opt - $(INSTALL_DATA) $(BEAM_TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/text -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/text + $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/text" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 64b6478..5cf0fe2 100644 +index 9486804..ea4830c 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile @@ -93,7 +93,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/udp -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/udp + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 1c8ec54..cc00b60 100644 +index 6f28943..ead350f 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile @@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 91a4c65..b14dc4b 100644 +index 7135a6a..c8e78e6 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile @@ -130,7 +130,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/examples - $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index b48dd76..deb9947 100644 +index 2af65cc..2358d16 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXT_HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 064447f..b464b55 100644 +index 769c08a..9906247 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile -@@ -144,8 +144,8 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/COSS/CosNaming -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming -- $(INSTALL_DATA) $(GEN_FILES) $(RELSYSDIR)/COSS/CosNaming -+ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) $(RELSYSDIR)/COSS/CosNaming -+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) $(RELSYSDIR)/COSS/CosNaming +@@ -144,7 +144,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" ++ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" + $(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming" - release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index d2e9868..5ff5803 100644 +index 72610de..a800d2f 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -257,7 +257,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) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index a492a63..77e7a06 100644 +index 79a4076..1197250 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 833a439..257e294 100644 +index 03298d3..83b2e05 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGETS) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index 89e079e..1093f4f 100644 +index 4f199da..bffd62f 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/include +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index 5dfc725..a8a1718 100644 +index 253a8c2..6720c05 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile @@ -93,8 +93,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - # $(INSTALL_DIR) $(RELSYSDIR)/include - # $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" + # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile -index e573e57..bdbced1 100644 +index fa01fe7..5197f4b 100644 --- a/lib/pman/src/Makefile +++ b/lib/pman/src/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 062c495..954bf7c 100644 +index d5cd13d..d2a35f8 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -48,8 +48,6 @@ MODULES = \ @@ -837,270 +837,272 @@ index 062c495..954bf7c 100644 include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 4e6a112..cef22b5 100644 +index a7e3405..3705dd9 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile @@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index cb302b7..0cd12ba 100644 +index 810e3e8..b529c92 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile @@ -99,8 +99,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/examples +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 9a5d1e4..4dd511f 100644 +index de0c45e..1f8bd28 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index a67fe4d..012e8be 100644 +index beed696..752072d 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/agent -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/agent -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/agent - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - $(RELSYSDIR)/ebin + "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index d89eb4e..2adf916 100644 +index f7c311b..59d68b8 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/app -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/app -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/app - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - $(RELSYSDIR)/ebin + "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 627af6f..af185bf 100644 +index f63fc18..9759451 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/compiler -- $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(EBIN_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/bin + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" +- $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index c1d5703..568530d 100644 +index c76dbac..548823a 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/manager -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/manager -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/manager - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - # $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index 48d76bd..9f1f868 100644 +index 698c341..3344a0c 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/misc -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src/misc -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src/misc - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - # $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 1734ae4..99eb3a4 100644 +index b8eecd3..41bf50c 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -128,7 +128,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index dc69b53..63ac81e 100644 +index c5c5bf5..a7ac1aa 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 90e239b..31cb268 100644 +index 1430482..d217c2d 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index bac138e..2cce48c 100644 +index dca5e78..6a65bfe 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(OBJECTS) $(RELSYSDIR)/ebin -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(SOURCES) $(RELSYSDIR)/src + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" release_docs_spec: diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 4bc5187..90419de 100644 +index 513720d..09766b1 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile @@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile -index 14e1451..d71e18b 100644 +index 102970a..bdf63b5 100644 --- a/lib/toolbar/src/Makefile +++ b/lib/toolbar/src/Makefile @@ -85,7 +85,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index 360f4f8..22deb2f 100644 +index abe1389..e5e4874 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile @@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - $(RELSYSDIR)/ebin + "$(RELSYSDIR)/ebin" diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile -index 457b9d3..1d2c97c 100644 +index da1713e..4436ac7 100644 --- a/lib/tv/src/Makefile +++ b/lib/tv/src/Makefile @@ -127,7 +127,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 620b3eb..67c266f 100644 +index 1f94d8f..751e76e 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile -@@ -102,8 +102,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src +- $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \ -- $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin +- "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index 62845cd..841cf11 100644 +index 783ffad..37135d3 100644 --- a/lib/webtool/src/Makefile +++ b/lib/webtool/src/Makefile @@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt -- $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/ebin +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - $(RELSYSDIR)/ebin + "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 16b425e..f42521a 100644 +index 777fb7d..f6a5a2a 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/src/gen -- $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) $(RELSYSDIR)/src/gen -+ $(INSTALL_DATA) $(GEN_HRL) $(RELSYSDIR)/src/gen - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXT_HRL) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/gen" +- $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen" ++ $(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index a5dbe45..52fe190 100644 +index ce1aa11..b381ce6 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -217,9 +217,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - $(INSTALL_DIR) $(RELSYSDIR)/src -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) $(RELSYSDIR)/src -- $(INSTALL_DATA) xmerl_xpath_parse.yrl $(RELSYSDIR)/src -- $(INSTALL_DATA) xmerl_b64Bin.yrl $(RELSYSDIR)/src -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src" +- $(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch index 1062a4c..0aa2e82 100644 --- a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ b/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch @@ -10,8 +10,8 @@ Fedora-Spec-Before: %ifnarch %{ix86} x86_64 Fedora-Spec-After: %endif Fedora-Spec-After: %endif --- - .../java_src/com/ericsson/otp/erlang/OtpErlangList.java | 14 +------------- - .../java_src/com/ericsson/otp/erlang/OtpInputStream.java | 13 ++----------- + .../java_src/com/ericsson/otp/erlang/OtpErlangList.java | 14 +------------- + .../java_src/com/ericsson/otp/erlang/OtpInputStream.java | 13 ++----------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangList.java diff --git a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch index 12321ec..df98992 100644 --- a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch +++ b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch @@ -10,40 +10,44 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov --- - lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) + lib/erl_interface/src/Makefile.in | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 91a2cc9..99ad8b7 100644 +index 9aeba86..dafd2ce 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -846,11 +846,29 @@ release: opt - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DIR) $(RELSYSDIR)/lib - $(INSTALL_DIR) $(RELSYSDIR)/bin -+ $(INSTALL_DIR) $(RELSYSDIR)/src/auxdir -+ $(INSTALL_DIR) $(RELSYSDIR)/src/connect -+ $(INSTALL_DIR) $(RELSYSDIR)/src/decode -+ $(INSTALL_DIR) $(RELSYSDIR)/src/encode -+ $(INSTALL_DIR) $(RELSYSDIR)/src/epmd -+ $(INSTALL_DIR) $(RELSYSDIR)/src/legacy -+ $(INSTALL_DIR) $(RELSYSDIR)/src/misc -+ $(INSTALL_DIR) $(RELSYSDIR)/src/prog -+ $(INSTALL_DIR) $(RELSYSDIR)/src/registry - $(INSTALL_DATA) $(HEADERS) $(RELSYSDIR)/include - $(INSTALL_DATA) $(OBJ_TARGETS) $(RELSYSDIR)/lib +@@ -843,14 +843,33 @@ EXTRA = \ + $(TARGET)/eidefs.mk + + release: opt ++<<<<<<< HEAD + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/lib" + $(INSTALL_DIR) "$(RELSYSDIR)/bin" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/connect" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/decode" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/encode" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/epmd" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/legacy" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/prog" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/registry" + $(INSTALL_DATA) $(HEADERS) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib" ifneq ($(EXE_TARGETS),) - $(INSTALL_PROGRAM) $(EXE_TARGETS) $(RELSYSDIR)/bin + $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif -+ $(INSTALL_DATA) $(EXTRA) $(RELSYSDIR)/src -+ $(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 ++ $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" ++ $(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/sources b/sources index 14e9e70..ba69c1d 100644 --- a/sources +++ b/sources @@ -4,3 +4,6 @@ dd6c2a4807551b4a8a536067bde31d73 otp_src_R15B.tar.gz 7569cae680eecd64e7e5d952be788ee5 otp_doc_html_R15B01.tar.gz d87412c2a1e6005bbe29dfe642a9ca20 otp_doc_man_R15B01.tar.gz f12d00f6e62b36ad027d6c0c08905fad otp_src_R15B01.tar.gz +36d91f123204f4c71a464985b1b2a375 otp_doc_html_R15B02.tar.gz +974020ba533242fca759a7f5eaf628e5 otp_doc_man_R15B02.tar.gz +ccbe5e032a2afe2390de8913bfe737a1 otp_src_R15B02.tar.gz From 52f46d3ddcd96ffdcc68d9ee46e0ecfce8044ef2 Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 18:15:51 +0400 Subject: [PATCH 011/340] typo Signed-off-by: Fedora Build --- ...nstallation-of-a-n-internal-erl_interface-A.patch | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch index df98992..c05258b 100644 --- a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch +++ b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch @@ -10,18 +10,14 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov --- - lib/erl_interface/src/Makefile.in | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 9aeba86..dafd2ce 100644 +index 9aeba86..708d0a1 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -843,14 +843,33 @@ EXTRA = \ - $(TARGET)/eidefs.mk - - release: opt -+<<<<<<< HEAD +@@ -846,11 +846,29 @@ release: opt $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/lib" $(INSTALL_DIR) "$(RELSYSDIR)/bin" From 0eeae8c66426bab8f7a861043027565883b60d0c Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 20:14:18 +0400 Subject: [PATCH 012/340] Fix failure Signed-off-by: Fedora Build --- otp-0007-Do-not-install-erlang-sources.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index 732de80..5eb7672 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -65,7 +65,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/public_key/src/Makefile | 4 ---- lib/reltool/src/Makefile | 2 +- lib/runtime_tools/src/Makefile | 2 -- - lib/sasl/src/Makefile | 2 +- + lib/sasl/src/Makefile | 1 - lib/snmp/src/agent/Makefile | 2 +- lib/snmp/src/app/Makefile | 2 +- lib/snmp/src/compile/Makefile | 2 +- @@ -83,7 +83,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 60 insertions(+), 110 deletions(-) + 76 files changed, 59 insertions(+), 110 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 5bcc2eb..c87dc9e 100644 @@ -869,15 +869,14 @@ index 810e3e8..b529c92 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index de0c45e..1f8bd28 100644 +index de0c45e..58c2ecb 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) "$(RELSYSDIR)/src" $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" From 72d4e15bdc16e7fc5ecfacc9169a32223bee76c9 Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 20:58:27 +0400 Subject: [PATCH 013/340] Fix megaco module building Signed-off-by: Fedora Build --- otp-0007-Do-not-install-erlang-sources.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index 5eb7672..cbc0ed6 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -48,7 +48,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/megaco/src/app/Makefile | 2 +- lib/megaco/src/binary/Makefile | 2 +- lib/megaco/src/engine/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- + lib/megaco/src/flex/Makefile.in | 2 -- lib/megaco/src/tcp/Makefile | 2 +- lib/megaco/src/text/Makefile | 2 +- lib/megaco/src/udp/Makefile | 2 +- @@ -83,7 +83,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 59 insertions(+), 110 deletions(-) + 76 files changed, 58 insertions(+), 111 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 5bcc2eb..c87dc9e 100644 @@ -641,18 +641,18 @@ index 7cecef1..841a88a 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index b36ef26..5b5042d 100644 +index b36ef26..2e748fe 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -276,7 +276,7 @@ release_spec: opt +@@ -276,8 +276,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +- $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile index 0c30aba..aa553ff 100644 --- a/lib/megaco/src/tcp/Makefile From 70bf321d5f77aaa048921d2f0db209a671d09bb2 Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 21:49:26 +0400 Subject: [PATCH 014/340] Fix hipe module building Signed-off-by: Fedora Build --- otp-0007-Do-not-install-erlang-sources.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index cbc0ed6..e238049 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -35,7 +35,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/hipe/main/Makefile | 2 +- lib/hipe/misc/Makefile | 2 +- lib/hipe/rtl/Makefile | 2 +- - lib/hipe/util/Makefile | 3 +-- + lib/hipe/util/Makefile | 3 --- lib/ic/src/Makefile | 2 +- lib/inets/src/ftp/Makefile | 2 +- lib/inets/src/http_client/Makefile | 2 +- @@ -83,7 +83,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 58 insertions(+), 111 deletions(-) + 76 files changed, 57 insertions(+), 112 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 5bcc2eb..c87dc9e 100644 @@ -465,7 +465,7 @@ index 426d1bd..44238b9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index a5ee232..e46ece0 100644 +index a5ee232..f03e41d 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -49,7 +49,6 @@ HIPE_MODULES = @@ -476,12 +476,12 @@ index a5ee232..e46ece0 100644 ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -104,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl + include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/util" +- $(INSTALL_DIR) "$(RELSYSDIR)/util" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/util" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" From fa3a34866f7698168a90ae266781576f8590383b Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 22:33:50 +0400 Subject: [PATCH 015/340] Add missing man-page Signed-off-by: Fedora Build --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index 89f0818..e674b25 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1241,6 +1241,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/ct_ftp.* %{_libdir}/erlang/man/man3/ct_hooks.* %{_libdir}/erlang/man/man3/ct_master.* +%{_libdir}/erlang/man/man3/ct_netconfc.* %{_libdir}/erlang/man/man3/ct_rpc.* %{_libdir}/erlang/man/man3/ct_slave.* %{_libdir}/erlang/man/man3/ct_snmp.* From 171e3c16acc7005bdda011db513e3a7c6026690e Mon Sep 17 00:00:00 2001 From: Fedora Build Date: Mon, 10 Sep 2012 22:35:17 +0400 Subject: [PATCH 016/340] Kill defattr directive (no longer required since EL5/FC6) Signed-off-by: Fedora Build --- erlang.spec | 64 ----------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/erlang.spec b/erlang.spec index e674b25..99ba87a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1202,7 +1202,6 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) %if %{with doc} %dir %{_docdir}/%{n_uvr}/ %doc %{_docdir}/%{n_uvr}/AUTHORS @@ -1214,14 +1213,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files appmon -%defattr(-,root,root) %{_libdir}/erlang/lib/appmon-*/ %if %{with doc} %{_libdir}/erlang/man/man3/appmon.* %endif %files asn1 -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/asn1-*/ %{_libdir}/erlang/lib/asn1-*/ebin %{_libdir}/erlang/lib/asn1-*/priv @@ -1232,7 +1229,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files common_test -%defattr(-,root,root) %{_bindir}/ct_run %{_libdir}/erlang/lib/common_test-*/ %if %{with doc} @@ -1252,14 +1248,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files compiler -%defattr(-,root,root) %{_libdir}/erlang/lib/compiler-*/ %if %{with doc} %{_libdir}/erlang/man/man3/compile.* %endif %files cosEvent -%defattr(-,root,root) %{_libdir}/erlang/lib/cosEvent-*/ %if %{with doc} %{_libdir}/erlang/man/man3/cosEventApp.* @@ -1274,7 +1268,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosEventDomain -%defattr(-,root,root) %{_libdir}/erlang/lib/cosEventDomain-*/ %if %{with doc} %{_libdir}/erlang/man/man3/CosEventDomainAdmin.* @@ -1284,7 +1277,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosFileTransfer -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/cosFileTransfer-*/ %{_libdir}/erlang/lib/cosFileTransfer-*/ebin %{_libdir}/erlang/lib/cosFileTransfer-*/include @@ -1299,7 +1291,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosNotification -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/cosNotification-*/ %{_libdir}/erlang/lib/cosNotification-*/ebin %{_libdir}/erlang/lib/cosNotification-*/include @@ -1336,7 +1327,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosProperty -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/cosProperty-*/ %{_libdir}/erlang/lib/cosProperty-*/ebin %{_libdir}/erlang/lib/cosProperty-*/include @@ -1352,7 +1342,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosTime -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/cosTime-*/ %{_libdir}/erlang/lib/cosTime-*/ebin %{_libdir}/erlang/lib/cosTime-*/include @@ -1367,7 +1356,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files cosTransactions -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/cosTransactions-*/ %{_libdir}/erlang/lib/cosTransactions-*/ebin %{_libdir}/erlang/lib/cosTransactions-*/include @@ -1384,7 +1372,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files crypto -%defattr(-,root,root) %{_libdir}/erlang/lib/crypto-*/ %if %{with doc} %{_libdir}/erlang/man/man3/crypto.* @@ -1392,7 +1379,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files debugger -%defattr(-,root,root) %{_libdir}/erlang/lib/debugger-*/ %if %{with doc} %{_libdir}/erlang/man/man3/debugger.* @@ -1401,7 +1387,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files dialyzer -%defattr(-,root,root) %{_bindir}/dialyzer %{_libdir}/erlang/bin/dialyzer %{_libdir}/erlang/erts-*/bin/dialyzer @@ -1411,7 +1396,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files diameter -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/diameter-*/ %{_libdir}/erlang/lib/diameter-*/bin %{_libdir}/erlang/lib/diameter-*/ebin @@ -1428,7 +1412,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files doc -%defattr(-,root,root) %if %{with doc} %doc %{_docdir}/%{n_uvr}/doc %doc %{_docdir}/%{n_uvr}/erts-*/ @@ -1436,7 +1419,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files edoc -%defattr(-,root,root) %{_libdir}/erlang/lib/edoc-*/ %if %{with doc} %{_libdir}/erlang/man/man3/edoc.* @@ -1448,19 +1430,16 @@ rm -rf $RPM_BUILD_ROOT %endif %files eldap -%defattr(-,root,root) %{_libdir}/erlang/lib/eldap-*/ %if %{with doc} %{_libdir}/erlang/man/man3/eldap.* %endif %files erl_docgen -%defattr(-,root,root) %{_libdir}/erlang/lib/erl_docgen-*/ %{_libdir}/erlang/man/man6/erl_docgen.* %files erl_interface -%defattr(-,root,root) %{_libdir}/erlang/lib/erl_interface-*/ %if %{with doc} %{_libdir}/erlang/man/man1/erl_call.* @@ -1477,8 +1456,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files erts -%defattr(-,root,root) - # TODO these directories should be packaged separately %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ @@ -1560,7 +1537,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/usr/ %files et -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/et-*/ %{_libdir}/erlang/lib/et-*/ebin %{_libdir}/erlang/lib/et-*/include @@ -1573,7 +1549,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files eunit -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include @@ -1583,7 +1558,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files examples -%defattr(-,root,root) %{_libdir}/erlang/lib/asn1-*/examples/ #%{_libdir}/erlang/lib/cosFileTransfer-*/examples/ #%{_libdir}/erlang/lib/cosNotification-*/examples/ @@ -1613,7 +1587,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/wx-*/examples/ %files gs -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/gs-*/ %{_libdir}/erlang/lib/gs-*/contribs %{_libdir}/erlang/lib/gs-*/ebin @@ -1624,11 +1597,9 @@ rm -rf $RPM_BUILD_ROOT %endif %files hipe -%defattr(-,root,root) %{_libdir}/erlang/lib/hipe-*/ %files ic -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/ic-*/ %{_libdir}/erlang/lib/ic-*/ebin %{_libdir}/erlang/lib/ic-*/include @@ -1642,7 +1613,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files inets -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin %{_libdir}/erlang/lib/inets-*/include @@ -1665,7 +1635,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files inviso -%defattr(-,root,root) %{_libdir}/erlang/lib/inviso-*/ %if %{with doc} %{_libdir}/erlang/man/man3/inviso.* @@ -1677,12 +1646,10 @@ rm -rf $RPM_BUILD_ROOT %endif %files jinterface -%defattr(-,root,root) %{_libdir}/erlang/lib/jinterface-*/ %{_javadir}/%{name}/OtpErlang.jar %files kernel -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/kernel-*/ %{_libdir}/erlang/lib/kernel-*/ebin %{_libdir}/erlang/lib/kernel-*/include @@ -1724,7 +1691,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files megaco -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/megaco-*/ %{_libdir}/erlang/lib/megaco-*/ebin %{_libdir}/erlang/lib/megaco-*/include @@ -1746,7 +1712,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files mnesia -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/mnesia-*/ %{_libdir}/erlang/lib/mnesia-*/ebin #%{_libdir}/erlang/lib/mnesia-*/include @@ -1758,7 +1723,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files observer -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/observer-*/ %{_libdir}/erlang/lib/observer-*/ebin/ %{_libdir}/erlang/lib/observer-*/include/ @@ -1772,14 +1736,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files odbc -%defattr(-,root,root) %{_libdir}/erlang/lib/odbc-*/ %if %{with doc} %{_libdir}/erlang/man/man3/odbc.* %endif %files orber -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/orber-*/ %{_libdir}/erlang/lib/orber-*/COSS %{_libdir}/erlang/lib/orber-*/ebin @@ -1809,7 +1771,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files os_mon -%defattr(-,root,root) %{_libdir}/erlang/lib/os_mon-*/ %if %{with doc} %{_libdir}/erlang/man/man3/cpu_sup.* @@ -1821,14 +1782,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files otp_mibs -%defattr(-,root,root) %{_libdir}/erlang/lib/otp_mibs-*/ %if %{with doc} %{_libdir}/erlang/man/man3/otp_mib.* %endif %files parsetools -%defattr(-,root,root) %{_libdir}/erlang/lib/parsetools-*/ %if %{with doc} %{_libdir}/erlang/man/man3/leex.* @@ -1836,7 +1795,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files percept -%defattr(-,root,root) %{_libdir}/erlang/lib/percept-*/ %if %{with doc} %{_libdir}/erlang/man/man3/egd.* @@ -1845,21 +1803,18 @@ rm -rf $RPM_BUILD_ROOT %endif %files pman -%defattr(-,root,root) %{_libdir}/erlang/lib/pman-*/ %if %{with doc} %{_libdir}/erlang/man/man3/pman.* %endif %files public_key -%defattr(-,root,root) %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} %{_libdir}/erlang/man/man3/public_key.* %endif %files reltool -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src @@ -1868,7 +1823,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files runtime_tools -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/runtime_tools-*/ %{_libdir}/erlang/lib/runtime_tools-*/ebin/ %{_libdir}/erlang/lib/runtime_tools-*/include/ @@ -1881,7 +1835,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files sasl -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/sasl-*/ %{_libdir}/erlang/lib/sasl-*/ebin %{_libdir}/erlang/lib/sasl-*/src @@ -1899,7 +1852,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files snmp -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/snmp-*/ %{_libdir}/erlang/lib/snmp-*/bin %{_libdir}/erlang/lib/snmp-*/ebin @@ -1960,7 +1912,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files ssh -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/ssh-*/ %{_libdir}/erlang/lib/ssh-*/ebin %{_libdir}/erlang/lib/ssh-*/include @@ -1974,7 +1925,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files ssl -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/ssl-*/ %{_libdir}/erlang/lib/ssl-*/ebin %{_libdir}/erlang/lib/ssl-*/src @@ -1985,7 +1935,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files stdlib -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/stdlib-*/ %{_libdir}/erlang/lib/stdlib-*/ebin %{_libdir}/erlang/lib/stdlib-*/include @@ -2053,7 +2002,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files syntax_tools -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin %if %{with doc} @@ -2069,7 +2017,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files test_server -%defattr(-,root,root) %{_libdir}/erlang/lib/test_server-*/ %if %{with doc} %{_libdir}/erlang/man/man3/test_server.* @@ -2078,14 +2025,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files toolbar -%defattr(-,root,root) %{_libdir}/erlang/lib/toolbar-*/ %if %{with doc} %{_libdir}/erlang/man/man3/toolbar.* %endif %files tools -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/tools-*/ %{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin @@ -2106,14 +2051,12 @@ rm -rf $RPM_BUILD_ROOT %endif %files tv -%defattr(-,root,root) %{_libdir}/erlang/lib/tv-*/ %if %{with doc} %{_libdir}/erlang/man/man3/tv.* %endif %files typer -%defattr(-,root,root) %{_bindir}/typer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/typer @@ -2122,7 +2065,6 @@ rm -rf $RPM_BUILD_ROOT #%{_libdir}/erlang/lib/typer-*/src/ %files webtool -%defattr(-,root,root) %{_libdir}/erlang/lib/webtool-*/ %if %{with doc} %{_libdir}/erlang/man/man1/start_webtool.* @@ -2130,7 +2072,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files wx -%defattr(-,root,root) %dir %{_libdir}/erlang/lib/wx-*/ %{_libdir}/erlang/lib/wx-*/ebin %{_libdir}/erlang/lib/wx-*/include @@ -2360,7 +2301,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files xmerl -%defattr(-,root,root) %{_libdir}/erlang/lib/xmerl-*/ %if %{with doc} %{_libdir}/erlang/man/man3/xmerl.* @@ -2374,25 +2314,21 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?el6}%{?fedora} %files -n emacs-erlang -%defattr(-,root,root,-) %dir %{_emacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README %{_emacs_sitelispdir}/erlang/*.elc %{_emacs_sitestartdir}/erlang-init.el %files -n emacs-erlang-el -%defattr(-,root,root,-) %{_emacs_sitelispdir}/erlang/*.el %files -n xemacs-erlang -%defattr(-,root,root,-) %dir %{_xemacs_sitelispdir}/erlang %doc %{_xemacs_sitelispdir}/erlang/README %{_xemacs_sitelispdir}/erlang/*.elc %{_xemacs_sitestartdir}/erlang-init.el %files -n xemacs-erlang-el -%defattr(-,root,root,-) %{_xemacs_sitelispdir}/erlang/*.el %endif From ab89e306e4a2dfd83132c67651dde30fa9f786b3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Dec 2012 18:43:38 +0400 Subject: [PATCH 017/340] R15B03-1 Signed-off-by: Peter Lemenkov --- .gitignore | 4 ++++ erlang.spec | 19 +++++++++++++------ otp-0007-Do-not-install-erlang-sources.patch | 8 ++++---- sources | 13 ++++--------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 082e3bc..47b31a3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 99ba87a..af33811 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ %global upstream_ver R15B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 02 +%global upstream_rel 03 #%%global upstream_rel %%{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -31,11 +31,12 @@ Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.tar.gz +Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.tar.gz %if %{use_prebuilt_docs} -Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}.tar.gz -Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.tar.gz +Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}-1.tar.gz +Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1.tar.gz %endif +Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme # For the source of the Fedora specific patches, see the respective @@ -1028,8 +1029,9 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif -# remove pre-built stuff -make clean +# FIXME remove pre-built BEAM files +# some of them are required for compilation +#find ./lib -type f -name "*.beam" -delete # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -1405,6 +1407,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man1/diameter_compile.* %{_libdir}/erlang/man/man3/diameter.* %{_libdir}/erlang/man/man3/diameter_app.* +%{_libdir}/erlang/man/man3/diameter_codec.* +%{_libdir}/erlang/man/man3/diameter_make.* %{_libdir}/erlang/man/man3/diameter_sctp.* %{_libdir}/erlang/man/man3/diameter_tcp.* %{_libdir}/erlang/man/man3/diameter_transport.* @@ -2334,6 +2338,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 21 2012 Peter Lemenkov - R15B-03.1 +- Ver. R15B03 (actually R15B03-1) + * Mon Sep 10 2012 Peter Lemenkov - R15B-02.1 - Ver. R15B02 diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index e238049..457c781 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -125,10 +125,10 @@ index 4bd49aa..b6d4880 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index f7dce19..ee75f6e 100644 +index dd2923e..246d30a 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -138,7 +138,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -288,10 +288,10 @@ index 63cc1c9..af956d9 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 99c3432..d79b3af 100644 +index 060659b..5e91d0f 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -231,11 +231,8 @@ release_spec: opt +@@ -222,11 +222,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: diff --git a/sources b/sources index ba69c1d..e64519f 100644 --- a/sources +++ b/sources @@ -1,9 +1,4 @@ -80553f4730b04aad4c9994590bad3fe6 otp_doc_html_R15B.tar.gz -9738da523737712a9db87db0dee05338 otp_doc_man_R15B.tar.gz -dd6c2a4807551b4a8a536067bde31d73 otp_src_R15B.tar.gz -7569cae680eecd64e7e5d952be788ee5 otp_doc_html_R15B01.tar.gz -d87412c2a1e6005bbe29dfe642a9ca20 otp_doc_man_R15B01.tar.gz -f12d00f6e62b36ad027d6c0c08905fad otp_src_R15B01.tar.gz -36d91f123204f4c71a464985b1b2a375 otp_doc_html_R15B02.tar.gz -974020ba533242fca759a7f5eaf628e5 otp_doc_man_R15B02.tar.gz -ccbe5e032a2afe2390de8913bfe737a1 otp_src_R15B02.tar.gz +18ba57d24085a77c01bf05f5bc0e6fb5 otp_doc_html_R15B03-1.tar.gz +1d7ace92e8cf41abbee1dba8192b7d5f otp_doc_man_R15B03-1.tar.gz +f299c8af6f54e4b767fbba100b18acf2 otp_src_R15B03-1.readme +eccd1e6dda6132993555e088005019f2 otp_src_R15B03-1.tar.gz From 0ba7416904c8c29010ad689cce13396a1d6ffcf3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 25 Dec 2012 16:31:05 +0400 Subject: [PATCH 018/340] Run make clean before build (to remove pre-built files) Signed-off-by: Peter Lemenkov --- erlang.spec | 10 ++++--- otp-0007-Do-not-install-erlang-sources.patch | 28 ++++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/erlang.spec b/erlang.spec index af33811..a897a47 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1029,9 +1029,8 @@ CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enabl CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib %endif -# FIXME remove pre-built BEAM files -# some of them are required for compilation -#find ./lib -type f -name "*.beam" -delete +# Remove pre-built BEAM files +make clean # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -2338,6 +2337,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 25 2012 Peter Lemenkov - R15B-03.2 +- Run make clean before build (to remove pre-built files) + * Fri Dec 21 2012 Peter Lemenkov - R15B-03.1 - Ver. R15B03 (actually R15B03-1) diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0007-Do-not-install-erlang-sources.patch index 457c781..399a5dd 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0007-Do-not-install-erlang-sources.patch @@ -55,13 +55,14 @@ Signed-off-by: Hans Ulrich Niedermann lib/mnesia/src/Makefile | 2 +- lib/observer/src/Makefile | 1 - lib/odbc/src/Makefile | 2 +- - lib/orber/COSS/CosNaming/Makefile | 2 +- + lib/orber/COSS/CosNaming/Makefile | 4 ++-- lib/orber/src/Makefile | 2 +- lib/os_mon/src/Makefile | 1 - lib/otp_mibs/src/Makefile | 2 -- lib/parsetools/src/Makefile | 2 -- lib/percept/src/Makefile | 2 -- lib/pman/src/Makefile | 2 +- + lib/public_key/asn1/Makefile | 4 ++-- lib/public_key/src/Makefile | 4 ---- lib/reltool/src/Makefile | 2 +- lib/runtime_tools/src/Makefile | 2 -- @@ -83,7 +84,7 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 57 insertions(+), 112 deletions(-) + 77 files changed, 60 insertions(+), 115 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 5bcc2eb..c87dc9e 100644 @@ -731,18 +732,20 @@ index 2af65cc..2358d16 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 769c08a..9906247 100644 +index 769c08a..cfc56b3 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile -@@ -144,7 +144,7 @@ release_spec: opt +@@ -144,8 +144,8 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" +- $(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming" + $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" - $(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming" ++ $(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming" + release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile index 72610de..a800d2f 100644 --- a/lib/orber/src/Makefile @@ -820,6 +823,21 @@ index fa01fe7..5197f4b 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile +index 957c332..26d9420 100644 +--- a/lib/public_key/asn1/Makefile ++++ b/lib/public_key/asn1/Makefile +@@ -95,8 +95,8 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/asn1" +- $(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \ +- $(GEN_ERLS) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \ ++ "$(RELSYSDIR)/asn1" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile index d5cd13d..d2a35f8 100644 --- a/lib/public_key/src/Makefile From a6c18203f47a708fd520caf2e2a6e48b7bc23022 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Feb 2013 12:22:32 +0400 Subject: [PATCH 019/340] Ver. R16A Signed-off-by: Peter Lemenkov --- .gitignore | 4 + erlang.spec | 76 +- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0002-Remove-rpath.patch | 6 +- otp-0003-Do-not-install-C-sources.patch | 87 +- otp-0004-Do-not-install-Java-sources.patch | 18 +- ...teventlog-and-related-doc-files-on-n.patch | 8 +- ...Do-not-install-VxWorks-specific-docs.patch | 21 - ...p-0006-Do-not-install-erlang-sources.patch | 168 +- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 4 +- ...tion-of-a-n-internal-erl_interface-A.patch | 49 - otp-get-patches.sh | 92 - otp_src_R16A_RELEASE_CANDIDATE.readme | 2250 +++++++++++++++++ sources | 5 +- 14 files changed, 2422 insertions(+), 370 deletions(-) delete mode 100644 otp-0006-Do-not-install-VxWorks-specific-docs.patch rename otp-0007-Do-not-install-erlang-sources.patch => otp-0006-Do-not-install-erlang-sources.patch (93%) rename otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch => otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch (96%) delete mode 100644 otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch delete mode 100755 otp-get-patches.sh create mode 100644 otp_src_R16A_RELEASE_CANDIDATE.readme diff --git a/.gitignore b/.gitignore index 47b31a3..13eb3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index a897a47..8413b3a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ -%global upstream_ver R15B +%global upstream_ver R16A # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -%global upstream_rel 03 -#%%global upstream_rel %%{nil} +#%global upstream_rel 03 +%global upstream_rel %{nil} # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -25,18 +25,18 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.tar.gz +Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz %if %{use_prebuilt_docs} -Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}-1.tar.gz -Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1.tar.gz +Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz +Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz %endif -Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme +Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.readme # For the source of the Fedora specific patches, see the respective @@ -71,17 +71,11 @@ Patch4: otp-0004-Do-not-install-Java-sources.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 VxWorks-specific docs -Patch6: otp-0006-Do-not-install-VxWorks-specific-docs.patch -# Fedora specific patch # Do not install erlang sources -Patch7: otp-0007-Do-not-install-erlang-sources.patch +Patch6: otp-0006-Do-not-install-erlang-sources.patch # Required only for el5, el6 on PowerPC # Ugly workaround for java-1.5.0-gcj which doesn't support -Patch8: otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch -# Fedora specific patch -# Restore installation of a n internal erl_interface API -Patch9: otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch +Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -136,7 +130,6 @@ Requires: erlang-gs%{?_isa} = %{version}-%{release} Requires: erlang-hipe%{?_isa} = %{version}-%{release} Requires: erlang-ic%{?_isa} = %{version}-%{release} Requires: erlang-inets%{?_isa} = %{version}-%{release} -Requires: erlang-inviso%{?_isa} = %{version}-%{release} Requires: erlang-jinterface%{?_isa} = %{version}-%{release} Requires: erlang-kernel%{?_isa} = %{version}-%{release} Requires: erlang-megaco%{?_isa} = %{version}-%{release} @@ -167,6 +160,7 @@ Requires: erlang-webtool%{?_isa} = %{version}-%{release} Requires: erlang-wx%{?_isa} = %{version}-%{release} Requires: erlang-xmerl%{?_isa} = %{version}-%{release} Obsoletes: erlang-docbuilder +Obsoletes: erlang-inviso %description Erlang is a general-purpose programming language and runtime @@ -182,6 +176,7 @@ Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -193,7 +188,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description asn1 @@ -354,7 +348,7 @@ Obsoletes: %{name} < R13B-04.5 A debugger for debugging and testing of Erlang programs. %package dialyzer -Summary: A DIscrepany AnaLYZer for ERlang programs +Summary: A DIscrepancy AnaLYZer for ERlang programs Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -367,7 +361,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description dialyzer -A DIscrepany AnaLYZer for ERlang programs. +A DIscrepancy AnaLYZer for ERlang programs. %package diameter Summary: Diameter (RFC 3588) library @@ -540,18 +534,6 @@ Obsoletes: %{name} < R13B-04.5 %description inets A set of services such as a Web server and a ftp client etc. -%package inviso -Summary: A trace tool for both development and delivered systems -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 - -%description inviso -A trace tool for both development and delivered systems. - %package jinterface Summary: A library for accessing Java from Erlang Group: Development/Languages @@ -600,6 +582,7 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages +#Error:erlang(megaco_flex_scanner:scan/2) Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -611,7 +594,6 @@ A heavy duty real-time distributed database. %package observer Summary: A set of tools for tracing and investigation of distributed systems Group: Development/Languages -Requires: %{name}-appmon%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-gs%{?_isa} = %{version}-%{release} @@ -844,6 +826,7 @@ reading source files differently, pretty-printing syntax trees. Summary: The OTP Test Server Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} @@ -998,14 +981,12 @@ Erlang mode for XEmacs (source lisp files). %patch3 -p1 -b .Do_not_install_C_sources %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n -%patch6 -p1 -b .Do_not_install_VxWorks_specific_docs -%patch7 -p1 -b .Do_not_install_erlang_sources +%patch6 -p1 -b .Do_not_install_erlang_sources %if 0%{?el4}%{?el5}%{?el6} %ifnarch %{ix86} x86_64 -%patch8 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup +%patch7 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif -%patch9 -p1 -b .Restore_installation_of_a_n_internal_erl_interface_A # end of autogenerated prep patch list # remove shipped zlib sources @@ -1637,17 +1618,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/tftp.* %endif -%files inviso -%{_libdir}/erlang/lib/inviso-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/inviso.* -%{_libdir}/erlang/man/man3/inviso_as_lib.* -%{_libdir}/erlang/man/man3/inviso_lfm.* -%{_libdir}/erlang/man/man3/inviso_lfm_tpfreader.* -%{_libdir}/erlang/man/man3/inviso_rt.* -%{_libdir}/erlang/man/man3/inviso_rt_meta.* -%endif - %files jinterface %{_libdir}/erlang/lib/jinterface-*/ %{_javadir}/%{name}/OtpErlang.jar @@ -1681,7 +1651,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/net_adm.* %{_libdir}/erlang/man/man3/net_kernel.* %{_libdir}/erlang/man/man3/os.* -%{_libdir}/erlang/man/man3/packages.* %{_libdir}/erlang/man/man3/pg2.* %{_libdir}/erlang/man/man3/rpc.* %{_libdir}/erlang/man/man3/seq_trace.* @@ -1922,9 +1891,12 @@ rm -rf $RPM_BUILD_ROOT %if %{with doc} %{_libdir}/erlang/man/man3/ssh.* %{_libdir}/erlang/man/man3/ssh_channel.* +%{_libdir}/erlang/man/man3/ssh_client_key_api.* %{_libdir}/erlang/man/man3/ssh_connection.* +%{_libdir}/erlang/man/man3/ssh_server_key_api.* %{_libdir}/erlang/man/man3/ssh_sftp.* %{_libdir}/erlang/man/man3/ssh_sftpd.* +%{_libdir}/erlang/man/man6/ssh.* %endif %files ssl @@ -2218,7 +2190,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxMoveEvent.* %{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* %{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* -%{_libdir}/erlang/man/man3/wxNcPaintEvent.* %{_libdir}/erlang/man/man3/wxNotebook.* %{_libdir}/erlang/man/man3/wxNotebookEvent.* %{_libdir}/erlang/man/man3/wxNotifyEvent.* @@ -2337,6 +2308,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 03 2013 Peter Lemenkov - R16A-0.1 +- Ver. R16A + * Tue Dec 25 2012 Peter Lemenkov - R15B-03.2 - Run make clean before build (to remove pre-built files) @@ -2487,7 +2461,7 @@ rm -rf $RPM_BUILD_ROOT - Made erlang-rpm-macros as separate package - Fix error while installing erlang-rpm-macros -* Wed Apr 17 2010 Peter Lemenkov - R13B-04.5 +* Sat Apr 17 2010 Peter Lemenkov - R13B-04.5 - Use erlang rpm macros for adding provides/reqires - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which in turn becomes purely virtual now. diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 524ad7f..5952bab 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -10,10 +10,10 @@ Signed-off-by: Peter Lemenkov 2 files changed, 14 deletions(-) diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 83fe97d..f77b485 100644 +index 5c1ce51..5a07855 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -568,10 +568,6 @@ endif +@@ -474,10 +474,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 03fc5eb..2192c39 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -9,18 +9,18 @@ Signed-off-by: Peter Lemenkov 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index ffd556c..80e95ef 100644 +index a20ddff..e890927 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -84,7 +84,7 @@ endif +@@ -85,7 +85,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ 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 - SSL_DED_LD_RUNTIME_LIBRARY_PATH= diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile index 0989f14..0d29444 100644 --- a/lib/crypto/priv/Makefile diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 9e6a72d..705b48f 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -2,26 +2,33 @@ From: Peter Lemenkov Date: Fri, 18 Jun 2010 23:41:33 +0400 Subject: [PATCH] Do not install C sources -Don't install *.c and *.o files at all. +Don't install *.c and *.o files. + +Excepts ones from the internal erl_interface. These +API headers are necessary. See rhbz #818419 for the +explanation why they're necessary for the low-level +interaction with the Erlang nodes: + +https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov --- lib/asn1/c_src/Makefile | 2 -- - lib/crypto/c_src/Makefile.in | 3 --- - lib/erl_interface/src/Makefile.in | 18 ------------------ + lib/crypto/c_src/Makefile.in | 4 ---- + lib/erl_interface/src/Makefile.in | 16 ++++++++-------- lib/ic/c_src/Makefile.in | 2 -- lib/megaco/src/flex/Makefile.in | 2 +- lib/odbc/c_src/Makefile.in | 3 --- lib/os_mon/c_src/Makefile.in | 2 -- lib/runtime_tools/c_src/Makefile.in | 2 -- lib/tools/c_src/Makefile.in | 2 -- - 9 files changed, 1 insertion(+), 35 deletions(-) + 9 files changed, 9 insertions(+), 26 deletions(-) diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index a73d01a..102d4fb 100644 +index 7023833..8bf8eb9 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -112,8 +112,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" @@ -31,43 +38,31 @@ index a73d01a..102d4fb 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 80e95ef..c644ad2 100644 +index e890927..1377654 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -133,10 +133,7 @@ docs: +@@ -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) $(OBJS) "$(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 - release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index cb41391..9aeba86 100644 +index ebacc1c..388e27e 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -846,29 +846,11 @@ release: opt - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/lib" - $(INSTALL_DIR) "$(RELSYSDIR)/bin" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/connect" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/decode" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/encode" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/epmd" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/legacy" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/prog" -- $(INSTALL_DIR) "$(RELSYSDIR)/src/registry" - $(INSTALL_DATA) $(HEADERS) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib" - ifneq ($(EXE_TARGETS),) +@@ -872,14 +872,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif -- $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" + $(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" @@ -76,14 +71,22 @@ index cb41391..9aeba86 100644 - $(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 de46ead..b30ce1e 100644 +index 856823b..d000273 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in -@@ -140,10 +140,8 @@ $(OBJDIR)/%.o: %.c +@@ -146,10 +146,8 @@ $(OBJDIR)/%.o: %.c include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -95,10 +98,10 @@ index de46ead..b30ce1e 100644 $(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib" diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 69c2425..b36ef26 100644 +index 6111cf2..bd62e8b 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -279,7 +279,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) @@ -108,7 +111,7 @@ index 69c2425..b36ef26 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 026da39..3a568e4 100644 +index 6572d28..c7093ae 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -124,23 +127,23 @@ index 026da39..3a568e4 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index 2b16789..1241014 100644 +index 51569f6..4e4d729 100644 --- a/lib/os_mon/c_src/Makefile.in +++ b/lib/os_mon/c_src/Makefile.in -@@ -131,8 +131,6 @@ ifeq ($(findstring vxworks_simso,$(TARGET)),vxworks_simso) - release_spec: - else +@@ -124,8 +124,6 @@ $(OBJDIR)/memsup.o: memsup.h + include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(C_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" - endif + diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in -index 754e6cc..1c367ef 100644 +index d315a90..7b4b9fb 100644 --- a/lib/runtime_tools/c_src/Makefile.in +++ b/lib/runtime_tools/c_src/Makefile.in -@@ -193,9 +193,7 @@ docs: +@@ -177,9 +177,7 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -151,10 +154,10 @@ index 754e6cc..1c367ef 100644 release_docs_spec: diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 0382d32..f74eb5a 100644 +index aea5686..a0c8883 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -188,8 +188,6 @@ include ../vsn.mk +@@ -189,8 +189,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 301d66b..fc3ccd5 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov 2 files changed, 4 deletions(-) diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -index cf4c353..57f64d9 100644 +index 273614e..5b1fb57 100644 --- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile +++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -@@ -109,8 +109,6 @@ docs: +@@ -112,8 +112,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -22,15 +22,15 @@ index cf4c353..57f64d9 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index 8ae63a1..8605a20 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 -@@ -99,8 +99,6 @@ release release_docs release_tests release_html: - $(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) $@_spec +@@ -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 -- $(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang" -- $(INSTALL_DATA) $(JAVA_SRC) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang" - $(INSTALL_DIR) "$(RELSYSDIR)/priv" - $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" +- $(V_at)$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/erlang" +- $(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" diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 988069e..c73b50c 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -33,7 +33,7 @@ index 08fd23e..5606cfc 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 864d7a0..79a4076 100644 +index cd2dade..4e78cf8 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) @@ -56,10 +56,10 @@ index 864d7a0..79a4076 100644 $(APP_TARGET): $(APP_SRC) ../vsn.mk +ifeq ($(findstring win32,$(TARGET)),win32) - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ +else -+ sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@ ++ $(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@ +endif $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - sed -e 's;%VSN%;$(VSN);' $< > $@ + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ diff --git a/otp-0006-Do-not-install-VxWorks-specific-docs.patch b/otp-0006-Do-not-install-VxWorks-specific-docs.patch deleted file mode 100644 index 4be897b..0000000 --- a/otp-0006-Do-not-install-VxWorks-specific-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 19 Jun 2010 11:26:04 +0400 -Subject: [PATCH] Do not install VxWorks-specific docs - -Signed-off-by: Peter Lemenkov ---- - erts/doc/src/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile -index da245d7..a494b3a 100644 ---- a/erts/doc/src/Makefile -+++ b/erts/doc/src/Makefile -@@ -55,7 +55,6 @@ XML_REF3_EFILES = \ - XML_REF3_FILES = \ - driver_entry.xml \ - erl_nif.xml \ -- erl_set_memory_block.xml \ - erl_driver.xml \ - erl_prim_loader.xml \ - erlang.xml \ diff --git a/otp-0007-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch similarity index 93% rename from otp-0007-Do-not-install-erlang-sources.patch rename to otp-0006-Do-not-install-erlang-sources.patch index 399a5dd..c3229c9 100644 --- a/otp-0007-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -43,7 +43,6 @@ Signed-off-by: Hans Ulrich Niedermann lib/inets/src/http_server/Makefile | 2 +- lib/inets/src/inets_app/Makefile | 2 +- lib/inets/src/tftp/Makefile | 2 +- - lib/inviso/src/Makefile | 2 -- lib/kernel/src/Makefile | 1 - lib/megaco/src/app/Makefile | 2 +- lib/megaco/src/binary/Makefile | 2 +- @@ -84,13 +83,13 @@ Signed-off-by: Hans Ulrich Niedermann lib/webtool/src/Makefile | 2 -- lib/wx/src/Makefile | 4 ++-- lib/xmerl/src/Makefile | 4 +--- - 77 files changed, 60 insertions(+), 115 deletions(-) + 76 files changed, 60 insertions(+), 113 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 5bcc2eb..c87dc9e 100644 +index a224b6a..e88641b 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -68,8 +68,6 @@ copy: +@@ -69,8 +69,6 @@ copy: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: @@ -100,10 +99,10 @@ index 5bcc2eb..c87dc9e 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile -index 06e61b7..cae409b 100644 +index c1620bc..02c0984 100644 --- a/lib/appmon/src/Makefile +++ b/lib/appmon/src/Makefile -@@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -113,7 +112,7 @@ index 06e61b7..cae409b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 4bd49aa..b6d4880 100644 +index 9607799..dbfb40b 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -156,7 +156,7 @@ release_spec: opt @@ -126,7 +125,7 @@ index 4bd49aa..b6d4880 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index dd2923e..246d30a 100644 +index 4600c0a..1675a4a 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -139,10 +138,10 @@ index dd2923e..246d30a 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 958d350..312ddfa 100644 +index c6d09d8..46dcdf4 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -164,8 +164,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -165,8 +165,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -154,7 +153,7 @@ index 958d350..312ddfa 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index 7787fad..0bf29fb 100644 +index 2864ee0..0e27bb6 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile @@ -202,7 +202,7 @@ release_spec: opt @@ -167,7 +166,7 @@ index 7787fad..0bf29fb 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index 213d433..f1efdac 100644 +index b4b74bd..420f566 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile @@ -171,7 +171,7 @@ release_spec: opt @@ -180,7 +179,7 @@ index 213d433..f1efdac 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index d552349..6aa53b7 100644 +index 9d3abb9..c3d83a5 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile @@ -179,9 +179,7 @@ release_spec: opt @@ -195,7 +194,7 @@ index d552349..6aa53b7 100644 release_docs_spec: diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index decf598..3c3423f 100644 +index 13153bd..0860700 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile @@ -370,8 +370,7 @@ release_spec: opt @@ -209,7 +208,7 @@ index decf598..3c3423f 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index 54d1b60..25d3d43 100644 +index d7b75d8..fba8746 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile @@ -179,8 +179,7 @@ release_spec: opt @@ -223,7 +222,7 @@ index 54d1b60..25d3d43 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index e8536a3..3872160 100644 +index 0ab2b41..c29caeb 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile @@ -198,8 +198,7 @@ release_spec: opt @@ -237,7 +236,7 @@ index e8536a3..3872160 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 1d935c4..0dd00c1 100644 +index 7b4a9cf..290707c 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile @@ -173,7 +173,7 @@ release_spec: opt @@ -250,7 +249,7 @@ index 1d935c4..0dd00c1 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 910e893..2baf92d 100644 +index 574c207..52320b0 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -83,8 +83,6 @@ docs: @@ -263,7 +262,7 @@ index 910e893..2baf92d 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index e8b350c..85da380 100644 +index 85754da..5a6f298 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile @@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -276,7 +275,7 @@ index e8b350c..85da380 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 63cc1c9..af956d9 100644 +index bb2edd4..6b20995 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -156,7 +156,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -289,10 +288,10 @@ index 63cc1c9..af956d9 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 060659b..5e91d0f 100644 +index a08c204..3f5483a 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -222,11 +222,8 @@ release_spec: opt +@@ -230,11 +230,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -307,7 +306,7 @@ index 060659b..5e91d0f 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index 72354ac..f6ed199 100644 +index 4e5a418..c0bb0c3 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -88,7 +88,7 @@ release_spec: opt @@ -320,7 +319,7 @@ index 72354ac..f6ed199 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index 39a41d0..30b0b17 100644 +index ebb7967..b6337cb 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile @@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -335,7 +334,7 @@ index 39a41d0..30b0b17 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 6c8b438..5f918a9 100644 +index ef96f5d..d9a2f0d 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -348,7 +347,7 @@ index 6c8b438..5f918a9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index c68a3f4..4d8e93f 100644 +index 386169f..216b548 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -108,7 +108,6 @@ release_spec: opt @@ -360,7 +359,7 @@ index c68a3f4..4d8e93f 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 0a2e71c..18db0f4 100644 +index e88e28d..e7f44a4 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -117,8 +117,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -373,7 +372,7 @@ index 0a2e71c..18db0f4 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index 4b7a452..ada9464 100644 +index 0a63d54..8a49249 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -427,7 +426,7 @@ index 0f2d6db..4e267f9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index 673431a..c372a37 100644 +index 66e4c3e..2f11670 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -453,7 +452,7 @@ index 16166f5..0ba5845 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 426d1bd..44238b9 100644 +index 7852a21..917cdee 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -487,7 +486,7 @@ index a5ee232..f03e41d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index 280d86a..3cd19f4 100644 +index e8769d2..965d0e7 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile @@ -199,7 +199,7 @@ release_spec: opt @@ -552,7 +551,7 @@ index 67555d5..0620f3a 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 7d68145..71885ef 100644 +index 22426ee..0b0cfb8 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -577,24 +576,11 @@ index b368b12..5eddaf0 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/inviso/src/Makefile b/lib/inviso/src/Makefile -index 292a2be..b1c9a1f 100644 ---- a/lib/inviso/src/Makefile -+++ b/lib/inviso/src/Makefile -@@ -87,8 +87,6 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" - # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index c76ff9e..7706204 100644 +index cb3c0a4..dbda2a2 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -198,7 +198,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -603,7 +589,7 @@ index c76ff9e..7706204 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index 42030c5..282419f 100644 +index d18da53..4a9f4d2 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -113,7 +113,7 @@ release_spec: opt @@ -616,10 +602,10 @@ index 42030c5..282419f 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 695599b..187ccac 100644 +index c1fd66b..0699ffa 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile -@@ -198,7 +198,7 @@ release_spec: opt +@@ -175,7 +175,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" @@ -642,10 +628,10 @@ index 7cecef1..841a88a 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index b36ef26..2e748fe 100644 +index bd62e8b..cce5a8d 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -276,8 +276,6 @@ release_spec: opt +@@ -267,8 +267,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_DIR) "$(RELSYSDIR)/include" @@ -694,10 +680,10 @@ index 9486804..ea4830c 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 6f28943..ead350f 100644 +index ac38fa0..20bce7e 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -707,10 +693,10 @@ index 6f28943..ead350f 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 7135a6a..c8e78e6 100644 +index 42f5c19..a98b706 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -130,7 +130,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -131,7 +131,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -719,7 +705,7 @@ index 7135a6a..c8e78e6 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index 2af65cc..2358d16 100644 +index bfbda8a..6e4ad54 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -732,7 +718,7 @@ index 2af65cc..2358d16 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 769c08a..cfc56b3 100644 +index 8140620..73df530 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile @@ -144,8 +144,8 @@ release_spec: opt @@ -747,10 +733,10 @@ index 769c08a..cfc56b3 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 72610de..a800d2f 100644 +index 1c6781e..e471f88 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile -@@ -257,7 +257,7 @@ release_spec: opt +@@ -256,7 +256,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -760,7 +746,7 @@ index 72610de..a800d2f 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 79a4076..1197250 100644 +index 4e78cf8..69d434c 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -772,7 +758,7 @@ index 79a4076..1197250 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 03298d3..83b2e05 100644 +index 4f03d02..756db7b 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -785,10 +771,10 @@ index 03298d3..83b2e05 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index 4f199da..bffd62f 100644 +index 2ee2285..ea075ed 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile -@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -798,7 +784,7 @@ index 4f199da..bffd62f 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index 253a8c2..6720c05 100644 +index 6bf0af9..e501539 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile @@ -93,8 +93,6 @@ docs: @@ -811,7 +797,7 @@ index 253a8c2..6720c05 100644 # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile -index fa01fe7..5197f4b 100644 +index eb0413b..4f5419b 100644 --- a/lib/pman/src/Makefile +++ b/lib/pman/src/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -824,7 +810,7 @@ index fa01fe7..5197f4b 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 957c332..26d9420 100644 +index a4e36c7..432e73a 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -95,8 +95,8 @@ release_spec: opt @@ -839,10 +825,10 @@ index 957c332..26d9420 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index d5cd13d..d2a35f8 100644 +index 09393e8..eb4c54d 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -48,8 +48,6 @@ MODULES = \ +@@ -49,8 +49,6 @@ MODULES = \ HRL_FILES = $(INCLUDE)/public_key.hrl @@ -851,7 +837,7 @@ index d5cd13d..d2a35f8 100644 ERL_FILES = $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -@@ -102,8 +100,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -103,8 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -861,10 +847,10 @@ index d5cd13d..d2a35f8 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index a7e3405..3705dd9 100644 +index b8387ff..2012af9 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile -@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -99,7 +99,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -874,10 +860,10 @@ index a7e3405..3705dd9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 810e3e8..b529c92 100644 +index 2347986..b7f57b8 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -99,8 +99,6 @@ docs: +@@ -95,8 +95,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -887,7 +873,7 @@ index 810e3e8..b529c92 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index de0c45e..58c2ecb 100644 +index ab2d3a3..bb53a67 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -912,7 +898,7 @@ index beed696..752072d 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index f7c311b..59d68b8 100644 +index 716add8..59ce2ef 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -964,10 +950,10 @@ index 698c341..3344a0c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index b8eecd3..41bf50c 100644 +index 93d0b54..5904bc2 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -977,7 +963,7 @@ index b8eecd3..41bf50c 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index c5c5bf5..a7ac1aa 100644 +index 043645b..ef98c3b 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -990,10 +976,10 @@ index c5c5bf5..a7ac1aa 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 1430482..d217c2d 100644 +index f3387d6..4c5e622 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -1002,7 +988,7 @@ index 1430482..d217c2d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index dca5e78..6a65bfe 100644 +index c9fbad8..2fc7f18 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -1015,10 +1001,10 @@ index dca5e78..6a65bfe 100644 release_docs_spec: diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 513720d..09766b1 100644 +index ebc5f5b..471375c 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile -@@ -125,7 +125,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -124,7 +124,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -1027,7 +1013,7 @@ index 513720d..09766b1 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile -index 102970a..bdf63b5 100644 +index a248469..96c42df 100644 --- a/lib/toolbar/src/Makefile +++ b/lib/toolbar/src/Makefile @@ -85,7 +85,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -1040,7 +1026,7 @@ index 102970a..bdf63b5 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index abe1389..e5e4874 100644 +index e606b97..1beb8cc 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile @@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -1053,7 +1039,7 @@ index abe1389..e5e4874 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile -index da1713e..4436ac7 100644 +index 3d680c1..e6ed610 100644 --- a/lib/tv/src/Makefile +++ b/lib/tv/src/Makefile @@ -127,7 +127,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -1066,7 +1052,7 @@ index da1713e..4436ac7 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 1f94d8f..751e76e 100644 +index 13af466..c29a597 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile @@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -1080,7 +1066,7 @@ index 1f94d8f..751e76e 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index 783ffad..37135d3 100644 +index f28c777..346ce37 100644 --- a/lib/webtool/src/Makefile +++ b/lib/webtool/src/Makefile @@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -1093,7 +1079,7 @@ index 783ffad..37135d3 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 777fb7d..f6a5a2a 100644 +index 26574ed..266a5d6 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) @@ -1109,7 +1095,7 @@ index 777fb7d..f6a5a2a 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index ce1aa11..b381ce6 100644 +index d5ce3fe..e21e4b1 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -217,9 +217,7 @@ release_spec: opt diff --git a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch similarity index 96% rename from otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch rename to otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch index 0aa2e82..d7fb120 100644 --- a/otp-0008-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ b/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch @@ -40,10 +40,10 @@ index 3456fd7..86cd411 100644 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 b9b4348..c11702c 100644 +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 -@@ -1074,17 +1074,8 @@ public class OtpInputStream extends ByteArrayInputStream { +@@ -1112,17 +1112,8 @@ public class OtpInputStream extends ByteArrayInputStream { case OtpExternal.nilTag: return ""; case OtpExternal.listTag: // List when unicode + diff --git a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch b/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch deleted file mode 100644 index c05258b..0000000 --- a/otp-0009-Restore-installation-of-a-n-internal-erl_interface-A.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 26 Jun 2012 15:16:39 +0400 -Subject: [PATCH] Restore installation of a n internal erl_interface API - headers - -See rhbz #818419 for the explanation why they're necessary for low-level -interaction with Erlang nodes: - -https://bugzilla.redhat.com/818419 - -Signed-off-by: Peter Lemenkov ---- - lib/erl_interface/src/Makefile.in | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 9aeba86..708d0a1 100644 ---- a/lib/erl_interface/src/Makefile.in -+++ b/lib/erl_interface/src/Makefile.in -@@ -846,11 +846,29 @@ release: opt - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/lib" - $(INSTALL_DIR) "$(RELSYSDIR)/bin" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/auxdir" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/connect" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/decode" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/encode" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/epmd" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/legacy" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/prog" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/registry" - $(INSTALL_DATA) $(HEADERS) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib" - ifneq ($(EXE_TARGETS),) - $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" - endif -+ $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" -+ $(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/otp-get-patches.sh b/otp-get-patches.sh deleted file mode 100755 index 5033e60..0000000 --- a/otp-get-patches.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# Usage: -# ./otp-get-patches.sh /path/to/otp OTP_R14B02 fedora-R14B02 -# -# otp-get-patches.sh - update erlang.spec and otp-00*.patch files -# -# otp-get-patches.sh updates the erlang.spec and otp-00*.patch -# files in the git index. After an otp-get-patches.sh run, you -# will need to review the stage git changes, possibly adapt the -# Release: and %changelog parts of erlang spec, and can then -# "git commit" everything. -# -# Caution: Leave the four special comment lines untouched in the -# spec file, as otp-get-patches.sh requires them and will only -# touch erlang.spec between the respective start/end pair: -# -# # 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'}" -otp_upstream="${2:?'Fatal: git ref to upstream release required'}" -otp_fedora="${3:?'Fatal: git ref to branch with fedora patches required'}" - -# Setup -set -e -# set -x -tmpdir="$(mktemp -d --tmpdir="$PWD")" - -# Generate patch files -pushd "$otp_dir" -git format-patch -N -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" -popd - -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 "$newspec2" "$specfile" -git add "$specfile" - -rm -rf "$tmpdir" -# End of file. diff --git a/otp_src_R16A_RELEASE_CANDIDATE.readme b/otp_src_R16A_RELEASE_CANDIDATE.readme new file mode 100644 index 0000000..53c3db5 --- /dev/null +++ b/otp_src_R16A_RELEASE_CANDIDATE.readme @@ -0,0 +1,2250 @@ +Major release : otp_src_R16A +Build date : 2013-01-29 + +R16A is a major new release of Erlang/OTP. +You can download the full source distribution from + + http://www.erlang.org/download/otp_src_R16A.tar.gz + http://www.erlang.org/download/otp_src_R16A.readme (this file) + +Note: To unpack the TAR archive you need a GNU TAR compatible program. + +For installation instructions please read the README that is part of +the distribution. + +The Windows binary distribution can be downloaded from + + http://www.erlang.org/download/otp_win32_R16A.exe + http://www.erlang.org/download/otp_win64_R16A.exe + + +On-line documentation can be found at http://www.erlang.org/doc/. +You can also download the complete HTML documentation or the Unix manual files + + http://www.erlang.org/download/otp_doc_html_R16A.tar.gz + http://www.erlang.org/download/otp_doc_man_R16A.tar.gz + +We also want to thank those that sent us patches, suggestions and bug reports, + +The OTP Team + + +--- HIGHLIGHTS ---------------------------------------------------------- + + OTP-7786 == ssh == + + Added User Guide for the SSH application + + OTP-9892 == erts == + + Process optimizations. The most notable: + + -- New internal process table implementation allowing for + both parallel reads as well as writes. Especially read + operations have become really cheap. This reduce contention + in various situations. For example when, spawning processes, + terminating processes, sending messages, etc. + + -- Optimizations of run queue management reducing contention. + + -- Optimizations of process state changes reducing + contention. + + These changes imply changes of the characteristics the + system. Most notable: changed timing in the system. + + OTP-9974 == erts == + + Non-blocking code loading. Earlier when an Erlang module was + loaded, all other execution in the VM were halted while the + load operation was carried out in single threaded mode. Now + modules are loaded without blocking the VM. Processes may + continue executing undisturbed in parallel during the entire + load operation. The load operation is completed by making the + loaded code visible to all processes in a consistent way with + one single atomic instruction. Non-blocking code loading will + improve realtime characteristics when modules are + loaded/upgraded on a running SMP system. + + OTP-10256 == inets == + + httpc: The HTTP client now supports HTTPS through proxies + + OTP-10336 == erts == + + Major port improvements. The most notable: + + -- New internal port table implementation allowing for both + parallel reads as well as writes. Especially read operations + have become really cheap.This reduce contention in various + situations. For example when, creating ports, terminating + ports, etc. + + -- Dynamic allocation of port structures. This allow for a + much larger maximum amount of ports allowed as a default. The + previous default of 1024 has been raised to 65536. Maximum + amount of ports can be set using the +Q command line flag of + erl(1). The previously used environment variable + ERL_MAX_PORTS has been deprecated and scheduled for removal + in OTP-R17. + + -- Major rewrite of scheduling of port tasks. Major benefits + of the rewrite are reduced contention on run queue locks, and + reduced amount of memory allocation operations needed. The + rewrite was also necessary in order to make it possible to + schedule signals from processes to ports. + + -- Improved internal thread progress functionality for easy + management of unmanaged threads. This improvement was + necessary for the rewrite of the port task scheduling. + + -- Rewrite of all process to port signal implementations in + order to make it possible to schedule those operations. All + port operations can now be scheduled which allows for reduced + lock contention on the port lock as well as truly + asynchronous communication with ports. + + -- Optimized lookup of port handles from drivers. + + -- Optimized driver lookup when creating ports. + + -- Preemptable erlang:ports/0 BIF. + + -- Improving responsiveness by bumping reductions for a + process calling a driver callback directly. + + These changes imply changes of the characteristics of the + system. The most notable: + + -- Order of signal delivery -- The previous implementation of + the VM has delivered signals from processes to ports in a + synchronous stricter fashion than required by the language. + As of ERTS version 5.10, signals are truly asynchronously + delivered. The order of signal delivery still adheres to the + requirements of the language, but only to the requirements. + That is, some signal sequences that previously always were + delivered in one specific order may now from time to time be + delivered in different orders. This may cause Erlang programs + that have made false assumptions about signal delivery order + to fail even though they previously succeeded. For more + information about signal ordering guarantees, see the chapter + on communication in the ERTS user's guide. The +n command + line flag of erl(1) can be helpful when trying to find + signaling order bugs in Erlang code that have been exposed by + these changes. + + -- Latency of signals sent from processes to ports -- Signals + from processes to ports where previously always delivered + immediately. This kept latency for such communication to a + minimum, but it could cause lock contention which was very + expensive for the system as a whole. In order to keep this + latency low also in the future, most signals from processes + to ports are by default still delivered immediately as long + as no conflicts occur. Such conflicts include not being able + to acquire the port lock, but also include other conflicts. + When a conflict occur, the signal will be scheduled for + delivery at a later time. A scheduled signal delivery may + cause a higher latency for this specific communication, but + improves the overall performance of the system since it + reduce lock contention between schedulers. The default + behavior of only scheduling delivery of these signals on + conflict can be changed by passing the +spp command line flag + to erl(1). The behavior can also be changed on port basis + using the parallelism option of the open_port/2 BIF. + + -- Execution time of the erlang:ports/0 BIF -- Since + erlang:ports/0 now can be preempted, the responsiveness of + the system as a whole has been improved. A call to + erlang:ports/0 may, however, take a much longer time to + complete than before. How much longer time heavily depends on + the system load. + + -- Reduction cost of calling driver callbacks -- Calling a + driver callback is quite costly. This was previously not + reflected in reduction cost at all. Since the reduction cost + now has increased, a process performing lots of direct driver + calls will be scheduled out more frequently than before. + + Potential incompatibilities: + + -- driver_send_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_send_term() with usage of erl_drv_send_term(). + + -- driver_output_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_output_term() with usage of erl_drv_output_term(). + + -- The new function erl_drv_busy_msgq_limits() has been added + in order to able to control management of port queues. + + The driver API version has been bumped to 2.1 from 2.0 due to + the above changes in the driver API. + + OTP-10410 == asn1 == + + The options for the ASN.1 compiler has been drastically + simplified. The backend is chosen by using ber, per, or uper. + The options optimize, nif, and driver are no longer needed. + The old options will still work, but will issue a warning. + + Another change is that generated encode/2 function will + always return a binary (some backends used to return an + iolist). + + OTP-10588 == asn1 == + + The ASN.1 compiler will now always include necessary run-time + functions in the generated Erlang modules (except for + asn1rt_nif which is still neeeded). If the option 'inline' is + used the ASN.1 compiler will generate a warning. But if + '{inline,OutputFile}' is use, the ASN.1 compiler will refuse + to compile the file. (Use a .set.asn file if you need to + remove the output file.) + + The 'BIT STRING' type will now be decoded as Erlang + bitstrings by default. Use the new legacy_bit_string option + to encode as lists of ones and zeroes. (The + compact_bit_string option still works as before.) + + Open types are now always returned as binaries (when there is + no information allowing them to be decoded). + + +--- POTENTIAL INCOMPATIBILITIES ----------------------------------------- + + OTP-9881 == common_test == + + It is now possible to let a test specification include other + test specifications. Included specs can either be joined with + the source spec (and all other joined specs), resulting in + one single test run, or they can be executed in separate test + runs. Also, a start flag/option, join_specs, has been + introduced, to be used in combination with the spec option. + With join_specs, Common Test can be told to either join + multiple test specifications, or run them separately. Without + join_specs, the latter behaviour is default. Note that this + is a change compared to earlier versions of Common Test, + where specifications could only be joined. More information + can be found in the Running Tests chapter in the User's Guide + (see the Test Specifications section). + + OTP-10117 == inviso == + + The inviso application has been removed. + + OTP-10170 == erts == + + Tuple funs (deprecated in R15B) are no longer supported. + + OTP-10195 == edoc == + + Since EDoc 0.7.7 (R14B02) separate values of union types can + be annotated. However, the parser has hitherto chosen not to + add the necessary parentheses due to backwards compatibility. + + From this release on code traversing the output of + edoc_parser needs to take care of parentheses around separate + values of union types. Examples of such code are layout + modules and doclet modules. + + OTP-10336 == erts == + + Major port improvements. The most notable: + + -- New internal port table implementation allowing for both + parallel reads as well as writes. Especially read operations + have become really cheap.This reduce contention in various + situations. For example when, creating ports, terminating + ports, etc. + + -- Dynamic allocation of port structures. This allow for a + much larger maximum amount of ports allowed as a default. The + previous default of 1024 has been raised to 65536. Maximum + amount of ports can be set using the +Q command line flag of + erl(1). The previously used environment variable + ERL_MAX_PORTS has been deprecated and scheduled for removal + in OTP-R17. + + -- Major rewrite of scheduling of port tasks. Major benefits + of the rewrite are reduced contention on run queue locks, and + reduced amount of memory allocation operations needed. The + rewrite was also necessary in order to make it possible to + schedule signals from processes to ports. + + -- Improved internal thread progress functionality for easy + management of unmanaged threads. This improvement was + necessary for the rewrite of the port task scheduling. + + -- Rewrite of all process to port signal implementations in + order to make it possible to schedule those operations. All + port operations can now be scheduled which allows for reduced + lock contention on the port lock as well as truly + asynchronous communication with ports. + + -- Optimized lookup of port handles from drivers. + + -- Optimized driver lookup when creating ports. + + -- Preemptable erlang:ports/0 BIF. + + -- Improving responsiveness by bumping reductions for a + process calling a driver callback directly. + + These changes imply changes of the characteristics of the + system. The most notable: + + -- Order of signal delivery -- The previous implementation of + the VM has delivered signals from processes to ports in a + synchronous stricter fashion than required by the language. + As of ERTS version 5.10, signals are truly asynchronously + delivered. The order of signal delivery still adheres to the + requirements of the language, but only to the requirements. + That is, some signal sequences that previously always were + delivered in one specific order may now from time to time be + delivered in different orders. This may cause Erlang programs + that have made false assumptions about signal delivery order + to fail even though they previously succeeded. For more + information about signal ordering guarantees, see the chapter + on communication in the ERTS user's guide. The +n command + line flag of erl(1) can be helpful when trying to find + signaling order bugs in Erlang code that have been exposed by + these changes. + + -- Latency of signals sent from processes to ports -- Signals + from processes to ports where previously always delivered + immediately. This kept latency for such communication to a + minimum, but it could cause lock contention which was very + expensive for the system as a whole. In order to keep this + latency low also in the future, most signals from processes + to ports are by default still delivered immediately as long + as no conflicts occur. Such conflicts include not being able + to acquire the port lock, but also include other conflicts. + When a conflict occur, the signal will be scheduled for + delivery at a later time. A scheduled signal delivery may + cause a higher latency for this specific communication, but + improves the overall performance of the system since it + reduce lock contention between schedulers. The default + behavior of only scheduling delivery of these signals on + conflict can be changed by passing the +spp command line flag + to erl(1). The behavior can also be changed on port basis + using the parallelism option of the open_port/2 BIF. + + -- Execution time of the erlang:ports/0 BIF -- Since + erlang:ports/0 now can be preempted, the responsiveness of + the system as a whole has been improved. A call to + erlang:ports/0 may, however, take a much longer time to + complete than before. How much longer time heavily depends on + the system load. + + -- Reduction cost of calling driver callbacks -- Calling a + driver callback is quite costly. This was previously not + reflected in reduction cost at all. Since the reduction cost + now has increased, a process performing lots of direct driver + calls will be scheduled out more frequently than before. + + Potential incompatibilities: + + -- driver_send_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_send_term() with usage of erl_drv_send_term(). + + -- driver_output_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_output_term() with usage of erl_drv_output_term(). + + -- The new function erl_drv_busy_msgq_limits() has been added + in order to able to control management of port queues. + + The driver API version has been bumped to 2.1 from 2.0 due to + the above changes in the driver API. + + OTP-10410 == asn1 == + + The options for the ASN.1 compiler has been drastically + simplified. The backend is chosen by using ber, per, or uper. + The options optimize, nif, and driver are no longer needed. + The old options will still work, but will issue a warning. + + Another change is that generated encode/2 function will + always return a binary (some backends used to return an + iolist). + + OTP-10417 == kernel sasl == + + It is no longer possible to have {Mod,Vsn} in the 'modules' + list in a .app file. + + This was earlier possible, although never documented in the + .app file reference manual. It was however visible in the + documentation of application:load/[1,2], where the same term + as in a .app file can be used as the first argument. + + The possibility has been removed since the Vsn part was never + used. + + OTP-10451 == ssl == + + Remove filter mechanisms that made error messages backwards + compatible with old ssl but hid information about what + actually happened. + + This does not break the documented API however other reason + terms may be returned, so code that matches on the reason + part of {error, Reason} may fail. + + OTP-10490 == stdlib == + + If a child process fails in its start function, then the + error reason was earlier only reported as an error report + from the error_handler, and supervisor:start_link would only + return {error,shutdown}. This has been changed so the + supervisor will now return {error,{shutdown,Reason}}, where + Reason identifies the failing child and its error reason. + (Thanks to Tomas Pihl) + + OTP-10523 == tools == + + A new function, cover:flush(Nodes), is added which will fetch + data from remote nodes without stopping cover on those nodes. + This is used by test_server and common_test when it is safe + to assume that the node will be terminated after the test + anyway. The purpose is to avoid processes crashing when + re-loading the original beam if the processes is still + running old code. + + Remote nodes will now continue to count code coverage if the + connection to the main node is broken. Earlier, a broken + connection would cause the cover_server on the remote node to + die and thus any still cover compiled modules would cause + process crash when trying to insert cover data in ets tables + that used to exist on the cover_server. The new functionality + also involves synchronization with the main node if the nodes + are reconnected. + + OTP-10588 == asn1 == + + The ASN.1 compiler will now always include necessary run-time + functions in the generated Erlang modules (except for + asn1rt_nif which is still neeeded). If the option 'inline' is + used the ASN.1 compiler will generate a warning. But if + '{inline,OutputFile}' is use, the ASN.1 compiler will refuse + to compile the file. (Use a .set.asn file if you need to + remove the output file.) + + The 'BIT STRING' type will now be decoded as Erlang + bitstrings by default. Use the new legacy_bit_string option + to encode as lists of ones and zeroes. (The + compact_bit_string option still works as before.) + + Open types are now always returned as binaries (when there is + no information allowing them to be decoded). + + OTP-10613 == ssl == + + Removed deprecated function ssl:pid/0, it has been pointless + since R14 but has been keep for backwards compatibility. + + OTP-10633 == erts == + + Erlang specification 4.7.3 defines max tuple size to 65535 + elements It is now enforced to no more than 16777215 elements + (arity 24 bits) + + Previous edge cases (28 bits) were not validated and could + cause undefined behaviour. + + OTP-10647 == erts == + + The previous default of a maximum of 32768 simultaneous + processes has been raised to 262144. This value can be + changed using the the +P command line flag of erl(1). Note + that the value passed now is considered as a hint, and that + actual value chosen in most cases will be a power of two. + +--- CHARACTERISTICS IMPACT ----------------------------------------------- + + OTP-9892 == erts == + + Process optimizations. The most notable: + + -- New internal process table implementation allowing for + both parallel reads as well as writes. Especially read + operations have become really cheap. This reduce contention + in various situations. For example when, spawning processes, + terminating processes, sending messages, etc. + + -- Optimizations of run queue management reducing contention. + + -- Optimizations of process state changes reducing + contention. + + These changes imply changes of the characteristics the + system. Most notable: changed timing in the system. + + + OTP-9974 == erts == + + Non-blocking code loading. Earlier when an Erlang module was + loaded, all other execution in the VM were halted while the + load operation was carried out in single threaded mode. Now + modules are loaded without blocking the VM. Processes may + continue executing undisturbed in parallel during the entire + load operation. The load operation is completed by making the + loaded code visible to all processes in a consistent way with + one single atomic instruction. Non-blocking code loading will + improve realtime characteristics when modules are + loaded/upgraded on a running SMP system. + + OTP-10122 == erts == + + In the SMP emulator, turning on and off tracing will no + longer take down the system to single-scheduling. + + OTP-10167 == erts == + + Optimized deletion of ETS-tables which significantly improves + performance when large amounts of temporary tables are used. + + This change imply changes of the characteristics the system. + Most notable: changed timing in the system. + + OTP-10273 == erts == + + New internal header scheme for allocators + + Impact: Reduces size on object allocated in multiblock + carriers by one word + + OTP-10336 == erts == + + Major port improvements. + + These changes imply changes of the characteristics of the + system. The most notable: + + -- Order of signal delivery -- The previous implementation of + the VM has delivered signals from processes to ports in a + synchronous stricter fashion than required by the language. + As of ERTS version 5.10, signals are truly asynchronously + delivered. The order of signal delivery still adheres to the + requirements of the language, but only to the requirements. + That is, some signal sequences that previously always were + delivered in one specific order may now from time to time be + delivered in different orders. This may cause Erlang programs + that have made false assumptions about signal delivery order + to fail even though they previously succeeded. For more + information about signal ordering guarantees, see the chapter + on communication in the ERTS user's guide. The +n command + line flag of erl(1) can be helpful when trying to find + signaling order bugs in Erlang code that have been exposed by + these changes. + + -- Latency of signals sent from processes to ports -- Signals + from processes to ports where previously always delivered + immediately. This kept latency for such communication to a + minimum, but it could cause lock contention which was very + expensive for the system as a whole. In order to keep this + latency low also in the future, most signals from processes + to ports are by default still delivered immediately as long + as no conflicts occur. Such conflicts include not being able + to acquire the port lock, but also include other conflicts. + When a conflict occur, the signal will be scheduled for + delivery at a later time. A scheduled signal delivery may + cause a higher latency for this specific communication, but + improves the overall performance of the system since it + reduce lock contention between schedulers. The default + behavior of only scheduling delivery of these signals on + conflict can be changed by passing the +spp command line flag + to erl(1). The behavior can also be changed on port basis + using the parallelism option of the open_port/2 BIF. + + -- Execution time of the erlang:ports/0 BIF -- Since + erlang:ports/0 now can be preempted, the responsiveness of + the system as a whole has been improved. A call to + erlang:ports/0 may, however, take a much longer time to + complete than before. How much longer time heavily depends on + the system load. + + -- Reduction cost of calling driver callbacks -- Calling a + driver callback is quite costly. This was previously not + reflected in reduction cost at all. Since the reduction cost + now has increased, a process performing lots of direct driver + calls will be scheduled out more frequently than before. + + OTP-10661 == erts == + + The previously (in R15) proposed scheduler wakeup strategy is + now used by default. This strategy is not as quick to forget + about previous overload as the previous strategy. + + This change imply changes of the characteristics the system. + Most notable: When a small overload comes and then disappears + repeatedly, the system will for a bit longer time be willing + to wake up schedulers than before. Timing in the system will + due to this also change. + + The previous strategy can still be enabled by passing the + +sws legacy command line flag to erl. + + OTP-10736 == erts == + + The runtime system will now by default use 10 async threads + if thread support has been enabled when building the runtime + system. + + This will prevent long blocking file-operations from blocking + scheduler threads for long periods of time, which can be + harmful. Apart from file-operations, it also effects other + operations scheduled on the async thread pool by user + implemented drivers. + + The amount of async threads can be controlled by using the +A + command line argument of erl(1). When running some offline + tools you might want to disable async threads, but you are + advised not to in the general case. Instead, you might want + to increase the amount of async threads used. + + This change imply changes of the characteristics the system + compared to the previous default. The responsiveness of the + system as a whole will be improved. Operations scheduled on + the async thread pool will get an increased latency. The + throughput of these operations may increase, or decrease + depending on the type of the operations and how they get + scheduled. In the case of file operations, the throughput + very much depends on how the Erlang application access files. + Multiple concurrent accesses to different files have the + potential of an increased throughput. + + OTP-10737 == erts == + + The default reader group limit has been increased to 64 from + 8. This limit can be set using the +rg command line argument + of erl(1). + + This change of default value will reduce lock contention on + ETS tables using the read_concurrency option at the expense + of memory consumption when the amount of schedulers and + logical processors are beween 8 and 64. For more information, + see documentation of the +rg command line argument of erl(1). + + OTP-10787 == erts == + + Increased potential concurrency in ETS for write_concurrency + option. The number of internal table locks has increased from + 16 to 64. This makes it four times less likely that two + concurrent processes writing to the same table would collide + and thereby serialized. The cost is an increased constant + memory footprint for tables using write_concurrency. The + memory consumption per inserted record is not affected. The + increased footprint can be particularly large if + write_concurrency is combined with read_concurrency. + + OTP-10519 == asn1 == + + The ASN.1 compiler generates faster decode functions for PER + and UPER. Some minor improvements have also been made for + PER/UPER encoding, and to the BER backend. + + OTP-10506 == odbc == + + Under Unix enable TCP_NODELAY to disable Nagel's socket + algorithm. Thanks to Andy Richards + + Impact: Performance gain on Unix systems + + OTP-10361 == ssl == + + Support Next Protocol Negotiation in TLS, thanks to Ben + Murphy for the contribution. + + Impact: Could give performance benefit if used as it saves a + round trip. + + OTP-10425 == ssl == + + TLS 1.2 will now be the default TLS version if sufficient + crypto support is available otherwise TLS 1.1 will be + default. + + Impact: A default TLS connection will have higher security + and hence it may be perceived as slower then before. + + OTP-10710 == ssl == + + Now handles cleaning of CA-certificate database correctly so + that there will be no memory leek, bug was introduced in ssl- + 5.1 when changing implementation to increase parallel + execution. + + Impact: Improved memory usage, especially if you have many + different certificates and upgrade tcp-connections to + TLS-connections. + + + +--- inviso -------------------------------------------------------------- + + OTP-10117 The inviso application has been removed. + + +--- otp ----------------------------------------------------------------- + + OTP-9684 Most specs for built in functions now reside in their + respective module instead of being coded in the erl_bif_types + module of the Hipe application. This creatyes a single source + for specifications and documentation, which should radically + lessen the risk for differences between the docs and the + actual spec seen by dialyzer. + + OTP-9862 Many types and specifications that used to reside in + erl_bif_types have been moved into respective module. + + OTP-10616 The experimental feature "parameterized modules" (also called + "abstract modules") has been removed. For applications that + depends on parameterized modules, there is a parse transform + that can be used to still use parameterized modules. The + parse transform can be found at: + github.com/erlang/pmod_transform + + OTP-10726 Implement ./otp_build configure --enable-silent-rules + + With silent rules, the output of make is less verbose and + compilation warnings are easier to spot. Silent rules are + disabled by default and can be disabled or enabled at will by + make V=0 and make V=1. (Thanks to Anthony Ramine) + + +--- appmon-2.1.14.2 ----------------------------------------------------- + + OTP-10784 Misc build updates + + OTP-10786 The backend module appmon_info.erl is moved from appmon + application to runtime_tools. This allows appmon to be run + from a remote erlang node towards a target node which does + not have appmon (and its dependencies) installed, as long as + runtime_tools is installed there. + + +--- asn1-2.0 ------------------------------------------------------------ + + OTP-10410 The options for the ASN.1 compiler has been drastically + simplified. The backend is chosen by using ber, per, or uper. + The options optimize, nif, and driver are no longer needed. + The old options will still work, but will issue a warning. + + Another change is that generated encode/2 function will + always return a binary (some backends used to return an + iolist). + + OTP-10519 The ASN.1 compiler generates faster decode functions for PER + and UPER. Some minor improvements have also been made for + PER/UPER encoding, and to the BER backend. + + OTP-10588 The ASN.1 compiler will now always include necessary run-time + functions in the generated Erlang modules (except for + asn1rt_nif which is still needed). If the option 'inline' is + used the ASN.1 compiler will generate a warning. But if + '{inline,OutputFile}' is use, the ASN.1 compiler will refuse + to compile the file. (Use a .set.asn file if you need to + remove the output file.) + + The 'BIT STRING' type will now be decoded as Erlang + bitstrings by default. Use the new legacy_bit_string option + to encode as lists of ones and zeroes. (The + compact_bit_string option still works as before.) + + Open types are now always returned as binaries (when there is + no information allowing them to be decoded). + + OTP-10664 Encoding SEQUENCEs with multiple extension addition groups + with optional values could fail (depending both on the + specification and whether all values were provided). + + +--- common_test-1.6.3.1 ------------------------------------------------- + + OTP-10589 The following corrections/changes are done in the cth_surefire + hook: Earlier there would always be a 'properties' element + under the 'testsuites' element. This would exist even if + there were no 'property' element inside it. This has been + changed so if there are no 'property' elements to display, + then there will not be a 'properties' element either. The + XML file will now (unless other is specified) be stored + in the top log directory. Earlier, the default directory + would be the current working directory for the erlang node, + which would mostly, but not always, be the top log directory. + The 'hostname' attribute in the 'testsuite' element would + earlier never have the correct value. This has been corrected. + The 'errors' attribute in the 'testsuite' element would + earlier display the number of failed testcases. This has + been changed and will now always have the value 0, while + the 'failures' attribute will show the number of failed + testcases. A new attribute 'skipped' is added to the 'testsuite' + element. This will display the number of skipped testcases. + These would earlier be included in the number of failed + test cases. The total number of tests displayed by the 'tests' + attribute in the 'testsuite' element would earlier include + init/end_per_suite and init/end_per_group. This is no longer + the case. The 'tests' attribute will now only count "real" + test cases. Earlier, auto skipped test cases would have + no value in the 'log' attribute. This is now corrected. + A new attributes 'log' is added to the 'testsuite' element. + A new option named 'url_base' is added for this hook. If + this option is used, a new attribute named 'url' will be + added to the 'testcase' and 'testsuite' elements. + + +--- common_test-1.7 ----------------------------------------------------- + + OTP-9769 Severe errors detected by test_server (e.g. if log files + directories cannot be created) will now be reported to + common_test and noted in the common_test logs. + + OTP-9870 The earlier undocumented cross cover feature for accumulating + cover data over multiple tests has now been fixed and + documented. + + OTP-9881 It is now possible to let a test specification include other + test specifications. Included specs can either be joined with + the source spec (and all other joined specs), resulting in + one single test run, or they can be executed in separate test + runs. Also, a start flag/option, join_specs, has been + introduced, to be used in combination with the spec option. + With join_specs, Common Test can be told to either join + multiple test specifications, or run them separately. Without + join_specs, the latter behaviour is default. Note that this + is a change compared to earlier versions of Common Test, + where specifications could only be joined. More information + can be found in the Running Tests chapter in the User's Guide + (see the Test Specifications section). + + OTP-10040 If a busy test case generated lots of error messages, + cth_log_redirect:post_end_per_testcase would crash with a + timeout while waiting for the error logger to finish handling + all error reports. The default timer was 5 seconds. This has + now been extended to 5 minutes. + + OTP-10070 When a test case failed because of a timetrap time out, the + Config data for the case was lost in the following call to + end_per_testcase/2, and also in calls to the CT Hook function + post_end_per_testcase/4. This problem has been solved and the + Config data is now correctly passed to the above functions + after a timetrap timeout failure. + + OTP-10088 Some calls to deprecated and removed functions in snmp are + removed from ct_snmp. + + OTP-10101 In test_server, the same process would supervise the + currently running test case and be group leader (and IO + server) for the test case. Furthermore, when running parallel + test cases, new temporary supervisor/group leader processes + were spawned and the process that was group leader for + sequential test cases would not be active. That would lead to + several problems: + + * Processes started by init_per_suite will inherit the group + leader of the init_per_suite process (and that group leader + would not process IO requests when parallel test cases was + running). If later a parallel test case caused such a + processto print using (for example) io:format/2, the calling + would hang. + + * Similarly, if a process was spawned from a parallel test + case, it would inherit the temporary group leader for that + parallel test case. If that spawned process later - when the + group of parallel tests have finished - attempted to print + something, its group leader would be dead and there would be + badarg exception. + + Those problems have been solved by having group leaders + separate from the processes that supervises the test cases, + and keeping temporary group leader process for parallel test + cases alive until no more process in the system use them as + group leaders. + + Also, a new unexpected_io.log log file (reachable from the + summary page of each test suite) has been introduced. All + unexpected IO will be printed into it(for example, IO to a + group leader for a parallel test case that has finished). + + OTP-10432 Some bugfixes in ct_snmp: + + -- ct_snmp will now use the value of the 'agent_vsns' config + variable when setting the 'variables' parameter to snmp + application agent configuration. Earlier this had to be done + separately - i.e. the supported versions had to be specified + twice. + + -- Snmp application failed to write notify.conf since ct_snmp + gave the notify type as a string instead of an atom. This has + been corrected. + + OTP-10434 Some bugfixes in ct_snmp: + + -- Functions register_users/2, register_agents/2 and + register_usm_users/2, and the corresponding unregister_*/1 + functions were not executable. These are corrected/rewritten. + + -- Function update_usm_users/2 is removed, and an unregister + function is added instead. Update can now be done with + unregister_usm_users and then register_usm_users. + + -- Functions unregister_*/2 are added, so specific + users/agents/usm users can be unregistered. + + -- Function unload_mibs/1 is added for completeness. + + -- Overriding configuration files did not work, since the + files were written in priv_dir instead of in the + configuration dir (priv_dir/conf). This has been corrected. + + -- Arguments to register_usm_users/2 were faulty documented. + This has been corrected. + + OTP-10469 The ct_slave:start/3 function now supports an + {env,[{Var,Value}]} option to extend environment for the + slave node. + + OTP-10601 Faulty exported specs in common test has been corrected to + ct_netconfc:hook_options/0 and inet:hostname/0 + + OTP-10646 The netconf client in common_test did not adjust the window + after receiving data. Due to this, the client stopped + receiving data after a while. This has been corrected. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10783 Update common test modules to handle unicode + + -- Use UTF-8 encoding for all HTML files, except the HTML + version of the test suite generated with erl2html2:convert, + which will have the same encoding as the original test suite + (.erl) file. + + -- Encode link targets in HTML files with + test_server_ctrl:uri_encode/1. + + -- Use unicode modifier 't' with ~s when appropriate. + + -- Use unicode:characters_to_list and + unicode:characters_to_binary for conversion between binaries + and strings instead of binary_to_list and list_to_binary. + + +--- compiler-4.9 -------------------------------------------------------- + + OTP-10193 The compiler optimizations have been polished, so that the + code quality will be slightly better in some cases. + + OTP-10302 Support for Unicode has been implemented. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10690 Fix some wrong warnings triggered by the option + inline_list_funcs. Thanks to Anthony Ramine. + + OTP-10706 Forbid local fun variables in Core Erlang guards. Thanks to + Anthony Ramine. + + OTP-10724 Binary syntax matches could cause an internal consistency + error in in the compiler. (Thanks to Viktor Sovietov for + reporting this bug.) + + +--- cosEvent-2.1.13 ----------------------------------------------------- + + OTP-10784 Misc build updates + + +--- cosEventDomain-1.1.13 ----------------------------------------------- + + OTP-10784 Misc build updates + + +--- cosFileTransfer-1.1.14 ---------------------------------------------- + + OTP-10784 Misc build updates + + +--- cosNotification-1.1.19 ---------------------------------------------- + + OTP-10784 Misc build updates + + +--- cosProperty-1.1.16 -------------------------------------------------- + + OTP-10784 Misc build updates + + +--- cosTime-1.1.13 ------------------------------------------------------ + + OTP-10784 Misc build updates + + +--- cosTransactions-1.2.13 ---------------------------------------------- + + OTP-10784 Misc build updates + + +--- crypto-2.3 ---------------------------------------------------------- + + OTP-10596 Enable runtime upgrade of crypto including the OpenSSL + library used by crypto. + + OTP-10640 Improve documentation and tests for hmac functions in crypto. + Thanks to Daniel White + + OTP-10667 Added ripemd160 support to crypto. Thanks to Michael Loftis + + +--- debugger-3.2.9 ------------------------------------------------------ + + OTP-10302 Support for Unicode has been implemented. + + OTP-10621 Fix Debugger settings dialog due to changed behavior in + wxFileDialog (Thanks to Håkan Mattsson) + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10679 Integer lists and utf-8 binaries in variables are now + displayed as strings. + + +--- dialyzer-2.5.4 ------------------------------------------------------ + + OTP-10302 Support for Unicode has been implemented. + + OTP-10433 Dialyzer no longer outputs warnings for unused anonymous + functions ("funs"). Warnings are still output for unused + functions. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10681 Fix precision of record creation violation warnings. Thanks + to Stavros Aronis + + OTP-10740 Report spec discrepancy on mismatching lists. Thanks to + Stavros Aronis. + + OTP-10772 Properly support functions with arbitrary arity in type + specs. Thanks to Stavros Aronis. + + +--- diameter-1.4 -------------------------------------------------------- + + OTP-10442 Add registered server names to the app file. + + OTP-10609 Fix #diameter_header{} handling broken by OTP-10445. + + The fault caused the the header of a [Header | Avps] request + to be ignored if both end_to_end_id and hop_by_hop_id were + undefined. + + OTP-10614 Fix error handling for handle_request callback. + + A callback that returned a #diameter_packet{} would fail if + the incoming request had decode errors. + + OTP-10618 Fix timing of service start event. + + The event did not necessarily precede other events as + documented. + + OTP-10619 Fix setting of header T flag at peer failover. + + The flag is now set in the diameter_header record passed to a + prepare_retransmit callback. + + OTP-10628 Fix sending of CER/CEA timeout event at capx_timeout. + + The event was not sent as documented. + + OTP-10655 Fix improper setting of Application-ID in the Diameter header + of an answer message whose E flag is set. + + The value should be that of the request in question. The + fault caused it always to be 0. + + OTP-10693 Fix faulty handling of AVP length errors. + + An incorrect AVP length but no other errors caused an + incoming request to fail. + + +--- edoc-0.7.11 --------------------------------------------------------- + + OTP-10195 Since EDoc 0.7.7 (R14B02) separate values of union types can + be annotated. However, the parser has hitherto chosen not to + add the necessary parentheses due to backwards compatibility. + + From this release on code traversing the output of + edoc_parser needs to take care of parentheses around separate + values of union types. Examples of such code are layout + modules and doclet modules. + + OTP-10302 Support for Unicode has been implemented. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- eldap-1.0.1 --------------------------------------------------------- + + OTP-10403 Fixed various dialyzer warnings + + OTP-10728 Configure the SSL options fully in eldap. + + +--- erl_docgen-0.3.4 ---------------------------------------------------- + + OTP-10302 Support for Unicode has been implemented. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10725 Correct a PDF indentation bug for tagged lists in tagged + lists and added some missing tags to the DTD. + + +--- erl_interface-3.7.10 ------------------------------------------------ + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10753 Limited support for unicode atoms in the external format and + in the internal representation of the vm. This is a + preparative feature in order to support communication with + future releases of Erlang/OTP that may create unicode atoms. + + +--- erts-5.9.3.1 -------------------------------------------------------- + + OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS + is set (behaviour changed). Don't create an erl_crash.dump + if heart do exists and no ERL_CRASH_DUMP_SECONDS is set + (behaviour not changed). This changes the behaviour back + to the R15B02 default considering if a beam was running + with no heart. + + +--- erts-5.10 ----------------------------------------------------------- + + OTP-8928 A boolean socket option 'ipv6_v6only' for IPv6 sockets has + been added. The default value of the option is OS dependent, + so applications aiming to be portable should consider using + {ipv6_v6only,true} when creating an inet6 + listening/destination socket, and if neccesary also create an + inet socket on the same port for IPv4 traffic. See the + documentation. + + OTP-9861 It is now allowed to define stubs for BIFs, to allow type + specs to be written for BIFs. For example, if there is BIF + called lists:member/2, a dummy definition of lists:member/2 + is now allowed. + + OTP-9892 Process optimizations. The most notable: + + -- New internal process table implementation allowing for + both parallel reads as well as writes. Especially read + operations have become really cheap. This reduce contention + in various situations. For example when, spawning processes, + terminating processes, sending messages, etc. + + -- Optimizations of run queue management reducing contention. + + -- Optimizations of process state changes reducing + contention. + + These changes imply changes of the characteristics the + system. Most notable: changed timing in the system. + + OTP-9974 Non-blocking code loading. Earlier when an Erlang module was + loaded, all other execution in the VM were halted while the + load operation was carried out in single threaded mode. Now + modules are loaded without blocking the VM. Processes may + continue executing undisturbed in parallel during the entire + load operation. The load operation is completed by making the + loaded code visible to all processes in a consistent way with + one single atomic instruction. Non-blocking code loading will + improve realtime characteristics when modules are + loaded/upgraded on a running SMP system. + + OTP-10122 In the SMP emulator, turning on and off tracing will no + longer take down the system to single-scheduling. + + OTP-10146 Remove VxWorks support + + OTP-10156 Added a general framework for executing benchmarks of + Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been + incorporated in the framework. + + For details about how to add more benchmarks see + $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. + + OTP-10167 Optimized deletion of ETS-tables which significantly improves + performance when large amounts of temporary tables are used. + + This change imply changes of the characteristics the system. + Most notable: changed timing in the system. + + OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. + + OTP-10273 New internal header scheme for allocators + + Impact: Reduces size on object allocated in multiblock + carriers by one word + + OTP-10336 Major port improvements. The most notable: + + -- New internal port table implementation allowing for both + parallel reads as well as writes. Especially read operations + have become really cheap.This reduce contention in various + situations. For example when, creating ports, terminating + ports, etc. + + -- Dynamic allocation of port structures. This allow for a + much larger maximum amount of ports allowed as a default. The + previous default of 1024 has been raised to 65536. Maximum + amount of ports can be set using the +Q command line flag of + erl(1). The previously used environment variable + ERL_MAX_PORTS has been deprecated and scheduled for removal + in OTP-R17. + + -- Major rewrite of scheduling of port tasks. Major benefits + of the rewrite are reduced contention on run queue locks, and + reduced amount of memory allocation operations needed. The + rewrite was also necessary in order to make it possible to + schedule signals from processes to ports. + + -- Improved internal thread progress functionality for easy + management of unmanaged threads. This improvement was + necessary for the rewrite of the port task scheduling. + + -- Rewrite of all process to port signal implementations in + order to make it possible to schedule those operations. All + port operations can now be scheduled which allows for reduced + lock contention on the port lock as well as truly + asynchronous communication with ports. + + -- Optimized lookup of port handles from drivers. + + -- Optimized driver lookup when creating ports. + + -- Preemptable erlang:ports/0 BIF. + + -- Improving responsiveness by bumping reductions for a + process calling a driver callback directly. + + These changes imply changes of the characteristics of the + system. The most notable: + + -- Order of signal delivery -- The previous implementation of + the VM has delivered signals from processes to ports in a + synchronous stricter fashion than required by the language. + As of ERTS version 5.10, signals are truly asynchronously + delivered. The order of signal delivery still adheres to the + requirements of the language, but only to the requirements. + That is, some signal sequences that previously always were + delivered in one specific order may now from time to time be + delivered in different orders. This may cause Erlang programs + that have made false assumptions about signal delivery order + to fail even though they previously succeeded. For more + information about signal ordering guarantees, see the chapter + on communication in the ERTS user's guide. The +n command + line flag of erl(1) can be helpful when trying to find + signaling order bugs in Erlang code that have been exposed by + these changes. + + -- Latency of signals sent from processes to ports -- Signals + from processes to ports where previously always delivered + immediately. This kept latency for such communication to a + minimum, but it could cause lock contention which was very + expensive for the system as a whole. In order to keep this + latency low also in the future, most signals from processes + to ports are by default still delivered immediately as long + as no conflicts occur. Such conflicts include not being able + to acquire the port lock, but also include other conflicts. + When a conflict occur, the signal will be scheduled for + delivery at a later time. A scheduled signal delivery may + cause a higher latency for this specific communication, but + improves the overall performance of the system since it + reduce lock contention between schedulers. The default + behavior of only scheduling delivery of these signals on + conflict can be changed by passing the +spp command line flag + to erl(1). The behavior can also be changed on port basis + using the parallelism option of the open_port/2 BIF. + + -- Execution time of the erlang:ports/0 BIF -- Since + erlang:ports/0 now can be preempted, the responsiveness of + the system as a whole has been improved. A call to + erlang:ports/0 may, however, take a much longer time to + complete than before. How much longer time heavily depends on + the system load. + + -- Reduction cost of calling driver callbacks -- Calling a + driver callback is quite costly. This was previously not + reflected in reduction cost at all. Since the reduction cost + now has increased, a process performing lots of direct driver + calls will be scheduled out more frequently than before. + + Potential incompatibilities: + + -- driver_send_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_send_term() with usage of erl_drv_send_term(). + + -- driver_output_term() has been deprecated and has been + scheduled for removal in OTP-R17. Replace usage of + driver_output_term() with usage of erl_drv_output_term(). + + -- The new function erl_drv_busy_msgq_limits() has been added + in order to able to control management of port queues. + + The driver API version has been bumped to 2.1 from 2.0 due to + the above changes in the driver API. + + OTP-10348 The experimental support for packages has been removed. + + OTP-10491 Set new peeled off SCTP socket to nonblocking socket (Thanks + to Jonas Falkevik) + + OTP-10522 Wrong parameters when setting seq_trace-tokens from within a + trace-pattern could crash the VM. This is now corrected. + + OTP-10611 Fix various typos (thanks to Tuncer Ayaz) + + OTP-10633 Erlang specification 4.7.3 defines max tuple size to 65535 + elements It is now enforced to no more than 16777215 elements + (arity 24 bits) + + Previous edge cases (28 bits) were not validated and could + cause undefined behaviour. + + OTP-10643 Add insert_element/3 and delete_element/2 + + OTP-10647 The previous default of a maximum of 32768 simultaneous + processes has been raised to 262144. This value can be + changed using the the +P command line flag of erl(1). Note + that the value passed now is considered as a hint, and that + actual value chosen in most cases will be a power of two. + + OTP-10661 The previously (in R15) proposed scheduler wakeup strategy is + now used by default. This strategy is not as quick to forget + about previous overload as the previous strategy. + + This change imply changes of the characteristics the system. + Most notable: When a small overload comes and then disappears + repeatedly, the system will for a bit longer time be willing + to wake up schedulers than before. Timing in the system will + due to this also change. + + The previous strategy can still be enabled by passing the + +sws legacy command line flag to erl. + + OTP-10668 The +stbt command line argument of erl was added. This + argument can be used for trying to set scheduler bind type. + Upon failure unbound schedulers will be used. + + OTP-10677 Fix fd leak when using async thread pool + + When using the async thread pool, if an erlang process asks + to open a file and it gets shutdown/killed while the + file:open/2 call hasn't returned, it's possible to leak a + file descriptor against the target file. This has now been + fixed. (Thanks to Filipe David Manana) + + OTP-10678 Support ANSI in console + + Unix platforms will no longer filter control sequences to the + ttsl driver thus enabling ANSI and colors in console. (Thanks + to Pedram Nimreezi) + + OTP-10680 Add file:allocate/3 operation + + This operation allows pre-allocation of space for files. It + succeeds only on systems that support such operation. (Thanks + to Filipe David Manana) + + OTP-10683 Treat -Wreturn-type warnings as error when using GCC (Thanks + to Tuncer Ayaz) + + OTP-10699 Use sys/types.h instead of string.h to pull ssize_t + definition to erl_driver.h. This fixes build issue on NetBSD. + (Thanks to Yamamoto Takashi). + + OTP-10702 Arguments given with the -run or -s flags to erl are now + translated according to the file name encoding mode of the + runtime system. + + OTP-10726 Implement ./otp_build configure --enable-silent-rules + + With silent rules, the output of make is less verbose and + compilation warnings are easier to spot. Silent rules are + disabled by default and can be disabled or enabled at will by + make V=0 and make V=1. (Thanks to Anthony Ramine) + + OTP-10727 Use share flags for all file operations on Windows. Thanks to + Filipe David Borba Manana. + + OTP-10733 Make/fakefop adjustments. Thanks to Tuncer Ayaz and Sebastian + Rasmussen. + + OTP-10736 The runtime system will now by default use 10 async threads + if thread support has been enabled when building the runtime + system. + + This will prevent long blocking file-operations from blocking + scheduler threads for long periods of time, which can be + harmful. Apart from file-operations, it also effects other + operations scheduled on the async thread pool by user + implemented drivers. + + The amount of async threads can be controlled by using the +A + command line argument of erl(1). When running some offline + tools you might want to disable async threads, but you are + advised not to in the general case. Instead, you might want + to increase the amount of async threads used. + + This change imply changes of the characteristics the system + compared to the previous default. The responsiveness of the + system as a whole will be improved. Operations scheduled on + the async thread pool will get an increased latency. The + throughput of these operations may increase, or decrease + depending on the type of the operations and how they get + scheduled. In the case of file operations, the throughput + very much depends on how the Erlang application access files. + Multiple concurrent accesses to different files have the + potential of an increased throughput. + + OTP-10737 The default reader group limit has been increased to 64 from + 8. This limit can be set using the +rg command line argument + of erl(1). + + This change of default value will reduce lock contention on + ETS tables using the read_concurrency option at the expense + of memory consumption when the amount of schedulers and + logical processors are beween 8 and 64. For more information, + see documentation of the +rg command line argument of erl(1). + + OTP-10746 The octet counters in the gen_tcp/inet interface could behave + in unexpected ways on 64bit platforms. The behaviour is now + as expected. + + OTP-10747 Certain linux kernels, most notably in redhat and CentOS + distribution, had a bug in writev which generated an infinite + loop in the tcp code of the VM. The bug is now worked around. + + OTP-10748 A process that got killed (got an exit signal) while + operating on a compresseed file, could cause a segmentation + fault in the VM. This is now corrected. Thanks to Filipe + David Manana for identifying the problem and submitting a + solution. + + OTP-10751 Windows previously used three digit exponent in formatting + which caused difference between platforms, as can be seen by + float_to_list/1. This has now been fixed. + + OTP-10752 New BIF float_to_list/2 which solves a problem of + float_to_list/1 that doesn't allow specifying the number of + digits after the decimal point when formatting floats (Thanks + to Serge Aleynikov). + + OTP-10753 Limited support for unicode atoms in the external format and + in the internal representation of the vm. This is a + preparative feature in order to support communication with + future releases of Erlang/OTP that may create unicode atoms. + + OTP-10787 Increased potential concurrency in ETS for write_concurrency + option. The number of internal table locks has increased from + 16 to 64. This makes it four times less likely that two + concurrent processes writing to the same table would collide + and thereby serialized. The cost is an increased constant + memory footprint for tables using write_concurrency. The + memory consumption per inserted record is not affected. The + increased footprint can be particularly large if + write_concurrency is combined with read_concurrency. + + +--- et-1.4.4.3 ---------------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- eunit-2.2.4 --------------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- gs-1.5.15.2 --------------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- hipe-3.10 ----------------------------------------------------------- + + OTP-10302 Support for Unicode has been implemented. + + OTP-10624 The type ascii_string() in the base64 module has been + corrected. The type file:file_info() has been cleaned up. The + type file:fd() has been made opaque in the documentation. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10705 Update .gitignore (lib/hipe/boot_ebin). Thanks to Tuncer + Ayaz. + + +--- ic-4.3 -------------------------------------------------------------- + + OTP-10784 Misc build updates + + OTP-10785 Adapt ic for changes in erl_interface and jinterface due to + utf8 atom support. This change makes ic dependent on + erl_interface-3.7.10 (R16) or later in order to build. + + +--- inets-5.9.3 --------------------------------------------------------- + + OTP-10256 httpc: The HTTP client now supports HTTPS through proxies + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10765 Fix autoredirect for POST requests responding 303. Thanks to + Hans Svensson. + + +--- jinterface-1.5.7 ---------------------------------------------------- + + OTP-10505 fix reading compressed binary terms from Java (Thanks to Nico + Kruber) + + OTP-10579 OtpEpmd.lokupNames() no longer hangs when badly configured + (Thanks to Vlad Dumitrescu) + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10753 Limited support for unicode atoms in the external format and + in the internal representation of the vm. This is a + preparative feature in order to support communication with + future releases of Erlang/OTP that may create unicode atoms. + + +--- kernel-2.16 --------------------------------------------------------- + + OTP-8067 Inet exported functionality + + inet:parse_ipv4_address/1, inet:parse_ipv4strict_address/1, + inet:parse_ipv6_address/1, inet:parse_ipv6strict_address/1, + inet:parse_address/1 and inet:parse_strict_address is now + exported from the inet module. + + OTP-8928 A boolean socket option 'ipv6_v6only' for IPv6 sockets has + been added. The default value of the option is OS dependent, + so applications aiming to be portable should consider using + {ipv6_v6only,true} when creating an inet6 + listening/destination socket, and if neccesary also create an + inet socket on the same port for IPv4 traffic. See the + documentation. + + OTP-10302 Support for Unicode has been implemented. + + OTP-10417 It is no longer possible to have {Mod,Vsn} in the 'modules' + list in a .app file. + + This was earlier possible, although never documented in the + .app file reference manual. It was however visible in the + documentation of application:load/[1,2], where the same term + as in a .app file can be used as the first argument. + + The possibility has been removed since the Vsn part was never + used. + + OTP-10419 The documentation for global:register_name/3 has been updated + to mention that the use of {Module,Function} as the method + argument (resolve function) is deprecated. + + OTP-10473 The contract of erl_ddll:format_error/1 has been corrected. + (Thanks to Joseph Wayne Norton.) + + OTP-10549 Fixed bug where sendfile on oracle solaris would return an + error when a partial send was done. + + OTP-10617 The error_handler module will now call + '$handle_undefined_function'/2 if an attempt is made to call + a non-existing function in a module that exists. See the + documentation for error_handler module for details. + + OTP-10620 Change printout of application crash message on startup to + formated strings (Thanks to Serge Aleynikov) + + OTP-10624 The type ascii_string() in the base64 module has been + corrected. The type file:file_info() has been cleaned up. The + type file:fd() has been made opaque in the documentation. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10662 Do not return wrong terms unnecessarily. (Thanks to Kostis + Sagonas.) + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10680 Add file:allocate/3 operation + + This operation allows pre-allocation of space for files. It + succeeds only on systems that support such operation. (Thanks + to Filipe David Manana) + + OTP-10694 Add application:get_key/3. The new function provides a + default value for a configuration parameter. Thanks to Serge + Aleynikov. + + OTP-10739 Add search to Erlang shell's history. Thanks to Fred Herbert. + + +--- megaco-3.16.0.3 ----------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- mnesia-4.8 ---------------------------------------------------------- + + OTP-10156 Added a general framework for executing benchmarks of + Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been + incorporated in the framework. + + For details about how to add more benchmarks see + $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10636 Use chained send_after instead of send_interval, to make + decrease the number of messages sent after a sleep (Thanks to + James Wheare) + + OTP-10639 Fix format of mnesia overload message (Thanks to Ahmed Omar) + + OTP-10729 Remove support for the query keyword and query expressions. + Thanks to Loïc Hoguin. + + +--- observer-1.3 -------------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- odbc-2.10.14 -------------------------------------------------------- + + OTP-10506 Under Unix enable TCP_NODELAY to disable Nagel's socket + algorithm. Thanks to Andy Richards + + Impact: Performance gain on Unix systems + + OTP-10603 Added extended_errors option to ODBC + + When enabled, this option alters the return code of ODBC + operations that produce errors to include the ODBC error code + as well as the native error code, in addition to the ODBC + reason field which is returned by default. Thanks to Bernard + Duggan. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10735 Fix aotocommit for Oracle ODBC driver in Linux. Thanks to + Danil Onishchenko. + + +--- orber-3.6.25 -------------------------------------------------------- + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + +--- os_mon-2.2.11 ------------------------------------------------------- + + OTP-10448 Removed deprecated function calls to snmp + + +--- otp_mibs-1.0.8 ------------------------------------------------------ + + OTP-10784 Misc build updates + + +--- parsetools-2.0.8 ---------------------------------------------------- + + OTP-10302 Support for Unicode has been implemented. + + OTP-10660 The file esyntax.yrl has been removed. + + +--- percept-0.8.8 ------------------------------------------------------- + + OTP-10784 Misc build updates + + +--- pman-2.7.1.3 -------------------------------------------------------- + + OTP-10784 Misc build updates + + +--- public_key-0.18 ----------------------------------------------------- + + OTP-7045 public_key now supports CRL validation and documents the + function public_key:pkix_path_validation/3 + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10670 Fix subjectPublicKeyInfo type comment in public_key. Thanks + to Ryosuke Nakai. + + OTP-10723 Fixed typo's in public_key spec. + + OTP-10767 Corrected PKCS-10 documentation and added some PKCS-9 support + that is fairly commonly used by PKCS-10. Full support for + PKCS-9 will be added later. + + +--- reltool-0.6.2 ------------------------------------------------------- + + OTP-10012 -- If incl_cond was set to derived on module level, then + reltool_server would crash with a case_clause. This has been + corrected. incl_cond on module level now overwrites mod_cond + on app or sys level as described in the documentation. + + -- If a rel spec in the reltool config does not contain all + applications that are listed as {applications,Applications} + in a .app file, then these applications are autmatically + added when creating the .rel file. For + 'included_applications', the behaviour was not the same. I.e. + if a rel spec in the reltool config did not contain all + applications that are listed as + {included_applications,InclApplications} in a .app file, then + reltool would fail with reason "Undefined applications" when + creating the .rel file. This has been corrected, so both + applications and included_applications are now automatically + added if not already in the rel spec. + + -- The rel specification now dictates the order in which + included and used applications (specified in the .app file as + included_applications and applications respectively) are + loaded/started by the boot file. If the applications are not + specified in the rel spec, then the order from the .app file + is used. This was a bug earlier reported on systools, and is + now also implemented in reltool. + + -- Instead of only looking at the directory name, reltool now + first looks for a .app file in order to figure out the name + of an application. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + +--- runtime_tools-1.8.10 ------------------------------------------------ + + OTP-10155 User Guides for the dynamic tracing tools dtrace and + systemtap have been added to the documentation. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10635 Fix Table Viewer refresh crash on no more existing ets tables + (Thanks to Peti Gömori) + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10786 The backend module appmon_info.erl is moved from appmon + application to runtime_tools. This allows appmon to be run + from a remote erlang node towards a target node which does + not have appmon (and its dependencies) installed, as long as + runtime_tools is installed there. + + +--- sasl-2.3 ------------------------------------------------------------ + + OTP-10394 release_handler_SUITE:otp_9864 deleted parts of the + release_handler_SUITE_data directory so the test suite could + not be executed twice without re-installation. This has been + corrected. + + OTP-10417 It is no longer possible to have {Mod,Vsn} in the 'modules' + list in a .app file. + + This was earlier possible, although never documented in the + .app file reference manual. It was however visible in the + documentation of application:load/[1,2], where the same term + as in a .app file can be used as the first argument. + + The possibility has been removed since the Vsn part was never + used. + + OTP-10463 release_handler:upgrade_script and + release_handler:downgrade_script could not read appup files + with regexps. This has been corrected. (Thanks to Ulf Wiger) + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + +--- snmp-4.23 ----------------------------------------------------------- + + OTP-10027 [manager] Remove deprecated functions. + + OTP-10610 Fix typo in snmpm doc (Thanks to Luca Favatella) + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10671 Polish return values of snmpm_user_default according to + snmpm_user doc. + + OTP-10672 Remove runtime warning in snmpa_agent because of tuple fun + usage. + + OTP-10673 SNMP manager performance optimization + + +--- ssh-2.1.2 ----------------------------------------------------------- + + OTP-10657 Fixed various syntax errors in SSH appup file + + +--- ssh-2.1.3 ----------------------------------------------------------- + + OTP-6406 SSH_FX_FILE_IS_A_DIRECTORY message for sftp implemented + + OTP-7785 SSH Rekeying fixed + + OTP-7786 Added User Guide for the SSH application + + OTP-7792 Documentation regarding failfun, connectfun and disconnectfun + provided + + OTP-9478 It is now possible to send an empty binary using + ssh_connection:send/3, this corner case previously caused + ssh_connection:send to hang. + + OTP-10456 Fix typo in keyboard-interactive string. Thanks to Daniel + Goertzen + + OTP-10467 ssh_connectino:send/3 will not return until all data has been + sent. Previously it could return too early, resulting in + things such premature close of the connection. Also improved + error handling of closed SSH channels. + + OTP-10475 Fixed ssh_cli.erl crashes because #state.buf is yet + 'undefined'. + + Fixed Client terminateing connections due to channel_request + message response is sent to the wrong id. + + Affected SSH clients: - all clients based on + SSH-2.0-TrileadSSH2Java_213 (problem #1) - SSH Term Pro + (problem #2) + + Thanks to Stefan Zegenhagen + + OTP-10514 SSH connection timer implementation + + New option, {idle_time, integer()}, sets a timeout on + connection when no channels are active, defaults to infinity + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10731 Fixed internal error on when client and server can not agree + o which authmethod to use. + + +--- ssl-5.1.2 ----------------------------------------------------------- + + OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored + + +--- ssl-5.2 ------------------------------------------------------------- + + OTP-10361 Support Next Protocol Negotiation in TLS, thanks to Ben + Murphy for the contribution. + + Impact: Could give performance benefit if used as it saves a + round trip. + + OTP-10425 TLS 1.2 will now be the default TLS version if sufficient + crypto support is available otherwise TLS 1.1 will be + default. + + Impact: A default TLS connection will have higher security + and hence it may be perceived as slower then before. + + OTP-10447 It is now possible to call controlling_process on a listen + socket, same as in gen_tcp. + + OTP-10451 Remove filter mechanisms that made error messages backwards + compatible with old ssl but hid information about what + actually happened. + + This does not break the documented API however other reason + terms may be returned, so code that matches on the reason + part of {error, Reason} may fail. + + OTP-10586 SSL: TLS 1.2, advertise sha224 support, thanks to Andreas + Schultz. + + OTP-10594 Added missing dependencies to Makefile + + OTP-10595 If an ssl server is restarted with new options and a client + tries to reuse a session the server must make sure that it + complies to the new options before agreeing to reuse it. + + OTP-10613 Removed deprecated function ssl:pid/0, it has been pointless + since R14 but has been keep for backwards compatibility. + + OTP-10709 Refactor to simplify addition of key exchange methods, thanks + to Andreas Schultz. + + OTP-10710 Now handles cleaning of CA-certificate database correctly so + that there will be no memory leek, bug was introduced in ssl- + 5.1 when changing implementation to increase parallel + execution. + + Impact: Improved memory usage, especially if you have many + different certificates and upgrade tcp-connections to + TLS-connections. + + +--- stdlib-1.19 --------------------------------------------------------- + + OTP-6874 Wildcards such as "some/path/*" passed to filelib:wildcard/2 + would fail to match any file. (Thanks to Samuel Rivas for + reporting this bug.) + + OTP-9803 Fixed error handling in proc_lib:start which could hang if + the spawned process died in init. + + OTP-10097 Dets tables are no longer fixed while traversing with a bound + key (when only the objects with the right key are matched). + This optimization affects the functions match/2, + match_object/2, select/2, match_delete/2, and + select_delete/2. + + OTP-10302 Support for Unicode has been implemented. + + OTP-10431 Allow ** in filelib:wildcard + + Two adjacent * used as a single pattern will match all files + and zero or more directories and subdirectories. (Thanks to + José Valim) + + OTP-10436 The linter now warns for opaque types that are not exported, + as well as for under-specified opaque types. + + OTP-10455 Add the \gN and \g{N} syntax for back references in + re:replace/3,4 to allow use with numeric replacement strings. + (Thanks to Vance Shipley) + + OTP-10472 Export ets:match_pattern/0 type (Thanks to Joseph Wayne + Norton) + + OTP-10474 The type file:name() has been substituted for the type + file:filename() in the following functions in the filename + module: absname/2, absname_join/2, join/1,2, and split/1. + + OTP-10490 If a child process fails in its start function, then the + error reason was earlier only reported as an error report + from the error_handler, and supervisor:start_link would only + return {error,shutdown}. This has been changed so the + supervisor will now return {error,{shutdown,Reason}}, where + Reason identifies the failing child and its error reason. + (Thanks to Tomas Pihl) + + OTP-10504 Fix printing the empty binary at depth 1 with ~W (Thanks to + Andrew Thompson) + + OTP-10624 The type ascii_string() in the base64 module has been + corrected. The type file:file_info() has been cleaned up. The + type file:fd() has been made opaque in the documentation. + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10658 The contracts and types of the modules erl_scan and sys have + been corrected and improved. (Thanks to Kostis Sagonas.) + + OTP-10659 The Erlang shell now skips the rest of the line when it + encounters an Erlang scanner error. + + OTP-10663 Clean up some specs in the proplists module. (Thanks to + Kostis Sagonas.) + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + + OTP-10691 Enable escript to accept emulator arguments when script file + has no shebang. Thanks to Magnus Henoch + + OTP-10722 Fix bug in queue:out/1, queue:out_r/1 that makes it O(N^2) in + worst case. Thanks to Aleksandr Erofeev. + + OTP-10742 There are new functions in the epp module which read the + character encoding from files. See epp(3) for more + information. + + OTP-10745 The functions in io_lib have been adjusted for Unicode. The + existing functions write_string() and so on now take Unicode + strings, while the old behavior has been taken over by new + functions write_latin1_string() and so on. There are also new + functions to write Unicode strings as Latin-1 strings, mainly + targetted towards the Erlang pretty printer (erl_pp). + + OTP-10749 The new functions proc_lib:format/2 and erl_parse:abstract/2 + accept an encoding as second argument. + + OTP-10787 Increased potential concurrency in ETS for write_concurrency + option. The number of internal table locks has increased from + 16 to 64. This makes it four times less likely that two + concurrent processes writing to the same table would collide + and thereby serialized. The cost is an increased constant + memory footprint for tables using write_concurrency. The + memory consumption per inserted record is not affected. The + increased footprint can be particularly large if + write_concurrency is combined with read_concurrency. + + +--- syntax_tools-1.6.10 ------------------------------------------------- + + OTP-10302 Support for Unicode has been implemented. + + +--- test_server-3.6 ----------------------------------------------------- + + OTP-9710 Line numbering of erlang files that were not correctly + indented could be wrong after coverting to html with + erl2html2:convert/[2,3] (the source code pointed to from the + test case). This has been corrected. + + Also, there are now link targets for each line and not only + for each 10th line, and link targets for functions now + include the arity and not only the function name (e.g. func/1 + has a link target "func-1"). + + OTP-9769 Severe errors detected by test_server (e.g. if log files + directories cannot be created) will now be reported to + common_test and noted in the common_test logs. + + OTP-9870 The earlier undocumented cross cover feature for accumulating + cover data over multiple tests has now been fixed and + documented. + + OTP-9956 If the test suite itself was included in code coverage + analysis, then the test_server would not manage to set + data_dir correctly for the test. This has been corrected. + + OTP-10046 Any call to test_server:break/1 should cancel all active + timetramps. However, in some cases Suite:end_per_testcase/2 + is executed on a different process than the test case itself, + and if test_server:break/1 was called from there, the + timetraps were not cancelled. This has been corrected. + + OTP-10070 When a test case failed because of a timetrap time out, the + Config data for the case was lost in the following call to + end_per_testcase/2, and also in calls to the CT Hook function + post_end_per_testcase/4. This problem has been solved and the + Config data is now correctly passed to the above functions + after a timetrap timeout failure. + + OTP-10101 In test_server, the same process would supervise the + currently running test case and be group leader (and IO + server) for the test case. Furthermore, when running parallel + test cases, new temporary supervisor/group leader processes + were spawned and the process that was group leader for + sequential test cases would not be active. That would lead to + several problems: + + * Processes started by init_per_suite will inherit the group + leader of the init_per_suite process (and that group leader + would not process IO requests when parallel test cases was + running). If later a parallel test case caused such a + processto print using (for example) io:format/2, the calling + would hang. + + * Similarly, if a process was spawned from a parallel test + case, it would inherit the temporary group leader for that + parallel test case. If that spawned process later - when the + group of parallel tests have finished - attempted to print + something, its group leader would be dead and there would be + badarg exception. + + Those problems have been solved by having group leaders + separate from the processes that supervises the test cases, + and keeping temporary group leader process for parallel test + cases alive until no more process in the system use them as + group leaders. + + Also, a new unexpected_io.log log file (reachable from the + summary page of each test suite) has been introduced. All + unexpected IO will be printed into it(for example, IO to a + group leader for a parallel test case that has finished). + + OTP-10156 Added a general framework for executing benchmarks of + Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been + incorporated in the framework. + + For details about how to add more benchmarks see + $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. + + OTP-10480 The stability of common_test and test_server when running + test cases in parallel has been improved. + + OTP-10783 Update common test modules to handle unicode + + -- Use UTF-8 encoding for all HTML files, except the HTML + version of the test suite generated with erl2html2:convert, + which will have the same encoding as the original test suite + (.erl) file. + + -- Encode link targets in HTML files with + test_server_ctrl:uri_encode/1. + + -- Use unicode modifier 't' with ~s when appropriate. + + -- Use unicode:characters_to_list and + unicode:characters_to_binary for conversion between binaries + and strings instead of binary_to_list and list_to_binary. + + +--- toolbar-1.4.2.3 ----------------------------------------------------- + + OTP-10784 Misc build updates + + +--- tools-2.6.9 --------------------------------------------------------- + + OTP-10302 Support for Unicode has been implemented. + + OTP-10465 Make erlang-mode more compatible with package.el (Thanks to + Gleb Peregud) + + OTP-10523 A new function, cover:flush(Nodes), is added which will fetch + data from remote nodes without stopping cover on those nodes. + This is used by test_server and common_test when it is safe + to assume that the node will be terminated after the test + anyway. The purpose is to avoid processes crashing when + re-loading the original beam if the processes is still + running old code. + + Remote nodes will now continue to count code coverage if the + connection to the main node is broken. Earlier, a broken + connection would cause the cover_server on the remote node to + die and thus any still cover compiled modules would cause + process crash when trying to insert cover data in ets tables + that used to exist on the cover_server. The new functionality + also involves synchronization with the main node if the nodes + are reconnected. + + OTP-10611 Fix various typos (thanks to Tuncer Ayaz) + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10637 Add separate face for exported functions (Thanks to Thomas + Järvstrand) + + OTP-10766 Fix syntax highlighting of $\' in Emacs mode. Thanks to + Magnus Henoch. + + OTP-10774 The BIF highlighting in the emacs mode has been updated to + correspond with the correct BIFs. + + +--- tv-2.1.4.10 --------------------------------------------------------- + + OTP-10784 Misc build updates + + +--- typer-0.9.5 --------------------------------------------------------- + + OTP-10784 Misc build updates + + +--- webtool-0.8.9.2 ----------------------------------------------------- + + OTP-10784 Misc build updates + + +--- wx-1.0 -------------------------------------------------------------- + + OTP-10407 The wx application now compiles and is usable with the + unstable development branch of wxWidgets-2.9. Some functions + are currently not available in wxWidgets-2.9 and their erlang + counterparts are marked as deprecated. They will generate an + error if called when linked against wxWidgets-2.9 libraries. + This means that wx can now be built on 64bit MacOsX, but keep + in mind that wxWidgets-2.9 is still a development branch and + needs (a lot) more work before it becomes stable. + + OTP-10585 Add {silent_start, boolean()} option to wx:new/1 in order to + be able to suppress error messages during startup of wx. + (Thanks to Håkan Mattsson) + + OTP-10743 Fix wxTreeCtrl:getBoundingRect/2 and wxTreeCtrl:hitTest/1. + wxTreeCtrl:hitTest now returns a tuple not bug compatible + with previous releases but needed. + + +--- xmerl-1.3.3 --------------------------------------------------------- + + OTP-10630 Where necessary a comment stating encoding has been added to + Erlang files. The comment is meant to be removed in + Erlang/OTP R17B when UTF-8 becomes the default encoding. + + OTP-10665 Some examples overflowing the width of PDF pages have been + corrected. + diff --git a/sources b/sources index e64519f..4a1b064 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -18ba57d24085a77c01bf05f5bc0e6fb5 otp_doc_html_R15B03-1.tar.gz -1d7ace92e8cf41abbee1dba8192b7d5f otp_doc_man_R15B03-1.tar.gz -f299c8af6f54e4b767fbba100b18acf2 otp_src_R15B03-1.readme -eccd1e6dda6132993555e088005019f2 otp_src_R15B03-1.tar.gz +39e2c511f8afeaacc02a16424f2cb103 otp_src_R16A_RELEASE_CANDIDATE.tar.gz From 08b6f7f0f614b804f3ab2d50cb2c1840fafa9957 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Feb 2013 12:40:22 +0400 Subject: [PATCH 020/340] Leftover Signed-off-by: Peter Lemenkov --- erlang.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 8413b3a..58f1284 100644 --- a/erlang.spec +++ b/erlang.spec @@ -582,7 +582,6 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database Group: Development/Languages -#Error:erlang(megaco_flex_scanner:scan/2) Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} From a0fe45fc3bd4c6d6bd094aaf4581f7331134dc6b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Feb 2013 12:43:56 +0400 Subject: [PATCH 021/340] Restore accidentally removed script Signed-off-by: Peter Lemenkov --- otp-get-patches.sh | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 otp-get-patches.sh diff --git a/otp-get-patches.sh b/otp-get-patches.sh new file mode 100755 index 0000000..5033e60 --- /dev/null +++ b/otp-get-patches.sh @@ -0,0 +1,92 @@ +#!/bin/bash +# Usage: +# ./otp-get-patches.sh /path/to/otp OTP_R14B02 fedora-R14B02 +# +# otp-get-patches.sh - update erlang.spec and otp-00*.patch files +# +# otp-get-patches.sh updates the erlang.spec and otp-00*.patch +# files in the git index. After an otp-get-patches.sh run, you +# will need to review the stage git changes, possibly adapt the +# Release: and %changelog parts of erlang spec, and can then +# "git commit" everything. +# +# Caution: Leave the four special comment lines untouched in the +# spec file, as otp-get-patches.sh requires them and will only +# touch erlang.spec between the respective start/end pair: +# +# # 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'}" +otp_upstream="${2:?'Fatal: git ref to upstream release required'}" +otp_fedora="${3:?'Fatal: git ref to branch with fedora patches required'}" + +# Setup +set -e +# set -x +tmpdir="$(mktemp -d --tmpdir="$PWD")" + +# Generate patch files +pushd "$otp_dir" +git format-patch -N -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" +popd + +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 "$newspec2" "$specfile" +git add "$specfile" + +rm -rf "$tmpdir" +# End of file. From 042c33880e54b974fd92b3deae77b315df4ce0c7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 1 Mar 2013 23:34:46 +0400 Subject: [PATCH 022/340] Ver. R16B Signed-off-by: Peter Lemenkov --- .gitignore | 3 + erlang.spec | 34 +- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 8 +- ...SE_CANDIDATE.readme => otp_src_R16B.readme | 626 ++++++++++++++++-- sources | 4 +- 6 files changed, 599 insertions(+), 80 deletions(-) rename otp_src_R16A_RELEASE_CANDIDATE.readme => otp_src_R16B.readme (79%) diff --git a/.gitignore b/.gitignore index 13eb3d8..e60b66a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 58f1284..03171d6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,4 +1,4 @@ -%global upstream_ver R16A +%global upstream_ver R16B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! #%global upstream_rel 03 %global upstream_rel %{nil} @@ -31,12 +31,13 @@ Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz +Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.tar.gz %if %{use_prebuilt_docs} -Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz -Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.tar.gz +Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}.tar.gz +Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.tar.gz %endif -Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}_RELEASE_CANDIDATE.readme +Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.readme +Source999: otp-get-patches.sh # For the source of the Fedora specific patches, see the respective @@ -175,8 +176,8 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description appmon @@ -420,10 +421,10 @@ Erlang LDAP library. %package erl_docgen Summary: A utility used to generate erlang HTML documentation Group: Development/Languages -Requires: %{name}-edoc%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} +Requires: %{name}-edoc%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 %description erl_docgen @@ -457,6 +458,8 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Provides: erlang(erl_drv_version) = 2.1 +Provides: erlang(erl_nif_version) = 2.4 Obsoletes: %{name} < R13B-04.5 %description et @@ -718,7 +721,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} Obsoletes: %{name} < R13B-04.5 @@ -1004,9 +1006,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %endif # Remove pre-built BEAM files @@ -1458,7 +1460,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/erlc %{_bindir}/escript %{_bindir}/run_erl -%{_bindir}/run_test %{_bindir}/to_erl %{_libdir}/erlang/bin/ct_run %{_libdir}/erlang/bin/epmd @@ -1466,7 +1467,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/bin/erlc %{_libdir}/erlang/bin/escript %{_libdir}/erlang/bin/run_erl -%{_libdir}/erlang/bin/run_test %{_libdir}/erlang/bin/start %{_libdir}/erlang/bin/start.boot %{_libdir}/erlang/bin/start.script @@ -2307,6 +2307,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 28 2013 Peter Lemenkov - R16B-0.1 +- Ver. R16B +- Enabled SCTP (see rhbz #908530) + * Sun Feb 03 2013 Peter Lemenkov - R16A-0.1 - Ver. R16A diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 5952bab..4fba9a0 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -25,10 +25,10 @@ index 5c1ce51..5a07855 100644 $(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 2dcd070..0bf82f1 100644 +index 0f33258..01fde22 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src -@@ -143,14 +143,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . +@@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . cp -p $Name.boot start.boot cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index c3229c9..00cf566 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -288,10 +288,10 @@ index bb2edd4..6b20995 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index a08c204..3f5483a 100644 +index df10c33..5c54e70 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -230,11 +230,8 @@ release_spec: opt +@@ -242,11 +242,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -963,10 +963,10 @@ index 93d0b54..5904bc2 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 043645b..ef98c3b 100644 +index e61f415..74661e3 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp_src_R16A_RELEASE_CANDIDATE.readme b/otp_src_R16B.readme similarity index 79% rename from otp_src_R16A_RELEASE_CANDIDATE.readme rename to otp_src_R16B.readme index 53c3db5..861ab56 100644 --- a/otp_src_R16A_RELEASE_CANDIDATE.readme +++ b/otp_src_R16B.readme @@ -1,11 +1,11 @@ -Major release : otp_src_R16A -Build date : 2013-01-29 +Major release : otp_src_R16B +Build date : 2013-02-25 -R16A is a major new release of Erlang/OTP. +R16B is a major new release of Erlang/OTP. You can download the full source distribution from - http://www.erlang.org/download/otp_src_R16A.tar.gz - http://www.erlang.org/download/otp_src_R16A.readme (this file) + http://www.erlang.org/download/otp_src_R16B.tar.gz + http://www.erlang.org/download/otp_src_R16B.readme (this file) Note: To unpack the TAR archive you need a GNU TAR compatible program. @@ -14,15 +14,15 @@ the distribution. The Windows binary distribution can be downloaded from - http://www.erlang.org/download/otp_win32_R16A.exe - http://www.erlang.org/download/otp_win64_R16A.exe + http://www.erlang.org/download/otp_win32_R16B.exe + http://www.erlang.org/download/otp_win64_R16B.exe On-line documentation can be found at http://www.erlang.org/doc/. You can also download the complete HTML documentation or the Unix manual files - http://www.erlang.org/download/otp_doc_html_R16A.tar.gz - http://www.erlang.org/download/otp_doc_man_R16A.tar.gz + http://www.erlang.org/download/otp_doc_html_R16B.tar.gz + http://www.erlang.org/download/otp_doc_man_R16B.tar.gz We also want to thank those that sent us patches, suggestions and bug reports, @@ -210,9 +210,12 @@ The OTP Team Open types are now always returned as binaries (when there is no information allowing them to be decoded). - --- POTENTIAL INCOMPATIBILITIES ----------------------------------------- + OTP-9052 == common_test == + + Removed depricated run_test program, use ct_run instead. + OTP-9881 == common_test == It is now possible to let a test specification include other @@ -233,7 +236,7 @@ The OTP Team The inviso application has been removed. - OTP-10170 == erts == + OTP-10170 == erts pman == Tuple funs (deprecated in R15B) are no longer supported. @@ -462,6 +465,30 @@ The OTP Team that the value passed now is considered as a hint, and that actual value chosen in most cases will be a power of two. + OTP-10812 == stdlib == + + filelib:wildcard("some/relative/path/*.beam", Path) would + fail to match any file. That is, filelib:wildcard/2 would not + work if the first component of the pattern did not contain + any wildcard characters. (A previous attempt to fix the + problem in R15B02 seems to have made matters worse.) + + (Thanks to Samuel Rivas and Tuncer Ayaz.) + + There is also an incompatible change to the Path argument. It + is no longer allowed to be a binary. + + OTP-10872 == erts == + + As of ERTS-5.10/OTP-R16A node names passed in the EPMD + protocol are required to be encoded in UTF-8. Since EPMD + previously accepted latin1 encoded node names this is an + incompatibility. However, since Erlang nodes always have + required characters in node names to be 7-bit ASCII + characters (and still do require this), this incompatibility + should not effect anyone using EPMD as an Erlang Port Mapper + Daemon. + --- CHARACTERISTICS IMPACT ----------------------------------------------- OTP-9892 == erts == @@ -681,8 +708,6 @@ The OTP Team different certificates and upgrade tcp-connections to TLS-connections. - - --- inviso -------------------------------------------------------------- OTP-10117 The inviso application has been removed. @@ -743,7 +768,7 @@ The OTP Team OTP-10588 The ASN.1 compiler will now always include necessary run-time functions in the generated Erlang modules (except for - asn1rt_nif which is still needed). If the option 'inline' is + asn1rt_nif which is still neeeded). If the option 'inline' is used the ASN.1 compiler will generate a warning. But if '{inline,OutputFile}' is use, the ASN.1 compiler will refuse to compile the file. (Use a .set.asn file if you need to @@ -762,37 +787,10 @@ The OTP Team specification and whether all values were provided). ---- common_test-1.6.3.1 ------------------------------------------------- +--- asn1-2.0.1 ---------------------------------------------------------- - OTP-10589 The following corrections/changes are done in the cth_surefire - hook: Earlier there would always be a 'properties' element - under the 'testsuites' element. This would exist even if - there were no 'property' element inside it. This has been - changed so if there are no 'property' elements to display, - then there will not be a 'properties' element either. The - XML file will now (unless other is specified) be stored - in the top log directory. Earlier, the default directory - would be the current working directory for the erlang node, - which would mostly, but not always, be the top log directory. - The 'hostname' attribute in the 'testsuite' element would - earlier never have the correct value. This has been corrected. - The 'errors' attribute in the 'testsuite' element would - earlier display the number of failed testcases. This has - been changed and will now always have the value 0, while - the 'failures' attribute will show the number of failed - testcases. A new attribute 'skipped' is added to the 'testsuite' - element. This will display the number of skipped testcases. - These would earlier be included in the number of failed - test cases. The total number of tests displayed by the 'tests' - attribute in the 'testsuite' element would earlier include - init/end_per_suite and init/end_per_group. This is no longer - the case. The 'tests' attribute will now only count "real" - test cases. Earlier, auto skipped test cases would have - no value in the 'log' attribute. This is now corrected. - A new attributes 'log' is added to the 'testsuite' element. - A new option named 'url_base' is added for this hook. If - this option is used, a new attribute named 'url' will be - added to the 'testcase' and 'testsuite' elements. + OTP-10853 Fixed broken table constraints within a SET OF or SEQUENCE OF + for the BER backend. --- common_test-1.7 ----------------------------------------------------- @@ -933,6 +931,26 @@ The OTP Team and strings instead of binary_to_list and list_to_binary. +--- common_test-1.7.1 --------------------------------------------------- + + OTP-9052 Removed depricated run_test program, use ct_run instead. + + OTP-10634 If an event handler installed in the CT Master event manager + took too long to respond during the termination phase, CT + Master crashed because of a timeout after 5 secs. This would + leave the system in a bad state. The problem has been solved + by means of a 30 min timeout value and if CT Master gets a + timeout after that time, it now kills the event manager and + shuts down properly. + + OTP-10826 Printing with any of the ct printout functions from an event + handler installed by Common Test, would cause a deadlock. + This problem has been solved. + + OTP-10832 Using the force_stop flag/option to interrupt a test run + caused a crash in Common Test. This problem has been solved. + + --- compiler-4.9 -------------------------------------------------------- OTP-10193 The compiler optimizations have been polished, so that the @@ -955,6 +973,25 @@ The OTP Team reporting this bug.) +--- compiler-4.9.1 ------------------------------------------------------ + + OTP-10788 Integers in expression that will give a floating point result + (such as "X / 2" will now be converted to floating point at + compile-time. (Suggested by Richard O'Keefe.) + + Identical floating points constans in a module will now be + coalesced to one entry in the constant pool. + + OTP-10794 The compiler would crash attempting to compile expressions + such as "element(2, not_tuple)". + + OTP-10818 Forbid multiple values in Core Erlang sequence arguments. + Thanks to José Valim and Anthony Ramine. + + OTP-10825 An unsafe optimization would cause the compiler to crash with + an internal error for certain complex code sequences. + + --- cosEvent-2.1.13 ----------------------------------------------------- OTP-10784 Misc build updates @@ -1016,6 +1053,14 @@ The OTP Team displayed as strings. +--- debugger-3.2.10 ----------------------------------------------------- + + OTP-10884 The +pc flag to erl can be used to set the range of + characters considered printable. This affects how the shell + and io:format("~tp",...) functionality does heuristic string + detection. More can be read in STDLIB users guide. + + --- dialyzer-2.5.4 ------------------------------------------------------ OTP-10302 Support for Unicode has been implemented. @@ -1041,6 +1086,16 @@ The OTP Team specs. Thanks to Stavros Aronis. +--- dialyzer-2.6 -------------------------------------------------------- + + OTP-10820 Miscellaneous updates due to Unicode support. + + OTP-10861 User defined types with same name and different arity and + documentation inconsistencies. Thanks Stavros Aronis. + + OTP-10865 Native code compilation changes. Thanks to Kostis Sagonas. + + --- diameter-1.4 -------------------------------------------------------- OTP-10442 Add registered server names to the app file. @@ -1082,6 +1137,51 @@ The OTP Team incoming request to fail. +--- diameter-1.4.1 ------------------------------------------------------ + + OTP-10686 Add application_opt() request_errors to make the handling of + incoming requests containing decode errors configurable. + + The value 'callback' ensures that a handle_request callback + takes place for all such requests, the default being for + diameter to answer 3xxx series errors itself. + + OTP-10687 Add transport_opt() length_errors. + + The value determines how messages received over the transport + interface with an incorrect Message Length are dealt with. + + OTP-10688 Add commentary on RFC 6733 to Standards Compliance chapter of + the User's Guide. + + OTP-10692 Fix erroneous watchdog transition from DOWN to INITIAL. + + This transition took place when a peer connection was + reestablished following a failed capabilities exchange. RFC + 3539 requires DOWN to transition into REOPEN. + + OTP-10759 Allow a 5xxx result code in an answer-message on peer + connections using the RFC 6733 common dictionary. + + RFC 6733 allows this while RFC 3588 does not. A + handle_request callback can return {answer_message, + 3000..3999|5000..5999} in the simplest case. + + OTP-10760 Add dictionaries for RFC 6733. + + Both the common and accounting dictionaries differ from their + RFC 3588 counterparts, which is reflected in generated record + definitions. Application configuration on a service or + transport determines the dictionary that will be used on a + given peer connection. + + OTP-10761 Allow a handle_request callback to control diameter's setting + of Result-Code and Failed-AVP. + + Setting errors = false in a returned #diameter_packet{} + disables the setting. + + --- edoc-0.7.11 --------------------------------------------------------- OTP-10195 Since EDoc 0.7.7 (R14B02) separate values of union types can @@ -1100,6 +1200,15 @@ The OTP Team Erlang/OTP R17B when UTF-8 becomes the default encoding. +--- edoc-0.7.12 --------------------------------------------------------- + + OTP-10820 Miscellaneous updates due to Unicode support. + + OTP-10866 EDoc sometimes failed to associate a comment with the + preceding type declaration. This bug has been fixed. (Thanks + to Serge Aleynikov for reporting the bug.) + + --- eldap-1.0.1 --------------------------------------------------------- OTP-10403 Fixed various dialyzer warnings @@ -1134,14 +1243,12 @@ The OTP Team future releases of Erlang/OTP that may create unicode atoms. ---- erts-5.9.3.1 -------------------------------------------------------- +--- erl_interface-3.7.11 ------------------------------------------------ - OTP-10602 Create an erl_crash.dump if no heart exists and no ERL_CRASH_DUMP_SECONDS - is set (behaviour changed). Don't create an erl_crash.dump - if heart do exists and no ERL_CRASH_DUMP_SECONDS is set - (behaviour not changed). This changes the behaviour back - to the R15B02 default considering if a beam was running - with no heart. + OTP-10885 Revert the structs erlang_pid, erlang_port and erlang_ref as + they were before R16A (without node_org_enc) in order to be + backward compatible with user code that accesses the fields + of these structs. --- erts-5.10 ----------------------------------------------------------- @@ -1482,6 +1589,198 @@ The OTP Team write_concurrency is combined with read_concurrency. +--- erts-5.10.1 --------------------------------------------------------- + + OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. + + OTP-10300 Added four new bifs, erlang:binary_to_integer/1,2, + erlang:integer_to_binary/1, erlang:binary_to_float/1 and + erlang:float_to_binary/1,2. These bifs work similarly to how + their list counterparts work, except they operate on + binaries. In most cases converting from and to binaries is + faster than converting from and to lists. + + These bifs are auto-imported into erlang source files and can + therefore be used without the erlang prefix. + + OTP-10348 The experimental support for packages has been removed. + + OTP-10802 Threads created internally in the runtime system by vanilla, + fd, and spawn drivers on Windows systems could make thread + unsafe calls to driver_select(). + + OTP-10803 Threads created internally in the runtime system by the + vanilla, fd, and spawn drivers on Windows systems could make + unsafe memory accesses to driver data after port had + terminated. + + OTP-10807 The runtime system could crash when flushing data to standard + out or standard error on Windows. + + OTP-10809 Bugs due to the port optimizations introduced in + erts-5.10/OTP-R16A have been fixed: + + -- Memory leak when terminating ports + + -- Memory leak when reaching the system limit of maximum + amount of concurrently existing ports + + -- Crashs due to missing, or late test of bad port handle + + -- The newly introduced driver API function + erl_drv_busy_msgq_limits() could not be used by dynamically + linked in drivers on Windows + + OTP-10810 The driver API function erl_drv_consume_timeslice(), and the + NIF API function enif_consume_timeslice() have been + introduced. + + These functions are provided in order to better support + co-operative scheduling, improve system responsiveness, and + to make it easier to prevent misbehaviors of the VM due to a + process or port monopolizing a scheduler thread. They can be + used when dividing lengthy work into a number of repeated + calls without the need to use threads. + + OTP-10824 Fix {packet,httph} header capitalization for unrecognized + header fields longer than 20 charachters such as + Sec-Websocket-Version. The limit is simply raised from 20 to + 50 characters with the hope that valid headers longer than 50 + are not used. + + OTP-10834 The list_to_integer/2 bif has been optimized when used with + bases other than 10. + + OTP-10837 Fix rounding issues in float_to_list/1,2. Thanks to Serge + Aleynikov + + OTP-10838 The git commit sha of the HEAD commit is now added to the + Erlang shell when compiling a non-released Erlang version. + + OTP-10840 Change caching policy for memory segment allocator. For + instance, prefer sbc segments over mbc segments, caching + policy is time-arrow aware, evicting older cached segments to + store newer segments. + + The default number of cachable segment has been increased + from five to ten segments. This can be modified, same as + before, with the command line option +MMmcs 5 + + Impact: Increased speed for processing on larger objects, + e.g. binaries. Slight increase of mapped and resident memory. + Tune your system with memory options to erl for best + performance. + + OTP-10841 Fix memory leak in file driver introduced in R16A. + + OTP-10848 Updated config.sub and config.guess to latest version from + gnu.org + + OTP-10849 Add an xcomp file for Blue Gene/Q. Thanks to Kostis Sagonas. + + OTP-10850 Cleanup of documentation of the type language. Thanks to + Kostis Sagonas. + + OTP-10851 Change the return value of hipe_bifs:remove_refs_from/1. + Thanks to Kostis Sagonas. + + OTP-10854 A bug in an ERTS internal queue implementation could cause + the loss of a wake up signal to a consumer thread. This has + now been fixed. + + The effect of this bug, when triggered, was often only a + small or even no delay of certain operations. This since, + threads often are woken due to other unrelated reasons. + However, if the consumer thread was not woken due to other + reasons when the bug was triggered, these operations could be + left hanging, potentially for ever. Such effects seems to + have been very rare, but we have on at least one occasion + gotten a report about such an issue. + + Operations potentially effected by this bug: + + -- Inspection of memory allocation status -- The Erlang + process calling erlang:memory/[0,1], or + erlang:system_info({allocator|allocator_sizes, _}) could + potentially hang waiting for responses from involved threads. + + -- Async thread pool jobs -- An async thread pool job request + and/or reply could potentially be left hanging. In OTP this + only effected file operations, but user implemented drivers + using the async thread pool were also effected. In the file + operation case, this would typically translate into an Erlang + process potentially hanging on the file operation. + + -- Shutting down the runtime system -- Due to the issue with + the async thread pool mentioned above, flushing of I/O while + terminating the runtime system could also potentially hang. + + -- ETS memory deallocation -- Scheduled jobs handling + deallocation of the main structure of an ETS table could + potentially hang. This more or less only translates into + minor memory leaks. + + -- Shutting down distribution -- The distribution shutdown + phase used when manually shutting down the distribution, + i.e., when calling net_kernel:stop(), could potentially hang. + + OTP-10858 OS X Snow Leopard now only uses write, as writev does not + work properly on very large files. + + OTP-10859 Fixed a bug where line oriented file I/O using read_ahead was + very slow for files with very large difference in line + length. + + OTP-10860 In erts-5.10 (R16A) faulty hashvalues were produced for + non-ASCII atoms (characters in byte-range 128..255). This has + now been fixed and hashvalues conforms to previous OTP + releases. + + OTP-10872 As of ERTS-5.10/OTP-R16A node names passed in the EPMD + protocol are required to be encoded in UTF-8. Since EPMD + previously accepted latin1 encoded node names this is an + incompatibility. However, since Erlang nodes always have + required characters in node names to be 7-bit ASCII + characters (and still do require this), this incompatibility + should not effect anyone using EPMD as an Erlang Port Mapper + Daemon. + + OTP-10875 Fixes of memory accesses that might be thread unsafe when the + runtime system has been linked against third-party libraries + for atomic memory operations during the build. Most builds + are uneffected by this bug. If triggered, the runtime system + will most likely crash more or less immediately. + + OTP-10881 Fixed a bug where it was longer possible to give the +sws + proposal flag to non-smp emulators. + + OTP-10884 The +pc flag to erl can be used to set the range of + characters considered printable. This affects how the shell + and io:format("~tp",...) functionality does heuristic string + detection. More can be read in STDLIB users guide. + + OTP-10887 Fix a number of type cast errors related to formatted + printing on Win64 that can potentially cause problem when the + Erlang VM exceeds 4 GB of ram. (Thanks to Blaine Whittle for + the original patch) + + OTP-10890 Faulty type to bytes read for ReadFile on Windows. This could + cause windows systems to misbehave. The correct type is now + used. + + OTP-10892 Change default max ports for Windows to 8192. Having a too + large value caused Windows to not be able to recover + properly. If you want to use another value, pass +Q Value to + erl or werl. + + OTP-10895 The effect of the deprecated environment variable + ERL_MAX_PORTS had been removed premeturely. It has now been + readded. Note that this is still scheduled to be released in + R17B. + + OTP-10896 Fix rare crash on halfword vm during code loading. + + --- et-1.4.4.3 ---------------------------------------------------------- OTP-10630 Where necessary a comment stating encoding has been added to @@ -1519,6 +1818,17 @@ The OTP Team Ayaz. +--- hipe-3.10.1 --------------------------------------------------------- + + OTP-10867 Bug fixed in hipe to where it did not allow unicode code + points 16#FFFE and 16#FFFF in bit syntax in natively compiled + modules. + + OTP-10897 Fix bug in hipe compiled code related to the handling of + is_number/1. (Thanks to Sebastian Egner and Johannes Weißl + for minimal test code and Kostis for quick patch) + + --- ic-4.3 -------------------------------------------------------------- OTP-10784 Misc build updates @@ -1528,6 +1838,14 @@ The OTP Team erl_interface-3.7.10 (R16) or later in order to build. +--- ic-4.3.1 ------------------------------------------------------------ + + OTP-10885 Revert the structs erlang_pid, erlang_port and erlang_ref as + they were before R16A (without node_org_enc) in order to be + backward compatible with user code that accesses the fields + of these structs. + + --- inets-5.9.3 --------------------------------------------------------- OTP-10256 httpc: The HTTP client now supports HTTPS through proxies @@ -1539,6 +1857,24 @@ The OTP Team Hans Svensson. +--- inets-5.9.4 --------------------------------------------------------- + + OTP-10844 httpd: The modules option now defaults to the documented + value. + + OTP-10845 httpc: Fixed persistent connection implementation that was + broken by a patch to R13. The patch made persisten + connections behaved the same way as pipelining. + + OTP-10846 httpd: Simplified configuration of ssl in httpd, this also + enables all ssl options to be configured. The old and limited + way is no longer documented but will be supported for + backwards comatibility for some time. + + OTP-10886 Handle correctly the "No files found or file unavailable" + error code. Thanks to Serge Aleynikov + + --- jinterface-1.5.7 ---------------------------------------------------- OTP-10505 fix reading compressed binary terms from Java (Thanks to Nico @@ -1557,6 +1893,18 @@ The OTP Team future releases of Erlang/OTP that may create unicode atoms. +--- jinterface-1.5.8 ---------------------------------------------------- + + OTP-10819 Fixed a bug in OtpErlangTuple constructor. Thanks to Vlad + Dumitrescu. + + OTP-10821 Fixed finding cookie file on windows. Thanks to Vlad + Dumitrescu + + OTP-10822 Don't compress external binary format if this increases the + size. Thanks to Nico Kruber. + + --- kernel-2.16 --------------------------------------------------------- OTP-8067 Inet exported functionality @@ -1632,6 +1980,37 @@ The OTP Team OTP-10739 Add search to Erlang shell's history. Thanks to Fred Herbert. +--- kernel-2.16.1 ------------------------------------------------------- + + OTP-10754 A bug that could cause a crash with wrong reason has been + corrected in the application_controller module. + + OTP-10797 Slightly nicer error message when node start fails due to + duplicate name. Thanks to Magnus Henoch. + + OTP-10820 Miscellaneous updates due to Unicode support. + + OTP-10823 Add a new function code:get_mode() can be used to detect how + the code servers behaves. Thanks to Vlad Dumitrescu + + OTP-10839 Fix type of error Reason on gen_tcp:send/2. Thanks to Sean + Cribbs. + + OTP-10852 file:list_dir_all/1 and file:read_link_all/1 that can handle + raw file names have been added. See the User Guide for STDLIB + for information about raw file names. + + OTP-10870 Fix code:is_module_native/1 that sometimes in R16A returned + false for hipe compiled modules containing BIFs such as + lists. + + OTP-10879 Respect {exit_on_close,false} option on tcp socket in + non-passive mode when receiving fails (due to an ill-formed + packet for example) by only doing a half close and still + allow sending on the socket. (Thanks to Anthony Molinaro and + Steve Vinoski for reporting the problem) + + --- megaco-3.16.0.3 ----------------------------------------------------- OTP-10630 Where necessary a comment stating encoding has been added to @@ -1695,6 +2074,13 @@ The OTP Team Danil Onishchenko. +--- odbc-2.10.15 -------------------------------------------------------- + + OTP-10798 Fixed calling odbc:param_query/3 and odbc:param_query/4 with + unparameterized query string and empty parameters list. + Thanks to Danil Onishchenko. + + --- orber-3.6.25 -------------------------------------------------------- OTP-10665 Some examples overflowing the width of PDF pages have been @@ -1718,6 +2104,11 @@ The OTP Team OTP-10660 The file esyntax.yrl has been removed. +--- parsetools-2.0.9 ---------------------------------------------------- + + OTP-10820 Miscellaneous updates due to Unicode support. + + --- percept-0.8.8 ------------------------------------------------------- OTP-10784 Misc build updates @@ -1728,6 +2119,11 @@ The OTP Team OTP-10784 Misc build updates +--- pman-2.7.1.4 -------------------------------------------------------- + + OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. + + --- public_key-0.18 ----------------------------------------------------- OTP-7045 public_key now supports CRL validation and documents the @@ -1782,6 +2178,11 @@ The OTP Team corrected. +--- reltool-0.6.3 ------------------------------------------------------- + + OTP-10781 Some updates are made to reltool for handling unicode. + + --- runtime_tools-1.8.10 ------------------------------------------------ OTP-10155 User Guides for the dynamic tracing tools dtrace and @@ -1831,6 +2232,12 @@ The OTP Team Erlang/OTP R17B when UTF-8 becomes the default encoding. +--- sasl-2.3.1 ---------------------------------------------------------- + + OTP-10782 Some updates are made to systools and release_handler for + handling of unicode. + + --- snmp-4.23 ----------------------------------------------------------- OTP-10027 [manager] Remove deprecated functions. @@ -1850,11 +2257,6 @@ The OTP Team OTP-10673 SNMP manager performance optimization ---- ssh-2.1.2 ----------------------------------------------------------- - - OTP-10657 Fixed various syntax errors in SSH appup file - - --- ssh-2.1.3 ----------------------------------------------------------- OTP-6406 SSH_FX_FILE_IS_A_DIRECTORY message for sftp implemented @@ -1902,9 +2304,13 @@ The OTP Team o which authmethod to use. ---- ssl-5.1.2 ----------------------------------------------------------- +--- ssh-2.1.4 ----------------------------------------------------------- - OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored + OTP-10553 Better quality on the error messages for when key exchange + failed. + + OTP-10862 Fix link to documentation for ssh:connect/3,4. Thanks to + Martin Hässler. --- ssl-5.2 ------------------------------------------------------------- @@ -1958,6 +2364,19 @@ The OTP Team TLS-connections. +--- ssl-5.2.1 ----------------------------------------------------------- + + OTP-10847 Transport callback handling is changed so that gen_tcp is + treated as a special case where inet will be called directly + for functions such as setopts, as gen_tcp does not have its + own setopts. This will enable users to use the transport + callback for other customizations such as websockets. + + OTP-10864 Follow up to OTP-10451 solved in ssl-5.2 R16A. Make sure + format_error return good strings. Replace confusing legacy + atoms with more descriptive atoms. + + --- stdlib-1.19 --------------------------------------------------------- OTP-6874 Wildcards such as "some/path/*" passed to filelib:wildcard/2 @@ -2057,11 +2476,51 @@ The OTP Team write_concurrency is combined with read_concurrency. +--- stdlib-1.19.1 ------------------------------------------------------- + + OTP-10622 Bugs related to Unicode have been fixed in the erl_eval + module. + + OTP-10755 The new STDLIB application variable shell_strings can be used + for determining how the Erlang shell outputs lists of + integers. The new function shell:strings/1 toggles the value + of the variable. + + The control sequence modifier l can be used for turning off + the string recognition of ~p and ~P. + + OTP-10812 filelib:wildcard("some/relative/path/*.beam", Path) would + fail to match any file. That is, filelib:wildcard/2 would not + work if the first component of the pattern did not contain + any wildcard characters. (A previous attempt to fix the + problem in R15B02 seems to have made matters worse.) + + (Thanks to Samuel Rivas and Tuncer Ayaz.) + + There is also an incompatible change to the Path argument. It + is no longer allowed to be a binary. + + OTP-10820 Miscellaneous updates due to Unicode support. + + OTP-10836 Extend ~ts to handle binaries with characters coded in + ISO-latin-1 + + OTP-10884 The +pc flag to erl can be used to set the range of + characters considered printable. This affects how the shell + and io:format("~tp",...) functionality does heuristic string + detection. More can be read in STDLIB users guide. + + --- syntax_tools-1.6.10 ------------------------------------------------- OTP-10302 Support for Unicode has been implemented. +--- syntax_tools-1.6.11 ------------------------------------------------- + + OTP-10820 Miscellaneous updates due to Unicode support. + + --- test_server-3.6 ----------------------------------------------------- OTP-9710 Line numbering of erlang files that were not correctly @@ -2159,6 +2618,50 @@ The OTP Team and strings instead of binary_to_list and list_to_binary. +--- test_server-3.6.1 --------------------------------------------------- + + OTP-10780 The unicode update of test_server for R16A introduced a few + potential errors when logging to files. Sometimes ~tp or ~ts + was used for formatting also when writing to files that were + not opened with the {encoding,utf8} option. If then the + argument contained unicode characters above 255, the file + descriptor would crash. This has been corrected by the + following modifications: + + -- Since the 'unexpected_io' log file is used only when the + test case HTML file is not available (e.g. between test + cases), this file is now also a HTML file and as other + test_server HTML logs it is always UTF-8 encoded + + -- Since it is possible to change which information is going + to which log file (with test_server_ctrl:set_levels/3), we do + not have full control over which information is written to + which file. This means that any printout could be written to + the 'major' log file (suite.log), which was earlier encoded + as latin1. To avoid crashing this file descriptor due to + unicode strings, the 'major' log file is now also encoded in + UTF-8 (possible incopatibility). + + -- The cross_cover.info file is no longer a text file which + can be read with file:consult/1, instead it is written as a + pure binary file using term_to_binary when writing and + binary_to_term when reading. + + -- The encoding of the file named 'last_name', which only + content is the path to the last run. directory, is + now dependent on the file name mode of the VM. If file names + are expected to be unicode, then the 'last_name' file is + UTF-8 encoded, else it is latin1 encoded. + + Also, ~tp has been changed back to ~p unless it is somehow + likely that the argument includes strings. It is not obvious + that this is the correct thing to do, but some decission had + to be taken... + + OTP-10832 Using the force_stop flag/option to interrupt a test run + caused a crash in Common Test. This problem has been solved. + + --- toolbar-1.4.2.3 ----------------------------------------------------- OTP-10784 Misc build updates @@ -2204,6 +2707,12 @@ The OTP Team correspond with the correct BIFs. +--- tools-2.6.10 -------------------------------------------------------- + + OTP-10778 Fix a bug in cover when used with no_auto_import. Thanks to + José Valim. + + --- tv-2.1.4.10 --------------------------------------------------------- OTP-10784 Misc build updates @@ -2248,3 +2757,4 @@ The OTP Team OTP-10665 Some examples overflowing the width of PDF pages have been corrected. + diff --git a/sources b/sources index 4a1b064..3fd68b9 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -39e2c511f8afeaacc02a16424f2cb103 otp_src_R16A_RELEASE_CANDIDATE.tar.gz +7ee131515bc496e7522e0dec2a4c26e3 otp_src_R16B.tar.gz +66fd89992d828fe0886b3e9b68867e0c otp_doc_html_R16B.tar.gz +f3a34cc45c8d0b44bec839824d5fca09 otp_doc_man_R16B.tar.gz From 94f8e6ca1aaa1d36bdfa5110694b1a060e04e26e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 2 Mar 2013 09:02:38 +0400 Subject: [PATCH 023/340] Fix erts deps Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 03171d6..4cf45ae 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -444,6 +444,8 @@ Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Provides: erlang(erl_drv_version) = 2.1 +Provides: erlang(erl_nif_version) = 2.4 Obsoletes: %{name} < R13B-04.5 %description erts @@ -458,8 +460,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Provides: erlang(erl_drv_version) = 2.1 -Provides: erlang(erl_nif_version) = 2.4 Obsoletes: %{name} < R13B-04.5 %description et @@ -2307,6 +2307,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 02 2013 Peter Lemenkov - R16B-0.2 +- Fixed erts provides + * Thu Feb 28 2013 Peter Lemenkov - R16B-0.1 - Ver. R16B - Enabled SCTP (see rhbz #908530) From 33c26948eeb2547686307bd35c4eb38474ed115d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 2 Mar 2013 09:23:26 +0400 Subject: [PATCH 024/340] Add neccessary BuildRequires for SCTP Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 4cf45ae..344264d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -82,6 +82,7 @@ Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # BuildRoot not strictly needed since F10, but keep it for spec file robustness BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: lksctp-tools-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -2307,6 +2308,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 02 2013 Peter Lemenkov - R16B-0.3 +- Add neccessary BuildRequires for SCTP + * Sat Mar 02 2013 Peter Lemenkov - R16B-0.2 - Fixed erts provides From 2e7458307589da5423a1f98dc10e36dc8d6d656d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 28 May 2013 18:27:18 +0400 Subject: [PATCH 025/340] Add Requires for SCTP (dlopened library) Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 344264d..ac8d514 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.3%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -445,6 +445,7 @@ Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: lksctp-tools Provides: erlang(erl_drv_version) = 2.1 Provides: erlang(erl_nif_version) = 2.4 Obsoletes: %{name} < R13B-04.5 @@ -2308,6 +2309,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 11 2013 Peter Lemenkov - R16B-0.4 +- Add Requires for SCTP (dlopened library) + * Sat Mar 02 2013 Peter Lemenkov - R16B-0.3 - Add neccessary BuildRequires for SCTP From 00d9d21922224fa378f8aecb8c06f67d9f1579f4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 20 Jun 2013 12:36:23 +0400 Subject: [PATCH 026/340] Ver. R16B01 Signed-off-by: Peter Lemenkov --- .gitignore | 4 + erlang.spec | 14 +- otp-0006-Do-not-install-erlang-sources.patch | 18 +- otp_src_R16B.readme | 2760 ------------------ otp_src_R16B01.readme | 1210 ++++++++ sources | 7 +- 6 files changed, 1238 insertions(+), 2775 deletions(-) delete mode 100644 otp_src_R16B.readme create mode 100644 otp_src_R16B01.readme diff --git a/.gitignore b/.gitignore index e60b66a..1b96e45 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,7 @@ otp_src_R14A.tar.gz /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 diff --git a/erlang.spec b/erlang.spec index ac8d514..a5cb668 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ %global upstream_ver R16B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -#%global upstream_rel 03 -%global upstream_rel %{nil} +#%global upstream_rel %{nil} +%global upstream_rel 01 # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -360,6 +360,7 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Requires: graphviz Obsoletes: %{name} < R13B-04.5 %description dialyzer @@ -791,6 +792,7 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages +Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -1843,6 +1845,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/snmpa_error_logger.* %{_libdir}/erlang/man/man3/snmpa_error_report.* %{_libdir}/erlang/man/man3/snmpa_local_db.* +%{_libdir}/erlang/man/man3/snmpa_mib_data.* +%{_libdir}/erlang/man/man3/snmpa_mib_storage.* %{_libdir}/erlang/man/man3/snmpa_mpd.* %{_libdir}/erlang/man/man3/snmpa_network_interface.* %{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* @@ -2309,6 +2313,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 19 2013 Peter Lemenkov - R16B-01.1 +- Ver. R16B01 +- Added graphviz as a requirement for dialyzer (thanks to Matwey V. Kornilov) + * Mon Mar 11 2013 Peter Lemenkov - R16B-0.4 - Add Requires for SCTP (dlopened library) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 00cf566..fbb06c0 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -86,15 +86,15 @@ Signed-off-by: Hans Ulrich Niedermann 76 files changed, 60 insertions(+), 113 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index a224b6a..e88641b 100644 +index 7a7b7fb..fcdb699 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -69,8 +69,6 @@ copy: +@@ -76,8 +76,6 @@ copy: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin" @@ -112,7 +112,7 @@ index c1620bc..02c0984 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 9607799..dbfb40b 100644 +index 33cd3cc..72c7005 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -156,7 +156,7 @@ release_spec: opt @@ -288,7 +288,7 @@ index bb2edd4..6b20995 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index df10c33..5c54e70 100644 +index 578bbae..647cfde 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -242,11 +242,8 @@ release_spec: opt @@ -413,7 +413,7 @@ index 75e156b..5e394ca 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index 0f2d6db..4e267f9 100644 +index 87015aa..84f870d 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -452,7 +452,7 @@ index 16166f5..0ba5845 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 7852a21..917cdee 100644 +index 751e876..98b7911 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -963,10 +963,10 @@ index 93d0b54..5904bc2 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index e61f415..74661e3 100644 +index cf9f7d5..0f80003 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp_src_R16B.readme b/otp_src_R16B.readme deleted file mode 100644 index 861ab56..0000000 --- a/otp_src_R16B.readme +++ /dev/null @@ -1,2760 +0,0 @@ -Major release : otp_src_R16B -Build date : 2013-02-25 - -R16B is a major new release of Erlang/OTP. -You can download the full source distribution from - - http://www.erlang.org/download/otp_src_R16B.tar.gz - http://www.erlang.org/download/otp_src_R16B.readme (this file) - -Note: To unpack the TAR archive you need a GNU TAR compatible program. - -For installation instructions please read the README that is part of -the distribution. - -The Windows binary distribution can be downloaded from - - http://www.erlang.org/download/otp_win32_R16B.exe - http://www.erlang.org/download/otp_win64_R16B.exe - - -On-line documentation can be found at http://www.erlang.org/doc/. -You can also download the complete HTML documentation or the Unix manual files - - http://www.erlang.org/download/otp_doc_html_R16B.tar.gz - http://www.erlang.org/download/otp_doc_man_R16B.tar.gz - -We also want to thank those that sent us patches, suggestions and bug reports, - -The OTP Team - - ---- HIGHLIGHTS ---------------------------------------------------------- - - OTP-7786 == ssh == - - Added User Guide for the SSH application - - OTP-9892 == erts == - - Process optimizations. The most notable: - - -- New internal process table implementation allowing for - both parallel reads as well as writes. Especially read - operations have become really cheap. This reduce contention - in various situations. For example when, spawning processes, - terminating processes, sending messages, etc. - - -- Optimizations of run queue management reducing contention. - - -- Optimizations of process state changes reducing - contention. - - These changes imply changes of the characteristics the - system. Most notable: changed timing in the system. - - OTP-9974 == erts == - - Non-blocking code loading. Earlier when an Erlang module was - loaded, all other execution in the VM were halted while the - load operation was carried out in single threaded mode. Now - modules are loaded without blocking the VM. Processes may - continue executing undisturbed in parallel during the entire - load operation. The load operation is completed by making the - loaded code visible to all processes in a consistent way with - one single atomic instruction. Non-blocking code loading will - improve realtime characteristics when modules are - loaded/upgraded on a running SMP system. - - OTP-10256 == inets == - - httpc: The HTTP client now supports HTTPS through proxies - - OTP-10336 == erts == - - Major port improvements. The most notable: - - -- New internal port table implementation allowing for both - parallel reads as well as writes. Especially read operations - have become really cheap.This reduce contention in various - situations. For example when, creating ports, terminating - ports, etc. - - -- Dynamic allocation of port structures. This allow for a - much larger maximum amount of ports allowed as a default. The - previous default of 1024 has been raised to 65536. Maximum - amount of ports can be set using the +Q command line flag of - erl(1). The previously used environment variable - ERL_MAX_PORTS has been deprecated and scheduled for removal - in OTP-R17. - - -- Major rewrite of scheduling of port tasks. Major benefits - of the rewrite are reduced contention on run queue locks, and - reduced amount of memory allocation operations needed. The - rewrite was also necessary in order to make it possible to - schedule signals from processes to ports. - - -- Improved internal thread progress functionality for easy - management of unmanaged threads. This improvement was - necessary for the rewrite of the port task scheduling. - - -- Rewrite of all process to port signal implementations in - order to make it possible to schedule those operations. All - port operations can now be scheduled which allows for reduced - lock contention on the port lock as well as truly - asynchronous communication with ports. - - -- Optimized lookup of port handles from drivers. - - -- Optimized driver lookup when creating ports. - - -- Preemptable erlang:ports/0 BIF. - - -- Improving responsiveness by bumping reductions for a - process calling a driver callback directly. - - These changes imply changes of the characteristics of the - system. The most notable: - - -- Order of signal delivery -- The previous implementation of - the VM has delivered signals from processes to ports in a - synchronous stricter fashion than required by the language. - As of ERTS version 5.10, signals are truly asynchronously - delivered. The order of signal delivery still adheres to the - requirements of the language, but only to the requirements. - That is, some signal sequences that previously always were - delivered in one specific order may now from time to time be - delivered in different orders. This may cause Erlang programs - that have made false assumptions about signal delivery order - to fail even though they previously succeeded. For more - information about signal ordering guarantees, see the chapter - on communication in the ERTS user's guide. The +n command - line flag of erl(1) can be helpful when trying to find - signaling order bugs in Erlang code that have been exposed by - these changes. - - -- Latency of signals sent from processes to ports -- Signals - from processes to ports where previously always delivered - immediately. This kept latency for such communication to a - minimum, but it could cause lock contention which was very - expensive for the system as a whole. In order to keep this - latency low also in the future, most signals from processes - to ports are by default still delivered immediately as long - as no conflicts occur. Such conflicts include not being able - to acquire the port lock, but also include other conflicts. - When a conflict occur, the signal will be scheduled for - delivery at a later time. A scheduled signal delivery may - cause a higher latency for this specific communication, but - improves the overall performance of the system since it - reduce lock contention between schedulers. The default - behavior of only scheduling delivery of these signals on - conflict can be changed by passing the +spp command line flag - to erl(1). The behavior can also be changed on port basis - using the parallelism option of the open_port/2 BIF. - - -- Execution time of the erlang:ports/0 BIF -- Since - erlang:ports/0 now can be preempted, the responsiveness of - the system as a whole has been improved. A call to - erlang:ports/0 may, however, take a much longer time to - complete than before. How much longer time heavily depends on - the system load. - - -- Reduction cost of calling driver callbacks -- Calling a - driver callback is quite costly. This was previously not - reflected in reduction cost at all. Since the reduction cost - now has increased, a process performing lots of direct driver - calls will be scheduled out more frequently than before. - - Potential incompatibilities: - - -- driver_send_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_send_term() with usage of erl_drv_send_term(). - - -- driver_output_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_output_term() with usage of erl_drv_output_term(). - - -- The new function erl_drv_busy_msgq_limits() has been added - in order to able to control management of port queues. - - The driver API version has been bumped to 2.1 from 2.0 due to - the above changes in the driver API. - - OTP-10410 == asn1 == - - The options for the ASN.1 compiler has been drastically - simplified. The backend is chosen by using ber, per, or uper. - The options optimize, nif, and driver are no longer needed. - The old options will still work, but will issue a warning. - - Another change is that generated encode/2 function will - always return a binary (some backends used to return an - iolist). - - OTP-10588 == asn1 == - - The ASN.1 compiler will now always include necessary run-time - functions in the generated Erlang modules (except for - asn1rt_nif which is still neeeded). If the option 'inline' is - used the ASN.1 compiler will generate a warning. But if - '{inline,OutputFile}' is use, the ASN.1 compiler will refuse - to compile the file. (Use a .set.asn file if you need to - remove the output file.) - - The 'BIT STRING' type will now be decoded as Erlang - bitstrings by default. Use the new legacy_bit_string option - to encode as lists of ones and zeroes. (The - compact_bit_string option still works as before.) - - Open types are now always returned as binaries (when there is - no information allowing them to be decoded). - ---- POTENTIAL INCOMPATIBILITIES ----------------------------------------- - - OTP-9052 == common_test == - - Removed depricated run_test program, use ct_run instead. - - OTP-9881 == common_test == - - It is now possible to let a test specification include other - test specifications. Included specs can either be joined with - the source spec (and all other joined specs), resulting in - one single test run, or they can be executed in separate test - runs. Also, a start flag/option, join_specs, has been - introduced, to be used in combination with the spec option. - With join_specs, Common Test can be told to either join - multiple test specifications, or run them separately. Without - join_specs, the latter behaviour is default. Note that this - is a change compared to earlier versions of Common Test, - where specifications could only be joined. More information - can be found in the Running Tests chapter in the User's Guide - (see the Test Specifications section). - - OTP-10117 == inviso == - - The inviso application has been removed. - - OTP-10170 == erts pman == - - Tuple funs (deprecated in R15B) are no longer supported. - - OTP-10195 == edoc == - - Since EDoc 0.7.7 (R14B02) separate values of union types can - be annotated. However, the parser has hitherto chosen not to - add the necessary parentheses due to backwards compatibility. - - From this release on code traversing the output of - edoc_parser needs to take care of parentheses around separate - values of union types. Examples of such code are layout - modules and doclet modules. - - OTP-10336 == erts == - - Major port improvements. The most notable: - - -- New internal port table implementation allowing for both - parallel reads as well as writes. Especially read operations - have become really cheap.This reduce contention in various - situations. For example when, creating ports, terminating - ports, etc. - - -- Dynamic allocation of port structures. This allow for a - much larger maximum amount of ports allowed as a default. The - previous default of 1024 has been raised to 65536. Maximum - amount of ports can be set using the +Q command line flag of - erl(1). The previously used environment variable - ERL_MAX_PORTS has been deprecated and scheduled for removal - in OTP-R17. - - -- Major rewrite of scheduling of port tasks. Major benefits - of the rewrite are reduced contention on run queue locks, and - reduced amount of memory allocation operations needed. The - rewrite was also necessary in order to make it possible to - schedule signals from processes to ports. - - -- Improved internal thread progress functionality for easy - management of unmanaged threads. This improvement was - necessary for the rewrite of the port task scheduling. - - -- Rewrite of all process to port signal implementations in - order to make it possible to schedule those operations. All - port operations can now be scheduled which allows for reduced - lock contention on the port lock as well as truly - asynchronous communication with ports. - - -- Optimized lookup of port handles from drivers. - - -- Optimized driver lookup when creating ports. - - -- Preemptable erlang:ports/0 BIF. - - -- Improving responsiveness by bumping reductions for a - process calling a driver callback directly. - - These changes imply changes of the characteristics of the - system. The most notable: - - -- Order of signal delivery -- The previous implementation of - the VM has delivered signals from processes to ports in a - synchronous stricter fashion than required by the language. - As of ERTS version 5.10, signals are truly asynchronously - delivered. The order of signal delivery still adheres to the - requirements of the language, but only to the requirements. - That is, some signal sequences that previously always were - delivered in one specific order may now from time to time be - delivered in different orders. This may cause Erlang programs - that have made false assumptions about signal delivery order - to fail even though they previously succeeded. For more - information about signal ordering guarantees, see the chapter - on communication in the ERTS user's guide. The +n command - line flag of erl(1) can be helpful when trying to find - signaling order bugs in Erlang code that have been exposed by - these changes. - - -- Latency of signals sent from processes to ports -- Signals - from processes to ports where previously always delivered - immediately. This kept latency for such communication to a - minimum, but it could cause lock contention which was very - expensive for the system as a whole. In order to keep this - latency low also in the future, most signals from processes - to ports are by default still delivered immediately as long - as no conflicts occur. Such conflicts include not being able - to acquire the port lock, but also include other conflicts. - When a conflict occur, the signal will be scheduled for - delivery at a later time. A scheduled signal delivery may - cause a higher latency for this specific communication, but - improves the overall performance of the system since it - reduce lock contention between schedulers. The default - behavior of only scheduling delivery of these signals on - conflict can be changed by passing the +spp command line flag - to erl(1). The behavior can also be changed on port basis - using the parallelism option of the open_port/2 BIF. - - -- Execution time of the erlang:ports/0 BIF -- Since - erlang:ports/0 now can be preempted, the responsiveness of - the system as a whole has been improved. A call to - erlang:ports/0 may, however, take a much longer time to - complete than before. How much longer time heavily depends on - the system load. - - -- Reduction cost of calling driver callbacks -- Calling a - driver callback is quite costly. This was previously not - reflected in reduction cost at all. Since the reduction cost - now has increased, a process performing lots of direct driver - calls will be scheduled out more frequently than before. - - Potential incompatibilities: - - -- driver_send_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_send_term() with usage of erl_drv_send_term(). - - -- driver_output_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_output_term() with usage of erl_drv_output_term(). - - -- The new function erl_drv_busy_msgq_limits() has been added - in order to able to control management of port queues. - - The driver API version has been bumped to 2.1 from 2.0 due to - the above changes in the driver API. - - OTP-10410 == asn1 == - - The options for the ASN.1 compiler has been drastically - simplified. The backend is chosen by using ber, per, or uper. - The options optimize, nif, and driver are no longer needed. - The old options will still work, but will issue a warning. - - Another change is that generated encode/2 function will - always return a binary (some backends used to return an - iolist). - - OTP-10417 == kernel sasl == - - It is no longer possible to have {Mod,Vsn} in the 'modules' - list in a .app file. - - This was earlier possible, although never documented in the - .app file reference manual. It was however visible in the - documentation of application:load/[1,2], where the same term - as in a .app file can be used as the first argument. - - The possibility has been removed since the Vsn part was never - used. - - OTP-10451 == ssl == - - Remove filter mechanisms that made error messages backwards - compatible with old ssl but hid information about what - actually happened. - - This does not break the documented API however other reason - terms may be returned, so code that matches on the reason - part of {error, Reason} may fail. - - OTP-10490 == stdlib == - - If a child process fails in its start function, then the - error reason was earlier only reported as an error report - from the error_handler, and supervisor:start_link would only - return {error,shutdown}. This has been changed so the - supervisor will now return {error,{shutdown,Reason}}, where - Reason identifies the failing child and its error reason. - (Thanks to Tomas Pihl) - - OTP-10523 == tools == - - A new function, cover:flush(Nodes), is added which will fetch - data from remote nodes without stopping cover on those nodes. - This is used by test_server and common_test when it is safe - to assume that the node will be terminated after the test - anyway. The purpose is to avoid processes crashing when - re-loading the original beam if the processes is still - running old code. - - Remote nodes will now continue to count code coverage if the - connection to the main node is broken. Earlier, a broken - connection would cause the cover_server on the remote node to - die and thus any still cover compiled modules would cause - process crash when trying to insert cover data in ets tables - that used to exist on the cover_server. The new functionality - also involves synchronization with the main node if the nodes - are reconnected. - - OTP-10588 == asn1 == - - The ASN.1 compiler will now always include necessary run-time - functions in the generated Erlang modules (except for - asn1rt_nif which is still neeeded). If the option 'inline' is - used the ASN.1 compiler will generate a warning. But if - '{inline,OutputFile}' is use, the ASN.1 compiler will refuse - to compile the file. (Use a .set.asn file if you need to - remove the output file.) - - The 'BIT STRING' type will now be decoded as Erlang - bitstrings by default. Use the new legacy_bit_string option - to encode as lists of ones and zeroes. (The - compact_bit_string option still works as before.) - - Open types are now always returned as binaries (when there is - no information allowing them to be decoded). - - OTP-10613 == ssl == - - Removed deprecated function ssl:pid/0, it has been pointless - since R14 but has been keep for backwards compatibility. - - OTP-10633 == erts == - - Erlang specification 4.7.3 defines max tuple size to 65535 - elements It is now enforced to no more than 16777215 elements - (arity 24 bits) - - Previous edge cases (28 bits) were not validated and could - cause undefined behaviour. - - OTP-10647 == erts == - - The previous default of a maximum of 32768 simultaneous - processes has been raised to 262144. This value can be - changed using the the +P command line flag of erl(1). Note - that the value passed now is considered as a hint, and that - actual value chosen in most cases will be a power of two. - - OTP-10812 == stdlib == - - filelib:wildcard("some/relative/path/*.beam", Path) would - fail to match any file. That is, filelib:wildcard/2 would not - work if the first component of the pattern did not contain - any wildcard characters. (A previous attempt to fix the - problem in R15B02 seems to have made matters worse.) - - (Thanks to Samuel Rivas and Tuncer Ayaz.) - - There is also an incompatible change to the Path argument. It - is no longer allowed to be a binary. - - OTP-10872 == erts == - - As of ERTS-5.10/OTP-R16A node names passed in the EPMD - protocol are required to be encoded in UTF-8. Since EPMD - previously accepted latin1 encoded node names this is an - incompatibility. However, since Erlang nodes always have - required characters in node names to be 7-bit ASCII - characters (and still do require this), this incompatibility - should not effect anyone using EPMD as an Erlang Port Mapper - Daemon. - ---- CHARACTERISTICS IMPACT ----------------------------------------------- - - OTP-9892 == erts == - - Process optimizations. The most notable: - - -- New internal process table implementation allowing for - both parallel reads as well as writes. Especially read - operations have become really cheap. This reduce contention - in various situations. For example when, spawning processes, - terminating processes, sending messages, etc. - - -- Optimizations of run queue management reducing contention. - - -- Optimizations of process state changes reducing - contention. - - These changes imply changes of the characteristics the - system. Most notable: changed timing in the system. - - - OTP-9974 == erts == - - Non-blocking code loading. Earlier when an Erlang module was - loaded, all other execution in the VM were halted while the - load operation was carried out in single threaded mode. Now - modules are loaded without blocking the VM. Processes may - continue executing undisturbed in parallel during the entire - load operation. The load operation is completed by making the - loaded code visible to all processes in a consistent way with - one single atomic instruction. Non-blocking code loading will - improve realtime characteristics when modules are - loaded/upgraded on a running SMP system. - - OTP-10122 == erts == - - In the SMP emulator, turning on and off tracing will no - longer take down the system to single-scheduling. - - OTP-10167 == erts == - - Optimized deletion of ETS-tables which significantly improves - performance when large amounts of temporary tables are used. - - This change imply changes of the characteristics the system. - Most notable: changed timing in the system. - - OTP-10273 == erts == - - New internal header scheme for allocators - - Impact: Reduces size on object allocated in multiblock - carriers by one word - - OTP-10336 == erts == - - Major port improvements. - - These changes imply changes of the characteristics of the - system. The most notable: - - -- Order of signal delivery -- The previous implementation of - the VM has delivered signals from processes to ports in a - synchronous stricter fashion than required by the language. - As of ERTS version 5.10, signals are truly asynchronously - delivered. The order of signal delivery still adheres to the - requirements of the language, but only to the requirements. - That is, some signal sequences that previously always were - delivered in one specific order may now from time to time be - delivered in different orders. This may cause Erlang programs - that have made false assumptions about signal delivery order - to fail even though they previously succeeded. For more - information about signal ordering guarantees, see the chapter - on communication in the ERTS user's guide. The +n command - line flag of erl(1) can be helpful when trying to find - signaling order bugs in Erlang code that have been exposed by - these changes. - - -- Latency of signals sent from processes to ports -- Signals - from processes to ports where previously always delivered - immediately. This kept latency for such communication to a - minimum, but it could cause lock contention which was very - expensive for the system as a whole. In order to keep this - latency low also in the future, most signals from processes - to ports are by default still delivered immediately as long - as no conflicts occur. Such conflicts include not being able - to acquire the port lock, but also include other conflicts. - When a conflict occur, the signal will be scheduled for - delivery at a later time. A scheduled signal delivery may - cause a higher latency for this specific communication, but - improves the overall performance of the system since it - reduce lock contention between schedulers. The default - behavior of only scheduling delivery of these signals on - conflict can be changed by passing the +spp command line flag - to erl(1). The behavior can also be changed on port basis - using the parallelism option of the open_port/2 BIF. - - -- Execution time of the erlang:ports/0 BIF -- Since - erlang:ports/0 now can be preempted, the responsiveness of - the system as a whole has been improved. A call to - erlang:ports/0 may, however, take a much longer time to - complete than before. How much longer time heavily depends on - the system load. - - -- Reduction cost of calling driver callbacks -- Calling a - driver callback is quite costly. This was previously not - reflected in reduction cost at all. Since the reduction cost - now has increased, a process performing lots of direct driver - calls will be scheduled out more frequently than before. - - OTP-10661 == erts == - - The previously (in R15) proposed scheduler wakeup strategy is - now used by default. This strategy is not as quick to forget - about previous overload as the previous strategy. - - This change imply changes of the characteristics the system. - Most notable: When a small overload comes and then disappears - repeatedly, the system will for a bit longer time be willing - to wake up schedulers than before. Timing in the system will - due to this also change. - - The previous strategy can still be enabled by passing the - +sws legacy command line flag to erl. - - OTP-10736 == erts == - - The runtime system will now by default use 10 async threads - if thread support has been enabled when building the runtime - system. - - This will prevent long blocking file-operations from blocking - scheduler threads for long periods of time, which can be - harmful. Apart from file-operations, it also effects other - operations scheduled on the async thread pool by user - implemented drivers. - - The amount of async threads can be controlled by using the +A - command line argument of erl(1). When running some offline - tools you might want to disable async threads, but you are - advised not to in the general case. Instead, you might want - to increase the amount of async threads used. - - This change imply changes of the characteristics the system - compared to the previous default. The responsiveness of the - system as a whole will be improved. Operations scheduled on - the async thread pool will get an increased latency. The - throughput of these operations may increase, or decrease - depending on the type of the operations and how they get - scheduled. In the case of file operations, the throughput - very much depends on how the Erlang application access files. - Multiple concurrent accesses to different files have the - potential of an increased throughput. - - OTP-10737 == erts == - - The default reader group limit has been increased to 64 from - 8. This limit can be set using the +rg command line argument - of erl(1). - - This change of default value will reduce lock contention on - ETS tables using the read_concurrency option at the expense - of memory consumption when the amount of schedulers and - logical processors are beween 8 and 64. For more information, - see documentation of the +rg command line argument of erl(1). - - OTP-10787 == erts == - - Increased potential concurrency in ETS for write_concurrency - option. The number of internal table locks has increased from - 16 to 64. This makes it four times less likely that two - concurrent processes writing to the same table would collide - and thereby serialized. The cost is an increased constant - memory footprint for tables using write_concurrency. The - memory consumption per inserted record is not affected. The - increased footprint can be particularly large if - write_concurrency is combined with read_concurrency. - - OTP-10519 == asn1 == - - The ASN.1 compiler generates faster decode functions for PER - and UPER. Some minor improvements have also been made for - PER/UPER encoding, and to the BER backend. - - OTP-10506 == odbc == - - Under Unix enable TCP_NODELAY to disable Nagel's socket - algorithm. Thanks to Andy Richards - - Impact: Performance gain on Unix systems - - OTP-10361 == ssl == - - Support Next Protocol Negotiation in TLS, thanks to Ben - Murphy for the contribution. - - Impact: Could give performance benefit if used as it saves a - round trip. - - OTP-10425 == ssl == - - TLS 1.2 will now be the default TLS version if sufficient - crypto support is available otherwise TLS 1.1 will be - default. - - Impact: A default TLS connection will have higher security - and hence it may be perceived as slower then before. - - OTP-10710 == ssl == - - Now handles cleaning of CA-certificate database correctly so - that there will be no memory leek, bug was introduced in ssl- - 5.1 when changing implementation to increase parallel - execution. - - Impact: Improved memory usage, especially if you have many - different certificates and upgrade tcp-connections to - TLS-connections. - ---- inviso -------------------------------------------------------------- - - OTP-10117 The inviso application has been removed. - - ---- otp ----------------------------------------------------------------- - - OTP-9684 Most specs for built in functions now reside in their - respective module instead of being coded in the erl_bif_types - module of the Hipe application. This creatyes a single source - for specifications and documentation, which should radically - lessen the risk for differences between the docs and the - actual spec seen by dialyzer. - - OTP-9862 Many types and specifications that used to reside in - erl_bif_types have been moved into respective module. - - OTP-10616 The experimental feature "parameterized modules" (also called - "abstract modules") has been removed. For applications that - depends on parameterized modules, there is a parse transform - that can be used to still use parameterized modules. The - parse transform can be found at: - github.com/erlang/pmod_transform - - OTP-10726 Implement ./otp_build configure --enable-silent-rules - - With silent rules, the output of make is less verbose and - compilation warnings are easier to spot. Silent rules are - disabled by default and can be disabled or enabled at will by - make V=0 and make V=1. (Thanks to Anthony Ramine) - - ---- appmon-2.1.14.2 ----------------------------------------------------- - - OTP-10784 Misc build updates - - OTP-10786 The backend module appmon_info.erl is moved from appmon - application to runtime_tools. This allows appmon to be run - from a remote erlang node towards a target node which does - not have appmon (and its dependencies) installed, as long as - runtime_tools is installed there. - - ---- asn1-2.0 ------------------------------------------------------------ - - OTP-10410 The options for the ASN.1 compiler has been drastically - simplified. The backend is chosen by using ber, per, or uper. - The options optimize, nif, and driver are no longer needed. - The old options will still work, but will issue a warning. - - Another change is that generated encode/2 function will - always return a binary (some backends used to return an - iolist). - - OTP-10519 The ASN.1 compiler generates faster decode functions for PER - and UPER. Some minor improvements have also been made for - PER/UPER encoding, and to the BER backend. - - OTP-10588 The ASN.1 compiler will now always include necessary run-time - functions in the generated Erlang modules (except for - asn1rt_nif which is still neeeded). If the option 'inline' is - used the ASN.1 compiler will generate a warning. But if - '{inline,OutputFile}' is use, the ASN.1 compiler will refuse - to compile the file. (Use a .set.asn file if you need to - remove the output file.) - - The 'BIT STRING' type will now be decoded as Erlang - bitstrings by default. Use the new legacy_bit_string option - to encode as lists of ones and zeroes. (The - compact_bit_string option still works as before.) - - Open types are now always returned as binaries (when there is - no information allowing them to be decoded). - - OTP-10664 Encoding SEQUENCEs with multiple extension addition groups - with optional values could fail (depending both on the - specification and whether all values were provided). - - ---- asn1-2.0.1 ---------------------------------------------------------- - - OTP-10853 Fixed broken table constraints within a SET OF or SEQUENCE OF - for the BER backend. - - ---- common_test-1.7 ----------------------------------------------------- - - OTP-9769 Severe errors detected by test_server (e.g. if log files - directories cannot be created) will now be reported to - common_test and noted in the common_test logs. - - OTP-9870 The earlier undocumented cross cover feature for accumulating - cover data over multiple tests has now been fixed and - documented. - - OTP-9881 It is now possible to let a test specification include other - test specifications. Included specs can either be joined with - the source spec (and all other joined specs), resulting in - one single test run, or they can be executed in separate test - runs. Also, a start flag/option, join_specs, has been - introduced, to be used in combination with the spec option. - With join_specs, Common Test can be told to either join - multiple test specifications, or run them separately. Without - join_specs, the latter behaviour is default. Note that this - is a change compared to earlier versions of Common Test, - where specifications could only be joined. More information - can be found in the Running Tests chapter in the User's Guide - (see the Test Specifications section). - - OTP-10040 If a busy test case generated lots of error messages, - cth_log_redirect:post_end_per_testcase would crash with a - timeout while waiting for the error logger to finish handling - all error reports. The default timer was 5 seconds. This has - now been extended to 5 minutes. - - OTP-10070 When a test case failed because of a timetrap time out, the - Config data for the case was lost in the following call to - end_per_testcase/2, and also in calls to the CT Hook function - post_end_per_testcase/4. This problem has been solved and the - Config data is now correctly passed to the above functions - after a timetrap timeout failure. - - OTP-10088 Some calls to deprecated and removed functions in snmp are - removed from ct_snmp. - - OTP-10101 In test_server, the same process would supervise the - currently running test case and be group leader (and IO - server) for the test case. Furthermore, when running parallel - test cases, new temporary supervisor/group leader processes - were spawned and the process that was group leader for - sequential test cases would not be active. That would lead to - several problems: - - * Processes started by init_per_suite will inherit the group - leader of the init_per_suite process (and that group leader - would not process IO requests when parallel test cases was - running). If later a parallel test case caused such a - processto print using (for example) io:format/2, the calling - would hang. - - * Similarly, if a process was spawned from a parallel test - case, it would inherit the temporary group leader for that - parallel test case. If that spawned process later - when the - group of parallel tests have finished - attempted to print - something, its group leader would be dead and there would be - badarg exception. - - Those problems have been solved by having group leaders - separate from the processes that supervises the test cases, - and keeping temporary group leader process for parallel test - cases alive until no more process in the system use them as - group leaders. - - Also, a new unexpected_io.log log file (reachable from the - summary page of each test suite) has been introduced. All - unexpected IO will be printed into it(for example, IO to a - group leader for a parallel test case that has finished). - - OTP-10432 Some bugfixes in ct_snmp: - - -- ct_snmp will now use the value of the 'agent_vsns' config - variable when setting the 'variables' parameter to snmp - application agent configuration. Earlier this had to be done - separately - i.e. the supported versions had to be specified - twice. - - -- Snmp application failed to write notify.conf since ct_snmp - gave the notify type as a string instead of an atom. This has - been corrected. - - OTP-10434 Some bugfixes in ct_snmp: - - -- Functions register_users/2, register_agents/2 and - register_usm_users/2, and the corresponding unregister_*/1 - functions were not executable. These are corrected/rewritten. - - -- Function update_usm_users/2 is removed, and an unregister - function is added instead. Update can now be done with - unregister_usm_users and then register_usm_users. - - -- Functions unregister_*/2 are added, so specific - users/agents/usm users can be unregistered. - - -- Function unload_mibs/1 is added for completeness. - - -- Overriding configuration files did not work, since the - files were written in priv_dir instead of in the - configuration dir (priv_dir/conf). This has been corrected. - - -- Arguments to register_usm_users/2 were faulty documented. - This has been corrected. - - OTP-10469 The ct_slave:start/3 function now supports an - {env,[{Var,Value}]} option to extend environment for the - slave node. - - OTP-10601 Faulty exported specs in common test has been corrected to - ct_netconfc:hook_options/0 and inet:hostname/0 - - OTP-10646 The netconf client in common_test did not adjust the window - after receiving data. Due to this, the client stopped - receiving data after a while. This has been corrected. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10783 Update common test modules to handle unicode - - -- Use UTF-8 encoding for all HTML files, except the HTML - version of the test suite generated with erl2html2:convert, - which will have the same encoding as the original test suite - (.erl) file. - - -- Encode link targets in HTML files with - test_server_ctrl:uri_encode/1. - - -- Use unicode modifier 't' with ~s when appropriate. - - -- Use unicode:characters_to_list and - unicode:characters_to_binary for conversion between binaries - and strings instead of binary_to_list and list_to_binary. - - ---- common_test-1.7.1 --------------------------------------------------- - - OTP-9052 Removed depricated run_test program, use ct_run instead. - - OTP-10634 If an event handler installed in the CT Master event manager - took too long to respond during the termination phase, CT - Master crashed because of a timeout after 5 secs. This would - leave the system in a bad state. The problem has been solved - by means of a 30 min timeout value and if CT Master gets a - timeout after that time, it now kills the event manager and - shuts down properly. - - OTP-10826 Printing with any of the ct printout functions from an event - handler installed by Common Test, would cause a deadlock. - This problem has been solved. - - OTP-10832 Using the force_stop flag/option to interrupt a test run - caused a crash in Common Test. This problem has been solved. - - ---- compiler-4.9 -------------------------------------------------------- - - OTP-10193 The compiler optimizations have been polished, so that the - code quality will be slightly better in some cases. - - OTP-10302 Support for Unicode has been implemented. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10690 Fix some wrong warnings triggered by the option - inline_list_funcs. Thanks to Anthony Ramine. - - OTP-10706 Forbid local fun variables in Core Erlang guards. Thanks to - Anthony Ramine. - - OTP-10724 Binary syntax matches could cause an internal consistency - error in in the compiler. (Thanks to Viktor Sovietov for - reporting this bug.) - - ---- compiler-4.9.1 ------------------------------------------------------ - - OTP-10788 Integers in expression that will give a floating point result - (such as "X / 2" will now be converted to floating point at - compile-time. (Suggested by Richard O'Keefe.) - - Identical floating points constans in a module will now be - coalesced to one entry in the constant pool. - - OTP-10794 The compiler would crash attempting to compile expressions - such as "element(2, not_tuple)". - - OTP-10818 Forbid multiple values in Core Erlang sequence arguments. - Thanks to José Valim and Anthony Ramine. - - OTP-10825 An unsafe optimization would cause the compiler to crash with - an internal error for certain complex code sequences. - - ---- cosEvent-2.1.13 ----------------------------------------------------- - - OTP-10784 Misc build updates - - ---- cosEventDomain-1.1.13 ----------------------------------------------- - - OTP-10784 Misc build updates - - ---- cosFileTransfer-1.1.14 ---------------------------------------------- - - OTP-10784 Misc build updates - - ---- cosNotification-1.1.19 ---------------------------------------------- - - OTP-10784 Misc build updates - - ---- cosProperty-1.1.16 -------------------------------------------------- - - OTP-10784 Misc build updates - - ---- cosTime-1.1.13 ------------------------------------------------------ - - OTP-10784 Misc build updates - - ---- cosTransactions-1.2.13 ---------------------------------------------- - - OTP-10784 Misc build updates - - ---- crypto-2.3 ---------------------------------------------------------- - - OTP-10596 Enable runtime upgrade of crypto including the OpenSSL - library used by crypto. - - OTP-10640 Improve documentation and tests for hmac functions in crypto. - Thanks to Daniel White - - OTP-10667 Added ripemd160 support to crypto. Thanks to Michael Loftis - - ---- debugger-3.2.9 ------------------------------------------------------ - - OTP-10302 Support for Unicode has been implemented. - - OTP-10621 Fix Debugger settings dialog due to changed behavior in - wxFileDialog (Thanks to Håkan Mattsson) - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10679 Integer lists and utf-8 binaries in variables are now - displayed as strings. - - ---- debugger-3.2.10 ----------------------------------------------------- - - OTP-10884 The +pc flag to erl can be used to set the range of - characters considered printable. This affects how the shell - and io:format("~tp",...) functionality does heuristic string - detection. More can be read in STDLIB users guide. - - ---- dialyzer-2.5.4 ------------------------------------------------------ - - OTP-10302 Support for Unicode has been implemented. - - OTP-10433 Dialyzer no longer outputs warnings for unused anonymous - functions ("funs"). Warnings are still output for unused - functions. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10681 Fix precision of record creation violation warnings. Thanks - to Stavros Aronis - - OTP-10740 Report spec discrepancy on mismatching lists. Thanks to - Stavros Aronis. - - OTP-10772 Properly support functions with arbitrary arity in type - specs. Thanks to Stavros Aronis. - - ---- dialyzer-2.6 -------------------------------------------------------- - - OTP-10820 Miscellaneous updates due to Unicode support. - - OTP-10861 User defined types with same name and different arity and - documentation inconsistencies. Thanks Stavros Aronis. - - OTP-10865 Native code compilation changes. Thanks to Kostis Sagonas. - - ---- diameter-1.4 -------------------------------------------------------- - - OTP-10442 Add registered server names to the app file. - - OTP-10609 Fix #diameter_header{} handling broken by OTP-10445. - - The fault caused the the header of a [Header | Avps] request - to be ignored if both end_to_end_id and hop_by_hop_id were - undefined. - - OTP-10614 Fix error handling for handle_request callback. - - A callback that returned a #diameter_packet{} would fail if - the incoming request had decode errors. - - OTP-10618 Fix timing of service start event. - - The event did not necessarily precede other events as - documented. - - OTP-10619 Fix setting of header T flag at peer failover. - - The flag is now set in the diameter_header record passed to a - prepare_retransmit callback. - - OTP-10628 Fix sending of CER/CEA timeout event at capx_timeout. - - The event was not sent as documented. - - OTP-10655 Fix improper setting of Application-ID in the Diameter header - of an answer message whose E flag is set. - - The value should be that of the request in question. The - fault caused it always to be 0. - - OTP-10693 Fix faulty handling of AVP length errors. - - An incorrect AVP length but no other errors caused an - incoming request to fail. - - ---- diameter-1.4.1 ------------------------------------------------------ - - OTP-10686 Add application_opt() request_errors to make the handling of - incoming requests containing decode errors configurable. - - The value 'callback' ensures that a handle_request callback - takes place for all such requests, the default being for - diameter to answer 3xxx series errors itself. - - OTP-10687 Add transport_opt() length_errors. - - The value determines how messages received over the transport - interface with an incorrect Message Length are dealt with. - - OTP-10688 Add commentary on RFC 6733 to Standards Compliance chapter of - the User's Guide. - - OTP-10692 Fix erroneous watchdog transition from DOWN to INITIAL. - - This transition took place when a peer connection was - reestablished following a failed capabilities exchange. RFC - 3539 requires DOWN to transition into REOPEN. - - OTP-10759 Allow a 5xxx result code in an answer-message on peer - connections using the RFC 6733 common dictionary. - - RFC 6733 allows this while RFC 3588 does not. A - handle_request callback can return {answer_message, - 3000..3999|5000..5999} in the simplest case. - - OTP-10760 Add dictionaries for RFC 6733. - - Both the common and accounting dictionaries differ from their - RFC 3588 counterparts, which is reflected in generated record - definitions. Application configuration on a service or - transport determines the dictionary that will be used on a - given peer connection. - - OTP-10761 Allow a handle_request callback to control diameter's setting - of Result-Code and Failed-AVP. - - Setting errors = false in a returned #diameter_packet{} - disables the setting. - - ---- edoc-0.7.11 --------------------------------------------------------- - - OTP-10195 Since EDoc 0.7.7 (R14B02) separate values of union types can - be annotated. However, the parser has hitherto chosen not to - add the necessary parentheses due to backwards compatibility. - - From this release on code traversing the output of - edoc_parser needs to take care of parentheses around separate - values of union types. Examples of such code are layout - modules and doclet modules. - - OTP-10302 Support for Unicode has been implemented. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- edoc-0.7.12 --------------------------------------------------------- - - OTP-10820 Miscellaneous updates due to Unicode support. - - OTP-10866 EDoc sometimes failed to associate a comment with the - preceding type declaration. This bug has been fixed. (Thanks - to Serge Aleynikov for reporting the bug.) - - ---- eldap-1.0.1 --------------------------------------------------------- - - OTP-10403 Fixed various dialyzer warnings - - OTP-10728 Configure the SSL options fully in eldap. - - ---- erl_docgen-0.3.4 ---------------------------------------------------- - - OTP-10302 Support for Unicode has been implemented. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10725 Correct a PDF indentation bug for tagged lists in tagged - lists and added some missing tags to the DTD. - - ---- erl_interface-3.7.10 ------------------------------------------------ - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10753 Limited support for unicode atoms in the external format and - in the internal representation of the vm. This is a - preparative feature in order to support communication with - future releases of Erlang/OTP that may create unicode atoms. - - ---- erl_interface-3.7.11 ------------------------------------------------ - - OTP-10885 Revert the structs erlang_pid, erlang_port and erlang_ref as - they were before R16A (without node_org_enc) in order to be - backward compatible with user code that accesses the fields - of these structs. - - ---- erts-5.10 ----------------------------------------------------------- - - OTP-8928 A boolean socket option 'ipv6_v6only' for IPv6 sockets has - been added. The default value of the option is OS dependent, - so applications aiming to be portable should consider using - {ipv6_v6only,true} when creating an inet6 - listening/destination socket, and if neccesary also create an - inet socket on the same port for IPv4 traffic. See the - documentation. - - OTP-9861 It is now allowed to define stubs for BIFs, to allow type - specs to be written for BIFs. For example, if there is BIF - called lists:member/2, a dummy definition of lists:member/2 - is now allowed. - - OTP-9892 Process optimizations. The most notable: - - -- New internal process table implementation allowing for - both parallel reads as well as writes. Especially read - operations have become really cheap. This reduce contention - in various situations. For example when, spawning processes, - terminating processes, sending messages, etc. - - -- Optimizations of run queue management reducing contention. - - -- Optimizations of process state changes reducing - contention. - - These changes imply changes of the characteristics the - system. Most notable: changed timing in the system. - - OTP-9974 Non-blocking code loading. Earlier when an Erlang module was - loaded, all other execution in the VM were halted while the - load operation was carried out in single threaded mode. Now - modules are loaded without blocking the VM. Processes may - continue executing undisturbed in parallel during the entire - load operation. The load operation is completed by making the - loaded code visible to all processes in a consistent way with - one single atomic instruction. Non-blocking code loading will - improve realtime characteristics when modules are - loaded/upgraded on a running SMP system. - - OTP-10122 In the SMP emulator, turning on and off tracing will no - longer take down the system to single-scheduling. - - OTP-10146 Remove VxWorks support - - OTP-10156 Added a general framework for executing benchmarks of - Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been - incorporated in the framework. - - For details about how to add more benchmarks see - $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. - - OTP-10167 Optimized deletion of ETS-tables which significantly improves - performance when large amounts of temporary tables are used. - - This change imply changes of the characteristics the system. - Most notable: changed timing in the system. - - OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. - - OTP-10273 New internal header scheme for allocators - - Impact: Reduces size on object allocated in multiblock - carriers by one word - - OTP-10336 Major port improvements. The most notable: - - -- New internal port table implementation allowing for both - parallel reads as well as writes. Especially read operations - have become really cheap.This reduce contention in various - situations. For example when, creating ports, terminating - ports, etc. - - -- Dynamic allocation of port structures. This allow for a - much larger maximum amount of ports allowed as a default. The - previous default of 1024 has been raised to 65536. Maximum - amount of ports can be set using the +Q command line flag of - erl(1). The previously used environment variable - ERL_MAX_PORTS has been deprecated and scheduled for removal - in OTP-R17. - - -- Major rewrite of scheduling of port tasks. Major benefits - of the rewrite are reduced contention on run queue locks, and - reduced amount of memory allocation operations needed. The - rewrite was also necessary in order to make it possible to - schedule signals from processes to ports. - - -- Improved internal thread progress functionality for easy - management of unmanaged threads. This improvement was - necessary for the rewrite of the port task scheduling. - - -- Rewrite of all process to port signal implementations in - order to make it possible to schedule those operations. All - port operations can now be scheduled which allows for reduced - lock contention on the port lock as well as truly - asynchronous communication with ports. - - -- Optimized lookup of port handles from drivers. - - -- Optimized driver lookup when creating ports. - - -- Preemptable erlang:ports/0 BIF. - - -- Improving responsiveness by bumping reductions for a - process calling a driver callback directly. - - These changes imply changes of the characteristics of the - system. The most notable: - - -- Order of signal delivery -- The previous implementation of - the VM has delivered signals from processes to ports in a - synchronous stricter fashion than required by the language. - As of ERTS version 5.10, signals are truly asynchronously - delivered. The order of signal delivery still adheres to the - requirements of the language, but only to the requirements. - That is, some signal sequences that previously always were - delivered in one specific order may now from time to time be - delivered in different orders. This may cause Erlang programs - that have made false assumptions about signal delivery order - to fail even though they previously succeeded. For more - information about signal ordering guarantees, see the chapter - on communication in the ERTS user's guide. The +n command - line flag of erl(1) can be helpful when trying to find - signaling order bugs in Erlang code that have been exposed by - these changes. - - -- Latency of signals sent from processes to ports -- Signals - from processes to ports where previously always delivered - immediately. This kept latency for such communication to a - minimum, but it could cause lock contention which was very - expensive for the system as a whole. In order to keep this - latency low also in the future, most signals from processes - to ports are by default still delivered immediately as long - as no conflicts occur. Such conflicts include not being able - to acquire the port lock, but also include other conflicts. - When a conflict occur, the signal will be scheduled for - delivery at a later time. A scheduled signal delivery may - cause a higher latency for this specific communication, but - improves the overall performance of the system since it - reduce lock contention between schedulers. The default - behavior of only scheduling delivery of these signals on - conflict can be changed by passing the +spp command line flag - to erl(1). The behavior can also be changed on port basis - using the parallelism option of the open_port/2 BIF. - - -- Execution time of the erlang:ports/0 BIF -- Since - erlang:ports/0 now can be preempted, the responsiveness of - the system as a whole has been improved. A call to - erlang:ports/0 may, however, take a much longer time to - complete than before. How much longer time heavily depends on - the system load. - - -- Reduction cost of calling driver callbacks -- Calling a - driver callback is quite costly. This was previously not - reflected in reduction cost at all. Since the reduction cost - now has increased, a process performing lots of direct driver - calls will be scheduled out more frequently than before. - - Potential incompatibilities: - - -- driver_send_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_send_term() with usage of erl_drv_send_term(). - - -- driver_output_term() has been deprecated and has been - scheduled for removal in OTP-R17. Replace usage of - driver_output_term() with usage of erl_drv_output_term(). - - -- The new function erl_drv_busy_msgq_limits() has been added - in order to able to control management of port queues. - - The driver API version has been bumped to 2.1 from 2.0 due to - the above changes in the driver API. - - OTP-10348 The experimental support for packages has been removed. - - OTP-10491 Set new peeled off SCTP socket to nonblocking socket (Thanks - to Jonas Falkevik) - - OTP-10522 Wrong parameters when setting seq_trace-tokens from within a - trace-pattern could crash the VM. This is now corrected. - - OTP-10611 Fix various typos (thanks to Tuncer Ayaz) - - OTP-10633 Erlang specification 4.7.3 defines max tuple size to 65535 - elements It is now enforced to no more than 16777215 elements - (arity 24 bits) - - Previous edge cases (28 bits) were not validated and could - cause undefined behaviour. - - OTP-10643 Add insert_element/3 and delete_element/2 - - OTP-10647 The previous default of a maximum of 32768 simultaneous - processes has been raised to 262144. This value can be - changed using the the +P command line flag of erl(1). Note - that the value passed now is considered as a hint, and that - actual value chosen in most cases will be a power of two. - - OTP-10661 The previously (in R15) proposed scheduler wakeup strategy is - now used by default. This strategy is not as quick to forget - about previous overload as the previous strategy. - - This change imply changes of the characteristics the system. - Most notable: When a small overload comes and then disappears - repeatedly, the system will for a bit longer time be willing - to wake up schedulers than before. Timing in the system will - due to this also change. - - The previous strategy can still be enabled by passing the - +sws legacy command line flag to erl. - - OTP-10668 The +stbt command line argument of erl was added. This - argument can be used for trying to set scheduler bind type. - Upon failure unbound schedulers will be used. - - OTP-10677 Fix fd leak when using async thread pool - - When using the async thread pool, if an erlang process asks - to open a file and it gets shutdown/killed while the - file:open/2 call hasn't returned, it's possible to leak a - file descriptor against the target file. This has now been - fixed. (Thanks to Filipe David Manana) - - OTP-10678 Support ANSI in console - - Unix platforms will no longer filter control sequences to the - ttsl driver thus enabling ANSI and colors in console. (Thanks - to Pedram Nimreezi) - - OTP-10680 Add file:allocate/3 operation - - This operation allows pre-allocation of space for files. It - succeeds only on systems that support such operation. (Thanks - to Filipe David Manana) - - OTP-10683 Treat -Wreturn-type warnings as error when using GCC (Thanks - to Tuncer Ayaz) - - OTP-10699 Use sys/types.h instead of string.h to pull ssize_t - definition to erl_driver.h. This fixes build issue on NetBSD. - (Thanks to Yamamoto Takashi). - - OTP-10702 Arguments given with the -run or -s flags to erl are now - translated according to the file name encoding mode of the - runtime system. - - OTP-10726 Implement ./otp_build configure --enable-silent-rules - - With silent rules, the output of make is less verbose and - compilation warnings are easier to spot. Silent rules are - disabled by default and can be disabled or enabled at will by - make V=0 and make V=1. (Thanks to Anthony Ramine) - - OTP-10727 Use share flags for all file operations on Windows. Thanks to - Filipe David Borba Manana. - - OTP-10733 Make/fakefop adjustments. Thanks to Tuncer Ayaz and Sebastian - Rasmussen. - - OTP-10736 The runtime system will now by default use 10 async threads - if thread support has been enabled when building the runtime - system. - - This will prevent long blocking file-operations from blocking - scheduler threads for long periods of time, which can be - harmful. Apart from file-operations, it also effects other - operations scheduled on the async thread pool by user - implemented drivers. - - The amount of async threads can be controlled by using the +A - command line argument of erl(1). When running some offline - tools you might want to disable async threads, but you are - advised not to in the general case. Instead, you might want - to increase the amount of async threads used. - - This change imply changes of the characteristics the system - compared to the previous default. The responsiveness of the - system as a whole will be improved. Operations scheduled on - the async thread pool will get an increased latency. The - throughput of these operations may increase, or decrease - depending on the type of the operations and how they get - scheduled. In the case of file operations, the throughput - very much depends on how the Erlang application access files. - Multiple concurrent accesses to different files have the - potential of an increased throughput. - - OTP-10737 The default reader group limit has been increased to 64 from - 8. This limit can be set using the +rg command line argument - of erl(1). - - This change of default value will reduce lock contention on - ETS tables using the read_concurrency option at the expense - of memory consumption when the amount of schedulers and - logical processors are beween 8 and 64. For more information, - see documentation of the +rg command line argument of erl(1). - - OTP-10746 The octet counters in the gen_tcp/inet interface could behave - in unexpected ways on 64bit platforms. The behaviour is now - as expected. - - OTP-10747 Certain linux kernels, most notably in redhat and CentOS - distribution, had a bug in writev which generated an infinite - loop in the tcp code of the VM. The bug is now worked around. - - OTP-10748 A process that got killed (got an exit signal) while - operating on a compresseed file, could cause a segmentation - fault in the VM. This is now corrected. Thanks to Filipe - David Manana for identifying the problem and submitting a - solution. - - OTP-10751 Windows previously used three digit exponent in formatting - which caused difference between platforms, as can be seen by - float_to_list/1. This has now been fixed. - - OTP-10752 New BIF float_to_list/2 which solves a problem of - float_to_list/1 that doesn't allow specifying the number of - digits after the decimal point when formatting floats (Thanks - to Serge Aleynikov). - - OTP-10753 Limited support for unicode atoms in the external format and - in the internal representation of the vm. This is a - preparative feature in order to support communication with - future releases of Erlang/OTP that may create unicode atoms. - - OTP-10787 Increased potential concurrency in ETS for write_concurrency - option. The number of internal table locks has increased from - 16 to 64. This makes it four times less likely that two - concurrent processes writing to the same table would collide - and thereby serialized. The cost is an increased constant - memory footprint for tables using write_concurrency. The - memory consumption per inserted record is not affected. The - increased footprint can be particularly large if - write_concurrency is combined with read_concurrency. - - ---- erts-5.10.1 --------------------------------------------------------- - - OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. - - OTP-10300 Added four new bifs, erlang:binary_to_integer/1,2, - erlang:integer_to_binary/1, erlang:binary_to_float/1 and - erlang:float_to_binary/1,2. These bifs work similarly to how - their list counterparts work, except they operate on - binaries. In most cases converting from and to binaries is - faster than converting from and to lists. - - These bifs are auto-imported into erlang source files and can - therefore be used without the erlang prefix. - - OTP-10348 The experimental support for packages has been removed. - - OTP-10802 Threads created internally in the runtime system by vanilla, - fd, and spawn drivers on Windows systems could make thread - unsafe calls to driver_select(). - - OTP-10803 Threads created internally in the runtime system by the - vanilla, fd, and spawn drivers on Windows systems could make - unsafe memory accesses to driver data after port had - terminated. - - OTP-10807 The runtime system could crash when flushing data to standard - out or standard error on Windows. - - OTP-10809 Bugs due to the port optimizations introduced in - erts-5.10/OTP-R16A have been fixed: - - -- Memory leak when terminating ports - - -- Memory leak when reaching the system limit of maximum - amount of concurrently existing ports - - -- Crashs due to missing, or late test of bad port handle - - -- The newly introduced driver API function - erl_drv_busy_msgq_limits() could not be used by dynamically - linked in drivers on Windows - - OTP-10810 The driver API function erl_drv_consume_timeslice(), and the - NIF API function enif_consume_timeslice() have been - introduced. - - These functions are provided in order to better support - co-operative scheduling, improve system responsiveness, and - to make it easier to prevent misbehaviors of the VM due to a - process or port monopolizing a scheduler thread. They can be - used when dividing lengthy work into a number of repeated - calls without the need to use threads. - - OTP-10824 Fix {packet,httph} header capitalization for unrecognized - header fields longer than 20 charachters such as - Sec-Websocket-Version. The limit is simply raised from 20 to - 50 characters with the hope that valid headers longer than 50 - are not used. - - OTP-10834 The list_to_integer/2 bif has been optimized when used with - bases other than 10. - - OTP-10837 Fix rounding issues in float_to_list/1,2. Thanks to Serge - Aleynikov - - OTP-10838 The git commit sha of the HEAD commit is now added to the - Erlang shell when compiling a non-released Erlang version. - - OTP-10840 Change caching policy for memory segment allocator. For - instance, prefer sbc segments over mbc segments, caching - policy is time-arrow aware, evicting older cached segments to - store newer segments. - - The default number of cachable segment has been increased - from five to ten segments. This can be modified, same as - before, with the command line option +MMmcs 5 - - Impact: Increased speed for processing on larger objects, - e.g. binaries. Slight increase of mapped and resident memory. - Tune your system with memory options to erl for best - performance. - - OTP-10841 Fix memory leak in file driver introduced in R16A. - - OTP-10848 Updated config.sub and config.guess to latest version from - gnu.org - - OTP-10849 Add an xcomp file for Blue Gene/Q. Thanks to Kostis Sagonas. - - OTP-10850 Cleanup of documentation of the type language. Thanks to - Kostis Sagonas. - - OTP-10851 Change the return value of hipe_bifs:remove_refs_from/1. - Thanks to Kostis Sagonas. - - OTP-10854 A bug in an ERTS internal queue implementation could cause - the loss of a wake up signal to a consumer thread. This has - now been fixed. - - The effect of this bug, when triggered, was often only a - small or even no delay of certain operations. This since, - threads often are woken due to other unrelated reasons. - However, if the consumer thread was not woken due to other - reasons when the bug was triggered, these operations could be - left hanging, potentially for ever. Such effects seems to - have been very rare, but we have on at least one occasion - gotten a report about such an issue. - - Operations potentially effected by this bug: - - -- Inspection of memory allocation status -- The Erlang - process calling erlang:memory/[0,1], or - erlang:system_info({allocator|allocator_sizes, _}) could - potentially hang waiting for responses from involved threads. - - -- Async thread pool jobs -- An async thread pool job request - and/or reply could potentially be left hanging. In OTP this - only effected file operations, but user implemented drivers - using the async thread pool were also effected. In the file - operation case, this would typically translate into an Erlang - process potentially hanging on the file operation. - - -- Shutting down the runtime system -- Due to the issue with - the async thread pool mentioned above, flushing of I/O while - terminating the runtime system could also potentially hang. - - -- ETS memory deallocation -- Scheduled jobs handling - deallocation of the main structure of an ETS table could - potentially hang. This more or less only translates into - minor memory leaks. - - -- Shutting down distribution -- The distribution shutdown - phase used when manually shutting down the distribution, - i.e., when calling net_kernel:stop(), could potentially hang. - - OTP-10858 OS X Snow Leopard now only uses write, as writev does not - work properly on very large files. - - OTP-10859 Fixed a bug where line oriented file I/O using read_ahead was - very slow for files with very large difference in line - length. - - OTP-10860 In erts-5.10 (R16A) faulty hashvalues were produced for - non-ASCII atoms (characters in byte-range 128..255). This has - now been fixed and hashvalues conforms to previous OTP - releases. - - OTP-10872 As of ERTS-5.10/OTP-R16A node names passed in the EPMD - protocol are required to be encoded in UTF-8. Since EPMD - previously accepted latin1 encoded node names this is an - incompatibility. However, since Erlang nodes always have - required characters in node names to be 7-bit ASCII - characters (and still do require this), this incompatibility - should not effect anyone using EPMD as an Erlang Port Mapper - Daemon. - - OTP-10875 Fixes of memory accesses that might be thread unsafe when the - runtime system has been linked against third-party libraries - for atomic memory operations during the build. Most builds - are uneffected by this bug. If triggered, the runtime system - will most likely crash more or less immediately. - - OTP-10881 Fixed a bug where it was longer possible to give the +sws - proposal flag to non-smp emulators. - - OTP-10884 The +pc flag to erl can be used to set the range of - characters considered printable. This affects how the shell - and io:format("~tp",...) functionality does heuristic string - detection. More can be read in STDLIB users guide. - - OTP-10887 Fix a number of type cast errors related to formatted - printing on Win64 that can potentially cause problem when the - Erlang VM exceeds 4 GB of ram. (Thanks to Blaine Whittle for - the original patch) - - OTP-10890 Faulty type to bytes read for ReadFile on Windows. This could - cause windows systems to misbehave. The correct type is now - used. - - OTP-10892 Change default max ports for Windows to 8192. Having a too - large value caused Windows to not be able to recover - properly. If you want to use another value, pass +Q Value to - erl or werl. - - OTP-10895 The effect of the deprecated environment variable - ERL_MAX_PORTS had been removed premeturely. It has now been - readded. Note that this is still scheduled to be released in - R17B. - - OTP-10896 Fix rare crash on halfword vm during code loading. - - ---- et-1.4.4.3 ---------------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- eunit-2.2.4 --------------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- gs-1.5.15.2 --------------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- hipe-3.10 ----------------------------------------------------------- - - OTP-10302 Support for Unicode has been implemented. - - OTP-10624 The type ascii_string() in the base64 module has been - corrected. The type file:file_info() has been cleaned up. The - type file:fd() has been made opaque in the documentation. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10705 Update .gitignore (lib/hipe/boot_ebin). Thanks to Tuncer - Ayaz. - - ---- hipe-3.10.1 --------------------------------------------------------- - - OTP-10867 Bug fixed in hipe to where it did not allow unicode code - points 16#FFFE and 16#FFFF in bit syntax in natively compiled - modules. - - OTP-10897 Fix bug in hipe compiled code related to the handling of - is_number/1. (Thanks to Sebastian Egner and Johannes Weißl - for minimal test code and Kostis for quick patch) - - ---- ic-4.3 -------------------------------------------------------------- - - OTP-10784 Misc build updates - - OTP-10785 Adapt ic for changes in erl_interface and jinterface due to - utf8 atom support. This change makes ic dependent on - erl_interface-3.7.10 (R16) or later in order to build. - - ---- ic-4.3.1 ------------------------------------------------------------ - - OTP-10885 Revert the structs erlang_pid, erlang_port and erlang_ref as - they were before R16A (without node_org_enc) in order to be - backward compatible with user code that accesses the fields - of these structs. - - ---- inets-5.9.3 --------------------------------------------------------- - - OTP-10256 httpc: The HTTP client now supports HTTPS through proxies - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10765 Fix autoredirect for POST requests responding 303. Thanks to - Hans Svensson. - - ---- inets-5.9.4 --------------------------------------------------------- - - OTP-10844 httpd: The modules option now defaults to the documented - value. - - OTP-10845 httpc: Fixed persistent connection implementation that was - broken by a patch to R13. The patch made persisten - connections behaved the same way as pipelining. - - OTP-10846 httpd: Simplified configuration of ssl in httpd, this also - enables all ssl options to be configured. The old and limited - way is no longer documented but will be supported for - backwards comatibility for some time. - - OTP-10886 Handle correctly the "No files found or file unavailable" - error code. Thanks to Serge Aleynikov - - ---- jinterface-1.5.7 ---------------------------------------------------- - - OTP-10505 fix reading compressed binary terms from Java (Thanks to Nico - Kruber) - - OTP-10579 OtpEpmd.lokupNames() no longer hangs when badly configured - (Thanks to Vlad Dumitrescu) - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10753 Limited support for unicode atoms in the external format and - in the internal representation of the vm. This is a - preparative feature in order to support communication with - future releases of Erlang/OTP that may create unicode atoms. - - ---- jinterface-1.5.8 ---------------------------------------------------- - - OTP-10819 Fixed a bug in OtpErlangTuple constructor. Thanks to Vlad - Dumitrescu. - - OTP-10821 Fixed finding cookie file on windows. Thanks to Vlad - Dumitrescu - - OTP-10822 Don't compress external binary format if this increases the - size. Thanks to Nico Kruber. - - ---- kernel-2.16 --------------------------------------------------------- - - OTP-8067 Inet exported functionality - - inet:parse_ipv4_address/1, inet:parse_ipv4strict_address/1, - inet:parse_ipv6_address/1, inet:parse_ipv6strict_address/1, - inet:parse_address/1 and inet:parse_strict_address is now - exported from the inet module. - - OTP-8928 A boolean socket option 'ipv6_v6only' for IPv6 sockets has - been added. The default value of the option is OS dependent, - so applications aiming to be portable should consider using - {ipv6_v6only,true} when creating an inet6 - listening/destination socket, and if neccesary also create an - inet socket on the same port for IPv4 traffic. See the - documentation. - - OTP-10302 Support for Unicode has been implemented. - - OTP-10417 It is no longer possible to have {Mod,Vsn} in the 'modules' - list in a .app file. - - This was earlier possible, although never documented in the - .app file reference manual. It was however visible in the - documentation of application:load/[1,2], where the same term - as in a .app file can be used as the first argument. - - The possibility has been removed since the Vsn part was never - used. - - OTP-10419 The documentation for global:register_name/3 has been updated - to mention that the use of {Module,Function} as the method - argument (resolve function) is deprecated. - - OTP-10473 The contract of erl_ddll:format_error/1 has been corrected. - (Thanks to Joseph Wayne Norton.) - - OTP-10549 Fixed bug where sendfile on oracle solaris would return an - error when a partial send was done. - - OTP-10617 The error_handler module will now call - '$handle_undefined_function'/2 if an attempt is made to call - a non-existing function in a module that exists. See the - documentation for error_handler module for details. - - OTP-10620 Change printout of application crash message on startup to - formated strings (Thanks to Serge Aleynikov) - - OTP-10624 The type ascii_string() in the base64 module has been - corrected. The type file:file_info() has been cleaned up. The - type file:fd() has been made opaque in the documentation. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10662 Do not return wrong terms unnecessarily. (Thanks to Kostis - Sagonas.) - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10680 Add file:allocate/3 operation - - This operation allows pre-allocation of space for files. It - succeeds only on systems that support such operation. (Thanks - to Filipe David Manana) - - OTP-10694 Add application:get_key/3. The new function provides a - default value for a configuration parameter. Thanks to Serge - Aleynikov. - - OTP-10739 Add search to Erlang shell's history. Thanks to Fred Herbert. - - ---- kernel-2.16.1 ------------------------------------------------------- - - OTP-10754 A bug that could cause a crash with wrong reason has been - corrected in the application_controller module. - - OTP-10797 Slightly nicer error message when node start fails due to - duplicate name. Thanks to Magnus Henoch. - - OTP-10820 Miscellaneous updates due to Unicode support. - - OTP-10823 Add a new function code:get_mode() can be used to detect how - the code servers behaves. Thanks to Vlad Dumitrescu - - OTP-10839 Fix type of error Reason on gen_tcp:send/2. Thanks to Sean - Cribbs. - - OTP-10852 file:list_dir_all/1 and file:read_link_all/1 that can handle - raw file names have been added. See the User Guide for STDLIB - for information about raw file names. - - OTP-10870 Fix code:is_module_native/1 that sometimes in R16A returned - false for hipe compiled modules containing BIFs such as - lists. - - OTP-10879 Respect {exit_on_close,false} option on tcp socket in - non-passive mode when receiving fails (due to an ill-formed - packet for example) by only doing a half close and still - allow sending on the socket. (Thanks to Anthony Molinaro and - Steve Vinoski for reporting the problem) - - ---- megaco-3.16.0.3 ----------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- mnesia-4.8 ---------------------------------------------------------- - - OTP-10156 Added a general framework for executing benchmarks of - Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been - incorporated in the framework. - - For details about how to add more benchmarks see - $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10636 Use chained send_after instead of send_interval, to make - decrease the number of messages sent after a sleep (Thanks to - James Wheare) - - OTP-10639 Fix format of mnesia overload message (Thanks to Ahmed Omar) - - OTP-10729 Remove support for the query keyword and query expressions. - Thanks to Loïc Hoguin. - - ---- observer-1.3 -------------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- odbc-2.10.14 -------------------------------------------------------- - - OTP-10506 Under Unix enable TCP_NODELAY to disable Nagel's socket - algorithm. Thanks to Andy Richards - - Impact: Performance gain on Unix systems - - OTP-10603 Added extended_errors option to ODBC - - When enabled, this option alters the return code of ODBC - operations that produce errors to include the ODBC error code - as well as the native error code, in addition to the ODBC - reason field which is returned by default. Thanks to Bernard - Duggan. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10735 Fix aotocommit for Oracle ODBC driver in Linux. Thanks to - Danil Onishchenko. - - ---- odbc-2.10.15 -------------------------------------------------------- - - OTP-10798 Fixed calling odbc:param_query/3 and odbc:param_query/4 with - unparameterized query string and empty parameters list. - Thanks to Danil Onishchenko. - - ---- orber-3.6.25 -------------------------------------------------------- - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - ---- os_mon-2.2.11 ------------------------------------------------------- - - OTP-10448 Removed deprecated function calls to snmp - - ---- otp_mibs-1.0.8 ------------------------------------------------------ - - OTP-10784 Misc build updates - - ---- parsetools-2.0.8 ---------------------------------------------------- - - OTP-10302 Support for Unicode has been implemented. - - OTP-10660 The file esyntax.yrl has been removed. - - ---- parsetools-2.0.9 ---------------------------------------------------- - - OTP-10820 Miscellaneous updates due to Unicode support. - - ---- percept-0.8.8 ------------------------------------------------------- - - OTP-10784 Misc build updates - - ---- pman-2.7.1.3 -------------------------------------------------------- - - OTP-10784 Misc build updates - - ---- pman-2.7.1.4 -------------------------------------------------------- - - OTP-10170 Tuple funs (deprecated in R15B) are no longer supported. - - ---- public_key-0.18 ----------------------------------------------------- - - OTP-7045 public_key now supports CRL validation and documents the - function public_key:pkix_path_validation/3 - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10670 Fix subjectPublicKeyInfo type comment in public_key. Thanks - to Ryosuke Nakai. - - OTP-10723 Fixed typo's in public_key spec. - - OTP-10767 Corrected PKCS-10 documentation and added some PKCS-9 support - that is fairly commonly used by PKCS-10. Full support for - PKCS-9 will be added later. - - ---- reltool-0.6.2 ------------------------------------------------------- - - OTP-10012 -- If incl_cond was set to derived on module level, then - reltool_server would crash with a case_clause. This has been - corrected. incl_cond on module level now overwrites mod_cond - on app or sys level as described in the documentation. - - -- If a rel spec in the reltool config does not contain all - applications that are listed as {applications,Applications} - in a .app file, then these applications are autmatically - added when creating the .rel file. For - 'included_applications', the behaviour was not the same. I.e. - if a rel spec in the reltool config did not contain all - applications that are listed as - {included_applications,InclApplications} in a .app file, then - reltool would fail with reason "Undefined applications" when - creating the .rel file. This has been corrected, so both - applications and included_applications are now automatically - added if not already in the rel spec. - - -- The rel specification now dictates the order in which - included and used applications (specified in the .app file as - included_applications and applications respectively) are - loaded/started by the boot file. If the applications are not - specified in the rel spec, then the order from the .app file - is used. This was a bug earlier reported on systools, and is - now also implemented in reltool. - - -- Instead of only looking at the directory name, reltool now - first looks for a .app file in order to figure out the name - of an application. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - ---- reltool-0.6.3 ------------------------------------------------------- - - OTP-10781 Some updates are made to reltool for handling unicode. - - ---- runtime_tools-1.8.10 ------------------------------------------------ - - OTP-10155 User Guides for the dynamic tracing tools dtrace and - systemtap have been added to the documentation. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10635 Fix Table Viewer refresh crash on no more existing ets tables - (Thanks to Peti Gömori) - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10786 The backend module appmon_info.erl is moved from appmon - application to runtime_tools. This allows appmon to be run - from a remote erlang node towards a target node which does - not have appmon (and its dependencies) installed, as long as - runtime_tools is installed there. - - ---- sasl-2.3 ------------------------------------------------------------ - - OTP-10394 release_handler_SUITE:otp_9864 deleted parts of the - release_handler_SUITE_data directory so the test suite could - not be executed twice without re-installation. This has been - corrected. - - OTP-10417 It is no longer possible to have {Mod,Vsn} in the 'modules' - list in a .app file. - - This was earlier possible, although never documented in the - .app file reference manual. It was however visible in the - documentation of application:load/[1,2], where the same term - as in a .app file can be used as the first argument. - - The possibility has been removed since the Vsn part was never - used. - - OTP-10463 release_handler:upgrade_script and - release_handler:downgrade_script could not read appup files - with regexps. This has been corrected. (Thanks to Ulf Wiger) - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - ---- sasl-2.3.1 ---------------------------------------------------------- - - OTP-10782 Some updates are made to systools and release_handler for - handling of unicode. - - ---- snmp-4.23 ----------------------------------------------------------- - - OTP-10027 [manager] Remove deprecated functions. - - OTP-10610 Fix typo in snmpm doc (Thanks to Luca Favatella) - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10671 Polish return values of snmpm_user_default according to - snmpm_user doc. - - OTP-10672 Remove runtime warning in snmpa_agent because of tuple fun - usage. - - OTP-10673 SNMP manager performance optimization - - ---- ssh-2.1.3 ----------------------------------------------------------- - - OTP-6406 SSH_FX_FILE_IS_A_DIRECTORY message for sftp implemented - - OTP-7785 SSH Rekeying fixed - - OTP-7786 Added User Guide for the SSH application - - OTP-7792 Documentation regarding failfun, connectfun and disconnectfun - provided - - OTP-9478 It is now possible to send an empty binary using - ssh_connection:send/3, this corner case previously caused - ssh_connection:send to hang. - - OTP-10456 Fix typo in keyboard-interactive string. Thanks to Daniel - Goertzen - - OTP-10467 ssh_connectino:send/3 will not return until all data has been - sent. Previously it could return too early, resulting in - things such premature close of the connection. Also improved - error handling of closed SSH channels. - - OTP-10475 Fixed ssh_cli.erl crashes because #state.buf is yet - 'undefined'. - - Fixed Client terminateing connections due to channel_request - message response is sent to the wrong id. - - Affected SSH clients: - all clients based on - SSH-2.0-TrileadSSH2Java_213 (problem #1) - SSH Term Pro - (problem #2) - - Thanks to Stefan Zegenhagen - - OTP-10514 SSH connection timer implementation - - New option, {idle_time, integer()}, sets a timeout on - connection when no channels are active, defaults to infinity - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10731 Fixed internal error on when client and server can not agree - o which authmethod to use. - - ---- ssh-2.1.4 ----------------------------------------------------------- - - OTP-10553 Better quality on the error messages for when key exchange - failed. - - OTP-10862 Fix link to documentation for ssh:connect/3,4. Thanks to - Martin Hässler. - - ---- ssl-5.2 ------------------------------------------------------------- - - OTP-10361 Support Next Protocol Negotiation in TLS, thanks to Ben - Murphy for the contribution. - - Impact: Could give performance benefit if used as it saves a - round trip. - - OTP-10425 TLS 1.2 will now be the default TLS version if sufficient - crypto support is available otherwise TLS 1.1 will be - default. - - Impact: A default TLS connection will have higher security - and hence it may be perceived as slower then before. - - OTP-10447 It is now possible to call controlling_process on a listen - socket, same as in gen_tcp. - - OTP-10451 Remove filter mechanisms that made error messages backwards - compatible with old ssl but hid information about what - actually happened. - - This does not break the documented API however other reason - terms may be returned, so code that matches on the reason - part of {error, Reason} may fail. - - OTP-10586 SSL: TLS 1.2, advertise sha224 support, thanks to Andreas - Schultz. - - OTP-10594 Added missing dependencies to Makefile - - OTP-10595 If an ssl server is restarted with new options and a client - tries to reuse a session the server must make sure that it - complies to the new options before agreeing to reuse it. - - OTP-10613 Removed deprecated function ssl:pid/0, it has been pointless - since R14 but has been keep for backwards compatibility. - - OTP-10709 Refactor to simplify addition of key exchange methods, thanks - to Andreas Schultz. - - OTP-10710 Now handles cleaning of CA-certificate database correctly so - that there will be no memory leek, bug was introduced in ssl- - 5.1 when changing implementation to increase parallel - execution. - - Impact: Improved memory usage, especially if you have many - different certificates and upgrade tcp-connections to - TLS-connections. - - ---- ssl-5.2.1 ----------------------------------------------------------- - - OTP-10847 Transport callback handling is changed so that gen_tcp is - treated as a special case where inet will be called directly - for functions such as setopts, as gen_tcp does not have its - own setopts. This will enable users to use the transport - callback for other customizations such as websockets. - - OTP-10864 Follow up to OTP-10451 solved in ssl-5.2 R16A. Make sure - format_error return good strings. Replace confusing legacy - atoms with more descriptive atoms. - - ---- stdlib-1.19 --------------------------------------------------------- - - OTP-6874 Wildcards such as "some/path/*" passed to filelib:wildcard/2 - would fail to match any file. (Thanks to Samuel Rivas for - reporting this bug.) - - OTP-9803 Fixed error handling in proc_lib:start which could hang if - the spawned process died in init. - - OTP-10097 Dets tables are no longer fixed while traversing with a bound - key (when only the objects with the right key are matched). - This optimization affects the functions match/2, - match_object/2, select/2, match_delete/2, and - select_delete/2. - - OTP-10302 Support for Unicode has been implemented. - - OTP-10431 Allow ** in filelib:wildcard - - Two adjacent * used as a single pattern will match all files - and zero or more directories and subdirectories. (Thanks to - José Valim) - - OTP-10436 The linter now warns for opaque types that are not exported, - as well as for under-specified opaque types. - - OTP-10455 Add the \gN and \g{N} syntax for back references in - re:replace/3,4 to allow use with numeric replacement strings. - (Thanks to Vance Shipley) - - OTP-10472 Export ets:match_pattern/0 type (Thanks to Joseph Wayne - Norton) - - OTP-10474 The type file:name() has been substituted for the type - file:filename() in the following functions in the filename - module: absname/2, absname_join/2, join/1,2, and split/1. - - OTP-10490 If a child process fails in its start function, then the - error reason was earlier only reported as an error report - from the error_handler, and supervisor:start_link would only - return {error,shutdown}. This has been changed so the - supervisor will now return {error,{shutdown,Reason}}, where - Reason identifies the failing child and its error reason. - (Thanks to Tomas Pihl) - - OTP-10504 Fix printing the empty binary at depth 1 with ~W (Thanks to - Andrew Thompson) - - OTP-10624 The type ascii_string() in the base64 module has been - corrected. The type file:file_info() has been cleaned up. The - type file:fd() has been made opaque in the documentation. - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10658 The contracts and types of the modules erl_scan and sys have - been corrected and improved. (Thanks to Kostis Sagonas.) - - OTP-10659 The Erlang shell now skips the rest of the line when it - encounters an Erlang scanner error. - - OTP-10663 Clean up some specs in the proplists module. (Thanks to - Kostis Sagonas.) - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - OTP-10691 Enable escript to accept emulator arguments when script file - has no shebang. Thanks to Magnus Henoch - - OTP-10722 Fix bug in queue:out/1, queue:out_r/1 that makes it O(N^2) in - worst case. Thanks to Aleksandr Erofeev. - - OTP-10742 There are new functions in the epp module which read the - character encoding from files. See epp(3) for more - information. - - OTP-10745 The functions in io_lib have been adjusted for Unicode. The - existing functions write_string() and so on now take Unicode - strings, while the old behavior has been taken over by new - functions write_latin1_string() and so on. There are also new - functions to write Unicode strings as Latin-1 strings, mainly - targetted towards the Erlang pretty printer (erl_pp). - - OTP-10749 The new functions proc_lib:format/2 and erl_parse:abstract/2 - accept an encoding as second argument. - - OTP-10787 Increased potential concurrency in ETS for write_concurrency - option. The number of internal table locks has increased from - 16 to 64. This makes it four times less likely that two - concurrent processes writing to the same table would collide - and thereby serialized. The cost is an increased constant - memory footprint for tables using write_concurrency. The - memory consumption per inserted record is not affected. The - increased footprint can be particularly large if - write_concurrency is combined with read_concurrency. - - ---- stdlib-1.19.1 ------------------------------------------------------- - - OTP-10622 Bugs related to Unicode have been fixed in the erl_eval - module. - - OTP-10755 The new STDLIB application variable shell_strings can be used - for determining how the Erlang shell outputs lists of - integers. The new function shell:strings/1 toggles the value - of the variable. - - The control sequence modifier l can be used for turning off - the string recognition of ~p and ~P. - - OTP-10812 filelib:wildcard("some/relative/path/*.beam", Path) would - fail to match any file. That is, filelib:wildcard/2 would not - work if the first component of the pattern did not contain - any wildcard characters. (A previous attempt to fix the - problem in R15B02 seems to have made matters worse.) - - (Thanks to Samuel Rivas and Tuncer Ayaz.) - - There is also an incompatible change to the Path argument. It - is no longer allowed to be a binary. - - OTP-10820 Miscellaneous updates due to Unicode support. - - OTP-10836 Extend ~ts to handle binaries with characters coded in - ISO-latin-1 - - OTP-10884 The +pc flag to erl can be used to set the range of - characters considered printable. This affects how the shell - and io:format("~tp",...) functionality does heuristic string - detection. More can be read in STDLIB users guide. - - ---- syntax_tools-1.6.10 ------------------------------------------------- - - OTP-10302 Support for Unicode has been implemented. - - ---- syntax_tools-1.6.11 ------------------------------------------------- - - OTP-10820 Miscellaneous updates due to Unicode support. - - ---- test_server-3.6 ----------------------------------------------------- - - OTP-9710 Line numbering of erlang files that were not correctly - indented could be wrong after coverting to html with - erl2html2:convert/[2,3] (the source code pointed to from the - test case). This has been corrected. - - Also, there are now link targets for each line and not only - for each 10th line, and link targets for functions now - include the arity and not only the function name (e.g. func/1 - has a link target "func-1"). - - OTP-9769 Severe errors detected by test_server (e.g. if log files - directories cannot be created) will now be reported to - common_test and noted in the common_test logs. - - OTP-9870 The earlier undocumented cross cover feature for accumulating - cover data over multiple tests has now been fixed and - documented. - - OTP-9956 If the test suite itself was included in code coverage - analysis, then the test_server would not manage to set - data_dir correctly for the test. This has been corrected. - - OTP-10046 Any call to test_server:break/1 should cancel all active - timetramps. However, in some cases Suite:end_per_testcase/2 - is executed on a different process than the test case itself, - and if test_server:break/1 was called from there, the - timetraps were not cancelled. This has been corrected. - - OTP-10070 When a test case failed because of a timetrap time out, the - Config data for the case was lost in the following call to - end_per_testcase/2, and also in calls to the CT Hook function - post_end_per_testcase/4. This problem has been solved and the - Config data is now correctly passed to the above functions - after a timetrap timeout failure. - - OTP-10101 In test_server, the same process would supervise the - currently running test case and be group leader (and IO - server) for the test case. Furthermore, when running parallel - test cases, new temporary supervisor/group leader processes - were spawned and the process that was group leader for - sequential test cases would not be active. That would lead to - several problems: - - * Processes started by init_per_suite will inherit the group - leader of the init_per_suite process (and that group leader - would not process IO requests when parallel test cases was - running). If later a parallel test case caused such a - processto print using (for example) io:format/2, the calling - would hang. - - * Similarly, if a process was spawned from a parallel test - case, it would inherit the temporary group leader for that - parallel test case. If that spawned process later - when the - group of parallel tests have finished - attempted to print - something, its group leader would be dead and there would be - badarg exception. - - Those problems have been solved by having group leaders - separate from the processes that supervises the test cases, - and keeping temporary group leader process for parallel test - cases alive until no more process in the system use them as - group leaders. - - Also, a new unexpected_io.log log file (reachable from the - summary page of each test suite) has been introduced. All - unexpected IO will be printed into it(for example, IO to a - group leader for a parallel test case that has finished). - - OTP-10156 Added a general framework for executing benchmarks of - Erlang/OTP. Benchmarks for the Erlang VM and mnesia have been - incorporated in the framework. - - For details about how to add more benchmarks see - $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution. - - OTP-10480 The stability of common_test and test_server when running - test cases in parallel has been improved. - - OTP-10783 Update common test modules to handle unicode - - -- Use UTF-8 encoding for all HTML files, except the HTML - version of the test suite generated with erl2html2:convert, - which will have the same encoding as the original test suite - (.erl) file. - - -- Encode link targets in HTML files with - test_server_ctrl:uri_encode/1. - - -- Use unicode modifier 't' with ~s when appropriate. - - -- Use unicode:characters_to_list and - unicode:characters_to_binary for conversion between binaries - and strings instead of binary_to_list and list_to_binary. - - ---- test_server-3.6.1 --------------------------------------------------- - - OTP-10780 The unicode update of test_server for R16A introduced a few - potential errors when logging to files. Sometimes ~tp or ~ts - was used for formatting also when writing to files that were - not opened with the {encoding,utf8} option. If then the - argument contained unicode characters above 255, the file - descriptor would crash. This has been corrected by the - following modifications: - - -- Since the 'unexpected_io' log file is used only when the - test case HTML file is not available (e.g. between test - cases), this file is now also a HTML file and as other - test_server HTML logs it is always UTF-8 encoded - - -- Since it is possible to change which information is going - to which log file (with test_server_ctrl:set_levels/3), we do - not have full control over which information is written to - which file. This means that any printout could be written to - the 'major' log file (suite.log), which was earlier encoded - as latin1. To avoid crashing this file descriptor due to - unicode strings, the 'major' log file is now also encoded in - UTF-8 (possible incopatibility). - - -- The cross_cover.info file is no longer a text file which - can be read with file:consult/1, instead it is written as a - pure binary file using term_to_binary when writing and - binary_to_term when reading. - - -- The encoding of the file named 'last_name', which only - content is the path to the last run. directory, is - now dependent on the file name mode of the VM. If file names - are expected to be unicode, then the 'last_name' file is - UTF-8 encoded, else it is latin1 encoded. - - Also, ~tp has been changed back to ~p unless it is somehow - likely that the argument includes strings. It is not obvious - that this is the correct thing to do, but some decission had - to be taken... - - OTP-10832 Using the force_stop flag/option to interrupt a test run - caused a crash in Common Test. This problem has been solved. - - ---- toolbar-1.4.2.3 ----------------------------------------------------- - - OTP-10784 Misc build updates - - ---- tools-2.6.9 --------------------------------------------------------- - - OTP-10302 Support for Unicode has been implemented. - - OTP-10465 Make erlang-mode more compatible with package.el (Thanks to - Gleb Peregud) - - OTP-10523 A new function, cover:flush(Nodes), is added which will fetch - data from remote nodes without stopping cover on those nodes. - This is used by test_server and common_test when it is safe - to assume that the node will be terminated after the test - anyway. The purpose is to avoid processes crashing when - re-loading the original beam if the processes is still - running old code. - - Remote nodes will now continue to count code coverage if the - connection to the main node is broken. Earlier, a broken - connection would cause the cover_server on the remote node to - die and thus any still cover compiled modules would cause - process crash when trying to insert cover data in ets tables - that used to exist on the cover_server. The new functionality - also involves synchronization with the main node if the nodes - are reconnected. - - OTP-10611 Fix various typos (thanks to Tuncer Ayaz) - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10637 Add separate face for exported functions (Thanks to Thomas - Järvstrand) - - OTP-10766 Fix syntax highlighting of $\' in Emacs mode. Thanks to - Magnus Henoch. - - OTP-10774 The BIF highlighting in the emacs mode has been updated to - correspond with the correct BIFs. - - ---- tools-2.6.10 -------------------------------------------------------- - - OTP-10778 Fix a bug in cover when used with no_auto_import. Thanks to - José Valim. - - ---- tv-2.1.4.10 --------------------------------------------------------- - - OTP-10784 Misc build updates - - ---- typer-0.9.5 --------------------------------------------------------- - - OTP-10784 Misc build updates - - ---- webtool-0.8.9.2 ----------------------------------------------------- - - OTP-10784 Misc build updates - - ---- wx-1.0 -------------------------------------------------------------- - - OTP-10407 The wx application now compiles and is usable with the - unstable development branch of wxWidgets-2.9. Some functions - are currently not available in wxWidgets-2.9 and their erlang - counterparts are marked as deprecated. They will generate an - error if called when linked against wxWidgets-2.9 libraries. - This means that wx can now be built on 64bit MacOsX, but keep - in mind that wxWidgets-2.9 is still a development branch and - needs (a lot) more work before it becomes stable. - - OTP-10585 Add {silent_start, boolean()} option to wx:new/1 in order to - be able to suppress error messages during startup of wx. - (Thanks to Håkan Mattsson) - - OTP-10743 Fix wxTreeCtrl:getBoundingRect/2 and wxTreeCtrl:hitTest/1. - wxTreeCtrl:hitTest now returns a tuple not bug compatible - with previous releases but needed. - - ---- xmerl-1.3.3 --------------------------------------------------------- - - OTP-10630 Where necessary a comment stating encoding has been added to - Erlang files. The comment is meant to be removed in - Erlang/OTP R17B when UTF-8 becomes the default encoding. - - OTP-10665 Some examples overflowing the width of PDF pages have been - corrected. - - diff --git a/otp_src_R16B01.readme b/otp_src_R16B01.readme new file mode 100644 index 0000000..0f9fa30 --- /dev/null +++ b/otp_src_R16B01.readme @@ -0,0 +1,1210 @@ +Bug fix release : otp_src_R16B01 +Build date : 2013-06-18 + +This is R16B01, the first maintenance release for the R16B major release. + +You can find the README file for the release at + + http://www.erlang.org/download/otp_src_R16B01.readme (this file) + +The source distribution and binary distributions for Windows can be +downloaded from + + http://www.erlang.org/download/otp_src_R16B01.tar.gz + http://www.erlang.org/download/otp_win32_R16B01.exe + http://www.erlang.org/download/otp_win64_R16B01.exe + +Note: To unpack the TAR archive you need a GNU TAR compatible program. + +For installation instructions please read the README file that is part +of the distribution. + +The on-line documentation can be found at: http://www.erlang.org/doc/ +You can also download the complete HTML documentation or the Unix manual files + + http://www.erlang.org/download/otp_doc_html_R16B01.tar.gz + http://www.erlang.org/download/otp_doc_man_R16B01.tar.gz + +We also want to thank those that sent us patches, suggestions and bug reports, + +The OTP Team + + +--- HIGHLIGHTS ---------------------------------------------------------- + + OTP-10279 == erts == + + Support for migration of memory carriers between memory + allocator instances has been introduced. + + By default this feature is not enabled and do not effect the + characteristics of the system. When enabled it has the + following impact on the characteristics of the system: + + -- Reduced memory footprint when the memory load is unevenly + distributed between scheduler specific allocator instances. + + -- Depending on the default allocaton strategy used on a + specific allocator there might or might not be a slight + performance loss. + + -- When enabled on the fix_alloc allocator, a different + strategy for management of fix blocks will be used. + + -- The information returned from + erlang:system_info({allocator, A}), and + erlang:system_info({allocator_sizes, A}) will be slightly + different when this feature has been enabled. An mbcs_pool + tuple will be present giving information about abandoned + carriers, and in the fix_alloc case no fix_types tuple will + be present. + + For more information, see the documentation of the +Macul + command line argument. + + OTP-11009 == ssl public_key crypto common_test dialyzer ssh stdlib snmp + inets == + + Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11159 == erts == + + Lift static limitation (FD_SETSIZE) for file descriptors on + Mac OS X. (Thanks to Anthony Ramine) + + +--- otp ----------------------------------------------------------------- + + OTP-11117 Properly ignore os_mon and otp_mibs generated includes + + +--- asn1-2.0.1.1 -------------------------------------------------------- + + OTP-10916 The generated decoder for the 'per' and 'uper' backends + did not correctly decode ENUMERATEDs with a single value. + The generated encoder for the 'per' and 'uper' backends + generated an empty binary for a top-level type that did + not need to be encoded (such as an ENUMERATED with a single + value). The correct result should be a binary containing + a 0 byte. + + +--- asn1-2.0.1.2 -------------------------------------------------------- + + OTP-10995 When an object set is an actual parameter, the extension + marker for the object set could get lost (which would cause + the decoding of unknown values to fail). + + +--- asn1-2.0.2 ---------------------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11111 Fix some Makefile rules that didn't support silent rules. + Thanks to Anthony Ramine. + + OTP-11134 PER/UPER: A semi-constrained INTEGER with a non-zero lower + bound would be incorrectly decoded. This bug was introduced + in R16. + + PER/UPER: Given INTEGER (10..MAX, ...), attempting to decode + any integer below 10 would cause the encoder to enter an + infinite loop. + + PER/UPER: For a type with an extensible SIZE constraint, + sizes outside of the root range were incorrectly encoded. + + Given a constraint such as (SIZE (5, ...)), encoding a size + less than 5 would fail (PER/UPER). Similarly, for BER + decoding would fail. + + PER: The encoder did not align a known multiplier string + (such as IA5String) of length 16 bits (exactly) to an octet + boundary. + + In rare circumstances, DEFAULT values for the UPER backend + could be wrongly encoded. + + OTP-11153 UPER: The compiler would crash when compiling an ENUMERATED + having more than 63 extended values. + + PER/UPER: A SEQUENCE with more 64 extended values could not + be decoded. + + OTP-11154 When decoding a SEQUENCE defined inline inside a an extension + addition group, the record named generated by the decoding + code would not match the name in the generated .hrl file. + + +--- common_test-1.7.2 --------------------------------------------------- + + OTP-10126 A design flaw in the generic connection handling in Common + Test made it impossible to implement a connection handler + that could map multiple connection names (i.e. configuration + variable aliases) to single connection pids. This problem has + been solved. + + OTP-10494 If it could not be decided which test case a certain log + printout belonged to, the common test framework log was + earlier used. Such printouts are now instead sent to + unexpected_io.log.html in test_server so that there is only + one place to look for "missing" printouts. + + OTP-10648 If a telnet connection is hanging, then a call to + ct_telnet:close/1 will time out after 5 seconds and the + connection process is brutally killed. In some cases the + connection would not be unregistered and attempts at opening + a new connection with the same name would make common_test + try to reuse the same connection since it believed that it + was still alive. This has been corrected - a killed + connection is now always unregistered. + + OTP-10855 Test performance has been improved by means of a cache for + the top level HTML index logs (all_runs.html and index.html, + in the logdir directory). This solves problems with slow + start up times and test execution times increasing with the + number of ct_run directories stored in logdir. The cached + index entries are stored in RAM during test execution and are + saved to file in logdir (for faster start up times) whenever + a test run finishes. + + OTP-10856 The '-force_stop' flag to use with time-limited repeats of + test runs can now be used with a new 'skip_rest' option which + causes the rest of the test cases in the ongoing test job to + be skipped when the time limit is reached. E.g. 'ct_run -spec + xxx -duration 010000 -force_stop skip_rest' + + OTP-10857 Testing of the test specification functionality has been + improved and a couple of minor bugs have been discovered and + corrected. + + OTP-10902 Make cover smarter about finding source from beam. + + In particular, search using the source path in module_info if + the current heuristic fails. + + OTP-10920 Add a variant of ct_slave:start/2 that starts a node with + specified options on the local host. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11044 A link is added from the red error printout in a test case + log (for a failed test case) to the full error description at + the end of the log. The reason for this is that the error + description in the red field is sometimes truncated at 50 + characters in order to keep the log as short and easy to read + as possible. + + OTP-11046 Links to the top level index files in some HTML footers had + disappeared. This error has been corrected. Also, a problem + with the suite overview log file not being closed properly + has been solved. + + OTP-11052 Common Test would, in case of timetrap error, print a warning + in the log if end_per_testcase wasn't implemented in the + suite, even though it's an optional function. This printout + has been removed. + + OTP-11095 A new option 'no_prompt_check' is added to + ct_telnet:expect/3. If this option is used, ct_telnet will + not wait for a prompt or a newline before attempting to match + the given pattern. + + +--- compiler-4.9.2 ------------------------------------------------------ + + OTP-10939 Compiling functions with complex boolean operations in guards + could be very slow. (Thanks to Magnus Muller for reporting + this issue.) + + OTP-11005 Fix optimization of some binary comprehensions. Thanks to + Anthony Ramine. + + OTP-11069 Use a set to store ref registers in beam_receive. Thanks to + Anthony Ramine. + + OTP-11119 Certain guard expressions used in a receive statement could + cause the compiler to crash. + + OTP-11129 Fix renaming of bs_put_string instructions. Thanks to Anthony + Ramine. + + +--- cosEvent-2.1.14 ----------------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- cosFileTransfer-1.1.15 ---------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- cosNotification-1.1.20 ---------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- crypto-3.0 ---------------------------------------------------------- + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11058 Fixed a spelling mistake in crypto docs. Thanks to Klaus + Trainer + + +--- debugger-3.2.11 ----------------------------------------------------- + + OTP-10899 A new checkbox has been added. When it is checked, the range + set by the erl flag +pc is used for determining when to print + lists of integers as strings. When it is unchecked, integer + lists are never printed as strings. + + A minor incompatibility: settings saved by Erlang R16B01 or + later cannot be read by Erlang R16B or earlier. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + +--- dialyzer-2.6.1 ------------------------------------------------------ + + OTP-10918 Include module, function and arity in Dialyzer's "overlapping + domain" warnings. Thanks to Magnus Henoch. + + OTP-10996 Improve Dialyzer output for scan errors. Thanks to Magnus + Henoch. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11027 Bitstring type inference and duplicate module error message + fixes. Thanks to Stavros Aronis. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + OTP-11057 A bug that made it impossible to do any analyses from the GUI + has been fixed. + + +--- diameter-1.4.1.1 ---------------------------------------------------- + + OTP-10898 Add transport_opt() watchdog_config to allow non-standard + behaviour of the watchdog state machine. This can be useful + during test but should not be used on nodes that must conform + to RFC 3539. + + OTP-10942 Fix broken Vendor-Specific-Application-Id configuration. + RFC 6733 changed the definition of this Grouped AVP, changing + the arity of Vendor-Id from 1* to 1. A component Vendor-Id + can now be either list- or integer-valued in service and + transport configuration, allowing it to be used with both + RFC 3588 and RFC 6733 dictionaries. + + +--- diameter-1.4.2 ------------------------------------------------------ + + OTP-9610 Allow peer connections to be shared between Erlang nodes for + the purpose of sending outgoing requests. + + A diameter_app(3) pick_peer/4 callback gets a list of remote + candidates as argument, allowing a callback on one node to + select a transport connection established on another node. + The service_opt() share_peers controls the extent to which + local connections are shared with remote nodes. The + service_opt() use_shared_peers controls the extent to which + connections shared from remote nodes are utilized on the + local node. + + OTP-10893 Allow listening diameter_{tcp,sctp} transports to be + configured with remote addresses. + + Option 'accept' allows remote addresses to be configured as + tuples or regular expressions. Remote addresses are matched + against the configured values at connection establishment, + any non-matching address causing the connection to be + aborted. + + OTP-10972 Detect more transport_opt() configuration errors at + diameter:add_transport/2. + + Many errors would previously not be detected until transport + start, diameter:add_transport/2 returning 'ok' but transport + connections failing to be established. An error tuple is now + returned. + + OTP-10986 Make explicit local address configuration optional in + diameter_tcp:start/3. + + The default address (as determined by gen_tcp) is now used + when a local address is not explicitly configured. + + OTP-11007 Fix handling of 5014 (INVALID_AVP_LENGTH) errors. + + This was in some cases reported as 3009 (INVALID_AVP_BITS). + + Note that the correction is partially implemented in modules + generated by diameterc(1): a dictionary file must be + recompiled for the correction to apply to any messages it + defines. + + OTP-11014 Fix faulty capitalization in release notes. + + Diameter = the protocol.
diameter = the Erlang + application. + + OTP-11017 Improve handling of unrecognized service options. + + Such options were silently ignored by + diameter:start_service/2. An error tuple is now returned. + + OTP-11019 Fix watchdog memory leak. + + Entries were not removed from a service-specific ets table, + causing them to be orphaned at connection reestablishment for + listening transports, and diameter:remove_transport/2 for + both listening and connecting transports. + + The fault was introduced by OTP-10692 in diameter-1.4.1 + (R16B). + + OTP-11026 Fix decode failure on AVP Length < 8. + + The failure caused the message in question to be discarded. + + OTP-11045 Respect Host-IP-Address configuration. + + Addresses returned from a transport module were always used + to populate Host-IP-Address AVP's in an outgoing CER/CEA, + which precluded the sending of a VIP address. Transport + addresses are now only used if Host-IP-Address is + unspecified. + + OTP-11050 Don't send default Inband-Security-Id in CER/CEA. + + RFC 6733 recommends against the use of Inband-Security-Id. + Only send a value that differs from the default, + NO_INBAND_SECURITY = 0. + + OTP-11051 Fix mkdir race. + + Install could fail if examples/code and examples/dict were + created in parallel. Noticed on FreeBSD. + + OTP-11060 Make spawn options for request processes configurable. + + OTP-11087 Fix recognition of 5001 on mandatory AVP's. + + An AVP setting the M-bit was not regarded as erroneous if it + was defined in the dictionary in question and its container + (message or Grouped AVP) had an 'AVP' field. It's now + regarded as a 5001 error (AVP_UNSUPPORTED), as in the case + that the AVP is not defined. + + Note that the correction is partially implemented in modules + generated by diameterc(1): a dictionary file must be + recompiled for the correction to apply to any messages it + defines. + + OTP-11092 Fix setting of Failed-AVP on handle_request {answer_message, + 5xxx} return. + + Failed-AVP was never in the outgoing answer-message. It is + now set with the AVP from the first entry with the specified + Result-Code in the errors field of the incoming + diameter_packet, if found. + + OTP-11115 Fix watchdog function_clause + + A listening transport on a service that allowed multiple + connections to the same peer could result in a + function_clause error in module diameter_watchdog. The + resulting crash was harmless but unseemly. + + Thanks to Aleksander Nycz. + + OTP-11127 Fix population of Failed-AVP. + + In cases in which diameter populated this AVP, many values + were sent instead of one as suggested by RFC 6733. This was + partially corrected by OTP-11007. + + OTP-11165 Fix list-valued Vendor-Specific-Application-Id config + + R16B (specifically, OTP-10760) broke the handling of such + configuration, resulting in a function clause error if the + list was not of length 3, and faulty interpretation of the + list's contents otherwise. Only record-valued configuration + was properly interpreted. + + +--- erl_interface-3.7.12 ------------------------------------------------ + + OTP-10913 Superfluous trailing comma in enum erlang_char_encoding + causing compile error for g++ with --pedantic option. + + +--- erl_interface-3.7.13 ------------------------------------------------ + + OTP-11167 A guard was added to check if file descriptor is valid before + closing it. + + +--- erts-5.10.1.1 ------------------------------------------------------- + + OTP-10926 The BIF is_process_alive/1 could prematurely return false + while the process being inspected was terminating. This + bug was introduced in ERTS-5.10. + + OTP-10932 Fix a problem in erlang:delete_element/2 where the call + could corrupt one word of stack if the heap and stack met + during call. + + OTP-10994 Scheduler threads will now by default be less eager requesting + wakeup due to certain cleanup operations. This can also + be controlled using the +swct command line argument of erl(1). + + OTP-11000 The +sws<value> and +swt<value> system flags + failed if no white space were passed between the parameter + and value parts of the flags. Upon failure, the runtime + system refused to start. + + +--- erts-5.10.1.2 ------------------------------------------------------- + + OTP-11022 A bug in the implementation of offline schedulers has been + fixed. The bug was introduced in OTP-R16A/ERTS-5.10, and + caused work-stealing between schedulers to fail. This in + turn, caused work to accumulate in some run-queues. The + bug was only triggered when there were offline schedulers + in the system, i.e., when the amount of online schedulers + was less than the total amount of schedulers. The effect + of the bug got more severe the larger amount of offline + schedulers the system had. + + +--- erts-5.10.2 --------------------------------------------------------- + + OTP-10271 Replaced the lock protecting gathering of garbage collection + statistics with a lock-free solution. + + OTP-10279 Support for migration of memory carriers between memory + allocator instances has been introduced. + + By default this feature is not enabled and do not effect the + characteristics of the system. When enabled it has the + following impact on the characteristics of the system: + + -- Reduced memory footprint when the memory load is unevenly + distributed between scheduler specific allocator instances. + + -- Depending on the default allocaton strategy used on a + specific allocator there might or might not be a slight + performance loss. + + -- When enabled on the fix_alloc allocator, a different + strategy for management of fix blocks will be used. + + -- The information returned from + erlang:system_info({allocator, A}), and + erlang:system_info({allocator_sizes, A}) will be slightly + different when this feature has been enabled. An mbcs_pool + tuple will be present giving information about abandoned + carriers, and in the fix_alloc case no fix_types tuple will + be present. + + For more information, see the documentation of the +Macul + command line argument. + + OTP-10497 A bug in prim_inet has been corrected. If the port owner was + killed at a bad time while closing the socket port the port + could become orphaned hence causing port and socket leaking. + Reported by Fred Herbert, Dmitry Belyaev and others. + + OTP-10941 Compilation fixes for NetBSD. Thanks to YAMAMOTO Takashi. + + OTP-10984 Fixed a race condition when using delayed_write when writing + to a file which would cause the same data to be written + multiple times. + + OTP-10997 Fix small memory leak from tracing with option meta. + + OTP-11002 Correct typo in erlsrv usage. Thanks to Bryan Hunter + + OTP-11003 ct_run: delete unused function. Thanks to Tuncer Ayaz. + + OTP-11008 Change specs for spawn_opt to use the process_level() type + declaration instead of re-defining it in various places. + Thanks to Kostis Sagonas. + + OTP-11012 Corrections to run_erl/to_erl handshake behaviour. + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11024 Fix typo in type: erlang:process_info_item(). Thanks to + Andrew Tunnell-Jones. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + OTP-11064 Fix src/dest overlap issue in ttsl driver. Thanks to Steve + Vinoski. + + OTP-11074 Optimization of simultaneous inet_db operations on the same + socket by using a lock free implementation. + + Impact on the characteristics of the system: Improved + performance. + + OTP-11075 The high_msgq_watermark and low_msgq_watermark inet socket + options introduced in OTP-R16A could only be set on TCP + sockets. These options are now generic and can be set on all + types of sockets. + + OTP-11076 When sending to a port using erlang:send(Port, Msg, + [nosuspend]), the send operation was performed synchronously. + This bug has now been fixed. + + OTP-11077 A new better algorithm for management of the process, and + port tables has been introduced. + + Impact on the characteristics of the system: + + -- The new algorithm ensures that both insert and delete + operations can be made in O(1) time complexity. Previously + used algorithm either caused insert or delete to be O(N). + + -- The new algorithm will also ensure that reuse of + identifiers will be less frequent than when the old algorithm + was used. + + -- Previously used algorithm ensured that the latest created + identifier compared as the largest when comparing two + identifiers of the same type that had been created on the + same node as long as no identifiers had been reused. Since + identifiers can be reused quite fast, one has never been able + to rely on this property. Due to the introduction of this new + algorithm this property will not hold even if no identifiers + has been reused yet. This could be considered as an + incompatibility. + + Due to the above mensioned potential incompatibility, it will + still be possible to enable the old algorithm for some time. + The command line argument +P legacy will enable the old + algorithm on the process table, and +Q legacy will do the + same for the port table. These command line arguments are + however deprecated as of their introduction and have been + scheduled for removal in OTP-R18. + + OTP-11080 When converting a faulty binary to a list with + unicode:characters_to_list, the error return value could + contain a faulty "rest", i.e. the io_list of characters that + could not be converted was wrong. This happened only if input + was a sub binary and conversion was from utf8. This is now + corrected. + + OTP-11084 Runtime system could crash when reporting stale + driver_select(). + + OTP-11085 Fix lock order violation for memory instrumentation (+Mim, + +Mis, +Mit). + + OTP-11086 Fixed some compilation warnings on miscellaneous platforms. + Thanks to Anthony Ramine. + + OTP-11088 Support wide characters in the shell through wcwidth(). + Thanks to Anthony Ramine. Reported by Loïc Hoguin. + + OTP-11096 Fixed issue when flushing i/o during shutdown on windows + where the Erlang VM would sometime hang due to a race + condition. + + OTP-11097 Fixed issue where repeated calls to erlang:nodes() could + cause unnecessary contention in the dist_table lock. + + OTP-11098 Added total used memory for each process in erlang crash + dumps. + + OTP-11106 Properly guard WIDE_TAG use with HAVE_WCWIDTH in ttsl_drv. + Thanks to Anthony Ramine + + OTP-11111 Fix some Makefile rules that didn't support silent rules. + Thanks to Anthony Ramine. + + OTP-11125 Added support for hipe on Raspberry Pi (armv6l). Thanks to + Klaus Alfert. + + OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to + Anthony Ramine. + + OTP-11146 erlang:now() could suddenly jump ~24 days into the future on + Windows. This is now corrected. Thanks to Garret Smith for + reporting and testing fixes. + + OTP-11158 Remove 'query' from the list of reserved words in docs. + Thanks to Matthias Endler and Loïc Hoguin. + + OTP-11159 Lift static limitation (FD_SETSIZE) for file descriptors on + Mac OS X. (Thanks to Anthony Ramine) + + OTP-11163 erlang:term_to_binary will now cost an appropriate amount of + reductions and will interrupt (yield) for reschedule if the + term is big. This avoids too long schedules when + term_to_binary is used. + + Impact: Programs running term_to_binary on large terms will + run more smothly, but rescheduling will impact the single + process performance of the BIF. Single threaded benchmarks + will show degraded performance of the BIF when called with + very large terms, while general system behaviour will be + improved. The overhead for allowing restart and reduction + counting also degrades local performance of the BIF with + between 5% and 10% even for small terms. + + +--- et-1.4.4.4 ---------------------------------------------------------- + + OTP-11039 Use erlang:demonitor(Ref, [flush]) where applicable. Thanks + to Loïc Hoguin. + + OTP-11078 Rename and document lists:zf/2 as lists:filtermap/2. Thanks + to Anthony Ramine. + + +--- hipe-3.10.2 --------------------------------------------------------- + + OTP-10904 Fix the title of hipe_app documentation page. Thanks to Loïc + Hoguin. + + OTP-10985 Fix native code compiler crash involving bs_match_string. + Thanks to Kostis Sagonas. + + OTP-11031 Loosen the assumptions of code that handles escaping + functions. Thanks to Kostis Sagonas + + +--- ic-4.3.2 ------------------------------------------------------------ + + OTP-11086 Fixed some compilation warnings on miscellaneous platforms. + Thanks to Anthony Ramine. + + +--- inets-5.9.5 --------------------------------------------------------- + + OTP-10934 Fix http_request:http_headers/1 to send content-length when + length is zero. Thanks to CA Meijer. + + OTP-10956 Reverted incorrect commit that broke cookie handling when + using httpc-profiles. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11122 Fix {stream, {self, once}} in httpc to work as expected. + Thanks to Masatake Daimon + + +--- kernel-2.16.2 ------------------------------------------------------- + + OTP-10497 A bug in prim_inet has been corrected. If the port owner was + killed at a bad time while closing the socket port the port + could become orphaned hence causing port and socket leaking. + Reported by Fred Herbert, Dmitry Belyaev and others. + + OTP-10689 A few bugs regarding case sensitivity for hostname resolution + while using e.g the internal lookup types 'file' and 'dns' + has been corrected. When looking up hostnames ASCII letters + a-z are to be regarded as the same as A-Z according to RFC + 4343 "Domain Name System (DNS) Case Insensitivity + Clarification", and this was not always the case. + + OTP-10910 Add application:ensure_started/1,2. It is equivavlent to + application:start/1,2 except it returns ok for already + started applications. + + OTP-11040 Optimize communication with file io server. Thanks to Anthony + Ramine. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + OTP-11074 Optimization of simultaneous inet_db operations on the same + socket by using a lock free implementation. + + Impact on the characteristics of the system: Improved + performance. + + OTP-11075 The high_msgq_watermark and low_msgq_watermark inet socket + options introduced in OTP-R16A could only be set on TCP + sockets. These options are now generic and can be set on all + types of sockets. + + OTP-11104 Fix deep list argument error under Windows in os:cmd/1. + Thanks to Aleksandr Vinokurov . + + +--- megaco-3.17 --------------------------------------------------------- + + OTP-10998 A buffer overrun error in the flex scanner could occur when + scanning property parms. + + +--- megaco-3.17.0.1 ----------------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- mnesia-4.9 ---------------------------------------------------------- + + OTP-11030 If mnesia:clear_table/2 was called during a table load on + that table, the schema record was written to the table + instead of clearing table. + + OTP-11103 Optimize index creation for Mnesia set tables. Thanks to Nick + Marino. + + +--- observer-1.3.1 ------------------------------------------------------ + + OTP-10604 -- The new Memory field from a crash dump is now presented by + crashdump viewer, both in the process overview and in the + process detail page. + + -- A summary of blocks- and carriers sizes is added to the + allocator information page in the crashdump viewer. + + OTP-10894 Some bugs related to calculation of CPU/scheduler utilization + in observer are corrected. + + Current function for a process is accepted to be 'undefined' + when running hipe. + + OTP-10929 Use "open" as default browser for crashdump viewer on Mac OS + X. Thanks to Magnus Henoch. + + OTP-10931 Fix observer table viewer crash on formatting improper lists. + Thanks to Andrey Tsirulev + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11136 Add processes state view in observer. Thanks to Eric + Pailleau. + + +--- odbc-2.10.16 -------------------------------------------------------- + + OTP-10993 Fix a 64bit related bug in odbcserver. Thanks to Satoshi + Kinoshita. + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11126 Fix checking for odbc in standard locations when "with-odbc" + flag present. Thanks to Alexey Saltanov. + + +--- orber-3.6.26 -------------------------------------------------------- + + OTP-10675 Fix bug in corbaloc/corbaname over ssl. + + +--- orber-3.6.26.1 ------------------------------------------------------ + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- os_mon-2.2.12 ------------------------------------------------------- + + OTP-10941 Compilation fixes for NetBSD. Thanks to YAMAMOTO Takashi. + + OTP-10945 Fixed disksup:get_disk_data for SUSv3, specifically OS X ML. + Thanks to Sriram Melkote. + + +--- percept-0.8.8.1 ----------------------------------------------------- + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + +--- public_key-0.19 ----------------------------------------------------- + + OTP-10873 Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27 that + are somtimes used instead of the PKCS defined oids + 1.2.840.113549.1.1.5 and 1.2.840.10040.4.3. Add function + pkix_sign_types:/1 that translates oids to to algorithm atoms + ex: + + > public_key:pkix_sign_types({1,3,14,3,2,29}). {sha,rsa} + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + +--- reltool-0.6.4 ------------------------------------------------------- + + OTP-10988 Reltool used to fail if an application was mentioned in the + config file which was not found in the file system, even if + the application was explicitly excluded in the config. This + has been changed and will only produce a warning. If the + application is not explicitly excluded it will still cause + reltool to fail. Thanks to Håkan Mattsson! + + OTP-11099 Fix possibly "not owner" error while file copy with reltool. + Thanks to Alexey Saltanov. + + OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to + Anthony Ramine. + + +--- runtime_tools-1.8.11 ------------------------------------------------ + + OTP-10894 Some bugs related to calculation of CPU/scheduler utilization + in observer are corrected. + + Current function for a process is accepted to be 'undefined' + when running hipe. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + +--- safe-1.2.9 ---------------------------------------------------------- + + OTP-11083 Fix value assignment for trend parameter + + OTP-11094 Changed API for ccb augmentation + + +--- sasl-2.3.2 ---------------------------------------------------------- + + OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to + Anthony Ramine. + + +--- snmp-4.24 ----------------------------------------------------------- + + OTP-11004 Fix SNMP gitignore files. Thanks to Anthony Ramine. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11101 [snmp/agent] Introduced the mib-server data module behaviour. + + OTP-11107 [snmp/agent] Introduced a documented mib-storage behaviour. + This will allow users to implement alternative storage + methods. + + +--- ssh-2.1.6 ----------------------------------------------------------- + + OTP-10940 Fixed timing rekeying bug. + + +--- ssh-2.1.7 ----------------------------------------------------------- + + OTP-10975 ssh:daemon will get feeded with an argument even if it is not + a valid expression. + + OTP-10983 Properly ignore everything in lib/ssh/doc/html/. Thanks to + Anthony Ramine. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + +--- ssl-5.3 ------------------------------------------------------------- + + OTP-10450 Add support for PSK (Pre Shared Key) and SRP (Secure Remote + Password) chipher suits, thanks to Andreas Schultz. + + OTP-10905 Honor the versions option to ssl:connect and ssl:listen. + + OTP-10909 Next protocol negotiation with reused sessions will now + succeed + + OTP-10955 Fix SSL Next Protocol Negotiation documentation. Thanks to + Julien Barbot. + + OTP-10980 Fix ssl_connection to support reading proxy/chain + certificates. Thanks to Valentin Kuznetsov. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + +--- stdlib-1.19.2 ------------------------------------------------------- + + OTP-10938 Delete obsolete note about simple-one-for-one supervisor. + Thanks to Magnus Henoch. + + OTP-10951 When selecting encoding of a script written in Erlang + (escript) the optional directive on the second line is now + recognized. + + OTP-10990 The Erlang scanner no longer accepts floating point numbers + in the input string. + + OTP-10992 The function erl_parse:abstract/2 has been documented. + + OTP-11009 Integrate elliptic curve contribution from Andreas Schultz + + In order to be able to support elliptic curve cipher suites + in SSL/TLS, additions to handle elliptic curve infrastructure + has been added to public_key and crypto. + + This also has resulted in a rewrite of the crypto API to gain + consistency and remove unnecessary overhead. All OTP + applications using crypto has been updated to use the new + API. + + Impact: Elliptic curve cryptography (ECC) offers equivalent + security with smaller key sizes than other public key + algorithms. Smaller key sizes result in savings for power, + memory, bandwidth, and computational cost that make ECC + especially attractive for constrained environments. + + OTP-11013 Added sys:get_state/1,2 and sys:replace_state/2,3. Thanks to + Steve Vinoski. + + OTP-11025 Optimizations to gen mechanism. Thanks to Loïc Hoguin. + + OTP-11035 Optimizations to gen.erl. Thanks to Loïc Hoguin. + + OTP-11039 Use erlang:demonitor(Ref, [flush]) where applicable. Thanks + to Loïc Hoguin. + + OTP-11041 Erlang source files with non-ASCII characters are now encoded + in UTF-8 (instead of latin1). + + OTP-11042 Fix rest_for_one and one_for_all restarting a child not + terminated. Thanks to James Fish. + + OTP-11053 Fix excessive CPU consumption of timer_server. Thanks to + Aliaksey Kandratsenka. + + OTP-11078 Rename and document lists:zf/2 as lists:filtermap/2. Thanks + to Anthony Ramine. + + OTP-11079 Fixed an inconsistent state in epp. Thanks to Anthony Ramine + + OTP-11080 When converting a faulty binary to a list with + unicode:characters_to_list, the error return value could + contain a faulty "rest", i.e. the io_list of characters that + could not be converted was wrong. This happened only if input + was a sub binary and conversion was from utf8. This is now + corrected. + + OTP-11100 The type hook_function() has been corrected in erl_pp, the + Erlang Pretty Printer. + + The printing of invalid forms, e.g. record field types, has + also been fixed. It has been broken since R16B. + + (Thanks to Tomáš Janoušek.) + + OTP-11108 c:ls(File) will now print File, similar to ls(1) in Unix. The + error messages have also been improved. (Thanks to Bengt + Kleberg.) + + OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to + Anthony Ramine. + + OTP-11140 Support callback attributes in erl_pp. Thanks to Anthony + Ramine. + + OTP-11143 Improve erl_lint performance. Thanks to José Valim. + + +--- test_server-3.6.2 --------------------------------------------------- + + OTP-10607 Some unused code related to remote targets is removed, and + documentation is updated. + + OTP-10856 The '-force_stop' flag to use with time-limited repeats of + test runs can now be used with a new 'skip_rest' option which + causes the rest of the test cases in the ongoing test job to + be skipped when the time limit is reached. E.g. 'ct_run -spec + xxx -duration 010000 -force_stop skip_rest' + + OTP-10991 A bug in test_server_gl caused io requests containing invalid + data (i.e. not unicode:chardata()) to hang, since no io reply + was sent. This has been corrected. + + OTP-11052 Common Test would, in case of timetrap error, print a warning + in the log if end_per_testcase wasn't implemented in the + suite, even though it's an optional function. This printout + has been removed. + + +--- tools-2.6.11 -------------------------------------------------------- + + OTP-10902 Make cover smarter about finding source from beam. + + In particular, search using the source path in module_info if + the current heuristic fails. + + OTP-10930 Remove Flymake dependency in erlang-pkg.el. Thanks to Magnus + Henoch. + + OTP-10979 When cover:stop(Node) was called on a non-existing node, a + process waiting for cover data from the node would hang + forever. This has been corrected. + + OTP-10999 Erlang-mode: Add autoload cookies for file extension + associations. Thanks to Magnus Henoch. + + OTP-11016 Postscript files no longer needed for the generation of PDF + files have been removed. + + OTP-11028 Fix a race condition when there're several applications in + apps directory. Thanks to Manuel Rubio. + + OTP-11144 New option for eprof, 'set_on_spawn'. This option was + previously always on and is also the default. + + diff --git a/sources b/sources index 3fd68b9..edb6a9f 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -7ee131515bc496e7522e0dec2a4c26e3 otp_src_R16B.tar.gz -66fd89992d828fe0886b3e9b68867e0c otp_doc_html_R16B.tar.gz -f3a34cc45c8d0b44bec839824d5fca09 otp_doc_man_R16B.tar.gz +266b95db35560e505c9f69cc3e539e41 otp_src_R16B01.tar.gz +288fd4066ae07fa3ca23043a31826d46 otp_doc_html_R16B01.tar.gz +951be958bc9af55df6062165cf21fe1f otp_doc_man_R16B01.tar.gz +8d0757af41f545b757ac71125b2b6488 otp_src_R16B01.readme From 52d08e3c24cabb2311266cfcfdd70a377f0d74fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 04:57:36 -0500 Subject: [PATCH 027/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index a5cb668..181d04c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2313,6 +2313,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - R16B-01.1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jun 19 2013 Peter Lemenkov - R16B-01.1 - Ver. R16B01 - Added graphviz as a requirement for dialyzer (thanks to Matwey V. Kornilov) From 9a9df59c558aad3357c6f89284adeda18abde213 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 23 Oct 2013 18:06:00 +0400 Subject: [PATCH 028/340] R16B02 Signed-off-by: Peter Lemenkov --- .gitignore | 4 + erlang.spec | 114 +- otp-0003-Do-not-install-C-sources.patch | 16 +- otp-0006-Do-not-install-erlang-sources.patch | 24 +- otp-0008-Fix-for-armv7hl-architecture.patch | 29 + otp_src_R16B01.readme | 1210 ------------------ otp_src_R16B02.readme | 640 +++++++++ sources | 8 +- 8 files changed, 734 insertions(+), 1311 deletions(-) create mode 100644 otp-0008-Fix-for-armv7hl-architecture.patch delete mode 100644 otp_src_R16B01.readme create mode 100644 otp_src_R16B02.readme diff --git a/.gitignore b/.gitignore index 1b96e45..d8a2277 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 181d04c..fb7c46d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ %global upstream_ver R16B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! #%global upstream_rel %{nil} -%global upstream_rel 01 +%global upstream_rel 02 # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -13,12 +13,11 @@ %bcond_without doc -# Change this back to include all Fedora versions (not just those < -# 15) when the fop package has been fixed on fc15 (bug 689930). -%if 0%{?el5}%{?el6}%{?fc15}%{?fc17} -%define use_prebuilt_docs 1 +# No fop for EPEL5, and only for x86/x86_64 in EPEL6, so just disable there too +%if 0%{?el5}%{?el6} +%global use_prebuilt_docs 1 %else -%define use_prebuilt_docs 0 +%global use_prebuilt_docs 0 %endif %global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm} @@ -77,6 +76,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch # Required only for el5, el6 on PowerPC # Ugly workaround for java-1.5.0-gcj which doesn't support Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +Patch8: otp-0008-Fix-for-armv7hl-architecture.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -98,7 +98,7 @@ BuildRequires: erlang %endif %endif -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} BuildRequires: emacs BuildRequires: xemacs BuildRequires: emacs-el @@ -179,7 +179,6 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description appmon A utility used to supervise Applications executing on several Erlang nodes. @@ -190,7 +189,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description asn1 Provides support for Abstract Syntax Notation One. @@ -213,7 +211,6 @@ Requires: %{name}-test_server%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-webtool%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description common_test A portable framework for automatic testing. @@ -226,7 +223,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description compiler A byte code compiler for Erlang which produces highly compact code. @@ -238,7 +234,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosEvent Orber OMG Event Service. @@ -251,7 +246,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosEventDomain Orber OMG Event Domain Service. @@ -266,7 +260,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosFileTransfer Orber OMG File Transfer Service. @@ -280,7 +273,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosNotification Orber OMG Notification Service. @@ -293,7 +285,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosProperty Orber OMG Property Service. @@ -306,7 +297,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description cosTime Orber OMG Timer and TimerEvent Service. @@ -318,8 +308,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 -Obsoletes: %{name}-cosTransaction < R13B-04.7 %description cosTransactions Orber OMG Transaction Service. @@ -330,7 +318,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description crypto Cryptographical support. @@ -344,7 +331,6 @@ Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description debugger A debugger for debugging and testing of Erlang programs. @@ -361,7 +347,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} Requires: graphviz -Obsoletes: %{name} < R13B-04.5 %description dialyzer A DIscrepancy AnaLYZer for ERlang programs. @@ -376,7 +361,6 @@ Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description diameter Diameter (RFC 3588) library @@ -384,11 +368,9 @@ Diameter (RFC 3588) library %package doc Summary: Erlang documentation Group: Development/Languages -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} BuildArch: noarch %endif -# erlang-doc does not require the base package at all -Obsoletes: %{name}-doc < R13B-04.4 %description doc Documentation for Erlang. @@ -402,7 +384,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description edoc A utility used to generate documentation out of tags in source files. @@ -415,7 +396,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description eldap Erlang LDAP library. @@ -427,7 +407,6 @@ Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description erl_docgen A utility used to generate erlang HTML documentation. @@ -436,7 +415,6 @@ A utility used to generate erlang HTML documentation. Summary: Low level interface to C Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description erl_interface Low level interface to C. @@ -447,9 +425,8 @@ Group: Development/Languages Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: lksctp-tools -Provides: erlang(erl_drv_version) = 2.1 +Provides: erlang(erl_drv_version) = 2.2 Provides: erlang(erl_nif_version) = 2.4 -Obsoletes: %{name} < R13B-04.5 %description erts Functionality necessary to run the Erlang System itself. @@ -463,7 +440,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description et An event tracer for Erlang programs. @@ -474,7 +450,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description eunit Support for unit testing. @@ -483,7 +458,6 @@ Support for unit testing. Summary: Examples for some Erlang modules Group: Development/Languages Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description examples Examples for some Erlang modules. @@ -497,7 +471,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} BuildRequires: tcl-devel BuildRequires: tk-devel Requires: tk -Obsoletes: %{name} < R13B-04.5 %description gs A Graphics System used to write platform independent user interfaces. @@ -510,7 +483,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description hipe High Performance Erlang. @@ -521,7 +493,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description ic IDL compiler. @@ -535,7 +506,8 @@ Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 +# FIXME see erlang-jinterface also +#Requires: jpackage-utils %description inets A set of services such as a Web server and a ftp client etc. @@ -544,7 +516,8 @@ A set of services such as a Web server and a ftp client etc. Summary: A library for accessing Java from Erlang Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 +# FIXME see erlang-ic also +#Requires: jpackage-utils %if 0%{?fedora} BuildRequires: java-devel %else @@ -563,7 +536,6 @@ Summary: Main erlang library Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description kernel Main erlang library. @@ -578,7 +550,6 @@ Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description megaco Megaco/H.248 is a protocol for control of elements in a physically @@ -591,7 +562,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description mnesia A heavy duty real-time distributed database. @@ -608,7 +578,6 @@ Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-webtool%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description observer A set of tools for tracing and investigation of distributed systems. @@ -619,7 +588,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 BuildRequires: unixODBC-devel %description odbc @@ -635,7 +603,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description orber A CORBA Object Request Broker. @@ -650,7 +617,6 @@ Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description os_mon A monitor which allows inspection of the underlying operating system. @@ -663,7 +629,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description otp_mibs SNMP management information base for Erlang/OTP nodes. @@ -674,7 +639,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description parsetools A set of parsing and lexical analysis tools. @@ -687,7 +651,6 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description percept A concurrency profiler tool. @@ -699,7 +662,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description pman A graphical process manager used to inspect Erlang processes. @@ -712,7 +674,6 @@ Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description public_key API to public key infrastructure. @@ -726,7 +687,6 @@ Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description reltool Reltool is a release management tool. It analyses a given @@ -743,7 +703,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description runtime_tools A set of tools to include in a production system. @@ -755,7 +714,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description sasl The System Architecture Support Libraries is a set of tools for @@ -770,7 +728,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description snmp Simple Network Management Protocol (SNMP) support including a @@ -784,7 +741,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description ssh Secure Shell application with sftp and ssh support. @@ -792,13 +748,12 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -Requires: %{name}-asn1%{?_isa} = %{version}-%{release} +#Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description ssl Secure Socket Layer support. @@ -810,7 +765,6 @@ Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description stdlib The Erlang standard libraries. @@ -821,7 +775,6 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description syntax_tools A utility used to handle abstract Erlang syntax trees, @@ -835,10 +788,9 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-sasl%{?_isa} = %{version}-%{release} +#Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description test_server The OTP Test Server. @@ -850,7 +802,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description toolbar A tool bar simplifying access to the Erlang tools. @@ -865,7 +816,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-webtool%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 Provides: emacs-common-erlang = %{version}-%{release} %description tools @@ -880,7 +830,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-pman%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description tv An ETS and MNESIA graphical table visualizer. @@ -894,7 +843,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description typer TYPe annotator for ERlang programs. @@ -907,7 +855,6 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description webtool A tool that simplifying the use of web based Erlang tools. @@ -920,7 +867,6 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: mesa-libGL Requires: mesa-libGLU -Obsoletes: %{name} < R13B-04.5 BuildRequires: wxGTK-devel %description wx @@ -932,12 +878,11 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Obsoletes: %{name} < R13B-04.5 %description xmerl Provides support for XML 1.0. -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} %package -n emacs-erlang Summary: Compiled elisp files for erlang-mode under GNU Emacs Requires: emacs-common-erlang = %{version}-%{release} @@ -992,6 +937,7 @@ Erlang mode for XEmacs (source lisp files). %patch7 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif +%patch8 -p1 -b .fix_armv7hl_hipe # end of autogenerated prep patch list # remove shipped zlib sources @@ -1010,9 +956,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe %endif # Remove pre-built BEAM files @@ -1021,7 +967,7 @@ make clean # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} # GNU Emacs related stuff cat > emacs-erlang-init.el << EOF (setq load-path (cons "%{_emacs_sitelispdir}/erlang" load-path)) @@ -1068,7 +1014,7 @@ make docs %install rm -rf $RPM_BUILD_ROOT -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -1181,7 +1127,7 @@ ln -s "${ic_lib_dir}/priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}" -ln -s "${jinterface_lib_dir}/priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" +ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" %clean @@ -1592,6 +1538,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src +# FIXME see erlang-jinterface also +#%dir %{_javadir}/%{name}/ %{_javadir}/%{name}/ic.jar %if %{with doc} %{_libdir}/erlang/man/man3/ic.* @@ -1622,8 +1570,10 @@ rm -rf $RPM_BUILD_ROOT %endif %files jinterface -%{_libdir}/erlang/lib/jinterface-*/ +# FIXME see erlang-ic also +#%dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar +%{_libdir}/erlang/lib/jinterface-*/ %files kernel %dir %{_libdir}/erlang/lib/kernel-*/ @@ -2092,6 +2042,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxChoicebook.* %{_libdir}/erlang/man/man3/wxClientDC.* %{_libdir}/erlang/man/man3/wxClipboard.* +%{_libdir}/erlang/man/man3/wxClipboardTextEvent.* %{_libdir}/erlang/man/man3/wxCloseEvent.* %{_libdir}/erlang/man/man3/wxColourData.* %{_libdir}/erlang/man/man3/wxColourDialog.* @@ -2291,7 +2242,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif -%if 0%{?el6}%{?fedora} +%if 0%{?el6}%{?el7}%{?fedora} %files -n emacs-erlang %dir %{_emacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README @@ -2313,6 +2264,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 26 2013 Peter Lemenkov - R16B-02.1 +- Ver. R16B02 (see rhbz #1009502) +- Increase erlang(erl_drv_version) from 2.1 to 2.2 (drivers needs rebuilding) +- Remove ancient obsoletes (see rhbz #1002103) +- Removed pre-F18 compatibility +- Enable HiPE + * Sat Aug 03 2013 Fedora Release Engineering - R16B-01.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 705b48f..8f7f6b7 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -56,10 +56,10 @@ index e890927..1377654 100644 endif diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index ebacc1c..388e27e 100644 +index e36b39c..fd377bb 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -872,14 +872,14 @@ ifneq ($(EXE_TARGETS),) +@@ -876,14 +876,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -83,20 +83,22 @@ index ebacc1c..388e27e 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index 856823b..d000273 100644 +index 6e65f06..4120029 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in -@@ -146,10 +146,8 @@ $(OBJDIR)/%.o: %.c +@@ -146,12 +146,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 6111cf2..bd62e8b 100644 --- a/lib/megaco/src/flex/Makefile.in @@ -127,10 +129,10 @@ index 6572d28..c7093ae 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index 51569f6..4e4d729 100644 +index f84ccf7..05d194f 100644 --- a/lib/os_mon/c_src/Makefile.in +++ b/lib/os_mon/c_src/Makefile.in -@@ -124,8 +124,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 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index fbb06c0..22ffaad 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -86,17 +86,17 @@ Signed-off-by: Hans Ulrich Niedermann 76 files changed, 60 insertions(+), 113 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 7a7b7fb..fcdb699 100644 +index c1580b1..2b9b5ce 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -76,8 +76,6 @@ copy: +@@ -85,8 +85,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: + release_spec: $(APP_TARGET) - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile index c1620bc..02c0984 100644 @@ -112,10 +112,10 @@ index c1620bc..02c0984 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 33cd3cc..72c7005 100644 +index 3f24e15..4cfb20f 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -156,7 +156,7 @@ release_spec: opt +@@ -153,7 +153,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -860,10 +860,10 @@ index b8387ff..2012af9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 2347986..b7f57b8 100644 +index 8d2bcfe..d1a9cac 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -95,8 +95,6 @@ docs: +@@ -96,8 +96,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -963,10 +963,10 @@ index 93d0b54..5904bc2 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index cf9f7d5..0f80003 100644 +index 6744e2f..1b62136 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -1001,10 +1001,10 @@ index c9fbad8..2fc7f18 100644 release_docs_spec: diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index ebc5f5b..471375c 100644 +index ab4dd4d..bcb1bc3 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile -@@ -124,7 +124,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0008-Fix-for-armv7hl-architecture.patch b/otp-0008-Fix-for-armv7hl-architecture.patch new file mode 100644 index 0000000..b985440 --- /dev/null +++ b/otp-0008-Fix-for-armv7hl-architecture.patch @@ -0,0 +1,29 @@ +From 98268681b57ddec0d7aad2234d271c47da538d63 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 26 Sep 2013 22:01:03 +0400 +Subject: [PATCH 8/8] 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 +--- + erts/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/erts/configure.in b/erts/configure.in +index 00c7045..5b72215 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -634,6 +634,7 @@ case $chk_arch_ in + armv5tejl) ARCH=arm;; + armv6l) ARCH=arm;; + armv7l) ARCH=arm;; ++ armv7hl) ARCH=arm;; + tile) ARCH=tile;; + *) ARCH=noarch;; + esac +-- +1.8.3.1 + diff --git a/otp_src_R16B01.readme b/otp_src_R16B01.readme deleted file mode 100644 index 0f9fa30..0000000 --- a/otp_src_R16B01.readme +++ /dev/null @@ -1,1210 +0,0 @@ -Bug fix release : otp_src_R16B01 -Build date : 2013-06-18 - -This is R16B01, the first maintenance release for the R16B major release. - -You can find the README file for the release at - - http://www.erlang.org/download/otp_src_R16B01.readme (this file) - -The source distribution and binary distributions for Windows can be -downloaded from - - http://www.erlang.org/download/otp_src_R16B01.tar.gz - http://www.erlang.org/download/otp_win32_R16B01.exe - http://www.erlang.org/download/otp_win64_R16B01.exe - -Note: To unpack the TAR archive you need a GNU TAR compatible program. - -For installation instructions please read the README file that is part -of the distribution. - -The on-line documentation can be found at: http://www.erlang.org/doc/ -You can also download the complete HTML documentation or the Unix manual files - - http://www.erlang.org/download/otp_doc_html_R16B01.tar.gz - http://www.erlang.org/download/otp_doc_man_R16B01.tar.gz - -We also want to thank those that sent us patches, suggestions and bug reports, - -The OTP Team - - ---- HIGHLIGHTS ---------------------------------------------------------- - - OTP-10279 == erts == - - Support for migration of memory carriers between memory - allocator instances has been introduced. - - By default this feature is not enabled and do not effect the - characteristics of the system. When enabled it has the - following impact on the characteristics of the system: - - -- Reduced memory footprint when the memory load is unevenly - distributed between scheduler specific allocator instances. - - -- Depending on the default allocaton strategy used on a - specific allocator there might or might not be a slight - performance loss. - - -- When enabled on the fix_alloc allocator, a different - strategy for management of fix blocks will be used. - - -- The information returned from - erlang:system_info({allocator, A}), and - erlang:system_info({allocator_sizes, A}) will be slightly - different when this feature has been enabled. An mbcs_pool - tuple will be present giving information about abandoned - carriers, and in the fix_alloc case no fix_types tuple will - be present. - - For more information, see the documentation of the +Macul - command line argument. - - OTP-11009 == ssl public_key crypto common_test dialyzer ssh stdlib snmp - inets == - - Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11159 == erts == - - Lift static limitation (FD_SETSIZE) for file descriptors on - Mac OS X. (Thanks to Anthony Ramine) - - ---- otp ----------------------------------------------------------------- - - OTP-11117 Properly ignore os_mon and otp_mibs generated includes - - ---- asn1-2.0.1.1 -------------------------------------------------------- - - OTP-10916 The generated decoder for the 'per' and 'uper' backends - did not correctly decode ENUMERATEDs with a single value. - The generated encoder for the 'per' and 'uper' backends - generated an empty binary for a top-level type that did - not need to be encoded (such as an ENUMERATED with a single - value). The correct result should be a binary containing - a 0 byte. - - ---- asn1-2.0.1.2 -------------------------------------------------------- - - OTP-10995 When an object set is an actual parameter, the extension - marker for the object set could get lost (which would cause - the decoding of unknown values to fail). - - ---- asn1-2.0.2 ---------------------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11111 Fix some Makefile rules that didn't support silent rules. - Thanks to Anthony Ramine. - - OTP-11134 PER/UPER: A semi-constrained INTEGER with a non-zero lower - bound would be incorrectly decoded. This bug was introduced - in R16. - - PER/UPER: Given INTEGER (10..MAX, ...), attempting to decode - any integer below 10 would cause the encoder to enter an - infinite loop. - - PER/UPER: For a type with an extensible SIZE constraint, - sizes outside of the root range were incorrectly encoded. - - Given a constraint such as (SIZE (5, ...)), encoding a size - less than 5 would fail (PER/UPER). Similarly, for BER - decoding would fail. - - PER: The encoder did not align a known multiplier string - (such as IA5String) of length 16 bits (exactly) to an octet - boundary. - - In rare circumstances, DEFAULT values for the UPER backend - could be wrongly encoded. - - OTP-11153 UPER: The compiler would crash when compiling an ENUMERATED - having more than 63 extended values. - - PER/UPER: A SEQUENCE with more 64 extended values could not - be decoded. - - OTP-11154 When decoding a SEQUENCE defined inline inside a an extension - addition group, the record named generated by the decoding - code would not match the name in the generated .hrl file. - - ---- common_test-1.7.2 --------------------------------------------------- - - OTP-10126 A design flaw in the generic connection handling in Common - Test made it impossible to implement a connection handler - that could map multiple connection names (i.e. configuration - variable aliases) to single connection pids. This problem has - been solved. - - OTP-10494 If it could not be decided which test case a certain log - printout belonged to, the common test framework log was - earlier used. Such printouts are now instead sent to - unexpected_io.log.html in test_server so that there is only - one place to look for "missing" printouts. - - OTP-10648 If a telnet connection is hanging, then a call to - ct_telnet:close/1 will time out after 5 seconds and the - connection process is brutally killed. In some cases the - connection would not be unregistered and attempts at opening - a new connection with the same name would make common_test - try to reuse the same connection since it believed that it - was still alive. This has been corrected - a killed - connection is now always unregistered. - - OTP-10855 Test performance has been improved by means of a cache for - the top level HTML index logs (all_runs.html and index.html, - in the logdir directory). This solves problems with slow - start up times and test execution times increasing with the - number of ct_run directories stored in logdir. The cached - index entries are stored in RAM during test execution and are - saved to file in logdir (for faster start up times) whenever - a test run finishes. - - OTP-10856 The '-force_stop' flag to use with time-limited repeats of - test runs can now be used with a new 'skip_rest' option which - causes the rest of the test cases in the ongoing test job to - be skipped when the time limit is reached. E.g. 'ct_run -spec - xxx -duration 010000 -force_stop skip_rest' - - OTP-10857 Testing of the test specification functionality has been - improved and a couple of minor bugs have been discovered and - corrected. - - OTP-10902 Make cover smarter about finding source from beam. - - In particular, search using the source path in module_info if - the current heuristic fails. - - OTP-10920 Add a variant of ct_slave:start/2 that starts a node with - specified options on the local host. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11044 A link is added from the red error printout in a test case - log (for a failed test case) to the full error description at - the end of the log. The reason for this is that the error - description in the red field is sometimes truncated at 50 - characters in order to keep the log as short and easy to read - as possible. - - OTP-11046 Links to the top level index files in some HTML footers had - disappeared. This error has been corrected. Also, a problem - with the suite overview log file not being closed properly - has been solved. - - OTP-11052 Common Test would, in case of timetrap error, print a warning - in the log if end_per_testcase wasn't implemented in the - suite, even though it's an optional function. This printout - has been removed. - - OTP-11095 A new option 'no_prompt_check' is added to - ct_telnet:expect/3. If this option is used, ct_telnet will - not wait for a prompt or a newline before attempting to match - the given pattern. - - ---- compiler-4.9.2 ------------------------------------------------------ - - OTP-10939 Compiling functions with complex boolean operations in guards - could be very slow. (Thanks to Magnus Muller for reporting - this issue.) - - OTP-11005 Fix optimization of some binary comprehensions. Thanks to - Anthony Ramine. - - OTP-11069 Use a set to store ref registers in beam_receive. Thanks to - Anthony Ramine. - - OTP-11119 Certain guard expressions used in a receive statement could - cause the compiler to crash. - - OTP-11129 Fix renaming of bs_put_string instructions. Thanks to Anthony - Ramine. - - ---- cosEvent-2.1.14 ----------------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- cosFileTransfer-1.1.15 ---------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- cosNotification-1.1.20 ---------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- crypto-3.0 ---------------------------------------------------------- - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11058 Fixed a spelling mistake in crypto docs. Thanks to Klaus - Trainer - - ---- debugger-3.2.11 ----------------------------------------------------- - - OTP-10899 A new checkbox has been added. When it is checked, the range - set by the erl flag +pc is used for determining when to print - lists of integers as strings. When it is unchecked, integer - lists are never printed as strings. - - A minor incompatibility: settings saved by Erlang R16B01 or - later cannot be read by Erlang R16B or earlier. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - ---- dialyzer-2.6.1 ------------------------------------------------------ - - OTP-10918 Include module, function and arity in Dialyzer's "overlapping - domain" warnings. Thanks to Magnus Henoch. - - OTP-10996 Improve Dialyzer output for scan errors. Thanks to Magnus - Henoch. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11027 Bitstring type inference and duplicate module error message - fixes. Thanks to Stavros Aronis. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - OTP-11057 A bug that made it impossible to do any analyses from the GUI - has been fixed. - - ---- diameter-1.4.1.1 ---------------------------------------------------- - - OTP-10898 Add transport_opt() watchdog_config to allow non-standard - behaviour of the watchdog state machine. This can be useful - during test but should not be used on nodes that must conform - to RFC 3539. - - OTP-10942 Fix broken Vendor-Specific-Application-Id configuration. - RFC 6733 changed the definition of this Grouped AVP, changing - the arity of Vendor-Id from 1* to 1. A component Vendor-Id - can now be either list- or integer-valued in service and - transport configuration, allowing it to be used with both - RFC 3588 and RFC 6733 dictionaries. - - ---- diameter-1.4.2 ------------------------------------------------------ - - OTP-9610 Allow peer connections to be shared between Erlang nodes for - the purpose of sending outgoing requests. - - A diameter_app(3) pick_peer/4 callback gets a list of remote - candidates as argument, allowing a callback on one node to - select a transport connection established on another node. - The service_opt() share_peers controls the extent to which - local connections are shared with remote nodes. The - service_opt() use_shared_peers controls the extent to which - connections shared from remote nodes are utilized on the - local node. - - OTP-10893 Allow listening diameter_{tcp,sctp} transports to be - configured with remote addresses. - - Option 'accept' allows remote addresses to be configured as - tuples or regular expressions. Remote addresses are matched - against the configured values at connection establishment, - any non-matching address causing the connection to be - aborted. - - OTP-10972 Detect more transport_opt() configuration errors at - diameter:add_transport/2. - - Many errors would previously not be detected until transport - start, diameter:add_transport/2 returning 'ok' but transport - connections failing to be established. An error tuple is now - returned. - - OTP-10986 Make explicit local address configuration optional in - diameter_tcp:start/3. - - The default address (as determined by gen_tcp) is now used - when a local address is not explicitly configured. - - OTP-11007 Fix handling of 5014 (INVALID_AVP_LENGTH) errors. - - This was in some cases reported as 3009 (INVALID_AVP_BITS). - - Note that the correction is partially implemented in modules - generated by diameterc(1): a dictionary file must be - recompiled for the correction to apply to any messages it - defines. - - OTP-11014 Fix faulty capitalization in release notes. - - Diameter = the protocol.
diameter = the Erlang - application. - - OTP-11017 Improve handling of unrecognized service options. - - Such options were silently ignored by - diameter:start_service/2. An error tuple is now returned. - - OTP-11019 Fix watchdog memory leak. - - Entries were not removed from a service-specific ets table, - causing them to be orphaned at connection reestablishment for - listening transports, and diameter:remove_transport/2 for - both listening and connecting transports. - - The fault was introduced by OTP-10692 in diameter-1.4.1 - (R16B). - - OTP-11026 Fix decode failure on AVP Length < 8. - - The failure caused the message in question to be discarded. - - OTP-11045 Respect Host-IP-Address configuration. - - Addresses returned from a transport module were always used - to populate Host-IP-Address AVP's in an outgoing CER/CEA, - which precluded the sending of a VIP address. Transport - addresses are now only used if Host-IP-Address is - unspecified. - - OTP-11050 Don't send default Inband-Security-Id in CER/CEA. - - RFC 6733 recommends against the use of Inband-Security-Id. - Only send a value that differs from the default, - NO_INBAND_SECURITY = 0. - - OTP-11051 Fix mkdir race. - - Install could fail if examples/code and examples/dict were - created in parallel. Noticed on FreeBSD. - - OTP-11060 Make spawn options for request processes configurable. - - OTP-11087 Fix recognition of 5001 on mandatory AVP's. - - An AVP setting the M-bit was not regarded as erroneous if it - was defined in the dictionary in question and its container - (message or Grouped AVP) had an 'AVP' field. It's now - regarded as a 5001 error (AVP_UNSUPPORTED), as in the case - that the AVP is not defined. - - Note that the correction is partially implemented in modules - generated by diameterc(1): a dictionary file must be - recompiled for the correction to apply to any messages it - defines. - - OTP-11092 Fix setting of Failed-AVP on handle_request {answer_message, - 5xxx} return. - - Failed-AVP was never in the outgoing answer-message. It is - now set with the AVP from the first entry with the specified - Result-Code in the errors field of the incoming - diameter_packet, if found. - - OTP-11115 Fix watchdog function_clause - - A listening transport on a service that allowed multiple - connections to the same peer could result in a - function_clause error in module diameter_watchdog. The - resulting crash was harmless but unseemly. - - Thanks to Aleksander Nycz. - - OTP-11127 Fix population of Failed-AVP. - - In cases in which diameter populated this AVP, many values - were sent instead of one as suggested by RFC 6733. This was - partially corrected by OTP-11007. - - OTP-11165 Fix list-valued Vendor-Specific-Application-Id config - - R16B (specifically, OTP-10760) broke the handling of such - configuration, resulting in a function clause error if the - list was not of length 3, and faulty interpretation of the - list's contents otherwise. Only record-valued configuration - was properly interpreted. - - ---- erl_interface-3.7.12 ------------------------------------------------ - - OTP-10913 Superfluous trailing comma in enum erlang_char_encoding - causing compile error for g++ with --pedantic option. - - ---- erl_interface-3.7.13 ------------------------------------------------ - - OTP-11167 A guard was added to check if file descriptor is valid before - closing it. - - ---- erts-5.10.1.1 ------------------------------------------------------- - - OTP-10926 The BIF is_process_alive/1 could prematurely return false - while the process being inspected was terminating. This - bug was introduced in ERTS-5.10. - - OTP-10932 Fix a problem in erlang:delete_element/2 where the call - could corrupt one word of stack if the heap and stack met - during call. - - OTP-10994 Scheduler threads will now by default be less eager requesting - wakeup due to certain cleanup operations. This can also - be controlled using the +swct command line argument of erl(1). - - OTP-11000 The +sws<value> and +swt<value> system flags - failed if no white space were passed between the parameter - and value parts of the flags. Upon failure, the runtime - system refused to start. - - ---- erts-5.10.1.2 ------------------------------------------------------- - - OTP-11022 A bug in the implementation of offline schedulers has been - fixed. The bug was introduced in OTP-R16A/ERTS-5.10, and - caused work-stealing between schedulers to fail. This in - turn, caused work to accumulate in some run-queues. The - bug was only triggered when there were offline schedulers - in the system, i.e., when the amount of online schedulers - was less than the total amount of schedulers. The effect - of the bug got more severe the larger amount of offline - schedulers the system had. - - ---- erts-5.10.2 --------------------------------------------------------- - - OTP-10271 Replaced the lock protecting gathering of garbage collection - statistics with a lock-free solution. - - OTP-10279 Support for migration of memory carriers between memory - allocator instances has been introduced. - - By default this feature is not enabled and do not effect the - characteristics of the system. When enabled it has the - following impact on the characteristics of the system: - - -- Reduced memory footprint when the memory load is unevenly - distributed between scheduler specific allocator instances. - - -- Depending on the default allocaton strategy used on a - specific allocator there might or might not be a slight - performance loss. - - -- When enabled on the fix_alloc allocator, a different - strategy for management of fix blocks will be used. - - -- The information returned from - erlang:system_info({allocator, A}), and - erlang:system_info({allocator_sizes, A}) will be slightly - different when this feature has been enabled. An mbcs_pool - tuple will be present giving information about abandoned - carriers, and in the fix_alloc case no fix_types tuple will - be present. - - For more information, see the documentation of the +Macul - command line argument. - - OTP-10497 A bug in prim_inet has been corrected. If the port owner was - killed at a bad time while closing the socket port the port - could become orphaned hence causing port and socket leaking. - Reported by Fred Herbert, Dmitry Belyaev and others. - - OTP-10941 Compilation fixes for NetBSD. Thanks to YAMAMOTO Takashi. - - OTP-10984 Fixed a race condition when using delayed_write when writing - to a file which would cause the same data to be written - multiple times. - - OTP-10997 Fix small memory leak from tracing with option meta. - - OTP-11002 Correct typo in erlsrv usage. Thanks to Bryan Hunter - - OTP-11003 ct_run: delete unused function. Thanks to Tuncer Ayaz. - - OTP-11008 Change specs for spawn_opt to use the process_level() type - declaration instead of re-defining it in various places. - Thanks to Kostis Sagonas. - - OTP-11012 Corrections to run_erl/to_erl handshake behaviour. - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11024 Fix typo in type: erlang:process_info_item(). Thanks to - Andrew Tunnell-Jones. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - OTP-11064 Fix src/dest overlap issue in ttsl driver. Thanks to Steve - Vinoski. - - OTP-11074 Optimization of simultaneous inet_db operations on the same - socket by using a lock free implementation. - - Impact on the characteristics of the system: Improved - performance. - - OTP-11075 The high_msgq_watermark and low_msgq_watermark inet socket - options introduced in OTP-R16A could only be set on TCP - sockets. These options are now generic and can be set on all - types of sockets. - - OTP-11076 When sending to a port using erlang:send(Port, Msg, - [nosuspend]), the send operation was performed synchronously. - This bug has now been fixed. - - OTP-11077 A new better algorithm for management of the process, and - port tables has been introduced. - - Impact on the characteristics of the system: - - -- The new algorithm ensures that both insert and delete - operations can be made in O(1) time complexity. Previously - used algorithm either caused insert or delete to be O(N). - - -- The new algorithm will also ensure that reuse of - identifiers will be less frequent than when the old algorithm - was used. - - -- Previously used algorithm ensured that the latest created - identifier compared as the largest when comparing two - identifiers of the same type that had been created on the - same node as long as no identifiers had been reused. Since - identifiers can be reused quite fast, one has never been able - to rely on this property. Due to the introduction of this new - algorithm this property will not hold even if no identifiers - has been reused yet. This could be considered as an - incompatibility. - - Due to the above mensioned potential incompatibility, it will - still be possible to enable the old algorithm for some time. - The command line argument +P legacy will enable the old - algorithm on the process table, and +Q legacy will do the - same for the port table. These command line arguments are - however deprecated as of their introduction and have been - scheduled for removal in OTP-R18. - - OTP-11080 When converting a faulty binary to a list with - unicode:characters_to_list, the error return value could - contain a faulty "rest", i.e. the io_list of characters that - could not be converted was wrong. This happened only if input - was a sub binary and conversion was from utf8. This is now - corrected. - - OTP-11084 Runtime system could crash when reporting stale - driver_select(). - - OTP-11085 Fix lock order violation for memory instrumentation (+Mim, - +Mis, +Mit). - - OTP-11086 Fixed some compilation warnings on miscellaneous platforms. - Thanks to Anthony Ramine. - - OTP-11088 Support wide characters in the shell through wcwidth(). - Thanks to Anthony Ramine. Reported by Loïc Hoguin. - - OTP-11096 Fixed issue when flushing i/o during shutdown on windows - where the Erlang VM would sometime hang due to a race - condition. - - OTP-11097 Fixed issue where repeated calls to erlang:nodes() could - cause unnecessary contention in the dist_table lock. - - OTP-11098 Added total used memory for each process in erlang crash - dumps. - - OTP-11106 Properly guard WIDE_TAG use with HAVE_WCWIDTH in ttsl_drv. - Thanks to Anthony Ramine - - OTP-11111 Fix some Makefile rules that didn't support silent rules. - Thanks to Anthony Ramine. - - OTP-11125 Added support for hipe on Raspberry Pi (armv6l). Thanks to - Klaus Alfert. - - OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to - Anthony Ramine. - - OTP-11146 erlang:now() could suddenly jump ~24 days into the future on - Windows. This is now corrected. Thanks to Garret Smith for - reporting and testing fixes. - - OTP-11158 Remove 'query' from the list of reserved words in docs. - Thanks to Matthias Endler and Loïc Hoguin. - - OTP-11159 Lift static limitation (FD_SETSIZE) for file descriptors on - Mac OS X. (Thanks to Anthony Ramine) - - OTP-11163 erlang:term_to_binary will now cost an appropriate amount of - reductions and will interrupt (yield) for reschedule if the - term is big. This avoids too long schedules when - term_to_binary is used. - - Impact: Programs running term_to_binary on large terms will - run more smothly, but rescheduling will impact the single - process performance of the BIF. Single threaded benchmarks - will show degraded performance of the BIF when called with - very large terms, while general system behaviour will be - improved. The overhead for allowing restart and reduction - counting also degrades local performance of the BIF with - between 5% and 10% even for small terms. - - ---- et-1.4.4.4 ---------------------------------------------------------- - - OTP-11039 Use erlang:demonitor(Ref, [flush]) where applicable. Thanks - to Loïc Hoguin. - - OTP-11078 Rename and document lists:zf/2 as lists:filtermap/2. Thanks - to Anthony Ramine. - - ---- hipe-3.10.2 --------------------------------------------------------- - - OTP-10904 Fix the title of hipe_app documentation page. Thanks to Loïc - Hoguin. - - OTP-10985 Fix native code compiler crash involving bs_match_string. - Thanks to Kostis Sagonas. - - OTP-11031 Loosen the assumptions of code that handles escaping - functions. Thanks to Kostis Sagonas - - ---- ic-4.3.2 ------------------------------------------------------------ - - OTP-11086 Fixed some compilation warnings on miscellaneous platforms. - Thanks to Anthony Ramine. - - ---- inets-5.9.5 --------------------------------------------------------- - - OTP-10934 Fix http_request:http_headers/1 to send content-length when - length is zero. Thanks to CA Meijer. - - OTP-10956 Reverted incorrect commit that broke cookie handling when - using httpc-profiles. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11122 Fix {stream, {self, once}} in httpc to work as expected. - Thanks to Masatake Daimon - - ---- kernel-2.16.2 ------------------------------------------------------- - - OTP-10497 A bug in prim_inet has been corrected. If the port owner was - killed at a bad time while closing the socket port the port - could become orphaned hence causing port and socket leaking. - Reported by Fred Herbert, Dmitry Belyaev and others. - - OTP-10689 A few bugs regarding case sensitivity for hostname resolution - while using e.g the internal lookup types 'file' and 'dns' - has been corrected. When looking up hostnames ASCII letters - a-z are to be regarded as the same as A-Z according to RFC - 4343 "Domain Name System (DNS) Case Insensitivity - Clarification", and this was not always the case. - - OTP-10910 Add application:ensure_started/1,2. It is equivavlent to - application:start/1,2 except it returns ok for already - started applications. - - OTP-11040 Optimize communication with file io server. Thanks to Anthony - Ramine. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - OTP-11074 Optimization of simultaneous inet_db operations on the same - socket by using a lock free implementation. - - Impact on the characteristics of the system: Improved - performance. - - OTP-11075 The high_msgq_watermark and low_msgq_watermark inet socket - options introduced in OTP-R16A could only be set on TCP - sockets. These options are now generic and can be set on all - types of sockets. - - OTP-11104 Fix deep list argument error under Windows in os:cmd/1. - Thanks to Aleksandr Vinokurov . - - ---- megaco-3.17 --------------------------------------------------------- - - OTP-10998 A buffer overrun error in the flex scanner could occur when - scanning property parms. - - ---- megaco-3.17.0.1 ----------------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- mnesia-4.9 ---------------------------------------------------------- - - OTP-11030 If mnesia:clear_table/2 was called during a table load on - that table, the schema record was written to the table - instead of clearing table. - - OTP-11103 Optimize index creation for Mnesia set tables. Thanks to Nick - Marino. - - ---- observer-1.3.1 ------------------------------------------------------ - - OTP-10604 -- The new Memory field from a crash dump is now presented by - crashdump viewer, both in the process overview and in the - process detail page. - - -- A summary of blocks- and carriers sizes is added to the - allocator information page in the crashdump viewer. - - OTP-10894 Some bugs related to calculation of CPU/scheduler utilization - in observer are corrected. - - Current function for a process is accepted to be 'undefined' - when running hipe. - - OTP-10929 Use "open" as default browser for crashdump viewer on Mac OS - X. Thanks to Magnus Henoch. - - OTP-10931 Fix observer table viewer crash on formatting improper lists. - Thanks to Andrey Tsirulev - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11136 Add processes state view in observer. Thanks to Eric - Pailleau. - - ---- odbc-2.10.16 -------------------------------------------------------- - - OTP-10993 Fix a 64bit related bug in odbcserver. Thanks to Satoshi - Kinoshita. - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11126 Fix checking for odbc in standard locations when "with-odbc" - flag present. Thanks to Alexey Saltanov. - - ---- orber-3.6.26 -------------------------------------------------------- - - OTP-10675 Fix bug in corbaloc/corbaname over ssl. - - ---- orber-3.6.26.1 ------------------------------------------------------ - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- os_mon-2.2.12 ------------------------------------------------------- - - OTP-10941 Compilation fixes for NetBSD. Thanks to YAMAMOTO Takashi. - - OTP-10945 Fixed disksup:get_disk_data for SUSv3, specifically OS X ML. - Thanks to Sriram Melkote. - - ---- percept-0.8.8.1 ----------------------------------------------------- - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - ---- public_key-0.19 ----------------------------------------------------- - - OTP-10873 Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27 that - are somtimes used instead of the PKCS defined oids - 1.2.840.113549.1.1.5 and 1.2.840.10040.4.3. Add function - pkix_sign_types:/1 that translates oids to to algorithm atoms - ex: - - > public_key:pkix_sign_types({1,3,14,3,2,29}). {sha,rsa} - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - ---- reltool-0.6.4 ------------------------------------------------------- - - OTP-10988 Reltool used to fail if an application was mentioned in the - config file which was not found in the file system, even if - the application was explicitly excluded in the config. This - has been changed and will only produce a warning. If the - application is not explicitly excluded it will still cause - reltool to fail. Thanks to Håkan Mattsson! - - OTP-11099 Fix possibly "not owner" error while file copy with reltool. - Thanks to Alexey Saltanov. - - OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to - Anthony Ramine. - - ---- runtime_tools-1.8.11 ------------------------------------------------ - - OTP-10894 Some bugs related to calculation of CPU/scheduler utilization - in observer are corrected. - - Current function for a process is accepted to be 'undefined' - when running hipe. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - ---- safe-1.2.9 ---------------------------------------------------------- - - OTP-11083 Fix value assignment for trend parameter - - OTP-11094 Changed API for ccb augmentation - - ---- sasl-2.3.2 ---------------------------------------------------------- - - OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to - Anthony Ramine. - - ---- snmp-4.24 ----------------------------------------------------------- - - OTP-11004 Fix SNMP gitignore files. Thanks to Anthony Ramine. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11101 [snmp/agent] Introduced the mib-server data module behaviour. - - OTP-11107 [snmp/agent] Introduced a documented mib-storage behaviour. - This will allow users to implement alternative storage - methods. - - ---- ssh-2.1.6 ----------------------------------------------------------- - - OTP-10940 Fixed timing rekeying bug. - - ---- ssh-2.1.7 ----------------------------------------------------------- - - OTP-10975 ssh:daemon will get feeded with an argument even if it is not - a valid expression. - - OTP-10983 Properly ignore everything in lib/ssh/doc/html/. Thanks to - Anthony Ramine. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - ---- ssl-5.3 ------------------------------------------------------------- - - OTP-10450 Add support for PSK (Pre Shared Key) and SRP (Secure Remote - Password) chipher suits, thanks to Andreas Schultz. - - OTP-10905 Honor the versions option to ssl:connect and ssl:listen. - - OTP-10909 Next protocol negotiation with reused sessions will now - succeed - - OTP-10955 Fix SSL Next Protocol Negotiation documentation. Thanks to - Julien Barbot. - - OTP-10980 Fix ssl_connection to support reading proxy/chain - certificates. Thanks to Valentin Kuznetsov. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - ---- stdlib-1.19.2 ------------------------------------------------------- - - OTP-10938 Delete obsolete note about simple-one-for-one supervisor. - Thanks to Magnus Henoch. - - OTP-10951 When selecting encoding of a script written in Erlang - (escript) the optional directive on the second line is now - recognized. - - OTP-10990 The Erlang scanner no longer accepts floating point numbers - in the input string. - - OTP-10992 The function erl_parse:abstract/2 has been documented. - - OTP-11009 Integrate elliptic curve contribution from Andreas Schultz - - In order to be able to support elliptic curve cipher suites - in SSL/TLS, additions to handle elliptic curve infrastructure - has been added to public_key and crypto. - - This also has resulted in a rewrite of the crypto API to gain - consistency and remove unnecessary overhead. All OTP - applications using crypto has been updated to use the new - API. - - Impact: Elliptic curve cryptography (ECC) offers equivalent - security with smaller key sizes than other public key - algorithms. Smaller key sizes result in savings for power, - memory, bandwidth, and computational cost that make ECC - especially attractive for constrained environments. - - OTP-11013 Added sys:get_state/1,2 and sys:replace_state/2,3. Thanks to - Steve Vinoski. - - OTP-11025 Optimizations to gen mechanism. Thanks to Loïc Hoguin. - - OTP-11035 Optimizations to gen.erl. Thanks to Loïc Hoguin. - - OTP-11039 Use erlang:demonitor(Ref, [flush]) where applicable. Thanks - to Loïc Hoguin. - - OTP-11041 Erlang source files with non-ASCII characters are now encoded - in UTF-8 (instead of latin1). - - OTP-11042 Fix rest_for_one and one_for_all restarting a child not - terminated. Thanks to James Fish. - - OTP-11053 Fix excessive CPU consumption of timer_server. Thanks to - Aliaksey Kandratsenka. - - OTP-11078 Rename and document lists:zf/2 as lists:filtermap/2. Thanks - to Anthony Ramine. - - OTP-11079 Fixed an inconsistent state in epp. Thanks to Anthony Ramine - - OTP-11080 When converting a faulty binary to a list with - unicode:characters_to_list, the error return value could - contain a faulty "rest", i.e. the io_list of characters that - could not be converted was wrong. This happened only if input - was a sub binary and conversion was from utf8. This is now - corrected. - - OTP-11100 The type hook_function() has been corrected in erl_pp, the - Erlang Pretty Printer. - - The printing of invalid forms, e.g. record field types, has - also been fixed. It has been broken since R16B. - - (Thanks to Tomáš Janoušek.) - - OTP-11108 c:ls(File) will now print File, similar to ls(1) in Unix. The - error messages have also been improved. (Thanks to Bengt - Kleberg.) - - OTP-11137 Fix receive support in erl_eval with a BEAM module. Thanks to - Anthony Ramine. - - OTP-11140 Support callback attributes in erl_pp. Thanks to Anthony - Ramine. - - OTP-11143 Improve erl_lint performance. Thanks to José Valim. - - ---- test_server-3.6.2 --------------------------------------------------- - - OTP-10607 Some unused code related to remote targets is removed, and - documentation is updated. - - OTP-10856 The '-force_stop' flag to use with time-limited repeats of - test runs can now be used with a new 'skip_rest' option which - causes the rest of the test cases in the ongoing test job to - be skipped when the time limit is reached. E.g. 'ct_run -spec - xxx -duration 010000 -force_stop skip_rest' - - OTP-10991 A bug in test_server_gl caused io requests containing invalid - data (i.e. not unicode:chardata()) to hang, since no io reply - was sent. This has been corrected. - - OTP-11052 Common Test would, in case of timetrap error, print a warning - in the log if end_per_testcase wasn't implemented in the - suite, even though it's an optional function. This printout - has been removed. - - ---- tools-2.6.11 -------------------------------------------------------- - - OTP-10902 Make cover smarter about finding source from beam. - - In particular, search using the source path in module_info if - the current heuristic fails. - - OTP-10930 Remove Flymake dependency in erlang-pkg.el. Thanks to Magnus - Henoch. - - OTP-10979 When cover:stop(Node) was called on a non-existing node, a - process waiting for cover data from the node would hang - forever. This has been corrected. - - OTP-10999 Erlang-mode: Add autoload cookies for file extension - associations. Thanks to Magnus Henoch. - - OTP-11016 Postscript files no longer needed for the generation of PDF - files have been removed. - - OTP-11028 Fix a race condition when there're several applications in - apps directory. Thanks to Manuel Rubio. - - OTP-11144 New option for eprof, 'set_on_spawn'. This option was - previously always on and is also the default. - - diff --git a/otp_src_R16B02.readme b/otp_src_R16B02.readme new file mode 100644 index 0000000..8a7db52 --- /dev/null +++ b/otp_src_R16B02.readme @@ -0,0 +1,640 @@ +Bug fix release : otp_src_R16B02 +Build date : 2013-09-17 + +This is R16B02, the second maintenance release for the R16B major release. + +You can find the README file for the release at + + http://www.erlang.org/download/otp_src_R16B02.readme (this file) + +The source distribution and binary distributions for Windows can be +downloaded from + + http://www.erlang.org/download/otp_src_R16B02.tar.gz + http://www.erlang.org/download/otp_win32_R16B02.exe + http://www.erlang.org/download/otp_win64_R16B02.exe + +Note: To unpack the TAR archive you need a GNU TAR compatible program. + +For installation instructions please read the README file that is part +of the distribution. + +The on-line documentation can be found at: http://www.erlang.org/doc/ +You can also download the complete HTML documentation or the Unix manual files + + http://www.erlang.org/download/otp_doc_html_R16B02.tar.gz + http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz + +We also want to thank those that sent us patches, suggestions and bug reports, + +The OTP Team + + +--- otp ----------------------------------------------------------------- + + OTP-11221 A new test scope has been added which is meant to be used for + making sure that the Erlang VM and other platform specific + libraries have been compiled correctly for you system. The + tests are executed just as normal tests, only that you use + ts:smoke_test instead of ts:run. See ts:help() for more + details. + + OTP-11288 configure now accepts any Erlang/OTP applications as an + option to the --without flag. For more details see the + Installation Guide for more details. + + +--- asn1-2.0.3 ---------------------------------------------------------- + + OTP-11193 The format of the xml source for documentation is corrected + in order to conform to the DTDs and to pass xmllint without + errors. + + OTP-11300 For the PER and UPER formats, code generation especially for + encoding has been improved. + + When encoding BIT STRINGs, values longer than the maximum + size for the BIT STRING type would be truncated silently - + they now cause an exception. + + Open types greater than 16383 bytes will now be correctly + encoded and decoded. + + IMPORTANT NOTE: For ASN.1 specifications that depend on each + other, such as the S1AP-* specifications, it is important to + recompile all specifications (compiling some with this + version of the compiler and some with an older version will + not work). + + +--- common_test-1.7.3 --------------------------------------------------- + + OTP-11132 Documentation is added for ct_netconfc:send and + ct_netconfc:send_rpc. + + OTP-11166 ct_netconfc:create_subscription only allowed one XML element + inside the 'filter' element. According to RFC5277 it should + be allowed to add any number of elements inside the filter, + so this is now corrected. + + OTP-11175 The error handler installed by the Common Test hook + cth_log_redirect did not respond to init:stop/1/2. This has + been corrected. + + OTP-11176 Calling ct:pal/2 or ct:print/2 when Common Test was not + running, would cause an exit. This has been changed and the + string is now simply printed to stdout instead. + + OTP-11193 The format of the xml source for documentation is corrected + in order to conform to the DTDs and to pass xmllint without + errors. + + OTP-11238 Fixed problem with the cth_log_redirect hook making calls to + an undefined function in ct_logs. + + OTP-11244 When running tests with the 'repeat' option, the Common Test + utility process did not always terminate quickly enough after + a test run, causing the start of the next run to fail. A + monitor is now used to ensure termination of the utility + process after each test run. + + OTP-11263 Test Server installed an error handler (test_server_h) only + to be able to write the name of the current test case to + stdout whenever it received an error- or progress report. + This functionality was not useful and has been removed. The + built-in Common Test hook, cth_log_redirect, has instead been + improved to now also tag all error- and progress reports in + the log with suite-, group-, and/or test case name. + + OTP-11272 A new log, the "Pre- and Post Test I/O Log", has been + introduced, which makes it possible to capture error- and + progress reports, as well as printouts made with ct:log/2 and + ct:pal/2, before and after a test run. (Some minor + improvements of the logging system have been made at the same + time). Links to the new log are found on the Common Test + Framework Log page. The Common Test User's Guide has been + updated with information about the new log and also with a + new section on how to synchronize external applications with + Common Test by means of the CT Hook init and terminate + functions. + + +--- compiler-4.9.3 ------------------------------------------------------ + + OTP-11201 Fix matching of floating point middle-endian machines. Thanks + to Johannes Weissl. + + OTP-11211 Restrict inlining of local fun references. Thanks to Anthony + Ramine. + + OTP-11212 Silence a misleading warning with some comprehensions. Thanks + to Anthony Ramine. + + OTP-11240 Expressions such as 'B = is_integer(V), if B and B -> ok end' + would crash the compiler. + + OTP-11247 Forbid returning a match context in beam_validator. Thanks to + Anthony Ramine. + + OTP-11304 compile:file2/2 with the option report_errors could return + ErrorInfo tuples with only two elements, while the + documentation says that the ErrorInfo tuple always has three + elements. Also updated the documentation to add that the + first element may be 'none' if no line number is applicable. + + +--- crypto-3.1 ---------------------------------------------------------- + + OTP-11320 Refactor ecdsa cipher to simplify code and improve + performance. + + +--- debugger-3.2.12 ----------------------------------------------------- + + OTP-11201 Fix matching of floating point middle-endian machines. Thanks + to Johannes Weissl. + + +--- diameter-1.4.3 ------------------------------------------------------ + + OTP-11172 Fix UTF8String encode. + + Encode now accepts any nested list of codepoints and + binaries. A list containing a binary was previously + misinterpreted and the documentation was incomplete. + + OTP-11184 Ensure DWR isn't sent immediately after DWA. + + This was possible if the timing was unfortunate. An incoming + DWR now properly resets the watchdog timer. + + OTP-11293 Fix faulty encode of Failed-AVP + + Reception of a CER, DWR or DPR that has decode failures + caused encode of the corresponding answer message to fail. + + OTP-11299 Fix broken service_opt() spawn_opt. + + The option was ignored. + + +--- edoc-0.7.12.1 ------------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- erl_docgen-0.3.4.1 -------------------------------------------------- + + OTP-11193 The format of the xml source for documentation is corrected + in order to conform to the DTDs and to pass xmllint without + errors. + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- erl_interface-3.7.14 ------------------------------------------------ + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + OTP-11284 Header and library files from ic and erl_interface are now + installed into usr/{include,lib}. Note that these directories + are unversioned, so the latest installed version will be the + one in the directory. + + OTP-11289 Fix location of true binary under Mac OSX. Thanks to Simon + Cornish. + + +--- erts-5.10.3 --------------------------------------------------------- + + OTP-11090 The documentation of predefined types and built-in types has + been corrected. + + OTP-11157 There is a new somewhat experimental socket option 'netns' + that can set the network namespace for a socket on Linux:es + where it is supported. See the documentation. + + OTP-11174 New allocator strategy aoffcbf (address order first fit + carrier best fit). Supports carrier migration but with better + CPU performance than aoffcaobf. + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + OTP-11201 Fix matching of floating point middle-endian machines. Thanks + to Johannes Weissl. + + OTP-11206 Fix changing terminal parameters in to_erl + + Change the behaviour of to_erl to use TCSADRAIN instead of + TCSANOW when changing terminal parameters. This makes the + serial driver wait for the output queues to be empty before + applying the terminal parameter change. Thanks to Stefan + Zegenhagen. + + OTP-11214 Fix compile error on ARM and GCC versions greater than 4.1.0. + Thanks to Johannes Weissl. + + OTP-11215 run_erl: Redirect standard streams to /dev/null. Thanks to + Johannes Weissl. + + OTP-11218 The default value of {flush, boolean()} in erlang:halt/2 is + documented to be 'true' if the status is an integer. The + implementation behaviour was reversed. The Implementation is + now corrected to adhere to the documentation. Thanks to Jose + Valim for reporting the error. + + OTP-11225 Fix serious race bug in R16B01 that could cause PID mix-ups + when a lot of processes were spawned and terminated in a very + rapid pace on an SMP emulator with at least two scheduler + threads. + + OTP-11227 Misc. corrections in documentation for erl_driver. Thanks to + Giacomo Olgeni. + + OTP-11232 Validating a trace pattern with the option silent no longer + incorrectly enables/disables the silent option of the calling + process. + + OTP-11239 Fix documentation regarding binary_part. + + OTP-11246 Fixed a bug where GCC 4.8 and later use a more aggressive + loop optimization algorithm that broke some previously + working code in the efile driver. Thanks to Tomas Abrahamsson + for reporting this issue. + + OTP-11251 Make edlin understand a few important control keys. Thanks to + Stefan Zegenhagen. + + OTP-11264 Fixed bug when printing memory allocator acul option in crash + dump. + + OTP-11265 Opening a new compressed file on Windows could in rare + (random) cases result in {error,eisdir} or other error codes + although it should have succeeded. This is now corrected. + + OTP-11278 Export type zlib:zstream/0. Thanks to Loic Hoguin. + + OTP-11282 Add erl option to set schedulers by percentages. + + For applications where measurements show enhanced performance + from the use of a non-default number of emulator scheduler + threads, having to accurately set the right number of + scheduler threads across multiple hosts each with different + numbers of logical processors is difficult because the erl +S + option requires absolute numbers of scheduler threads and + scheduler threads online to be specified. + + To address this issue, add a +SP option to erl, similar to + the existing +S option but allowing the number of scheduler + threads and scheduler threads online to be set as percentages + of logical processors configured and logical processors + available, respectively. For example, "+SP 50:25" sets the + number of scheduler threads to 50% of the logical processors + configured, and the number of scheduler threads online to 25% + of the logical processors available. The +SP option also + interacts with any settings specified with the +S option, + such that the combination of options "+S 4:4 +SP 50:50" (in + either order) results in 2 scheduler threads and 2 scheduler + threads online. + + Thanks to Steve Vinoski + + OTP-11290 Fixed a race condition when closing a trace port that would + cause the emulator to crash. + + OTP-11303 Extend erl_driver interface with lock names + + Lock and thread names are already a feature in the driver + interface. This extension will let developers read these + names which eases debugging. + + OTP-11311 Fix incorrect values returned by integer_to_binary/2. Thanks + to Juan Jose Comellas. + + OTP-11317 Fix system_flag scheduling_statistics - disable . Thanks to + Steve Vinoski. + + OTP-11321 The documentation of predefined types has been corrected + Thanks to Kostis Sagonas. + + +--- et-1.4.4.5 ---------------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- eunit-2.2.5 --------------------------------------------------------- + + OTP-11217 Wrap eunit macros into begin ... end blocks. Thanks to + Anthony Ramine. + + +--- hipe-3.10.2.1 ------------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- ic-4.3.3 ------------------------------------------------------------ + + OTP-11284 Header and library files from ic and erl_interface are now + installed into usr/{include,lib}. Note that these directories + are unversioned, so the latest installed version will be the + one in the directory. + + +--- inets-5.9.6 --------------------------------------------------------- + + OTP-11190 httpc: Allow content body in DELETE requests. Thanks to James + Wheare. + + OTP-11202 Add missing brackets to report formatting on ftp_progress + process exit. Thanks to Artur Wilniewczyc. + + OTP-11210 Fix some errors in the inets documentation. Thanks to + Johannes Weissl. + + OTP-11226 Fix various typos in httpd, inets. Thanks to Tomohiko Aono. + + OTP-11260 Fix httpd config option 'erl_script_nocache'. Thanks to + Johannes Weissl. + + +--- kernel-2.16.3 ------------------------------------------------------- + + OTP-10676 The previous undocumented function ntoa/1 has been added to + inet docs and exported in the inet module. + + OTP-11209 Fix indentation of User switch command help in Erlang shell. + Thanks to Sylvain Benner. + + OTP-11219 Fix typo in abcast() function comment. Thanks to Johannes + Weissl. + + OTP-11250 Add application:ensure_all_started/1-2. Thanks to Fred + Hebert. + + OTP-11251 Make edlin understand a few important control keys. Thanks to + Stefan Zegenhagen. + + OTP-11301 Cleanup of hipe_unified_loader, eliminating uses of + is_subtype/2 in specs, change module-local void functions to + return 'ok' instead of [] and made sure there are no dialyzer + warnings with --Wunmatched_returns. Thanks to Kostis Sagonas. + + +--- megaco-3.17.0.2 ----------------------------------------------------- + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + +--- mnesia-4.10 --------------------------------------------------------- + + OTP-10957 Fix timing issues in checkpoint creation. + + OTP-11241 Fixed a problem where the fallback BUP file is removed when + calling mnesia:uninstall_fallback and mnesia is not started. + + +--- observer-1.3.1.1 ---------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- odbc-2.10.17 -------------------------------------------------------- + + OTP-11193 The format of the xml source for documentation is corrected + in order to conform to the DTDs and to pass xmllint without + errors. + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + OTP-11233 Prevent odbcserver crash if it's executed and supplied + incorrect data to stdin. Thanks to Sergei Golovan. + + +--- os_mon-2.2.13 ------------------------------------------------------- + + OTP-11207 Use 'df -k -l' to query FreeBSD and OpenBSD about diskspace + on local disks. Previously 'df' -k -t ufs' was used but this + will not handle zfs or other disks. Just use '-l' instead of + listing potential filesystems. + + OTP-11213 Fix compilation on Solaris. Thanks to Maciej Malecki. + + OTP-11298 Fix broken cpu_sup:nprocs and others on Solaris 64-bit. + Thanks to Simon Cornish. + + +--- parsetools-2.0.10 --------------------------------------------------- + + OTP-11269 A bug causing Yecc to generate badly formed parsers when + encountering very simple recursive rules has been fixed. + (Thanks to Eric Pailleau.) + + OTP-11286 A bug where Unicode filenames combined with Latin-1 encoding + could crash Yecc and Leex has been fixed. + + OTP-11313 Fix leex module`s inability to build unicode-aware lexers. + Thanks to Pierre Fenoll. + + +--- percept-0.8.8.2 ----------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- public_key-0.20 ----------------------------------------------------- + + OTP-10874 Extend PKCS-7 to support SCEP (Simple Certificate Enrollment + Protocol). + + OTP-11281 public_key:pem_entry_decode/2 now handles AES-128-CBC + ciphered keys. Thanks to Simon Cornish. + + +--- reltool-0.6.4.1 ----------------------------------------------------- + + OTP-11310 The encoding of the notes.xml file has been changed from + latin1 to utf-8 to avoid future merge problems. + + +--- runtime_tools-1.8.12 ------------------------------------------------ + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + OTP-11222 The process trace flag 'silent' is now allowed in call to + dbg:p/2. + + +--- sasl-2.3.3 ---------------------------------------------------------- + + OTP-11252 Add Fd usage in rb logging. Thanks to Eric Pailleau. + + +--- snmp-4.24.1 --------------------------------------------------------- + + OTP-11177 [agent] Reading the value of the vacmViewTreeFamilyMask + returs it in the wrong (internal) format. The vacmViewTreeFamilyMask + is defined to be a bit string in the MIB (OCTET STRING). + Internally a bitlist (list of 1's and 0's) is used. However, + the MIB implementation assumed the latter, effectively rendering + all attempts to read/set masks via SNMP unsuccessful. Since + the mask is used in hot paths (e.g. access permission checks + for each SNMP operation, the bitlist representation of the + mask has benefits (e.g. faster processing). Reading/writing + the view mask objects is less time-critical. Therefore, + to fix the issue, convert between bitlist representation + and bitstring when the vacmViewTreeFamilyMask objects are + accessed. + + OTP-11192 [agent] The counter increment function in the local-db was + incorrect. It did not handle counter wrap correctly. + + +--- snmp-4.24.2 --------------------------------------------------------- + + OTP-11216 [agent] Improved documentation for the functions for loading + and unloading mibs, see snmpa:load_mibs/1,2,3 and + snmpa:unload_mibs/1,2,3 for more info. + Also added new functions for loading and unloading a + single mib, see snmpa:load_mib/1,2 and snmpa:unload_mib/1,2 + for more info. + + +--- ssh-2.1.8 ----------------------------------------------------------- + + OTP-11189 Do not chmod ~/.ssh unnecessarily. + + OTP-11199 Make ssh_cli.erl handle CTRL+C. Thanks to Stefan Zegenhagen. + + OTP-11249 Clarified timeout options in documentation. + + OTP-11256 Add openssh_zlib compression type to ssh_transport. Thanks to + Louis-Philippe Gauthier. + + +--- ssl-5.3.1 ----------------------------------------------------------- + + OTP-11228 Setopts during renegotiation caused the renegotiation to be + unsuccessful. + + If calling setopts during a renegotiation the FSM state might + change during the handling of the setopts messages, this is + now handled correctly. + + OTP-11229 Now handles signature_algorithm field in digitally_signed + properly with proper defaults. Prior to this change some + elliptic curve cipher suites could fail reporting the error + "bad certificate". + + OTP-11230 The code emulating the inet header option was changed in the + belief that it made it inet compatible. However the testing + is a bit hairy as the inet option is actually broken, now the + tests are corrected and the header option should work in the + same broken way as inet again, preferably use the bitsyntax + instead. + + OTP-11255 Make the ssl manager name for erlang distribution over + SSL/TLS relative to the module name of the ssl_manager. + + This can be beneficial when making tools that rename modules + for internal processing in the tool. + + OTP-11271 Add documentation regarding log_alert option. + + +--- stdlib-1.19.3 ------------------------------------------------------- + + OTP-11200 Fixed type typo in gen_server. + + OTP-11208 Update type specs in filelib and io_prompt. Thanks to Jose + Valim. + + OTP-11219 Fix typo in abcast() function comment. Thanks to Johannes + Weissl. + + OTP-11245 The functions dets:foldl/3, dets:foldr/3, and dets:traverse/2 + did not release the table after having traversed the table to + the end. The bug was introduced in R16B. (Thanks to Manuel + Duran Aguete.) + + OTP-11251 Make edlin understand a few important control keys. Thanks to + Stefan Zegenhagen. + + OTP-11254 If the fun M:F/A construct was used erroneously the linter + could crash. (Thanks to Mikhail Sobolev.) + + OTP-11261 The specifications of io_lib:fread/2,3 have been corrected. + (Thanks to Chris King and Kostis Sagonas for pinpointing the + bug.) + + OTP-11266 Export the edge/0 type from the digraph module. Thanks to + Alex Ronne Petersen. + + OTP-11268 Fix variable usage tracking in erl_lint and fixed unsafe + variable tracking in try expressions. Thanks to Anthony + Ramine. + + +--- test_server-3.6.3 --------------------------------------------------- + + OTP-11263 Test Server installed an error handler (test_server_h) only + to be able to write the name of the current test case to + stdout whenever it received an error- or progress report. + This functionality was not useful and has been removed. The + built-in Common Test hook, cth_log_redirect, has instead been + improved to now also tag all error- and progress reports in + the log with suite-, group-, and/or test case name. + + OTP-11272 A new log, the "Pre- and Post Test I/O Log", has been + introduced, which makes it possible to capture error- and + progress reports, as well as printouts made with ct:log/2 and + ct:pal/2, before and after a test run. (Some minor + improvements of the logging system have been made at the same + time). Links to the new log are found on the Common Test + Framework Log page. The Common Test User's Guide has been + updated with information about the new log and also with a + new section on how to synchronize external applications with + Common Test by means of the CT Hook init and terminate + functions. + + +--- tools-2.6.12 -------------------------------------------------------- + + OTP-11198 Remove trailing spaces in Emacs templates. Thanks to Roberto + Aloi. + + OTP-11242 Fixed the Emacs erlang-mode to accommodate the coding style + where lists written across several lines have each line + starting with a comma. Thanks to Magnus Henoch. + + OTP-11270 Make the Emacs Erlang mode TRAMP-aware when compiling. Thanks + to Tomas Abrahamsson. + + +--- wx-1.1 -------------------------------------------------------------- + + OTP-11196 Introduced functionality for inspection of system and build + configuration. + + OTP-11279 Fix return value in wxStatusBar:getFieldRect/2 and add + wxClipboardTextEvent and wxPanel:setFocusIgnoringChildren/1. + + +--- xmerl-1.3.4 --------------------------------------------------------- + + OTP-11224 Fixed various typos in xmerl documentation. Thanks to David + Welton. + + diff --git a/sources b/sources index edb6a9f..a5032de 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -266b95db35560e505c9f69cc3e539e41 otp_src_R16B01.tar.gz -288fd4066ae07fa3ca23043a31826d46 otp_doc_html_R16B01.tar.gz -951be958bc9af55df6062165cf21fe1f otp_doc_man_R16B01.tar.gz -8d0757af41f545b757ac71125b2b6488 otp_src_R16B01.readme +5bd028771290eacbc075ca65a63749e6 otp_doc_html_R16B02.tar.gz +fe3ff42375090d33ce1ba98c28218cf3 otp_doc_man_R16B02.tar.gz +fe73334b75669fac4c3c400ceab064c8 otp_src_R16B02.readme +ca63bcde0e5ae0f2df9457f97b3115a4 otp_src_R16B02.tar.gz From 491da303c1ed9b2a07920ca00794391d15bf7c5f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 24 Oct 2013 11:15:43 +0400 Subject: [PATCH 029/340] Fix building for armv7hl (patch taken from OpenSUSE repository) Signed-off-by: Peter Lemenkov --- erlang.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index fb7c46d..9d3719b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -24,7 +24,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist}.1 +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -940,8 +940,9 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .fix_armv7hl_hipe # end of autogenerated prep patch list +# FIXME we should come up with a better solution # remove shipped zlib sources -rm -f erts/emulator/zlib/*.[ch] +#rm -f erts/emulator/zlib/*.[ch] # Fix 664 file mode chmod 644 lib/kernel/examples/uds_dist/c_src/Makefile @@ -953,6 +954,9 @@ chmod 644 lib/ssl/examples/src/Makefile rm -f lib/ssl/examples/certs/etc/otpCA/index.txt.old rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old +# Reconfigure everything to apply changes to the autotools templates +./otp_build autoconf + %build %ifarch sparcv9 sparc64 @@ -2264,6 +2268,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 24 2013 Peter Lemenkov - R16B-02.2 +- Fix building for armv7hl (patch taken from OpenSUSE repository) + * Thu Sep 26 2013 Peter Lemenkov - R16B-02.1 - Ver. R16B02 (see rhbz #1009502) - Increase erlang(erl_drv_version) from 2.1 to 2.2 (drivers needs rebuilding) From a4b4d0bf9f48b857ab35fa39c06c33c10bf2c40f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 24 Oct 2013 16:46:17 +0400 Subject: [PATCH 030/340] TEMPORARILY disable ECC until dust settles Signed-off-by: Peter Lemenkov --- erlang.spec | 13 +++++++-- otp-0008-Fix-for-armv7hl-architecture.patch | 6 +---- ...ARILY-disable-ECC-until-dust-settles.patch | 27 +++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch diff --git a/erlang.spec b/erlang.spec index 9d3719b..1d4cbfd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -24,7 +24,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -76,7 +76,12 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch # Required only for el5, el6 on PowerPC # Ugly workaround for java-1.5.0-gcj which doesn't support Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +# Fedora specific patch +# Fix for armv7hl architecture Patch8: otp-0008-Fix-for-armv7hl-architecture.patch +# Fedora specific patch +# TEMPORARILY disable ECC until dust settles +Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -937,7 +942,8 @@ Erlang mode for XEmacs (source lisp files). %patch7 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup %endif %endif -%patch8 -p1 -b .fix_armv7hl_hipe +%patch8 -p1 -b .Fix_for_armv7hl_architecture +%patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2268,6 +2274,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 24 2013 Peter Lemenkov - R16B-02.3 +- TEMPORARILY disable ECC until dust settles + * Thu Oct 24 2013 Peter Lemenkov - R16B-02.2 - Fix building for armv7hl (patch taken from OpenSUSE repository) diff --git a/otp-0008-Fix-for-armv7hl-architecture.patch b/otp-0008-Fix-for-armv7hl-architecture.patch index b985440..fc9f76e 100644 --- a/otp-0008-Fix-for-armv7hl-architecture.patch +++ b/otp-0008-Fix-for-armv7hl-architecture.patch @@ -1,7 +1,6 @@ -From 98268681b57ddec0d7aad2234d271c47da538d63 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 26 Sep 2013 22:01:03 +0400 -Subject: [PATCH 8/8] Fix for armv7hl architecture +Subject: [PATCH] Fix for armv7hl architecture Taken from openSUSE: @@ -24,6 +23,3 @@ index 00c7045..5b72215 100644 tile) ARCH=tile;; *) ARCH=noarch;; esac --- -1.8.3.1 - diff --git a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch new file mode 100644 index 0000000..28c166a --- /dev/null +++ b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch @@ -0,0 +1,27 @@ +From: Peter Lemenkov +Date: Thu, 24 Oct 2013 16:44:22 +0400 +Subject: [PATCH] TEMPORARILY disable ECC until dust settles + +Signed-off-by: Peter Lemenkov +--- + lib/crypto/c_src/crypto.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index c28ff81..1b3b6c2 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 + #include From a737a5a32cdaaa7aa606f503331d5c4b4d8eae48 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 28 Oct 2013 17:40:26 +0400 Subject: [PATCH 031/340] Disable HiPE on unsupported arches Signed-off-by: Peter Lemenkov --- erlang.spec | 20 +++++++++++--- otp-0010-Fix-for-powerpc-architecture.patch | 29 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 otp-0010-Fix-for-powerpc-architecture.patch diff --git a/erlang.spec b/erlang.spec index 1d4cbfd..e673291 100644 --- a/erlang.spec +++ b/erlang.spec @@ -20,11 +20,17 @@ %global use_prebuilt_docs 0 %endif +%ifarch %{arm} %{ix86} x86_64 ppc +%global __with_hipe 1 +%else +%global __with_hipe 0 +%endif + %global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm} Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.3%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -82,6 +88,9 @@ Patch8: otp-0008-Fix-for-armv7hl-architecture.patch # Fedora specific patch # TEMPORARILY disable ECC until dust settles Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch +# Fedora specific patch +# Fix for powerpc architecture +Patch10: otp-0010-Fix-for-powerpc-architecture.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -944,6 +953,7 @@ Erlang mode for XEmacs (source lisp files). %endif %patch8 -p1 -b .Fix_for_armv7hl_architecture %patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles +%patch10 -p1 -b .Fix_for_powerpc_architecture # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -966,9 +976,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe} %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe} %endif # Remove pre-built BEAM files @@ -2274,6 +2284,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 28 2013 Peter Lemenkov - R16B-02.4 +- Disable HiPE on s390(x) (rhbz #1023960) +- Fix HiPE on ppc (rhbz #1023960) + * Thu Oct 24 2013 Peter Lemenkov - R16B-02.3 - TEMPORARILY disable ECC until dust settles diff --git a/otp-0010-Fix-for-powerpc-architecture.patch b/otp-0010-Fix-for-powerpc-architecture.patch new file mode 100644 index 0000000..1d56394 --- /dev/null +++ b/otp-0010-Fix-for-powerpc-architecture.patch @@ -0,0 +1,29 @@ +From: Peter Lemenkov +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 +--- + erts/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/erts/configure.in b/erts/configure.in +index 5b72215..9f396f0 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -625,6 +625,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;; From 13312e6dfe59910880417a3a8551b6a0ce4f7c4c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 28 Oct 2013 22:50:38 +0400 Subject: [PATCH 032/340] Re-enable HiPE on ppc64, ppc64v7 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index e673291..4ae1249 100644 --- a/erlang.spec +++ b/erlang.spec @@ -20,7 +20,7 @@ %global use_prebuilt_docs 0 %endif -%ifarch %{arm} %{ix86} x86_64 ppc +%ifarch %{arm} %{ix86} x86_64 ppc %{power64} %global __with_hipe 1 %else %global __with_hipe 0 @@ -30,7 +30,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist} +Release: %{upstream_rel_for_rpm}.5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2284,6 +2284,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 28 2013 Peter Lemenkov - R16B-02.5 +- Re-enable HiPE on ppc64, ppc64v7 + * Mon Oct 28 2013 Peter Lemenkov - R16B-02.4 - Disable HiPE on s390(x) (rhbz #1023960) - Fix HiPE on ppc (rhbz #1023960) From d2f651795b8284381b0ae921fb940ace69dc74b4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 29 Oct 2013 13:21:34 +0400 Subject: [PATCH 033/340] Actually re-enable HiPE Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 4ae1249..6c3b085 100644 --- a/erlang.spec +++ b/erlang.spec @@ -30,7 +30,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.5%{?dist} +Release: %{upstream_rel_for_rpm}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -976,9 +976,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe} %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe} %endif # Remove pre-built BEAM files @@ -2284,6 +2284,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 29 2013 Peter Lemenkov - R16B-02.6 +- Actually re-enable HiPE + * Mon Oct 28 2013 Peter Lemenkov - R16B-02.5 - Re-enable HiPE on ppc64, ppc64v7 From f56df7bde54c3f51f95c67a1cf5f49c423e0af5e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 29 Oct 2013 17:00:20 +0400 Subject: [PATCH 034/340] Really disable HiPE on s390(x) Signed-off-by: Peter Lemenkov --- erlang.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6c3b085..602748c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -22,15 +22,13 @@ %ifarch %{arm} %{ix86} x86_64 ppc %{power64} %global __with_hipe 1 -%else -%global __with_hipe 0 %endif %global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm} Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.6%{?dist} +Release: %{upstream_rel_for_rpm}.7%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2284,6 +2282,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 29 2013 Peter Lemenkov - R16B-02.7 +- Really disable HiPE on s390(x) + * Tue Oct 29 2013 Peter Lemenkov - R16B-02.6 - Actually re-enable HiPE From e7421b965eef1aed1089ca67cb33150c7a165ba3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 19 Nov 2013 16:16:32 +0100 Subject: [PATCH 035/340] ot-get-patches.sh: Clean up comment wording Just some grammar fixes improving clarity of the comments. --- otp-get-patches.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/otp-get-patches.sh b/otp-get-patches.sh index 5033e60..d9ca70d 100755 --- a/otp-get-patches.sh +++ b/otp-get-patches.sh @@ -6,13 +6,14 @@ # # otp-get-patches.sh updates the erlang.spec and otp-00*.patch # files in the git index. After an otp-get-patches.sh run, you -# will need to review the stage git changes, possibly adapt the -# Release: and %changelog parts of erlang spec, and can then +# will need to review the staged git changes, possibly adapt the +# 'Release:' and '%changelog' parts of erlang.spec, and can then # "git commit" everything. # # Caution: Leave the four special comment lines untouched in the # spec file, as otp-get-patches.sh requires them and will only -# touch erlang.spec between the respective start/end pair: +# touch the parts of erlang.spec between the respective start/end +# comment pair: # # # start of autogenerated patch tag list # # end of autogenerated patch tag list From 18d29ea8b1748e9ea128fbc87b8229354ee26bb4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 24 Dec 2013 16:34:56 +0400 Subject: [PATCH 036/340] Ver. R16B03 Signed-off-by: Peter Lemenkov --- .gitignore | 4 + erlang.spec | 10 +- ...n-pages-and-do-not-install-miscellan.patch | 12 +- otp-0002-Remove-rpath.patch | 4 - otp-0003-Do-not-install-C-sources.patch | 15 +- otp-0004-Do-not-install-Java-sources.patch | 4 - ...teventlog-and-related-doc-files-on-n.patch | 4 - otp-0006-Do-not-install-erlang-sources.patch | 96 +-- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 4 - otp-0008-Fix-for-armv7hl-architecture.patch | 7 +- ...ARILY-disable-ECC-until-dust-settles.patch | 5 +- otp-0010-Fix-for-powerpc-architecture.patch | 7 +- otp_src_R16B02.readme | 640 ---------------- otp_src_R16B03.readme | 718 ++++++++++++++++++ sources | 8 +- 15 files changed, 753 insertions(+), 785 deletions(-) delete mode 100644 otp_src_R16B02.readme create mode 100644 otp_src_R16B03.readme diff --git a/.gitignore b/.gitignore index d8a2277..102f125 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,7 @@ otp_src_R14A.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 diff --git a/erlang.spec b/erlang.spec index 602748c..cd39c58 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,7 +1,7 @@ %global upstream_ver R16B # Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! #%global upstream_rel %{nil} -%global upstream_rel 02 +%global upstream_rel 03 # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. @@ -28,7 +28,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.7%{?dist} +Release: %{upstream_rel_for_rpm}.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -1353,7 +1353,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/diameter-*/include %{_libdir}/erlang/lib/diameter-*/src %if %{with doc} -%{_libdir}/erlang/man/man1/diameter_compile.* +%{_libdir}/erlang/man/man1/diameterc.* %{_libdir}/erlang/man/man3/diameter.* %{_libdir}/erlang/man/man3/diameter_app.* %{_libdir}/erlang/man/man3/diameter_codec.* @@ -1434,6 +1434,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/bin/erl %{_libdir}/erlang/bin/erlc %{_libdir}/erlang/bin/escript +%{_libdir}/erlang/bin/no_dot_erlang.boot %{_libdir}/erlang/bin/run_erl %{_libdir}/erlang/bin/start %{_libdir}/erlang/bin/start.boot @@ -2282,6 +2283,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 24 2013 Peter Lemenkov - R16B-03.1 +- Ver. R16B03 + * Tue Oct 29 2013 Peter Lemenkov - R16B-02.7 - Really disable HiPE on s390(x) diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 4fba9a0..75bf3e5 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -4,10 +4,6 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous utilities for dealing with man-pages. Signed-off-by: Peter Lemenkov ---- - erts/etc/common/Makefile.in | 4 ---- - erts/etc/unix/Install.src | 10 ---------- - 2 files changed, 14 deletions(-) diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index 5c1ce51..5a07855 100644 @@ -25,13 +21,13 @@ index 5c1ce51..5a07855 100644 $(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 0f33258..01fde22 100644 +index 8eb1db7..9e340bb 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src -@@ -140,14 +140,4 @@ 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 - -# -# Fixing the man pages -# @@ -41,5 +37,5 @@ index 0f33258..01fde22 100644 - cd "$ERL_ROOT" - ./misc/format_man_pages "$ERL_ROOT" -fi -- + exit 0 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 2192c39..2a65565 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -3,10 +3,6 @@ Date: Thu, 25 Feb 2010 16:57:43 +0300 Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov ---- - lib/crypto/c_src/Makefile.in | 2 +- - lib/crypto/priv/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in index a20ddff..e890927 100644 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 8f7f6b7..821988b 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -12,17 +12,6 @@ interaction with the Erlang nodes: https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 -- - lib/crypto/c_src/Makefile.in | 4 ---- - lib/erl_interface/src/Makefile.in | 16 ++++++++-------- - lib/ic/c_src/Makefile.in | 2 -- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/odbc/c_src/Makefile.in | 3 --- - lib/os_mon/c_src/Makefile.in | 2 -- - lib/runtime_tools/c_src/Makefile.in | 2 -- - lib/tools/c_src/Makefile.in | 2 -- - 9 files changed, 9 insertions(+), 26 deletions(-) diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile index 7023833..8bf8eb9 100644 @@ -83,10 +72,10 @@ index e36b39c..fd377bb 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index 6e65f06..4120029 100644 +index ed860ab..96206ae 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in -@@ -146,12 +146,10 @@ $(OBJDIR)/%.o: %.c +@@ -144,12 +144,10 @@ $(OBJDIR)/%.o: %.c include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index fc3ccd5..378e86d 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -3,10 +3,6 @@ Date: Sat, 19 Jun 2010 09:25:18 +0400 Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov ---- - lib/ic/java_src/com/ericsson/otp/ic/Makefile | 2 -- - lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile | 2 -- - 2 files changed, 4 deletions(-) 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 diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index c73b50c..cf8e970 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -4,10 +4,6 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 systems Signed-off-by: Peter Lemenkov ---- - lib/os_mon/doc/src/Makefile | 7 ++++++- - lib/os_mon/src/Makefile | 11 ++++++++++- - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile index 08fd23e..5606cfc 100644 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 22ffaad..38c9dd1 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -6,87 +6,9 @@ Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann ---- - erts/preloaded/src/Makefile | 2 -- - lib/appmon/src/Makefile | 2 +- - lib/asn1/src/Makefile | 2 +- - lib/common_test/src/Makefile | 2 +- - lib/compiler/src/Makefile | 4 ++-- - lib/cosEvent/src/Makefile | 2 +- - lib/cosEventDomain/src/Makefile | 2 +- - lib/cosFileTransfer/src/Makefile | 4 +--- - lib/cosNotification/src/Makefile | 3 +-- - lib/cosProperty/src/Makefile | 3 +-- - lib/cosTime/src/Makefile | 3 +-- - lib/cosTransactions/src/Makefile | 2 +- - lib/crypto/src/Makefile | 2 -- - lib/debugger/src/Makefile | 2 +- - lib/dialyzer/src/Makefile | 2 +- - lib/diameter/src/Makefile | 7 ++----- - lib/edoc/src/Makefile | 2 +- - lib/eldap/src/Makefile | 4 ---- - lib/erl_docgen/src/Makefile | 2 -- - lib/et/src/Makefile | 1 - - lib/eunit/src/Makefile | 2 -- - lib/gs/src/Makefile | 4 ++-- - lib/hipe/cerl/Makefile | 2 +- - lib/hipe/flow/Makefile | 2 +- - lib/hipe/icode/Makefile | 2 +- - lib/hipe/main/Makefile | 2 +- - lib/hipe/misc/Makefile | 2 +- - lib/hipe/rtl/Makefile | 2 +- - lib/hipe/util/Makefile | 3 --- - lib/ic/src/Makefile | 2 +- - lib/inets/src/ftp/Makefile | 2 +- - lib/inets/src/http_client/Makefile | 2 +- - lib/inets/src/http_lib/Makefile | 2 +- - lib/inets/src/http_server/Makefile | 2 +- - lib/inets/src/inets_app/Makefile | 2 +- - lib/inets/src/tftp/Makefile | 2 +- - lib/kernel/src/Makefile | 1 - - lib/megaco/src/app/Makefile | 2 +- - lib/megaco/src/binary/Makefile | 2 +- - lib/megaco/src/engine/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 -- - lib/megaco/src/tcp/Makefile | 2 +- - lib/megaco/src/text/Makefile | 2 +- - lib/megaco/src/udp/Makefile | 2 +- - lib/mnesia/src/Makefile | 2 +- - lib/observer/src/Makefile | 1 - - lib/odbc/src/Makefile | 2 +- - lib/orber/COSS/CosNaming/Makefile | 4 ++-- - lib/orber/src/Makefile | 2 +- - lib/os_mon/src/Makefile | 1 - - lib/otp_mibs/src/Makefile | 2 -- - lib/parsetools/src/Makefile | 2 -- - lib/percept/src/Makefile | 2 -- - lib/pman/src/Makefile | 2 +- - lib/public_key/asn1/Makefile | 4 ++-- - lib/public_key/src/Makefile | 4 ---- - lib/reltool/src/Makefile | 2 +- - lib/runtime_tools/src/Makefile | 2 -- - lib/sasl/src/Makefile | 1 - - lib/snmp/src/agent/Makefile | 2 +- - lib/snmp/src/app/Makefile | 2 +- - lib/snmp/src/compile/Makefile | 2 +- - lib/snmp/src/manager/Makefile | 2 +- - lib/snmp/src/misc/Makefile | 2 +- - lib/ssh/src/Makefile | 2 +- - lib/ssl/src/Makefile | 2 +- - lib/stdlib/src/Makefile | 1 - - lib/syntax_tools/src/Makefile | 2 -- - lib/test_server/src/Makefile | 1 - - lib/toolbar/src/Makefile | 2 +- - lib/tools/src/Makefile | 2 +- - lib/tv/src/Makefile | 2 +- - lib/typer/src/Makefile | 3 --- - lib/webtool/src/Makefile | 2 -- - lib/wx/src/Makefile | 4 ++-- - lib/xmerl/src/Makefile | 4 +--- - 76 files changed, 60 insertions(+), 113 deletions(-) diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index c1580b1..2b9b5ce 100644 +index 4ea2d41..e1466c1 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -85,8 +85,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -112,7 +34,7 @@ index c1620bc..02c0984 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 3f24e15..4cfb20f 100644 +index 500f4a1..e707394 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -153,7 +153,7 @@ release_spec: opt @@ -359,7 +281,7 @@ index 386169f..216b548 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index e88e28d..e7f44a4 100644 +index e6dab67..a5e147d 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -117,8 +117,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -898,10 +820,10 @@ index beed696..752072d 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 716add8..59ce2ef 100644 +index b8cc4b8..d806efb 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile -@@ -129,7 +129,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/app" @@ -950,10 +872,10 @@ index 698c341..3344a0c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 93d0b54..5904bc2 100644 +index 2ef2859..aac91a3 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -963,10 +885,10 @@ index 93d0b54..5904bc2 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 6744e2f..1b62136 100644 +index 131b615..c456bfc 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch index d7fb120..33b5973 100644 --- a/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ b/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch @@ -9,10 +9,6 @@ Fedora-Spec-Before: %if 0%{?el4}%{?el5}%{?el6} Fedora-Spec-Before: %ifnarch %{ix86} x86_64 Fedora-Spec-After: %endif Fedora-Spec-After: %endif ---- - .../java_src/com/ericsson/otp/erlang/OtpErlangList.java | 14 +------------- - .../java_src/com/ericsson/otp/erlang/OtpInputStream.java | 13 ++----------- - 2 files changed, 3 insertions(+), 24 deletions(-) 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 diff --git a/otp-0008-Fix-for-armv7hl-architecture.patch b/otp-0008-Fix-for-armv7hl-architecture.patch index fc9f76e..b7d8b32 100644 --- a/otp-0008-Fix-for-armv7hl-architecture.patch +++ b/otp-0008-Fix-for-armv7hl-architecture.patch @@ -7,15 +7,12 @@ 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 ---- - erts/configure.in | 1 + - 1 file changed, 1 insertion(+) diff --git a/erts/configure.in b/erts/configure.in -index 00c7045..5b72215 100644 +index bad748d..230f27a 100644 --- a/erts/configure.in +++ b/erts/configure.in -@@ -634,6 +634,7 @@ case $chk_arch_ in +@@ -621,6 +621,7 @@ case $chk_arch_ in armv5tejl) ARCH=arm;; armv6l) ARCH=arm;; armv7l) ARCH=arm;; diff --git a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch index 28c166a..4dc7759 100644 --- a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch +++ b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch @@ -3,12 +3,9 @@ Date: Thu, 24 Oct 2013 16:44:22 +0400 Subject: [PATCH] TEMPORARILY disable ECC until dust settles Signed-off-by: Peter Lemenkov ---- - lib/crypto/c_src/crypto.c | 7 ------- - 1 file changed, 7 deletions(-) diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c -index c28ff81..1b3b6c2 100644 +index 42fb172..eb99719 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -74,13 +74,6 @@ diff --git a/otp-0010-Fix-for-powerpc-architecture.patch b/otp-0010-Fix-for-powerpc-architecture.patch index 1d56394..8eb1f35 100644 --- a/otp-0010-Fix-for-powerpc-architecture.patch +++ b/otp-0010-Fix-for-powerpc-architecture.patch @@ -11,15 +11,12 @@ See also: * https://bugzilla.redhat.com/1023960 Signed-off-by: Peter Lemenkov ---- - erts/configure.in | 1 + - 1 file changed, 1 insertion(+) diff --git a/erts/configure.in b/erts/configure.in -index 5b72215..9f396f0 100644 +index 230f27a..9ad3671 100644 --- a/erts/configure.in +++ b/erts/configure.in -@@ -625,6 +625,7 @@ case $chk_arch_ in +@@ -612,6 +612,7 @@ case $chk_arch_ in x86_64) ARCH=amd64;; amd64) ARCH=amd64;; macppc) ARCH=ppc;; diff --git a/otp_src_R16B02.readme b/otp_src_R16B02.readme deleted file mode 100644 index 8a7db52..0000000 --- a/otp_src_R16B02.readme +++ /dev/null @@ -1,640 +0,0 @@ -Bug fix release : otp_src_R16B02 -Build date : 2013-09-17 - -This is R16B02, the second maintenance release for the R16B major release. - -You can find the README file for the release at - - http://www.erlang.org/download/otp_src_R16B02.readme (this file) - -The source distribution and binary distributions for Windows can be -downloaded from - - http://www.erlang.org/download/otp_src_R16B02.tar.gz - http://www.erlang.org/download/otp_win32_R16B02.exe - http://www.erlang.org/download/otp_win64_R16B02.exe - -Note: To unpack the TAR archive you need a GNU TAR compatible program. - -For installation instructions please read the README file that is part -of the distribution. - -The on-line documentation can be found at: http://www.erlang.org/doc/ -You can also download the complete HTML documentation or the Unix manual files - - http://www.erlang.org/download/otp_doc_html_R16B02.tar.gz - http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz - -We also want to thank those that sent us patches, suggestions and bug reports, - -The OTP Team - - ---- otp ----------------------------------------------------------------- - - OTP-11221 A new test scope has been added which is meant to be used for - making sure that the Erlang VM and other platform specific - libraries have been compiled correctly for you system. The - tests are executed just as normal tests, only that you use - ts:smoke_test instead of ts:run. See ts:help() for more - details. - - OTP-11288 configure now accepts any Erlang/OTP applications as an - option to the --without flag. For more details see the - Installation Guide for more details. - - ---- asn1-2.0.3 ---------------------------------------------------------- - - OTP-11193 The format of the xml source for documentation is corrected - in order to conform to the DTDs and to pass xmllint without - errors. - - OTP-11300 For the PER and UPER formats, code generation especially for - encoding has been improved. - - When encoding BIT STRINGs, values longer than the maximum - size for the BIT STRING type would be truncated silently - - they now cause an exception. - - Open types greater than 16383 bytes will now be correctly - encoded and decoded. - - IMPORTANT NOTE: For ASN.1 specifications that depend on each - other, such as the S1AP-* specifications, it is important to - recompile all specifications (compiling some with this - version of the compiler and some with an older version will - not work). - - ---- common_test-1.7.3 --------------------------------------------------- - - OTP-11132 Documentation is added for ct_netconfc:send and - ct_netconfc:send_rpc. - - OTP-11166 ct_netconfc:create_subscription only allowed one XML element - inside the 'filter' element. According to RFC5277 it should - be allowed to add any number of elements inside the filter, - so this is now corrected. - - OTP-11175 The error handler installed by the Common Test hook - cth_log_redirect did not respond to init:stop/1/2. This has - been corrected. - - OTP-11176 Calling ct:pal/2 or ct:print/2 when Common Test was not - running, would cause an exit. This has been changed and the - string is now simply printed to stdout instead. - - OTP-11193 The format of the xml source for documentation is corrected - in order to conform to the DTDs and to pass xmllint without - errors. - - OTP-11238 Fixed problem with the cth_log_redirect hook making calls to - an undefined function in ct_logs. - - OTP-11244 When running tests with the 'repeat' option, the Common Test - utility process did not always terminate quickly enough after - a test run, causing the start of the next run to fail. A - monitor is now used to ensure termination of the utility - process after each test run. - - OTP-11263 Test Server installed an error handler (test_server_h) only - to be able to write the name of the current test case to - stdout whenever it received an error- or progress report. - This functionality was not useful and has been removed. The - built-in Common Test hook, cth_log_redirect, has instead been - improved to now also tag all error- and progress reports in - the log with suite-, group-, and/or test case name. - - OTP-11272 A new log, the "Pre- and Post Test I/O Log", has been - introduced, which makes it possible to capture error- and - progress reports, as well as printouts made with ct:log/2 and - ct:pal/2, before and after a test run. (Some minor - improvements of the logging system have been made at the same - time). Links to the new log are found on the Common Test - Framework Log page. The Common Test User's Guide has been - updated with information about the new log and also with a - new section on how to synchronize external applications with - Common Test by means of the CT Hook init and terminate - functions. - - ---- compiler-4.9.3 ------------------------------------------------------ - - OTP-11201 Fix matching of floating point middle-endian machines. Thanks - to Johannes Weissl. - - OTP-11211 Restrict inlining of local fun references. Thanks to Anthony - Ramine. - - OTP-11212 Silence a misleading warning with some comprehensions. Thanks - to Anthony Ramine. - - OTP-11240 Expressions such as 'B = is_integer(V), if B and B -> ok end' - would crash the compiler. - - OTP-11247 Forbid returning a match context in beam_validator. Thanks to - Anthony Ramine. - - OTP-11304 compile:file2/2 with the option report_errors could return - ErrorInfo tuples with only two elements, while the - documentation says that the ErrorInfo tuple always has three - elements. Also updated the documentation to add that the - first element may be 'none' if no line number is applicable. - - ---- crypto-3.1 ---------------------------------------------------------- - - OTP-11320 Refactor ecdsa cipher to simplify code and improve - performance. - - ---- debugger-3.2.12 ----------------------------------------------------- - - OTP-11201 Fix matching of floating point middle-endian machines. Thanks - to Johannes Weissl. - - ---- diameter-1.4.3 ------------------------------------------------------ - - OTP-11172 Fix UTF8String encode. - - Encode now accepts any nested list of codepoints and - binaries. A list containing a binary was previously - misinterpreted and the documentation was incomplete. - - OTP-11184 Ensure DWR isn't sent immediately after DWA. - - This was possible if the timing was unfortunate. An incoming - DWR now properly resets the watchdog timer. - - OTP-11293 Fix faulty encode of Failed-AVP - - Reception of a CER, DWR or DPR that has decode failures - caused encode of the corresponding answer message to fail. - - OTP-11299 Fix broken service_opt() spawn_opt. - - The option was ignored. - - ---- edoc-0.7.12.1 ------------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- erl_docgen-0.3.4.1 -------------------------------------------------- - - OTP-11193 The format of the xml source for documentation is corrected - in order to conform to the DTDs and to pass xmllint without - errors. - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- erl_interface-3.7.14 ------------------------------------------------ - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - OTP-11284 Header and library files from ic and erl_interface are now - installed into usr/{include,lib}. Note that these directories - are unversioned, so the latest installed version will be the - one in the directory. - - OTP-11289 Fix location of true binary under Mac OSX. Thanks to Simon - Cornish. - - ---- erts-5.10.3 --------------------------------------------------------- - - OTP-11090 The documentation of predefined types and built-in types has - been corrected. - - OTP-11157 There is a new somewhat experimental socket option 'netns' - that can set the network namespace for a socket on Linux:es - where it is supported. See the documentation. - - OTP-11174 New allocator strategy aoffcbf (address order first fit - carrier best fit). Supports carrier migration but with better - CPU performance than aoffcaobf. - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - OTP-11201 Fix matching of floating point middle-endian machines. Thanks - to Johannes Weissl. - - OTP-11206 Fix changing terminal parameters in to_erl - - Change the behaviour of to_erl to use TCSADRAIN instead of - TCSANOW when changing terminal parameters. This makes the - serial driver wait for the output queues to be empty before - applying the terminal parameter change. Thanks to Stefan - Zegenhagen. - - OTP-11214 Fix compile error on ARM and GCC versions greater than 4.1.0. - Thanks to Johannes Weissl. - - OTP-11215 run_erl: Redirect standard streams to /dev/null. Thanks to - Johannes Weissl. - - OTP-11218 The default value of {flush, boolean()} in erlang:halt/2 is - documented to be 'true' if the status is an integer. The - implementation behaviour was reversed. The Implementation is - now corrected to adhere to the documentation. Thanks to Jose - Valim for reporting the error. - - OTP-11225 Fix serious race bug in R16B01 that could cause PID mix-ups - when a lot of processes were spawned and terminated in a very - rapid pace on an SMP emulator with at least two scheduler - threads. - - OTP-11227 Misc. corrections in documentation for erl_driver. Thanks to - Giacomo Olgeni. - - OTP-11232 Validating a trace pattern with the option silent no longer - incorrectly enables/disables the silent option of the calling - process. - - OTP-11239 Fix documentation regarding binary_part. - - OTP-11246 Fixed a bug where GCC 4.8 and later use a more aggressive - loop optimization algorithm that broke some previously - working code in the efile driver. Thanks to Tomas Abrahamsson - for reporting this issue. - - OTP-11251 Make edlin understand a few important control keys. Thanks to - Stefan Zegenhagen. - - OTP-11264 Fixed bug when printing memory allocator acul option in crash - dump. - - OTP-11265 Opening a new compressed file on Windows could in rare - (random) cases result in {error,eisdir} or other error codes - although it should have succeeded. This is now corrected. - - OTP-11278 Export type zlib:zstream/0. Thanks to Loic Hoguin. - - OTP-11282 Add erl option to set schedulers by percentages. - - For applications where measurements show enhanced performance - from the use of a non-default number of emulator scheduler - threads, having to accurately set the right number of - scheduler threads across multiple hosts each with different - numbers of logical processors is difficult because the erl +S - option requires absolute numbers of scheduler threads and - scheduler threads online to be specified. - - To address this issue, add a +SP option to erl, similar to - the existing +S option but allowing the number of scheduler - threads and scheduler threads online to be set as percentages - of logical processors configured and logical processors - available, respectively. For example, "+SP 50:25" sets the - number of scheduler threads to 50% of the logical processors - configured, and the number of scheduler threads online to 25% - of the logical processors available. The +SP option also - interacts with any settings specified with the +S option, - such that the combination of options "+S 4:4 +SP 50:50" (in - either order) results in 2 scheduler threads and 2 scheduler - threads online. - - Thanks to Steve Vinoski - - OTP-11290 Fixed a race condition when closing a trace port that would - cause the emulator to crash. - - OTP-11303 Extend erl_driver interface with lock names - - Lock and thread names are already a feature in the driver - interface. This extension will let developers read these - names which eases debugging. - - OTP-11311 Fix incorrect values returned by integer_to_binary/2. Thanks - to Juan Jose Comellas. - - OTP-11317 Fix system_flag scheduling_statistics - disable . Thanks to - Steve Vinoski. - - OTP-11321 The documentation of predefined types has been corrected - Thanks to Kostis Sagonas. - - ---- et-1.4.4.5 ---------------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- eunit-2.2.5 --------------------------------------------------------- - - OTP-11217 Wrap eunit macros into begin ... end blocks. Thanks to - Anthony Ramine. - - ---- hipe-3.10.2.1 ------------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- ic-4.3.3 ------------------------------------------------------------ - - OTP-11284 Header and library files from ic and erl_interface are now - installed into usr/{include,lib}. Note that these directories - are unversioned, so the latest installed version will be the - one in the directory. - - ---- inets-5.9.6 --------------------------------------------------------- - - OTP-11190 httpc: Allow content body in DELETE requests. Thanks to James - Wheare. - - OTP-11202 Add missing brackets to report formatting on ftp_progress - process exit. Thanks to Artur Wilniewczyc. - - OTP-11210 Fix some errors in the inets documentation. Thanks to - Johannes Weissl. - - OTP-11226 Fix various typos in httpd, inets. Thanks to Tomohiko Aono. - - OTP-11260 Fix httpd config option 'erl_script_nocache'. Thanks to - Johannes Weissl. - - ---- kernel-2.16.3 ------------------------------------------------------- - - OTP-10676 The previous undocumented function ntoa/1 has been added to - inet docs and exported in the inet module. - - OTP-11209 Fix indentation of User switch command help in Erlang shell. - Thanks to Sylvain Benner. - - OTP-11219 Fix typo in abcast() function comment. Thanks to Johannes - Weissl. - - OTP-11250 Add application:ensure_all_started/1-2. Thanks to Fred - Hebert. - - OTP-11251 Make edlin understand a few important control keys. Thanks to - Stefan Zegenhagen. - - OTP-11301 Cleanup of hipe_unified_loader, eliminating uses of - is_subtype/2 in specs, change module-local void functions to - return 'ok' instead of [] and made sure there are no dialyzer - warnings with --Wunmatched_returns. Thanks to Kostis Sagonas. - - ---- megaco-3.17.0.2 ----------------------------------------------------- - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - ---- mnesia-4.10 --------------------------------------------------------- - - OTP-10957 Fix timing issues in checkpoint creation. - - OTP-11241 Fixed a problem where the fallback BUP file is removed when - calling mnesia:uninstall_fallback and mnesia is not started. - - ---- observer-1.3.1.1 ---------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- odbc-2.10.17 -------------------------------------------------------- - - OTP-11193 The format of the xml source for documentation is corrected - in order to conform to the DTDs and to pass xmllint without - errors. - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - OTP-11233 Prevent odbcserver crash if it's executed and supplied - incorrect data to stdin. Thanks to Sergei Golovan. - - ---- os_mon-2.2.13 ------------------------------------------------------- - - OTP-11207 Use 'df -k -l' to query FreeBSD and OpenBSD about diskspace - on local disks. Previously 'df' -k -t ufs' was used but this - will not handle zfs or other disks. Just use '-l' instead of - listing potential filesystems. - - OTP-11213 Fix compilation on Solaris. Thanks to Maciej Malecki. - - OTP-11298 Fix broken cpu_sup:nprocs and others on Solaris 64-bit. - Thanks to Simon Cornish. - - ---- parsetools-2.0.10 --------------------------------------------------- - - OTP-11269 A bug causing Yecc to generate badly formed parsers when - encountering very simple recursive rules has been fixed. - (Thanks to Eric Pailleau.) - - OTP-11286 A bug where Unicode filenames combined with Latin-1 encoding - could crash Yecc and Leex has been fixed. - - OTP-11313 Fix leex module`s inability to build unicode-aware lexers. - Thanks to Pierre Fenoll. - - ---- percept-0.8.8.2 ----------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- public_key-0.20 ----------------------------------------------------- - - OTP-10874 Extend PKCS-7 to support SCEP (Simple Certificate Enrollment - Protocol). - - OTP-11281 public_key:pem_entry_decode/2 now handles AES-128-CBC - ciphered keys. Thanks to Simon Cornish. - - ---- reltool-0.6.4.1 ----------------------------------------------------- - - OTP-11310 The encoding of the notes.xml file has been changed from - latin1 to utf-8 to avoid future merge problems. - - ---- runtime_tools-1.8.12 ------------------------------------------------ - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - OTP-11222 The process trace flag 'silent' is now allowed in call to - dbg:p/2. - - ---- sasl-2.3.3 ---------------------------------------------------------- - - OTP-11252 Add Fd usage in rb logging. Thanks to Eric Pailleau. - - ---- snmp-4.24.1 --------------------------------------------------------- - - OTP-11177 [agent] Reading the value of the vacmViewTreeFamilyMask - returs it in the wrong (internal) format. The vacmViewTreeFamilyMask - is defined to be a bit string in the MIB (OCTET STRING). - Internally a bitlist (list of 1's and 0's) is used. However, - the MIB implementation assumed the latter, effectively rendering - all attempts to read/set masks via SNMP unsuccessful. Since - the mask is used in hot paths (e.g. access permission checks - for each SNMP operation, the bitlist representation of the - mask has benefits (e.g. faster processing). Reading/writing - the view mask objects is less time-critical. Therefore, - to fix the issue, convert between bitlist representation - and bitstring when the vacmViewTreeFamilyMask objects are - accessed. - - OTP-11192 [agent] The counter increment function in the local-db was - incorrect. It did not handle counter wrap correctly. - - ---- snmp-4.24.2 --------------------------------------------------------- - - OTP-11216 [agent] Improved documentation for the functions for loading - and unloading mibs, see snmpa:load_mibs/1,2,3 and - snmpa:unload_mibs/1,2,3 for more info. - Also added new functions for loading and unloading a - single mib, see snmpa:load_mib/1,2 and snmpa:unload_mib/1,2 - for more info. - - ---- ssh-2.1.8 ----------------------------------------------------------- - - OTP-11189 Do not chmod ~/.ssh unnecessarily. - - OTP-11199 Make ssh_cli.erl handle CTRL+C. Thanks to Stefan Zegenhagen. - - OTP-11249 Clarified timeout options in documentation. - - OTP-11256 Add openssh_zlib compression type to ssh_transport. Thanks to - Louis-Philippe Gauthier. - - ---- ssl-5.3.1 ----------------------------------------------------------- - - OTP-11228 Setopts during renegotiation caused the renegotiation to be - unsuccessful. - - If calling setopts during a renegotiation the FSM state might - change during the handling of the setopts messages, this is - now handled correctly. - - OTP-11229 Now handles signature_algorithm field in digitally_signed - properly with proper defaults. Prior to this change some - elliptic curve cipher suites could fail reporting the error - "bad certificate". - - OTP-11230 The code emulating the inet header option was changed in the - belief that it made it inet compatible. However the testing - is a bit hairy as the inet option is actually broken, now the - tests are corrected and the header option should work in the - same broken way as inet again, preferably use the bitsyntax - instead. - - OTP-11255 Make the ssl manager name for erlang distribution over - SSL/TLS relative to the module name of the ssl_manager. - - This can be beneficial when making tools that rename modules - for internal processing in the tool. - - OTP-11271 Add documentation regarding log_alert option. - - ---- stdlib-1.19.3 ------------------------------------------------------- - - OTP-11200 Fixed type typo in gen_server. - - OTP-11208 Update type specs in filelib and io_prompt. Thanks to Jose - Valim. - - OTP-11219 Fix typo in abcast() function comment. Thanks to Johannes - Weissl. - - OTP-11245 The functions dets:foldl/3, dets:foldr/3, and dets:traverse/2 - did not release the table after having traversed the table to - the end. The bug was introduced in R16B. (Thanks to Manuel - Duran Aguete.) - - OTP-11251 Make edlin understand a few important control keys. Thanks to - Stefan Zegenhagen. - - OTP-11254 If the fun M:F/A construct was used erroneously the linter - could crash. (Thanks to Mikhail Sobolev.) - - OTP-11261 The specifications of io_lib:fread/2,3 have been corrected. - (Thanks to Chris King and Kostis Sagonas for pinpointing the - bug.) - - OTP-11266 Export the edge/0 type from the digraph module. Thanks to - Alex Ronne Petersen. - - OTP-11268 Fix variable usage tracking in erl_lint and fixed unsafe - variable tracking in try expressions. Thanks to Anthony - Ramine. - - ---- test_server-3.6.3 --------------------------------------------------- - - OTP-11263 Test Server installed an error handler (test_server_h) only - to be able to write the name of the current test case to - stdout whenever it received an error- or progress report. - This functionality was not useful and has been removed. The - built-in Common Test hook, cth_log_redirect, has instead been - improved to now also tag all error- and progress reports in - the log with suite-, group-, and/or test case name. - - OTP-11272 A new log, the "Pre- and Post Test I/O Log", has been - introduced, which makes it possible to capture error- and - progress reports, as well as printouts made with ct:log/2 and - ct:pal/2, before and after a test run. (Some minor - improvements of the logging system have been made at the same - time). Links to the new log are found on the Common Test - Framework Log page. The Common Test User's Guide has been - updated with information about the new log and also with a - new section on how to synchronize external applications with - Common Test by means of the CT Hook init and terminate - functions. - - ---- tools-2.6.12 -------------------------------------------------------- - - OTP-11198 Remove trailing spaces in Emacs templates. Thanks to Roberto - Aloi. - - OTP-11242 Fixed the Emacs erlang-mode to accommodate the coding style - where lists written across several lines have each line - starting with a comma. Thanks to Magnus Henoch. - - OTP-11270 Make the Emacs Erlang mode TRAMP-aware when compiling. Thanks - to Tomas Abrahamsson. - - ---- wx-1.1 -------------------------------------------------------------- - - OTP-11196 Introduced functionality for inspection of system and build - configuration. - - OTP-11279 Fix return value in wxStatusBar:getFieldRect/2 and add - wxClipboardTextEvent and wxPanel:setFocusIgnoringChildren/1. - - ---- xmerl-1.3.4 --------------------------------------------------------- - - OTP-11224 Fixed various typos in xmerl documentation. Thanks to David - Welton. - - diff --git a/otp_src_R16B03.readme b/otp_src_R16B03.readme new file mode 100644 index 0000000..aa9f45d --- /dev/null +++ b/otp_src_R16B03.readme @@ -0,0 +1,718 @@ +Bug fix release : otp_src_R16B03 +Build date : 2013-12-09 + +This is R16B03, the third maintenance release for the R16B major release. + +You can find the README file for the release at + + http://www.erlang.org/download/otp_src_R16B03.readme (this file) + +The source distribution and binary distributions for Windows can be +downloaded from + + http://www.erlang.org/download/otp_src_R16B03.tar.gz + http://www.erlang.org/download/otp_win32_R16B03.exe + http://www.erlang.org/download/otp_win64_R16B03.exe + +Note: To unpack the TAR archive you need a GNU TAR compatible program. + +For installation instructions please read the README file that is part +of the distribution. + +The on-line documentation can be found at: http://www.erlang.org/doc/ +You can also download the complete HTML documentation or the Unix manual files + + http://www.erlang.org/download/otp_doc_html_R16B03.tar.gz + http://www.erlang.org/download/otp_doc_man_R16B03.tar.gz + +We also want to thank those that sent us patches, suggestions and bug reports, + +The OTP Team + + +--- HIGHLIGHTS ---------------------------------------------------------- + + OTP-11149 == erts == + + A new memory allocation feature called "super carrier" has + been introduced. The super carrier feature can be used in + different ways. It can for example be used for pre-allocation + of all memory that the runtime system should be able to use. + + By default the super carrier is disabled. It is enabled by + passing the +MMscs command line argument. For + more information see the documentation of the +MMsco, + +MMscrfsd, +MMscrpm, +MMscs, +MMusac, and, +Mlpm command line + arguments in the erts_alloc(3) documentation. + + Since it is disabled by default there should be no impact on + system characteristics if not used. + + This change has been marked as a potential incompatibility + since the returned list when calling + erlang:system_info({allocator, mseg_alloc}) now also include + an {erts_mmap, _} tuple as one element in the list. + + +--- otp ----------------------------------------------------------------- + + OTP-11323 Remove ^L characters hidden randomly in the code. Not those + used in text files as delimiters. Thanks to Pierre Fenoll. + + OTP-11448 Update INSTALL md, added info how to generate configure file + if building from git. Thanks to Jakub Oboza. + + OTP-11472 Fixed typo in gen_fsm example. Thanks to Boris Mühmer. + + +--- asn1-2.0.4 ---------------------------------------------------------- + + OTP-11314 The new option 'no_ok_wrapper' generates M:encode/2 and + M:decode/2 functions that don't wrap the return value in an + {ok,...} tuple. + + OTP-11319 The default value for a BIT STRING would not always be + recognized, causing the encoding to be incorrect for the + DER/PER/UPER encodings. + + OTP-11360 The asn1 application would fail to build if the .erlang file + printed something to standard output. + + OTP-11411 An union of integer ranges in an INTEGER constraint could + sometimes be interpreted as the intersection of the range. + + OTP-11415 Extensible, multiple single value constraints (such as + INTEGER (1|17, ...)) would be incorrectly encoded. + + OTP-11504 The ASN.1 compiler would fail to compile a constraint with + values given for for the extension part (such as INTEGER + (1..10, ..., 11..20)). + + +--- common_test-1.7.4 --------------------------------------------------- + + OTP-10631 Return values from group and testcase info functions are now + properly checked, and associated test cases are auto skipped + if a return value is invalid. + + OTP-11305 The way Common Test handles skipping of test cases has been + updated. In previous versions, returning {skip,Reason} from a + configuration function (such as init_per_suite or + init_per_group), resulted in all affected test cases getting + skipped with status auto_skipped. This was inappropriate, + since this status is supposed to be used to inform that + Common Test has taken the initiative to skip something (e.g. + a test case group if init_per_group failed). Therefore, in + this version of Common Test, whenever the user skips a suite, + group, or individual test case (by means of a configuration + function or test specification term), the affected test cases + get the status user_skipped instead. + + This update has meant a few changes that may affect Common + Test users in various ways: + + -- The test results and statistics will be affected, which is + important to know when running regression tests and comparing + results to previous test runs. + + -- Users that read or parse the textual log file suite.log + will notice that an auto skipped function is now reported as + auto_skipped rather than skipped as before. + + -- When require fails in an info function (such as suite/0 or + group/1), all affected configuration functions and test cases + are marked as auto_skipped. + + -- If Common Test detects an error in the test suite (such as + e.g. an invalid all/0 function), all affected configuration + functions and test cases are marked as auto_skipped. + + -- If a repeated test run session reaches a deadline with + force_stop enabled, all remaining test cases are marked as + auto_skipped rather than user_skipped as before. + + -- The event messages that Common Test generates during test + runs have been affected by this update. For details see + OTP-11524. + + OTP-11401 Fix cth_log_redirect.erl to fulfill gen_event behaviour. + Thanks to Roberto Aloi. + + OTP-11409 Returning {skip, Reason} from a pre_end_per_group/3 user hook + function would result in an exit in the Common Test + cth_log_redirect hook. This problem has been solved. + + OTP-11478 When the netconf server did not respond to the close-session + request, the call to ct_netconfc:close_session/2 would hang + forever waiting for the netconf client to terminate. This has + been corrected. The client will now always terminate (and + take down the connection) if the close-session request times + out. + + OTP-11523 The first argument of the CT hook callback function + on_tc_skip/3 has been modified. When this function is called + for init_per_group or end_per_group, the value of the first + argument is now {init_per_group,GroupName} or + {end_per_group,GroupName}. + + OTP-11524 The following modifications have been made to the event + messages that Common Test sends during test execution: + + -- For the tc_auto_skip event, the value of the Func element + has changed from end_per_group to {end_per_group,GroupName}. + + -- When require fails in an info function, such as suite/0 or + group/1, the init configuration function is now reported as + auto_skipped intead of skipped, with the tc_done event. + + -- When require fails in an info function because of a + configuration name already in use, the tc_done event now + reports the error with a tuple (of size 2) tagged failed + instead of skipped. + + Please see the Event Handling chapter in the Common Test + User's Guide for reference. + + +--- compiler-4.9.4 ------------------------------------------------------ + + OTP-11267 Lift 'after' blocks to zeroary functions. Thanks to Anthony + Ramine. + + OTP-11455 Typo fix ambigous -> ambiguous. Thanks to Leo Correa. + + +--- crypto-3.2 ---------------------------------------------------------- + + OTP-11510 Fix uninitialized pointers in crypto (Thanks to Anthony + Ramine) + + +--- dialyzer-2.6.2 ------------------------------------------------------ + + OTP-11374 Fixed a dialyzer crash when using remote types in the tail + position of a maybe_improper_list/2 type. Thanks to Kostis + Sagonas + + +--- diameter-1.4.4 ------------------------------------------------------ + + OTP-11367 Fix setting of End-to-End and Hop-by-Hop Identifiers in + outgoing DWA. Broken by OTP-11184, which caused the identifiers + to be set anew, discarding the values from the incoming + DWR. + + OTP-11395 Fix handling of 5014, DIAMETER_INVALID_AVP_LENGTH. The error + was detected as 5004, DIAMETER_INVALID_AVP_VALUE, for some + Diameter types, in which case an AVP length that pointed + past the end of a message resulted in encode failure. + + +--- diameter-1.5 -------------------------------------------------------- + + OTP-11168 Rename reconnect_timer to connect_timer. + + The former is still accepted for backwards compatibility, but + the name is misleading given the semantics of the timer. + + OTP-11348 Extend diameter_make(3). + + Dictionaries can now be compiled from strings, not just + filesystem paths, and results can be returned instead of + written to the filesystem. + + OTP-11361 Remove hardcoding of diameter_base as @prefix on dictionaries + for application id 0. + + OTP-11514 Fix silent make rules (Thanks to Anthony Ramine) + + +--- eldap-1.0.2 --------------------------------------------------------- + + OTP-11336 The ldap client eldap now supports the start_tls operation. + This upgrades an existing tcp connection to encryption using + tls, if the server supports it. See eldap:start_tls/2 and /3. + + OTP-11354 Removed {verify,0} from ssl-options because eldap does not + support peer verification. Thanks to Florian Waas for + reporting. + + +--- erl_interface-3.7.15 ------------------------------------------------ + + OTP-11517 Silence warnings (Thanks to Anthony Ramine) + + +--- erts-5.10.3.1 ------------------------------------------------------- + + OTP-11318 Memory allocators will be able to create sys_alloc carriers + as fallback, if mseg_alloc cannot create more carriers, + on systems with posix_memalign() support. This is similar + to how it worked in pre-R16 releases. Windows systems will + create carriers using _aligned_malloc() and can by this + use the new optimized allocator header scheme introduced + in R16 on other platforms. + + +--- erts-5.10.4 --------------------------------------------------------- + + OTP-10229 New socket functions inet:socknames/1,2 and + inet:peernames/1,2 have been implemented. They are useful for + SCTP sockets since they return all addresses for an + association. For other sockets they fall back to + inet:sockname/1 and inet:peername/1, so the new functions can + replace the old for any application that wants to be multi + address aware yet socket type agnostic. See the + documentation. + + OTP-11149 A new memory allocation feature called "super carrier" has + been introduced. The super carrier feature can be used in + different ways. It can for example be used for pre-allocation + of all memory that the runtime system should be able to use. + + By default the super carrier is disabled. It is enabled by + passing the +MMscs command line argument. For + more information see the documentation of the +MMsco, + +MMscrfsd, +MMscrpm, +MMscs, +MMusac, and, +Mlpm command line + arguments in the erts_alloc(3) documentation. + + Since it is disabled by default there should be no impact on + system characteristics if not used. + + This change has been marked as a potential incompatibility + since the returned list when calling + erlang:system_info({allocator, mseg_alloc}) now also include + an {erts_mmap, _} tuple as one element in the list. + + OTP-11170 When normalizing paths, erl_prim_loader would always convert + backslash to forward slash. This is correct on Windows, but + not on other operating systems. erl_prim_loader now checks + which OS is running before performing this conversion. + + OTP-11349 Fixed syslog defines and defined LOG_ERR for systems without + syslog.h. Thanks to Matt Lewandowsky. + + OTP-11350 Check all pattern arguments passed to binary:matches/2. + Thanks to Mike Sassak. + + OTP-11351 Fix two small silent rules omissions. Thanks to Anthony + Ramine. + + OTP-11362 Added erlang:system_info(ets_limit) to provide a way to + retrieve the runtime's maximum number of ETS tables. Thanks + to Steve Vinoski + + OTP-11371 Teach configure to detect if posix_memalign cannot align to + more than the system page size. + + For cross-compiled systems a new environment variable called + erl_xcomp_posix_memalign has been introduced to indicate + whether posix_memalign should be used. + + OTP-11381 Fix bsr bug occurring when shifting a huge number a huge + number of bits to the right. Thanks to Lars Hesel + Christensen. + + OTP-11410 Fix memory leak for distributed monitors + + OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin + Hässler. + + OTP-11420 Crashdumps initiated by out-of-memory on process spawn could + cause the beam to segfault during crashdump writing due to + invalid pointers. + + The pointers are invalid since the process creation never + finished. This fix removes these processes from the + printouts. Reported by Richard Carlsson. + + OTP-11446 Add new BIF os:unsetenv/1 which deletes an environment + variable. Thanks to Martin Hässler. + + OTP-11450 Crash dumps from 64-bit Erlang machines would have all memory + addresses truncated to 32 bits, which could cause trouble + inspecting processes message queues and stacks in the + crashdump viewer. + + OTP-11456 Threads other than schedulers threads could make thread + unsafe accesses when support for migration of memory carriers + had been enabled, i.e., when the +Macul command line flag + had been passed to erl. This could cause corruption of the + VMs internal state. + + This bug was introduced in erts-5.10.2 when the support for + migration of memory carriers was introduced. + + OTP-11479 Fix bug in binary_to_term for invalid bitstrings and very + large binaries (>2Gb). + + OTP-11489 Introduced a new guarantee regarding exit signals from ports: + + If the process calling one of the synchronous port BIFs + listed below is linked to the port identified by the first + argument, and the port exits before sending the result of the + port operation, the exit signal issued due to this link will + be received by the processes before the BIF returns, or fail + with an exception due to the port not being open. + + The synchronous port BIFs are: + + -- port_close/1 + + -- port_command/2 + + -- port_command/3 + + -- port_connect/2 + + -- port_control/3 + + -- erlang:port_call/3 + + -- erlang:port_info/1 + + -- erlang:port_info/2 + + Note that some ports under certain circumstances unlink + themselves from the calling process before exiting, i.e. even + though the process linked itself to the port there might be + no link triggering an exit signal. + + Characteristics impact: The return or exception from the + synchronous port BIF will be delayed if the port + simultaneously exit due to some issue unrelated to the + outstanding synchronous port BIF call. In all other cases + characteristics are unchanged. + + OTP-11491 Under rare circumstances a process calling inet:close/1, + gen_tcp:close/1, gen_udp:close/1, or gen_sctp:close/1 could + hang in the call indefinitely. + + OTP-11496 Fix bug that could cause a 32-bit emulator to always crash at + start (since R16B01) depending on the alignment of static + data in the beam executable. + + OTP-11501 Fix benign bugs regarding bitstring compare. Only a nuisance + for debug and valgrind VM. + + OTP-11517 Silence warnings (Thanks to Anthony Ramine) + + OTP-11521 The default wordsize of the emulator (beam) is now determined + by compiler default on Mac OSX (Darwin). This was previously + forced to 32bits by the configure script unless otherwise + specified. + + +--- eunit-2.2.6 --------------------------------------------------------- + + OTP-11373 Fix I/O-protocol error handling in eunit. Thanks to Yuki Ito. + + OTP-11467 Do not attempt to detect lists of printable characters in + format. Thanks to Roberto Aloi. + + OTP-11516 Fix silent make rule (Thanks to Anthony Ramine ) + + +--- hipe-3.10.2.2 ------------------------------------------------------- + + OTP-11374 Fixed a dialyzer crash when using remote types in the tail + position of a maybe_improper_list/2 type. Thanks to Kostis + Sagonas + + +--- ic-4.3.4 ------------------------------------------------------------ + + OTP-11351 Fix two small silent rules omissions. Thanks to Anthony + Ramine. + + OTP-11517 Silence warnings (Thanks to Anthony Ramine) + + +--- inets-5.9.7 --------------------------------------------------------- + + OTP-11037 The ftp client now supports ftp over tls (ftps). + + OTP-11276 Fix httpd config option 'script_timeout' and fixed httpd + config option 'keep_alive_timeout'. Thanks to Johannes + Weissl. + + OTP-11312 Make httpc:request_cancel/[1,2] asynchronous. Previously + these functions tried to guarantee request answer would not + reach the client, which only worked for some of the use + cases. Now these functions are totally asynchronous which + makes it the clients responsibility to disregard possible + answers to canceled requests. + + Also pipelining implementation has been changed to improve + the utilization factor. Further investigation of possible + enhancements in this area are planned for later. + + OTP-11328 [httpd] Add handling of new response for mod_head (otherwise + causing case_clause crash). Also updated logging: Removed + logging for keep-alive connections timeout (this is a normal + occurrence and not an error) and some access-log body size + corrections. + + +--- kernel-2.16.4 ------------------------------------------------------- + + OTP-10229 New socket functions inet:socknames/1,2 and + inet:peernames/1,2 have been implemented. They are useful for + SCTP sockets since they return all addresses for an + association. For other sockets they fall back to + inet:sockname/1 and inet:peername/1, so the new functions can + replace the old for any application that wants to be multi + address aware yet socket type agnostic. See the + documentation. + + OTP-11377 Fix the typespec for the inet:ifget/2 and inet:ifget/3 return + value. Thanks to Ali Sabil. + + OTP-11379 Add more SCTP errors as described in RFC 4960. Thanks to + Artem Teslenko. + + OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin + Hässler. + + OTP-11446 Add new BIF os:unsetenv/1 which deletes an environment + variable. Thanks to Martin Hässler. + + OTP-11471 Fix rpc multicall sample code. Thanks to Edwin Fine. + + OTP-11491 Under rare circumstances a process calling inet:close/1, + gen_tcp:close/1, gen_udp:close/1, or gen_sctp:close/1 could + hang in the call indefinitely. + + +--- mnesia-4.11 --------------------------------------------------------- + + OTP-11375 Fixed a race in mnesia which could cause hanging transaction + when sticky locks had been used. Thanks janchochol. + + OTP-11485 Fixed dirty_update_counter which could return ok, thanks + Anton Ryabkov. + + +--- observer-1.3.1.2 ---------------------------------------------------- + + OTP-11335 The documentation for ttb:tracer/2 incorrectly stated that + there was an option named 'overload', while the correct name + used in the implementation is 'overload_check'. + + OTP-11475 Fixed typo in observer documentation. Thanks to Dave Parfitt. + + +--- odbc-2.10.18 -------------------------------------------------------- + + OTP-11483 Configure now also checks for the existence of the sql.h + header file + + +--- os_mon-2.2.14 ------------------------------------------------------- + + OTP-11454 Fix incorrect reporting of memory on OS X via memsup. Thanks + to Christopher Meiklejohn. + + +--- public_key-0.21 ----------------------------------------------------- + + OTP-11380 Fixed a little typo in public_key documentation. Thanks to + Tomas Morstein. + + OTP-11470 public_key: Workaround for incorrectly encoded utf8 + emailAddress. Thanks to Andrew Bennett. + + +--- runtime_tools-1.8.13 ------------------------------------------------ + + OTP-11520 Observer did not produce correct result when ERTS internal + memory allocators had been disabled. + + +--- sasl-2.3.4 ---------------------------------------------------------- + + OTP-8479 Added a boot file which skips loading the "$HOME/.erlang" + file on startup. Enable by starting erlang with "erl -boot + no_dot_erlang". + + OTP-11464 Don't try to add the log_mf_h handler in sasl unless + configured to do so. Thanks to Richard Carlsson. + + OTP-11507 Fix confusing documentation about error handlers in + SASL.(Thanks to Richard Carlsson) + + OTP-11529 A bug in the mechanism for upgrading core parts of Erlang/OTP + (emulator, kernel, stdlib, sasl) caused a switch of paths + between stdlib and sasl in the intermediate .script/.boot + file. The bug was introduces along with this upgrade + mechanism in R15B. It has now been corrected. (Thanks to + Tobias Schlager) + + +--- snmp-4.25 ----------------------------------------------------------- + + OTP-11307 [manager] Improved handling of unexpected/invalid return + values and crashes from called snmpm_user callback functions. + + OTP-11352 Enable SNMP to create missing database directories. Add + {db_init_error, create_db_and_dir} option to SNMP manager and + agent. This allows them to create any missing parent + directories for db_dir, rather than treating any missing + directories as a fatal error. The default for db_init_error, + which is terminate, is unchanged. + + OTP-11412 [manager] Wrong block cypher type used for AES ('aes_cbf128' + instead of 'aes_cfb128') when performing AES block + encrypt/decrypt. + + OTP-11413 [manager] When performing the AES encryption, invalid values + for the EngineBoots and EngineTime was used. The values of + the local agent was used, which would have produced some + values if an agent was actually running. If not it would have + caused a crash. + + +--- ssh-3.0 ------------------------------------------------------------- + + OTP-10976 Add option to disallow CLI + + OTP-11296 Add sockname and user to ssh:connection_info/2 + + OTP-11339 The ssh cli is now faster at close and before new prompt. + + OTP-11363 Ssh process structure was redesigned to better map to what is + truly parallel this has solved a lot of strange timing issues + that sometimes would occur, for instance a process leak could + happen when a lot of connections where taken up and down in + parallel in a short period of time. Also backwards compatible + clauses to "original" but never supported features has been + removed. + + Impact: Increases flow efficiency + + OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin + Hässler. + + OTP-11449 Correct private_key type documentation in ssh_server_key_api. + Thanks to Tristan Sloughter. + + OTP-11490 The functions in ssh_no_io.erl did not mimic the functions in + ssh_io.erl correctly, the arity was incorrect for some + functions which caused ssh to fail in the wrong way. + + +--- ssl-5.3.2 ----------------------------------------------------------- + + OTP-11370 Honors the clients advertised support of elliptic curves and + no longer sends incorrect elliptic curve extension in server + hello. + + OTP-11376 Fix initialization of DTLS fragment reassembler, in + previously contributed code, for future support of DTLS . + Thanks to Andreas Schultz. + + OTP-11447 Remove extraneous dev debug code left in the close function. + Thanks to Ken Key. + + OTP-11457 Corrected type error in client_preferred_next_protocols + documentation. Thanks to Julien Barbot. + + OTP-11460 Add SSL Server Name Indication (SNI) client support. Thanks + to Julien Barbot. + + +--- stdlib-1.19.4 ------------------------------------------------------- + + OTP-11398 Fix typo in gen_server.erl. Thanks to Brian L. Troutwine. + + OTP-11442 Add XML marker for regexp syntax. Thanks to HÃ¥kan Mattson. + + OTP-11465 Spec for atan2 should be atan2(Y, X), not atan2(X, Y). Thanks + to Ary Borenszweig. + + +--- syntax_tools-1.6.12 ------------------------------------------------- + + OTP-11506 Fix transformation of implicit funs in igor (Thanks to + Anthony Ramine) + + +--- test_server-3.6.4 --------------------------------------------------- + + OTP-11305 The way Common Test handles skipping of test cases has been + updated. In previous versions, returning {skip,Reason} from a + configuration function (such as init_per_suite or + init_per_group), resulted in all affected test cases getting + skipped with status auto_skipped. This was inappropriate, + since this status is supposed to be used to inform that + Common Test has taken the initiative to skip something (e.g. + a test case group if init_per_group failed). Therefore, in + this version of Common Test, whenever the user skips a suite, + group, or individual test case (by means of a configuration + function or test specification term), the affected test cases + get the status user_skipped instead. + + This update has meant a few changes that may affect Common + Test users in various ways: + + -- The test results and statistics will be affected, which is + important to know when running regression tests and comparing + results to previous test runs. + + -- Users that read or parse the textual log file suite.log + will notice that an auto skipped function is now reported as + auto_skipped rather than skipped as before. + + -- When require fails in an info function (such as suite/0 or + group/1), all affected configuration functions and test cases + are marked as auto_skipped. + + -- If Common Test detects an error in the test suite (such as + e.g. an invalid all/0 function), all affected configuration + functions and test cases are marked as auto_skipped. + + -- If a repeated test run session reaches a deadline with + force_stop enabled, all remaining test cases are marked as + auto_skipped rather than user_skipped as before. + + -- The event messages that Common Test generates during test + runs have been affected by this update. For details see + OTP-11524. + + +--- tools-2.6.13 -------------------------------------------------------- + + OTP-11394 Add iodata, nonempty_string to built-in type highlighting for + emacs. Thanks to Paul Oliver. + + OTP-11417 Erlang-specific compilation error regexp is added in + erlang-eunit.el. This defvar was earlier in erlang.el, but + was erroneously removed in R15B02, while still used by + erlang-eunit.el. + + OTP-11439 Take compiler options from beam in cover:compile_beam. Thanks + to Péter Gömöri. + + OTP-11517 Silence warnings (Thanks to Anthony Ramine) + + +--- wx-1.1.1 ------------------------------------------------------------ + + OTP-11393 wx initialization hanged with wxWidgets-3.0 on mac. Fixed a + crash with wxListBox on wxWidgets-3.0 (thanks Sergei Golovan) + Fixed documentation links. Fixed event callbacks cleanup. + + OTP-11505 Improve documentation (Thanks to Boris Mühmer) + + OTP-11515 Fix silent make rules (Thanks to Anthony Ramine) + + +--- xmerl-1.3.5 --------------------------------------------------------- + + OTP-11461 Teach xmerl_xpath to resolve context namespaces in more + cases. Thanks to Daniel White. + + OTP-11463 Avoid serialization on code_server in xmerl:export(). Thanks + to Richard Carlsson. + + diff --git a/sources b/sources index a5032de..3eb8f02 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -5bd028771290eacbc075ca65a63749e6 otp_doc_html_R16B02.tar.gz -fe3ff42375090d33ce1ba98c28218cf3 otp_doc_man_R16B02.tar.gz -fe73334b75669fac4c3c400ceab064c8 otp_src_R16B02.readme -ca63bcde0e5ae0f2df9457f97b3115a4 otp_src_R16B02.tar.gz +fb39e206739e43501f6d27edf9b04b37 otp_doc_html_R16B03.tar.gz +099ed598feadc54e7efea908cc598f08 otp_doc_man_R16B03.tar.gz +d8b65a1492007f388545176300182d4f otp_src_R16B03.readme +c330150913556a0fe73e57a441cb6375 otp_src_R16B03.tar.gz From 2845f9192535b10cfbda10fb3d9a19b0f28d1a5f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 26 Dec 2013 18:11:53 +0400 Subject: [PATCH 037/340] Don't generate signature and stats - they are noisy Signed-off-by: Peter Lemenkov --- otp-get-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otp-get-patches.sh b/otp-get-patches.sh index d9ca70d..033db0e 100755 --- a/otp-get-patches.sh +++ b/otp-get-patches.sh @@ -42,7 +42,7 @@ tmpdir="$(mktemp -d --tmpdir="$PWD")" # Generate patch files pushd "$otp_dir" -git format-patch -N -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" +git format-patch -N --no-signature --no-stat -o "$tmpdir" "${otp_upstream}..${otp_fedora}" > "$tmpdir/patch-list.txt" popd test -s "$tmpdir/patch-list.txt" From 52d3d2b66603fa844fc4ab0a7762a85614aed1e7 Mon Sep 17 00:00:00 2001 From: Sam Kottler Date: Fri, 7 Feb 2014 18:13:30 +0100 Subject: [PATCH 038/340] A few changes to get EPEL7 boostrapped and built --- erlang.spec | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/erlang.spec b/erlang.spec index cd39c58..e9e38ba 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,6 +5,10 @@ # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. +%global need_bootstrap_set 1 + +%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} + %if 0%{upstream_rel} %global upstream_rel_for_rpm %{upstream_rel} %else @@ -28,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.1%{?dist} +Release: %{upstream_rel_for_rpm}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -105,12 +109,15 @@ BuildRequires: m4 %else BuildRequires: fop BuildRequires: libxslt + +%if 0%{?need_bootstrap} < 1 # Required for building docs (escript) BuildRequires: erlang %endif %endif +%endif -%if 0%{?el6}%{?el7}%{?fedora} +%if 0%{?el6}%{?fedora} BuildRequires: emacs BuildRequires: xemacs BuildRequires: emacs-el @@ -130,6 +137,7 @@ Requires: erlang-cosTime%{?_isa} = %{version}-%{release} Requires: erlang-cosTransactions%{?_isa} = %{version}-%{release} Requires: erlang-crypto%{?_isa} = %{version}-%{release} Requires: erlang-debugger%{?_isa} = %{version}-%{release} + Requires: erlang-dialyzer%{?_isa} = %{version}-%{release} Requires: erlang-diameter%{?_isa} = %{version}-%{release} Requires: erlang-edoc%{?_isa} = %{version}-%{release} @@ -530,7 +538,7 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} # FIXME see erlang-ic also #Requires: jpackage-utils -%if 0%{?fedora} +%if 0%{?fedora}%{?el7} BuildRequires: java-devel %else %ifarch %{ix86} x86_64 @@ -894,7 +902,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. -%if 0%{?el6}%{?el7}%{?fedora} +%if 0%{?el6}%{?fedora} %package -n emacs-erlang Summary: Compiled elisp files for erlang-mode under GNU Emacs Requires: emacs-common-erlang = %{version}-%{release} @@ -985,7 +993,7 @@ make clean # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" -%if 0%{?el6}%{?el7}%{?fedora} +%if 0%{?el6}%{?fedora} # GNU Emacs related stuff cat > emacs-erlang-init.el << EOF (setq load-path (cons "%{_emacs_sitelispdir}/erlang" load-path)) @@ -1032,7 +1040,7 @@ make docs %install rm -rf $RPM_BUILD_ROOT -%if 0%{?el6}%{?el7}%{?fedora} +%if 0%{?el6}%{?fedora} # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -2261,7 +2269,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif -%if 0%{?el6}%{?el7}%{?fedora} +%if 0%{?el6}%{?fedora} %files -n emacs-erlang %dir %{_emacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README @@ -2283,6 +2291,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 7 2014 Sam Kottler - R16B-03.2 +- Fix macro usage for EPEL7 build and added need_bootstrap + * Tue Dec 24 2013 Peter Lemenkov - R16B-03.1 - Ver. R16B03 From b87fdb544b6b58e032f6d4bd4685f5ca0b905050 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2014 17:22:49 +0400 Subject: [PATCH 039/340] Don't bootstrap by default Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e9e38ba..981b2c0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ # Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, # and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. -%global need_bootstrap_set 1 +%global need_bootstrap_set 0 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} From 77ce5ed9dd7709b790bb257184a88d84d2b12dd0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2014 17:26:01 +0400 Subject: [PATCH 040/340] Use fedorahosted repo instead of private github forks Signed-off-by: Peter Lemenkov --- erlang.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index 981b2c0..fe2972a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -53,13 +53,11 @@ Source999: otp-get-patches.sh # Run something like # $ git clone git://github.com/erlang/otp.git # $ cd otp -# $ git remote add lemenkov git://github.com/lemenkov/otp.git -# $ git remote add ndim git://github.com/ndim/otp.git +# $ git remote add fedora https://git.fedorahosted.org/git/erlang.git # $ git fetch -v --all # to get yourself a copy of the Erlang/OTP source code with the -# Fedora specific patches from Peter Lemenkov and Hans Ulrich Niedermann. -# Then run something like -# $ ./otp-get-patches.sh /path/to/otp OTP_R14B02 ndim/fedora-R14B02 +# Fedora specific patches from Fedora. Then run something like +# $ ./otp-get-patches.sh /path/to/otp OTP_R14B02 fedora/fedora-R14B02 # for some semi-automatic patch update assistance. # # start of autogenerated patch tag list From f7eb6dd95b9352dad5d5a364e3300f508c4f0193 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2014 18:43:47 +0400 Subject: [PATCH 041/340] Update to the R16B03-1 - Update to the R16B03-1 - Initial systemd support in EPMD (w.i.p.) Signed-off-by: Peter Lemenkov --- .gitignore | 4 + epmd.service | 18 +++ epmd.socket | 10 ++ erlang.spec | 41 ++++++- otp-0006-Do-not-install-erlang-sources.patch | 4 +- ...on-to-empd.-Check-for-include-system.patch | 74 ++++++++++++ otp-0012-Add-systemd-support-to-epmd.patch | 111 ++++++++++++++++++ sources | 8 +- 8 files changed, 259 insertions(+), 11 deletions(-) create mode 100644 epmd.service create mode 100644 epmd.socket create mode 100644 otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch create mode 100644 otp-0012-Add-systemd-support-to-epmd.patch diff --git a/.gitignore b/.gitignore index 102f125..99b1241 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,7 @@ otp_src_R14A.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 diff --git a/epmd.service b/epmd.service new file mode 100644 index 0000000..c029ac4 --- /dev/null +++ b/epmd.service @@ -0,0 +1,18 @@ +[Unit] +Description=Erlang Port Mapper Daemon +After=network.target +Requires=epmd.socket + +[Service] +ExecStart=/usr/bin/epmd -systemd +ExecStop=/usr/bin/epmd -kill +Type=simple +StandardOutput=journal +StandardError=journal +User=epmd +Group=epmd + +[Install] +Also=epmd.socket +WantedBy=multi-user.target + diff --git a/epmd.socket b/epmd.socket new file mode 100644 index 0000000..8eee066 --- /dev/null +++ b/epmd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Erlang Port Mapper Daemon Activation Socket + +[Socket] +ListenStream=127.0.0.1:4369 +Accept=false + +[Install] +WantedBy=sockets.target + diff --git a/erlang.spec b/erlang.spec index fe2972a..e3b55aa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,18 +32,20 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.2%{?dist} +Release: %{upstream_rel_for_rpm}.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.tar.gz +Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.tar.gz %if %{use_prebuilt_docs} -Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}.tar.gz -Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.tar.gz +Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}-1.tar.gz +Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1.tar.gz %endif -Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.readme +Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme +Source5: epmd.service +Source6: epmd.socket Source999: otp-get-patches.sh @@ -91,6 +93,12 @@ Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch # Fedora specific patch # Fix for powerpc architecture Patch10: otp-0010-Fix-for-powerpc-architecture.patch +# Fedora specific patch +# Add -systemd option to empd. Check for include +Patch11: otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch +# Fedora specific patch +# Add systemd support to epmd +Patch12: otp-0012-Add-systemd-support-to-epmd.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -122,6 +130,13 @@ BuildRequires: emacs-el BuildRequires: xemacs-packages-extra-el %endif +%if 0%{?el7}%{?fedora} +Requires(post): systemd +Requires(preun):systemd +Requires(postun):systemd +Requires: systemd +%endif + Requires: erlang-appmon%{?_isa} = %{version}-%{release} Requires: erlang-asn1%{?_isa} = %{version}-%{release} Requires: erlang-common_test%{?_isa} = %{version}-%{release} @@ -958,6 +973,8 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .Fix_for_armv7hl_architecture %patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles %patch10 -p1 -b .Fix_for_powerpc_architecture +%patch11 -p1 -b .Add_systemd_option_to_empd_Check_for_include_system +%patch12 -p1 -b .Add_systemd_support_to_epmd # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1153,6 +1170,12 @@ test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}" ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" +# systemd-related stuff +%if 0%{?el7}%{?fedora} +install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service +install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -1493,6 +1516,10 @@ rm -rf $RPM_BUILD_ROOT %endif %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ +%if 0%{?el7}%{?fedora} +%{_unitdir}/epmd.service +%{_unitdir}/epmd.socket +%endif %files et %dir %{_libdir}/erlang/lib/et-*/ @@ -2289,6 +2316,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2014 Peter Lemenkov - R16B-03.3 +- Ver. R16B03-1 (Bugfix release) +- Enabled systemd support in EPMD + * Fri Feb 7 2014 Sam Kottler - R16B-03.2 - Fix macro usage for EPEL7 build and added need_bootstrap diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 38c9dd1..843e052 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -460,10 +460,10 @@ index 51167b3..a623824 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 67555d5..0620f3a 100644 +index 2660d04..c873a27 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" diff --git a/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch b/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch new file mode 100644 index 0000000..bb13893 --- /dev/null +++ b/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch @@ -0,0 +1,74 @@ +From: "Matwey V. Kornilov" +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*,...); diff --git a/otp-0012-Add-systemd-support-to-epmd.patch b/otp-0012-Add-systemd-support-to-epmd.patch new file mode 100644 index 0000000..3535601 --- /dev/null +++ b/otp-0012-Add-systemd-support-to-epmd.patch @@ -0,0 +1,111 @@ +From: "Matwey V. Kornilov" +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 + ++#ifdef HAVE_SYSTEMD_SD_DAEMON_H ++# include ++#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"); + diff --git a/sources b/sources index 3eb8f02..df29746 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -fb39e206739e43501f6d27edf9b04b37 otp_doc_html_R16B03.tar.gz -099ed598feadc54e7efea908cc598f08 otp_doc_man_R16B03.tar.gz -d8b65a1492007f388545176300182d4f otp_src_R16B03.readme -c330150913556a0fe73e57a441cb6375 otp_src_R16B03.tar.gz +d27250e9ee98d6388e7f2e65379a0406 otp_src_R16B03-1.readme +eff44490c9bbae3a5c5741bec2390ba3 otp_doc_html_R16B03-1.tar.gz +39113c0d2515bdd8cd7e0f975a380122 otp_doc_man_R16B03-1.tar.gz +e5ece977375197338c1b93b3d88514f8 otp_src_R16B03-1.tar.gz From 9467e052022130f1bdf7d2dc4a1528bf1cbf989f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2014 19:05:04 +0400 Subject: [PATCH 042/340] Quick build fix Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e3b55aa..6fbba7e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -956,7 +956,7 @@ Erlang mode for XEmacs (source lisp files). %endif %prep -%setup -q -n otp_src_%{upstream_ver}%{upstream_rel} +%setup -q -n otp_src_%{upstream_ver}%{upstream_rel}-1 # start of autogenerated prep patch list %patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan From 3f5b8b5019140c447c7b2efef92f1250ada7befa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Mar 2014 19:08:30 +0400 Subject: [PATCH 043/340] Removed leftover Signed-off-by: Peter Lemenkov --- otp_src_R16B03.readme | 718 ------------------------------------------ 1 file changed, 718 deletions(-) delete mode 100644 otp_src_R16B03.readme diff --git a/otp_src_R16B03.readme b/otp_src_R16B03.readme deleted file mode 100644 index aa9f45d..0000000 --- a/otp_src_R16B03.readme +++ /dev/null @@ -1,718 +0,0 @@ -Bug fix release : otp_src_R16B03 -Build date : 2013-12-09 - -This is R16B03, the third maintenance release for the R16B major release. - -You can find the README file for the release at - - http://www.erlang.org/download/otp_src_R16B03.readme (this file) - -The source distribution and binary distributions for Windows can be -downloaded from - - http://www.erlang.org/download/otp_src_R16B03.tar.gz - http://www.erlang.org/download/otp_win32_R16B03.exe - http://www.erlang.org/download/otp_win64_R16B03.exe - -Note: To unpack the TAR archive you need a GNU TAR compatible program. - -For installation instructions please read the README file that is part -of the distribution. - -The on-line documentation can be found at: http://www.erlang.org/doc/ -You can also download the complete HTML documentation or the Unix manual files - - http://www.erlang.org/download/otp_doc_html_R16B03.tar.gz - http://www.erlang.org/download/otp_doc_man_R16B03.tar.gz - -We also want to thank those that sent us patches, suggestions and bug reports, - -The OTP Team - - ---- HIGHLIGHTS ---------------------------------------------------------- - - OTP-11149 == erts == - - A new memory allocation feature called "super carrier" has - been introduced. The super carrier feature can be used in - different ways. It can for example be used for pre-allocation - of all memory that the runtime system should be able to use. - - By default the super carrier is disabled. It is enabled by - passing the +MMscs command line argument. For - more information see the documentation of the +MMsco, - +MMscrfsd, +MMscrpm, +MMscs, +MMusac, and, +Mlpm command line - arguments in the erts_alloc(3) documentation. - - Since it is disabled by default there should be no impact on - system characteristics if not used. - - This change has been marked as a potential incompatibility - since the returned list when calling - erlang:system_info({allocator, mseg_alloc}) now also include - an {erts_mmap, _} tuple as one element in the list. - - ---- otp ----------------------------------------------------------------- - - OTP-11323 Remove ^L characters hidden randomly in the code. Not those - used in text files as delimiters. Thanks to Pierre Fenoll. - - OTP-11448 Update INSTALL md, added info how to generate configure file - if building from git. Thanks to Jakub Oboza. - - OTP-11472 Fixed typo in gen_fsm example. Thanks to Boris Mühmer. - - ---- asn1-2.0.4 ---------------------------------------------------------- - - OTP-11314 The new option 'no_ok_wrapper' generates M:encode/2 and - M:decode/2 functions that don't wrap the return value in an - {ok,...} tuple. - - OTP-11319 The default value for a BIT STRING would not always be - recognized, causing the encoding to be incorrect for the - DER/PER/UPER encodings. - - OTP-11360 The asn1 application would fail to build if the .erlang file - printed something to standard output. - - OTP-11411 An union of integer ranges in an INTEGER constraint could - sometimes be interpreted as the intersection of the range. - - OTP-11415 Extensible, multiple single value constraints (such as - INTEGER (1|17, ...)) would be incorrectly encoded. - - OTP-11504 The ASN.1 compiler would fail to compile a constraint with - values given for for the extension part (such as INTEGER - (1..10, ..., 11..20)). - - ---- common_test-1.7.4 --------------------------------------------------- - - OTP-10631 Return values from group and testcase info functions are now - properly checked, and associated test cases are auto skipped - if a return value is invalid. - - OTP-11305 The way Common Test handles skipping of test cases has been - updated. In previous versions, returning {skip,Reason} from a - configuration function (such as init_per_suite or - init_per_group), resulted in all affected test cases getting - skipped with status auto_skipped. This was inappropriate, - since this status is supposed to be used to inform that - Common Test has taken the initiative to skip something (e.g. - a test case group if init_per_group failed). Therefore, in - this version of Common Test, whenever the user skips a suite, - group, or individual test case (by means of a configuration - function or test specification term), the affected test cases - get the status user_skipped instead. - - This update has meant a few changes that may affect Common - Test users in various ways: - - -- The test results and statistics will be affected, which is - important to know when running regression tests and comparing - results to previous test runs. - - -- Users that read or parse the textual log file suite.log - will notice that an auto skipped function is now reported as - auto_skipped rather than skipped as before. - - -- When require fails in an info function (such as suite/0 or - group/1), all affected configuration functions and test cases - are marked as auto_skipped. - - -- If Common Test detects an error in the test suite (such as - e.g. an invalid all/0 function), all affected configuration - functions and test cases are marked as auto_skipped. - - -- If a repeated test run session reaches a deadline with - force_stop enabled, all remaining test cases are marked as - auto_skipped rather than user_skipped as before. - - -- The event messages that Common Test generates during test - runs have been affected by this update. For details see - OTP-11524. - - OTP-11401 Fix cth_log_redirect.erl to fulfill gen_event behaviour. - Thanks to Roberto Aloi. - - OTP-11409 Returning {skip, Reason} from a pre_end_per_group/3 user hook - function would result in an exit in the Common Test - cth_log_redirect hook. This problem has been solved. - - OTP-11478 When the netconf server did not respond to the close-session - request, the call to ct_netconfc:close_session/2 would hang - forever waiting for the netconf client to terminate. This has - been corrected. The client will now always terminate (and - take down the connection) if the close-session request times - out. - - OTP-11523 The first argument of the CT hook callback function - on_tc_skip/3 has been modified. When this function is called - for init_per_group or end_per_group, the value of the first - argument is now {init_per_group,GroupName} or - {end_per_group,GroupName}. - - OTP-11524 The following modifications have been made to the event - messages that Common Test sends during test execution: - - -- For the tc_auto_skip event, the value of the Func element - has changed from end_per_group to {end_per_group,GroupName}. - - -- When require fails in an info function, such as suite/0 or - group/1, the init configuration function is now reported as - auto_skipped intead of skipped, with the tc_done event. - - -- When require fails in an info function because of a - configuration name already in use, the tc_done event now - reports the error with a tuple (of size 2) tagged failed - instead of skipped. - - Please see the Event Handling chapter in the Common Test - User's Guide for reference. - - ---- compiler-4.9.4 ------------------------------------------------------ - - OTP-11267 Lift 'after' blocks to zeroary functions. Thanks to Anthony - Ramine. - - OTP-11455 Typo fix ambigous -> ambiguous. Thanks to Leo Correa. - - ---- crypto-3.2 ---------------------------------------------------------- - - OTP-11510 Fix uninitialized pointers in crypto (Thanks to Anthony - Ramine) - - ---- dialyzer-2.6.2 ------------------------------------------------------ - - OTP-11374 Fixed a dialyzer crash when using remote types in the tail - position of a maybe_improper_list/2 type. Thanks to Kostis - Sagonas - - ---- diameter-1.4.4 ------------------------------------------------------ - - OTP-11367 Fix setting of End-to-End and Hop-by-Hop Identifiers in - outgoing DWA. Broken by OTP-11184, which caused the identifiers - to be set anew, discarding the values from the incoming - DWR. - - OTP-11395 Fix handling of 5014, DIAMETER_INVALID_AVP_LENGTH. The error - was detected as 5004, DIAMETER_INVALID_AVP_VALUE, for some - Diameter types, in which case an AVP length that pointed - past the end of a message resulted in encode failure. - - ---- diameter-1.5 -------------------------------------------------------- - - OTP-11168 Rename reconnect_timer to connect_timer. - - The former is still accepted for backwards compatibility, but - the name is misleading given the semantics of the timer. - - OTP-11348 Extend diameter_make(3). - - Dictionaries can now be compiled from strings, not just - filesystem paths, and results can be returned instead of - written to the filesystem. - - OTP-11361 Remove hardcoding of diameter_base as @prefix on dictionaries - for application id 0. - - OTP-11514 Fix silent make rules (Thanks to Anthony Ramine) - - ---- eldap-1.0.2 --------------------------------------------------------- - - OTP-11336 The ldap client eldap now supports the start_tls operation. - This upgrades an existing tcp connection to encryption using - tls, if the server supports it. See eldap:start_tls/2 and /3. - - OTP-11354 Removed {verify,0} from ssl-options because eldap does not - support peer verification. Thanks to Florian Waas for - reporting. - - ---- erl_interface-3.7.15 ------------------------------------------------ - - OTP-11517 Silence warnings (Thanks to Anthony Ramine) - - ---- erts-5.10.3.1 ------------------------------------------------------- - - OTP-11318 Memory allocators will be able to create sys_alloc carriers - as fallback, if mseg_alloc cannot create more carriers, - on systems with posix_memalign() support. This is similar - to how it worked in pre-R16 releases. Windows systems will - create carriers using _aligned_malloc() and can by this - use the new optimized allocator header scheme introduced - in R16 on other platforms. - - ---- erts-5.10.4 --------------------------------------------------------- - - OTP-10229 New socket functions inet:socknames/1,2 and - inet:peernames/1,2 have been implemented. They are useful for - SCTP sockets since they return all addresses for an - association. For other sockets they fall back to - inet:sockname/1 and inet:peername/1, so the new functions can - replace the old for any application that wants to be multi - address aware yet socket type agnostic. See the - documentation. - - OTP-11149 A new memory allocation feature called "super carrier" has - been introduced. The super carrier feature can be used in - different ways. It can for example be used for pre-allocation - of all memory that the runtime system should be able to use. - - By default the super carrier is disabled. It is enabled by - passing the +MMscs command line argument. For - more information see the documentation of the +MMsco, - +MMscrfsd, +MMscrpm, +MMscs, +MMusac, and, +Mlpm command line - arguments in the erts_alloc(3) documentation. - - Since it is disabled by default there should be no impact on - system characteristics if not used. - - This change has been marked as a potential incompatibility - since the returned list when calling - erlang:system_info({allocator, mseg_alloc}) now also include - an {erts_mmap, _} tuple as one element in the list. - - OTP-11170 When normalizing paths, erl_prim_loader would always convert - backslash to forward slash. This is correct on Windows, but - not on other operating systems. erl_prim_loader now checks - which OS is running before performing this conversion. - - OTP-11349 Fixed syslog defines and defined LOG_ERR for systems without - syslog.h. Thanks to Matt Lewandowsky. - - OTP-11350 Check all pattern arguments passed to binary:matches/2. - Thanks to Mike Sassak. - - OTP-11351 Fix two small silent rules omissions. Thanks to Anthony - Ramine. - - OTP-11362 Added erlang:system_info(ets_limit) to provide a way to - retrieve the runtime's maximum number of ETS tables. Thanks - to Steve Vinoski - - OTP-11371 Teach configure to detect if posix_memalign cannot align to - more than the system page size. - - For cross-compiled systems a new environment variable called - erl_xcomp_posix_memalign has been introduced to indicate - whether posix_memalign should be used. - - OTP-11381 Fix bsr bug occurring when shifting a huge number a huge - number of bits to the right. Thanks to Lars Hesel - Christensen. - - OTP-11410 Fix memory leak for distributed monitors - - OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin - Hässler. - - OTP-11420 Crashdumps initiated by out-of-memory on process spawn could - cause the beam to segfault during crashdump writing due to - invalid pointers. - - The pointers are invalid since the process creation never - finished. This fix removes these processes from the - printouts. Reported by Richard Carlsson. - - OTP-11446 Add new BIF os:unsetenv/1 which deletes an environment - variable. Thanks to Martin Hässler. - - OTP-11450 Crash dumps from 64-bit Erlang machines would have all memory - addresses truncated to 32 bits, which could cause trouble - inspecting processes message queues and stacks in the - crashdump viewer. - - OTP-11456 Threads other than schedulers threads could make thread - unsafe accesses when support for migration of memory carriers - had been enabled, i.e., when the +Macul command line flag - had been passed to erl. This could cause corruption of the - VMs internal state. - - This bug was introduced in erts-5.10.2 when the support for - migration of memory carriers was introduced. - - OTP-11479 Fix bug in binary_to_term for invalid bitstrings and very - large binaries (>2Gb). - - OTP-11489 Introduced a new guarantee regarding exit signals from ports: - - If the process calling one of the synchronous port BIFs - listed below is linked to the port identified by the first - argument, and the port exits before sending the result of the - port operation, the exit signal issued due to this link will - be received by the processes before the BIF returns, or fail - with an exception due to the port not being open. - - The synchronous port BIFs are: - - -- port_close/1 - - -- port_command/2 - - -- port_command/3 - - -- port_connect/2 - - -- port_control/3 - - -- erlang:port_call/3 - - -- erlang:port_info/1 - - -- erlang:port_info/2 - - Note that some ports under certain circumstances unlink - themselves from the calling process before exiting, i.e. even - though the process linked itself to the port there might be - no link triggering an exit signal. - - Characteristics impact: The return or exception from the - synchronous port BIF will be delayed if the port - simultaneously exit due to some issue unrelated to the - outstanding synchronous port BIF call. In all other cases - characteristics are unchanged. - - OTP-11491 Under rare circumstances a process calling inet:close/1, - gen_tcp:close/1, gen_udp:close/1, or gen_sctp:close/1 could - hang in the call indefinitely. - - OTP-11496 Fix bug that could cause a 32-bit emulator to always crash at - start (since R16B01) depending on the alignment of static - data in the beam executable. - - OTP-11501 Fix benign bugs regarding bitstring compare. Only a nuisance - for debug and valgrind VM. - - OTP-11517 Silence warnings (Thanks to Anthony Ramine) - - OTP-11521 The default wordsize of the emulator (beam) is now determined - by compiler default on Mac OSX (Darwin). This was previously - forced to 32bits by the configure script unless otherwise - specified. - - ---- eunit-2.2.6 --------------------------------------------------------- - - OTP-11373 Fix I/O-protocol error handling in eunit. Thanks to Yuki Ito. - - OTP-11467 Do not attempt to detect lists of printable characters in - format. Thanks to Roberto Aloi. - - OTP-11516 Fix silent make rule (Thanks to Anthony Ramine ) - - ---- hipe-3.10.2.2 ------------------------------------------------------- - - OTP-11374 Fixed a dialyzer crash when using remote types in the tail - position of a maybe_improper_list/2 type. Thanks to Kostis - Sagonas - - ---- ic-4.3.4 ------------------------------------------------------------ - - OTP-11351 Fix two small silent rules omissions. Thanks to Anthony - Ramine. - - OTP-11517 Silence warnings (Thanks to Anthony Ramine) - - ---- inets-5.9.7 --------------------------------------------------------- - - OTP-11037 The ftp client now supports ftp over tls (ftps). - - OTP-11276 Fix httpd config option 'script_timeout' and fixed httpd - config option 'keep_alive_timeout'. Thanks to Johannes - Weissl. - - OTP-11312 Make httpc:request_cancel/[1,2] asynchronous. Previously - these functions tried to guarantee request answer would not - reach the client, which only worked for some of the use - cases. Now these functions are totally asynchronous which - makes it the clients responsibility to disregard possible - answers to canceled requests. - - Also pipelining implementation has been changed to improve - the utilization factor. Further investigation of possible - enhancements in this area are planned for later. - - OTP-11328 [httpd] Add handling of new response for mod_head (otherwise - causing case_clause crash). Also updated logging: Removed - logging for keep-alive connections timeout (this is a normal - occurrence and not an error) and some access-log body size - corrections. - - ---- kernel-2.16.4 ------------------------------------------------------- - - OTP-10229 New socket functions inet:socknames/1,2 and - inet:peernames/1,2 have been implemented. They are useful for - SCTP sockets since they return all addresses for an - association. For other sockets they fall back to - inet:sockname/1 and inet:peername/1, so the new functions can - replace the old for any application that wants to be multi - address aware yet socket type agnostic. See the - documentation. - - OTP-11377 Fix the typespec for the inet:ifget/2 and inet:ifget/3 return - value. Thanks to Ali Sabil. - - OTP-11379 Add more SCTP errors as described in RFC 4960. Thanks to - Artem Teslenko. - - OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin - Hässler. - - OTP-11446 Add new BIF os:unsetenv/1 which deletes an environment - variable. Thanks to Martin Hässler. - - OTP-11471 Fix rpc multicall sample code. Thanks to Edwin Fine. - - OTP-11491 Under rare circumstances a process calling inet:close/1, - gen_tcp:close/1, gen_udp:close/1, or gen_sctp:close/1 could - hang in the call indefinitely. - - ---- mnesia-4.11 --------------------------------------------------------- - - OTP-11375 Fixed a race in mnesia which could cause hanging transaction - when sticky locks had been used. Thanks janchochol. - - OTP-11485 Fixed dirty_update_counter which could return ok, thanks - Anton Ryabkov. - - ---- observer-1.3.1.2 ---------------------------------------------------- - - OTP-11335 The documentation for ttb:tracer/2 incorrectly stated that - there was an option named 'overload', while the correct name - used in the implementation is 'overload_check'. - - OTP-11475 Fixed typo in observer documentation. Thanks to Dave Parfitt. - - ---- odbc-2.10.18 -------------------------------------------------------- - - OTP-11483 Configure now also checks for the existence of the sql.h - header file - - ---- os_mon-2.2.14 ------------------------------------------------------- - - OTP-11454 Fix incorrect reporting of memory on OS X via memsup. Thanks - to Christopher Meiklejohn. - - ---- public_key-0.21 ----------------------------------------------------- - - OTP-11380 Fixed a little typo in public_key documentation. Thanks to - Tomas Morstein. - - OTP-11470 public_key: Workaround for incorrectly encoded utf8 - emailAddress. Thanks to Andrew Bennett. - - ---- runtime_tools-1.8.13 ------------------------------------------------ - - OTP-11520 Observer did not produce correct result when ERTS internal - memory allocators had been disabled. - - ---- sasl-2.3.4 ---------------------------------------------------------- - - OTP-8479 Added a boot file which skips loading the "$HOME/.erlang" - file on startup. Enable by starting erlang with "erl -boot - no_dot_erlang". - - OTP-11464 Don't try to add the log_mf_h handler in sasl unless - configured to do so. Thanks to Richard Carlsson. - - OTP-11507 Fix confusing documentation about error handlers in - SASL.(Thanks to Richard Carlsson) - - OTP-11529 A bug in the mechanism for upgrading core parts of Erlang/OTP - (emulator, kernel, stdlib, sasl) caused a switch of paths - between stdlib and sasl in the intermediate .script/.boot - file. The bug was introduces along with this upgrade - mechanism in R15B. It has now been corrected. (Thanks to - Tobias Schlager) - - ---- snmp-4.25 ----------------------------------------------------------- - - OTP-11307 [manager] Improved handling of unexpected/invalid return - values and crashes from called snmpm_user callback functions. - - OTP-11352 Enable SNMP to create missing database directories. Add - {db_init_error, create_db_and_dir} option to SNMP manager and - agent. This allows them to create any missing parent - directories for db_dir, rather than treating any missing - directories as a fatal error. The default for db_init_error, - which is terminate, is unchanged. - - OTP-11412 [manager] Wrong block cypher type used for AES ('aes_cbf128' - instead of 'aes_cfb128') when performing AES block - encrypt/decrypt. - - OTP-11413 [manager] When performing the AES encryption, invalid values - for the EngineBoots and EngineTime was used. The values of - the local agent was used, which would have produced some - values if an agent was actually running. If not it would have - caused a crash. - - ---- ssh-3.0 ------------------------------------------------------------- - - OTP-10976 Add option to disallow CLI - - OTP-11296 Add sockname and user to ssh:connection_info/2 - - OTP-11339 The ssh cli is now faster at close and before new prompt. - - OTP-11363 Ssh process structure was redesigned to better map to what is - truly parallel this has solved a lot of strange timing issues - that sometimes would occur, for instance a process leak could - happen when a lot of connections where taken up and down in - parallel in a short period of time. Also backwards compatible - clauses to "original" but never supported features has been - removed. - - Impact: Increases flow efficiency - - OTP-11414 Fix various typos in erts, kernel and ssh. Thanks to Martin - Hässler. - - OTP-11449 Correct private_key type documentation in ssh_server_key_api. - Thanks to Tristan Sloughter. - - OTP-11490 The functions in ssh_no_io.erl did not mimic the functions in - ssh_io.erl correctly, the arity was incorrect for some - functions which caused ssh to fail in the wrong way. - - ---- ssl-5.3.2 ----------------------------------------------------------- - - OTP-11370 Honors the clients advertised support of elliptic curves and - no longer sends incorrect elliptic curve extension in server - hello. - - OTP-11376 Fix initialization of DTLS fragment reassembler, in - previously contributed code, for future support of DTLS . - Thanks to Andreas Schultz. - - OTP-11447 Remove extraneous dev debug code left in the close function. - Thanks to Ken Key. - - OTP-11457 Corrected type error in client_preferred_next_protocols - documentation. Thanks to Julien Barbot. - - OTP-11460 Add SSL Server Name Indication (SNI) client support. Thanks - to Julien Barbot. - - ---- stdlib-1.19.4 ------------------------------------------------------- - - OTP-11398 Fix typo in gen_server.erl. Thanks to Brian L. Troutwine. - - OTP-11442 Add XML marker for regexp syntax. Thanks to HÃ¥kan Mattson. - - OTP-11465 Spec for atan2 should be atan2(Y, X), not atan2(X, Y). Thanks - to Ary Borenszweig. - - ---- syntax_tools-1.6.12 ------------------------------------------------- - - OTP-11506 Fix transformation of implicit funs in igor (Thanks to - Anthony Ramine) - - ---- test_server-3.6.4 --------------------------------------------------- - - OTP-11305 The way Common Test handles skipping of test cases has been - updated. In previous versions, returning {skip,Reason} from a - configuration function (such as init_per_suite or - init_per_group), resulted in all affected test cases getting - skipped with status auto_skipped. This was inappropriate, - since this status is supposed to be used to inform that - Common Test has taken the initiative to skip something (e.g. - a test case group if init_per_group failed). Therefore, in - this version of Common Test, whenever the user skips a suite, - group, or individual test case (by means of a configuration - function or test specification term), the affected test cases - get the status user_skipped instead. - - This update has meant a few changes that may affect Common - Test users in various ways: - - -- The test results and statistics will be affected, which is - important to know when running regression tests and comparing - results to previous test runs. - - -- Users that read or parse the textual log file suite.log - will notice that an auto skipped function is now reported as - auto_skipped rather than skipped as before. - - -- When require fails in an info function (such as suite/0 or - group/1), all affected configuration functions and test cases - are marked as auto_skipped. - - -- If Common Test detects an error in the test suite (such as - e.g. an invalid all/0 function), all affected configuration - functions and test cases are marked as auto_skipped. - - -- If a repeated test run session reaches a deadline with - force_stop enabled, all remaining test cases are marked as - auto_skipped rather than user_skipped as before. - - -- The event messages that Common Test generates during test - runs have been affected by this update. For details see - OTP-11524. - - ---- tools-2.6.13 -------------------------------------------------------- - - OTP-11394 Add iodata, nonempty_string to built-in type highlighting for - emacs. Thanks to Paul Oliver. - - OTP-11417 Erlang-specific compilation error regexp is added in - erlang-eunit.el. This defvar was earlier in erlang.el, but - was erroneously removed in R15B02, while still used by - erlang-eunit.el. - - OTP-11439 Take compiler options from beam in cover:compile_beam. Thanks - to Péter Gömöri. - - OTP-11517 Silence warnings (Thanks to Anthony Ramine) - - ---- wx-1.1.1 ------------------------------------------------------------ - - OTP-11393 wx initialization hanged with wxWidgets-3.0 on mac. Fixed a - crash with wxListBox on wxWidgets-3.0 (thanks Sergei Golovan) - Fixed documentation links. Fixed event callbacks cleanup. - - OTP-11505 Improve documentation (Thanks to Boris Mühmer) - - OTP-11515 Fix silent make rules (Thanks to Anthony Ramine) - - ---- xmerl-1.3.5 --------------------------------------------------------- - - OTP-11461 Teach xmerl_xpath to resolve context namespaces in more - cases. Thanks to Daniel White. - - OTP-11463 Avoid serialization on code_server in xmerl:export(). Thanks - to Richard Carlsson. - - From 59867aa612beebea9e0eca9ca8b0a305f1ffd32e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 31 Mar 2014 12:39:45 +0400 Subject: [PATCH 044/340] Create group and user for EPMD Signed-off-by: Peter Lemenkov --- erlang.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 6fbba7e..0df6175 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.3%{?dist} +Release: %{upstream_rel_for_rpm}.4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -131,6 +131,8 @@ BuildRequires: xemacs-packages-extra-el %endif %if 0%{?el7}%{?fedora} +# for +BuildRequires: systemd-devel Requires(post): systemd Requires(preun):systemd Requires(postun):systemd @@ -1177,6 +1179,13 @@ install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket %endif +%pre erts +getent group epmd >/dev/null || groupadd -r epmd +getent passwd epmd >/dev/null || \ +useradd -r -g epmd -d /tmp -s /sbin/nologin \ +-c "Erlang Port Mapper Daemon" epmd 2>/dev/null || : + + %clean rm -rf $RPM_BUILD_ROOT @@ -2316,6 +2325,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 28 2014 Peter Lemenkov - R16B-03.4 +- Create group and user for EPMD + * Thu Mar 27 2014 Peter Lemenkov - R16B-03.3 - Ver. R16B03-1 (Bugfix release) - Enabled systemd support in EPMD From aa1f4058788a077c37988c03230a47667b4089d5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 3 Apr 2014 14:24:06 +0400 Subject: [PATCH 045/340] Improve EPMD service Signed-off-by: Peter Lemenkov --- epmd.service | 9 ++++++++- erlang.spec | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/epmd.service b/epmd.service index c029ac4..02c7e36 100644 --- a/epmd.service +++ b/epmd.service @@ -5,10 +5,17 @@ Requires=epmd.socket [Service] ExecStart=/usr/bin/epmd -systemd -ExecStop=/usr/bin/epmd -kill +#ExecStop=/usr/bin/epmd -kill Type=simple StandardOutput=journal StandardError=journal +DeviceAllow=/dev/null rw +PrivateTmp=true +#CapabilityBoundingSet= +NoNewPrivileges=true +Restart=always +LimitNPROC=1 +LimitFSIZE=0 User=epmd Group=epmd diff --git a/erlang.spec b/erlang.spec index 0df6175..e77d45f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.4%{?dist} +Release: %{upstream_rel_for_rpm}.5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2325,6 +2325,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 02 2014 Peter Lemenkov - R16B-03.5 +- Improve EPMD service + * Fri Mar 28 2014 Peter Lemenkov - R16B-03.4 - Create group and user for EPMD From 0585732b625744b86105f221547d62765ca051be Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Jun 2014 16:31:36 +0400 Subject: [PATCH 046/340] Change EPMD service type to Notify Signed-off-by: Peter Lemenkov --- epmd.service | 2 +- epmd@.socket | 10 +++++ erlang.spec | 12 ++++- ...Added-systemd-notify-support-to-EPMD.patch | 45 +++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 epmd@.socket create mode 100644 otp-0013-Added-systemd-notify-support-to-EPMD.patch diff --git a/epmd.service b/epmd.service index 02c7e36..6881195 100644 --- a/epmd.service +++ b/epmd.service @@ -6,7 +6,7 @@ Requires=epmd.socket [Service] ExecStart=/usr/bin/epmd -systemd #ExecStop=/usr/bin/epmd -kill -Type=simple +Type=notify StandardOutput=journal StandardError=journal DeviceAllow=/dev/null rw diff --git a/epmd@.socket b/epmd@.socket new file mode 100644 index 0000000..5dda63d --- /dev/null +++ b/epmd@.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Erlang Port Mapper Daemon Activation Socket + +[Socket] +ListenStream=%i:4369 +Accept=false + +[Install] +WantedBy=sockets.target + diff --git a/erlang.spec b/erlang.spec index e77d45f..e19b890 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.5%{?dist} +Release: %{upstream_rel_for_rpm}.6%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -46,6 +46,7 @@ Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1 Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme Source5: epmd.service Source6: epmd.socket +Source7: epmd@.socket Source999: otp-get-patches.sh @@ -99,6 +100,9 @@ Patch11: otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch # Fedora specific patch # Add systemd support to epmd Patch12: otp-0012-Add-systemd-support-to-epmd.patch +# Fedora specific patch +# Added systemd notify support to EPMD +Patch13: otp-0013-Added-systemd-notify-support-to-EPMD.patch # end of autogenerated patch tag list # BuildRoot not strictly needed since F10, but keep it for spec file robustness @@ -977,6 +981,7 @@ Erlang mode for XEmacs (source lisp files). %patch10 -p1 -b .Fix_for_powerpc_architecture %patch11 -p1 -b .Add_systemd_option_to_empd_Check_for_include_system %patch12 -p1 -b .Add_systemd_support_to_epmd +%patch13 -p1 -b .Added_systemd_notify_support_to_EPMD # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1176,6 +1181,7 @@ ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{na %if 0%{?el7}%{?fedora} install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket +install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.socket %endif @@ -2325,6 +2331,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 06 2014 Peter Lemenkov - R16B-03.6 +- Add configurable EPMD socket unit +- Change EPMD service's type from simple to notify + * Wed Apr 02 2014 Peter Lemenkov - R16B-03.5 - Improve EPMD service diff --git a/otp-0013-Added-systemd-notify-support-to-EPMD.patch b/otp-0013-Added-systemd-notify-support-to-EPMD.patch new file mode 100644 index 0000000..b41ce99 --- /dev/null +++ b/otp-0013-Added-systemd-notify-support-to-EPMD.patch @@ -0,0 +1,45 @@ +From: Peter Lemenkov +Date: Fri, 6 Jun 2014 15:29:49 +0400 +Subject: [PATCH] Added systemd notify support to EPMD + +Signed-off-by: Peter Lemenkov + +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"); From 06f0741a28a64522fc4541985b78ffe9bf1ec839 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Jun 2014 17:16:43 +0400 Subject: [PATCH 047/340] Added missing *.socket file Signed-off-by: Peter Lemenkov --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index e19b890..db57160 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1534,6 +1534,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?el7}%{?fedora} %{_unitdir}/epmd.service %{_unitdir}/epmd.socket +%{_unitdir}/epmd@.socket %endif %files et From 489a7664fb0be8fda9617c6341531d93be6f45ad Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 11 Jun 2014 12:41:54 +0400 Subject: [PATCH 048/340] Added missing template for epmd@.socket Signed-off-by: Peter Lemenkov --- epmd@.service | 25 +++++++++++++++++++++++++ erlang.spec | 12 +++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 epmd@.service diff --git a/epmd@.service b/epmd@.service new file mode 100644 index 0000000..822268f --- /dev/null +++ b/epmd@.service @@ -0,0 +1,25 @@ +[Unit] +Description=Erlang Port Mapper Daemon +After=network.target +Requires=epmd@.socket + +[Service] +ExecStart=/usr/bin/epmd -systemd +#ExecStop=/usr/bin/epmd -kill +Type=notify +StandardOutput=journal +StandardError=journal +DeviceAllow=/dev/null rw +PrivateTmp=true +#CapabilityBoundingSet= +NoNewPrivileges=true +Restart=always +LimitNPROC=1 +LimitFSIZE=0 +User=epmd +Group=epmd + +[Install] +Also=epmd@.socket +WantedBy=multi-user.target + diff --git a/erlang.spec b/erlang.spec index db57160..dbac58a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.6%{?dist} +Release: %{upstream_rel_for_rpm}.7%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -46,7 +46,8 @@ Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1 Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme Source5: epmd.service Source6: epmd.socket -Source7: epmd@.socket +Source7: epmd@.service +Source8: epmd@.socket Source999: otp-get-patches.sh @@ -1181,7 +1182,8 @@ ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{na %if 0%{?el7}%{?fedora} install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket -install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.socket +install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.service +install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket %endif @@ -1534,6 +1536,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?el7}%{?fedora} %{_unitdir}/epmd.service %{_unitdir}/epmd.socket +%{_unitdir}/epmd@.service %{_unitdir}/epmd@.socket %endif @@ -2332,6 +2335,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 11 2014 Peter Lemenkov - R16B-03.7 +- Added missing template for epmd@.socket + * Fri Jun 06 2014 Peter Lemenkov - R16B-03.6 - Add configurable EPMD socket unit - Change EPMD service's type from simple to notify From d5f69b7d53a58853ee1365efa4fccf36748700a5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 10:57:29 +0000 Subject: [PATCH 049/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index dbac58a..6368e77 100644 --- a/erlang.spec +++ b/erlang.spec @@ -32,7 +32,7 @@ Name: erlang Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.7%{?dist} +Release: %{upstream_rel_for_rpm}.7%{?dist}.1 Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2335,6 +2335,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 16 2014 Fedora Release Engineering - R16B-03.7.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 11 2014 Peter Lemenkov - R16B-03.7 - Added missing template for epmd@.socket From eeecf737fa34d651809b566eb4e6b1413cc6f020 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 27 Aug 2014 17:38:36 +0400 Subject: [PATCH 050/340] Erlang ver. 17.2.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 303 ++++++------------ ...n-pages-and-do-not-install-miscellan.patch | 10 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 26 +- otp-0006-Do-not-install-erlang-sources.patch | 129 +++----- ...Added-systemd-notify-support-to-EPMD.patch | 6 +- ...for-java-1.5.0-gcj-which-doesn-t-sup.patch | 61 ---- otp-0008-Fix-for-armv7hl-architecture.patch | 22 -- ...ll-internal-hrl-files-when-necessary.patch | 97 ++++++ ...ARILY-disable-ECC-until-dust-settles.patch | 24 -- otp-0010-Fix-for-powerpc-architecture.patch | 26 -- ...on-to-empd.-Check-for-include-system.patch | 74 ----- otp-0012-Add-systemd-support-to-epmd.patch | 111 ------- sources | 5 +- 15 files changed, 267 insertions(+), 632 deletions(-) rename otp-0013-Added-systemd-notify-support-to-EPMD.patch => otp-0007-Added-systemd-notify-support-to-EPMD.patch (91%) delete mode 100644 otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch delete mode 100644 otp-0008-Fix-for-armv7hl-architecture.patch create mode 100644 otp-0008-Install-internal-hrl-files-when-necessary.patch delete mode 100644 otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch delete mode 100644 otp-0010-Fix-for-powerpc-architecture.patch delete mode 100644 otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch delete mode 100644 otp-0012-Add-systemd-support-to-epmd.patch diff --git a/.gitignore b/.gitignore index 99b1241..74a0d65 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ otp_src_R14A.tar.gz /otp_doc_html_R16B03-1.tar.gz /otp_doc_man_R16B03-1.tar.gz /otp_src_R16B03-1.tar.gz +/otp-OTP-17.2.1.tar.gz diff --git a/erlang.spec b/erlang.spec index 6368e77..7b3b111 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,49 +1,25 @@ -%global upstream_ver R16B -# Do NOT change %%{upstream_rel} unless UPSTREAM has actually changed it! -#%global upstream_rel %{nil} -%global upstream_rel 03 -# Use %%{nil} for %%{upstream_rel} for tracking source like otp_src_R14B.tar.gz, -# and 01 %%{upstream_rel} for tracking source like otp_src_R14B01.tar.gz. - %global need_bootstrap_set 0 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%if 0%{upstream_rel} -%global upstream_rel_for_rpm %{upstream_rel} -%else -%global upstream_rel_for_rpm 0 -%endif - %bcond_without doc -# No fop for EPEL5, and only for x86/x86_64 in EPEL6, so just disable there too -%if 0%{?el5}%{?el6} -%global use_prebuilt_docs 1 -%else -%global use_prebuilt_docs 0 -%endif - %ifarch %{arm} %{ix86} x86_64 ppc %{power64} %global __with_hipe 1 %endif -%global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm} - Name: erlang -Version: %{upstream_ver} -Release: %{upstream_rel_for_rpm}.7%{?dist}.1 +Version: 17.2.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ERPL URL: http://www.erlang.org -Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.tar.gz -%if %{use_prebuilt_docs} -Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}-1.tar.gz -Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}-1.tar.gz +%if 0%{?el7}%{?fedora} +VCS: scm:git:https://github.com/erlang/otp %endif -Source4: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}-1.readme +Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -83,32 +59,14 @@ 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 -# Required only for el5, el6 on PowerPC -# Ugly workaround for java-1.5.0-gcj which doesn't support -Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch -# Fedora specific patch -# Fix for armv7hl architecture -Patch8: otp-0008-Fix-for-armv7hl-architecture.patch -# Fedora specific patch -# TEMPORARILY disable ECC until dust settles -Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch -# Fedora specific patch -# Fix for powerpc architecture -Patch10: otp-0010-Fix-for-powerpc-architecture.patch -# Fedora specific patch -# Add -systemd option to empd. Check for include -Patch11: otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch -# Fedora specific patch -# Add systemd support to epmd -Patch12: otp-0012-Add-systemd-support-to-epmd.patch # Fedora specific patch # Added systemd notify support to EPMD -Patch13: otp-0013-Added-systemd-notify-support-to-EPMD.patch +Patch7: otp-0007-Added-systemd-notify-support-to-EPMD.patch +# Fedora specific patch +# Install internal hrl files when necessary +Patch8: otp-0008-Install-internal-hrl-files-when-necessary.patch # end of autogenerated patch tag list -# BuildRoot not strictly needed since F10, but keep it for spec file robustness -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - BuildRequires: lksctp-tools-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -116,8 +74,7 @@ BuildRequires: zlib-devel BuildRequires: flex BuildRequires: m4 %if %{with doc} -%if %{use_prebuilt_docs} -%else +# BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6, so we cannot regenerate docs here BuildRequires: fop BuildRequires: libxslt @@ -126,14 +83,11 @@ BuildRequires: libxslt BuildRequires: erlang %endif %endif -%endif -%if 0%{?el6}%{?fedora} BuildRequires: emacs BuildRequires: xemacs BuildRequires: emacs-el BuildRequires: xemacs-packages-extra-el -%endif %if 0%{?el7}%{?fedora} # for @@ -144,7 +98,6 @@ Requires(postun):systemd Requires: systemd %endif -Requires: erlang-appmon%{?_isa} = %{version}-%{release} Requires: erlang-asn1%{?_isa} = %{version}-%{release} Requires: erlang-common_test%{?_isa} = %{version}-%{release} Requires: erlang-compiler%{?_isa} = %{version}-%{release} @@ -157,7 +110,6 @@ Requires: erlang-cosTime%{?_isa} = %{version}-%{release} Requires: erlang-cosTransactions%{?_isa} = %{version}-%{release} Requires: erlang-crypto%{?_isa} = %{version}-%{release} Requires: erlang-debugger%{?_isa} = %{version}-%{release} - Requires: erlang-dialyzer%{?_isa} = %{version}-%{release} Requires: erlang-diameter%{?_isa} = %{version}-%{release} Requires: erlang-edoc%{?_isa} = %{version}-%{release} @@ -167,7 +119,6 @@ Requires: erlang-erl_interface%{?_isa} = %{version}-%{release} Requires: erlang-erts%{?_isa} = %{version}-%{release} Requires: erlang-et%{?_isa} = %{version}-%{release} Requires: erlang-eunit%{?_isa} = %{version}-%{release} -Requires: erlang-examples%{?_isa} = %{version}-%{release} Requires: erlang-gs%{?_isa} = %{version}-%{release} Requires: erlang-hipe%{?_isa} = %{version}-%{release} Requires: erlang-ic%{?_isa} = %{version}-%{release} @@ -180,10 +131,10 @@ Requires: erlang-observer%{?_isa} = %{version}-%{release} Requires: erlang-odbc%{?_isa} = %{version}-%{release} Requires: erlang-orber%{?_isa} = %{version}-%{release} Requires: erlang-os_mon%{?_isa} = %{version}-%{release} +Requires: erlang-ose%{?_isa} = %{version}-%{release} Requires: erlang-otp_mibs%{?_isa} = %{version}-%{release} Requires: erlang-parsetools%{?_isa} = %{version}-%{release} Requires: erlang-percept%{?_isa} = %{version}-%{release} -Requires: erlang-pman%{?_isa} = %{version}-%{release} Requires: erlang-public_key%{?_isa} = %{version}-%{release} Requires: erlang-reltool%{?_isa} = %{version}-%{release} Requires: erlang-runtime_tools%{?_isa} = %{version}-%{release} @@ -194,15 +145,11 @@ Requires: erlang-ssl%{?_isa} = %{version}-%{release} Requires: erlang-stdlib%{?_isa} = %{version}-%{release} Requires: erlang-syntax_tools%{?_isa} = %{version}-%{release} Requires: erlang-test_server%{?_isa} = %{version}-%{release} -Requires: erlang-toolbar%{?_isa} = %{version}-%{release} Requires: erlang-tools%{?_isa} = %{version}-%{release} -Requires: erlang-tv%{?_isa} = %{version}-%{release} Requires: erlang-typer%{?_isa} = %{version}-%{release} Requires: erlang-webtool%{?_isa} = %{version}-%{release} Requires: erlang-wx%{?_isa} = %{version}-%{release} Requires: erlang-xmerl%{?_isa} = %{version}-%{release} -Obsoletes: erlang-docbuilder -Obsoletes: erlang-inviso %description Erlang is a general-purpose programming language and runtime @@ -210,19 +157,6 @@ environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication systems from Ericsson. -%package appmon -Summary: A utility used to supervise Applications executing on several Erlang nodes -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description appmon -A utility used to supervise Applications executing on several Erlang nodes. - %package asn1 Summary: Provides support for Abstract Syntax Notation One Group: Development/Languages @@ -367,7 +301,6 @@ Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} @@ -380,7 +313,6 @@ Summary: A DIscrepancy AnaLYZer for ERlang programs Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -408,9 +340,7 @@ Diameter (RFC 3588) library %package doc Summary: Erlang documentation Group: Development/Languages -%if 0%{?el6}%{?el7}%{?fedora} BuildArch: noarch -%endif %description doc Documentation for Erlang. @@ -464,9 +394,18 @@ Summary: Functionality necessary to run the Erlang System itself Group: Development/Languages Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +# This library is dlopened so it can't be picked up automatically by the RPM +# dependency checker Requires: lksctp-tools -Provides: erlang(erl_drv_version) = 2.2 -Provides: erlang(erl_nif_version) = 2.4 +Provides: erlang(erl_drv_version) = 3.0 +Provides: erlang(erl_nif_version) = 2.6 +# These sub-packages were removed once +Obsoletes: erlang-appmon +Obsoletes: erlang-docbuilder +Obsoletes: erlang-inviso +Obsoletes: erlang-pman +Obsoletes: erlang-toolbar +Obsoletes: erlang-tv %description erts Functionality necessary to run the Erlang System itself. @@ -475,7 +414,6 @@ Functionality necessary to run the Erlang System itself. Summary: An event tracer for Erlang programs Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -558,7 +496,7 @@ Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} # FIXME see erlang-ic also #Requires: jpackage-utils -%if 0%{?fedora}%{?el7} +%if 0%{?el7}%{?fedora} BuildRequires: java-devel %else %ifarch %{ix86} x86_64 @@ -583,6 +521,7 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages +# FIXME Error:erlang(megaco_flex_scanner:scan/2) Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -611,12 +550,10 @@ Summary: A set of tools for tracing and investigation of distributed systems Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-webtool%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description observer @@ -661,6 +598,15 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description os_mon A monitor which allows inspection of the underlying operating system. +%package ose +Summary: A module for interacting with Enea OSE +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description ose +A module for interacting with Enea OSE. + %package otp_mibs Summary: SNMP management information base for Erlang/OTP nodes Group: Development/Languages @@ -695,17 +641,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description percept A concurrency profiler tool. -%package pman -Summary: A graphical process manager used to inspect Erlang processes -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description pman -A graphical process manager used to inspect Erlang processes. - %package public_key Summary: API to public key infrastructure Group: Development/Languages @@ -788,7 +723,6 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support Group: Development/Languages -#Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -828,24 +762,12 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -#Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %description test_server The OTP Test Server. -%package toolbar -Summary: A tool bar simplifying access to the Erlang tools -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description toolbar -A tool bar simplifying access to the Erlang tools. - %package tools Summary: A set of programming tools including a coverage analyzer etc Group: Development/Languages @@ -861,19 +783,6 @@ Provides: emacs-common-erlang = %{version}-%{release} %description tools A set of programming tools including a coverage analyzer etc. -%package tv -Summary: An ETS and MNESIA graphical table visualizer -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-pman%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description tv -An ETS and MNESIA graphical table visualizer. - %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages @@ -922,7 +831,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. -%if 0%{?el6}%{?fedora} %package -n emacs-erlang Summary: Compiled elisp files for erlang-mode under GNU Emacs Requires: emacs-common-erlang = %{version}-%{release} @@ -960,10 +868,9 @@ BuildArch: noarch %description -n xemacs-erlang-el Erlang mode for XEmacs (source lisp files). -%endif %prep -%setup -q -n otp_src_%{upstream_ver}%{upstream_rel}-1 +%setup -q -n otp-OTP-%{version} # start of autogenerated prep patch list %patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan @@ -972,17 +879,8 @@ Erlang mode for XEmacs (source lisp files). %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources -%if 0%{?el4}%{?el5}%{?el6} -%ifnarch %{ix86} x86_64 -%patch7 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup -%endif -%endif -%patch8 -p1 -b .Fix_for_armv7hl_architecture -%patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles -%patch10 -p1 -b .Fix_for_powerpc_architecture -%patch11 -p1 -b .Add_systemd_option_to_empd_Check_for_include_system -%patch12 -p1 -b .Add_systemd_support_to_epmd -%patch13 -p1 -b .Added_systemd_notify_support_to_EPMD +%patch7 -p1 -b .Added_systemd_notify_support_to_EPMD +%patch8 -p1 -b .Install_internal_hrl_files_when_necessary # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1005,9 +903,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old %build %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} %endif # Remove pre-built BEAM files @@ -1016,7 +914,6 @@ make clean # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" -%if 0%{?el6}%{?fedora} # GNU Emacs related stuff cat > emacs-erlang-init.el << EOF (setq load-path (cons "%{_emacs_sitelispdir}/erlang" load-path)) @@ -1043,12 +940,10 @@ rm -f xemacs-erlang/erlang-flymake.el pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd -%endif make + %if %{with doc} -%if %{use_prebuilt_docs} -%else # should use FOP_OPTS after #832323 is resolved %ifnarch ppc %{power64} export BASE_OPTIONS=-Xmx1024m @@ -1057,13 +952,9 @@ export BASE_OPTIONS=-Xmx1536m %endif make docs %endif -%endif %install -rm -rf $RPM_BUILD_ROOT - -%if 0%{?el6}%{?fedora} # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -1089,25 +980,12 @@ for f in lib/tools/emacs/{README,*.el}; do done rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el" install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" -%endif make DESTDIR=$RPM_BUILD_ROOT install + %if %{with doc} -%if %{use_prebuilt_docs} -# extract prebuilt docs and man-pages -tar xf %{SOURCE1} -C $RPM_BUILD_ROOT%{_libdir}/erlang -tar xf %{SOURCE2} -C $RPM_BUILD_ROOT%{_libdir}/erlang -# rm Win32-specific functionality -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/nteventlog.* -# rm VxWorks specific -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/erl_set_memory_block.* -# rm unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/info -rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/lib/*-*/info -%else env ERL_LIBS="$RPM_BUILD_ROOT%{_libdir}/erlang/lib" make DESTDIR=$RPM_BUILD_ROOT install-docs %endif -%endif # Do not install info files - they are almost empty and useless find $RPM_BUILD_ROOT%{_libdir}/erlang -type f -name info -exec rm -f {} \; @@ -1119,18 +997,18 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin # Relocate doc-files into the proper directory %if %{with doc} -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib pushd . cd $RPM_BUILD_ROOT%{_libdir}/erlang -mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} -for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/$i ; done +mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{n_uvr}/lib/$i || true ; done +for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done popd -cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{n_uvr} +cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %endif # Win32-specific man-pages @@ -1187,6 +1065,11 @@ install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket %endif +%check +# FIXME run tests somehow +# make tests || exit 0 + + %pre erts getent group epmd >/dev/null || groupadd -r epmd getent passwd epmd >/dev/null || \ @@ -1194,25 +1077,15 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ -c "Erlang Port Mapper Daemon" epmd 2>/dev/null || : -%clean -rm -rf $RPM_BUILD_ROOT - - %files %if %{with doc} -%dir %{_docdir}/%{n_uvr}/ -%doc %{_docdir}/%{n_uvr}/AUTHORS -%doc %{_docdir}/%{n_uvr}/COPYRIGHT -%doc %{_docdir}/%{n_uvr}/EPLICENCE -%doc %{_docdir}/%{n_uvr}/PR.template -%doc %{_docdir}/%{n_uvr}/README -%doc %{_docdir}/%{n_uvr}/README.md -%endif - -%files appmon -%{_libdir}/erlang/lib/appmon-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/appmon.* +%dir %{_docdir}/%{name}-%{version}/ +%doc %{_docdir}/%{name}-%{version}/AUTHORS +%doc %{_docdir}/%{name}-%{version}/COPYRIGHT +%doc %{_docdir}/%{name}-%{version}/EPLICENCE +%doc %{_docdir}/%{name}-%{version}/PR.template +%doc %{_docdir}/%{name}-%{version}/README +%doc %{_docdir}/%{name}-%{version}/README.md %endif %files asn1 @@ -1412,9 +1285,9 @@ rm -rf $RPM_BUILD_ROOT %files doc %if %{with doc} -%doc %{_docdir}/%{n_uvr}/doc -%doc %{_docdir}/%{n_uvr}/erts-*/ -%doc %{_docdir}/%{n_uvr}/lib/ +%doc %{_docdir}/%{name}-%{version}/doc +%doc %{_docdir}/%{name}-%{version}/erts-*/ +%doc %{_docdir}/%{name}-%{version}/lib/ %endif %files edoc @@ -1455,7 +1328,9 @@ rm -rf $RPM_BUILD_ROOT %endif %files erts -# TODO these directories should be packaged separately +# TODO +# In order to have a parallel-installable Erlang packages these directories +# should be packaged separately %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ @@ -1556,6 +1431,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/erlang/lib/eunit-*/ %{_libdir}/erlang/lib/eunit-*/ebin %{_libdir}/erlang/lib/eunit-*/include +%{_libdir}/erlang/lib/eunit-*/src %if %{with doc} %{_libdir}/erlang/man/man3/eunit.* %{_libdir}/erlang/man/man3/eunit_surefire.* @@ -1725,6 +1601,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/lib/observer-*/priv/ %{_libdir}/erlang/lib/observer-*/src/ %if %{with doc} +%{_libdir}/erlang/man/man1/cdv.* %{_libdir}/erlang/man/man3/crashdump.* %{_libdir}/erlang/man/man3/observer.* %{_libdir}/erlang/man/man3/ttb.* @@ -1777,6 +1654,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man6/os_mon.* %endif +%files ose +%dir %{_libdir}/erlang/lib/ose-*/ +%{_libdir}/erlang/lib/ose-*/ebin/ +%if %{with doc} +%{_libdir}/erlang/man/man3/ose.* +%{_libdir}/erlang/man/man3/ose_erl_driver.* +%{_libdir}/erlang/man/man6/ose.* +%endif + %files otp_mibs %{_libdir}/erlang/lib/otp_mibs-*/ %if %{with doc} @@ -1798,12 +1684,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/percept_profile.* %endif -%files pman -%{_libdir}/erlang/lib/pman-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/pman.* -%endif - %files public_key %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} @@ -1827,6 +1707,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/dbg.* %{_libdir}/erlang/man/man3/dyntrace.* %{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man3/system_information.* %{_libdir}/erlang/man/man6/runtime_tools.* %endif @@ -1975,6 +1856,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/lib.* %{_libdir}/erlang/man/man3/lists.* %{_libdir}/erlang/man/man3/log_mf_h.* +%{_libdir}/erlang/man/man3/maps.* %{_libdir}/erlang/man/man3/math.* %{_libdir}/erlang/man/man3/ms_transform.* %{_libdir}/erlang/man/man3/orddict.* @@ -2025,12 +1907,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man6/test_server.* %endif -%files toolbar -%{_libdir}/erlang/lib/toolbar-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/toolbar.* -%endif - %files tools %dir %{_libdir}/erlang/lib/tools-*/ %{_libdir}/erlang/lib/tools-*/bin @@ -2051,12 +1927,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/xref.* %endif -%files tv -%{_libdir}/erlang/lib/tv-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/tv.* -%endif - %files typer %{_bindir}/typer %{_libdir}/erlang/bin/typer @@ -2086,6 +1956,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wx_object.* %{_libdir}/erlang/man/man3/wxAcceleratorEntry.* %{_libdir}/erlang/man/man3/wxAcceleratorTable.* +%{_libdir}/erlang/man/man3/wxActivateEvent.* %{_libdir}/erlang/man/man3/wxArtProvider.* %{_libdir}/erlang/man/man3/wxAuiDockArt.* %{_libdir}/erlang/man/man3/wxAuiManager.* @@ -2188,6 +2059,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxIdleEvent.* %{_libdir}/erlang/man/man3/wxImage.* %{_libdir}/erlang/man/man3/wxImageList.* +%{_libdir}/erlang/man/man3/wxInitDialogEvent.* %{_libdir}/erlang/man/man3/wxJoystickEvent.* %{_libdir}/erlang/man/man3/wxKeyEvent.* %{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* @@ -2198,6 +2070,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxListItem.* %{_libdir}/erlang/man/man3/wxListItemAttr.* %{_libdir}/erlang/man/man3/wxListView.* +%{_libdir}/erlang/man/man3/wxLocale.* %{_libdir}/erlang/man/man3/wxLogNull.* %{_libdir}/erlang/man/man3/wxMask.* %{_libdir}/erlang/man/man3/wxMaximizeEvent.* @@ -2230,6 +2103,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* %{_libdir}/erlang/man/man3/wxPen.* %{_libdir}/erlang/man/man3/wxPickerBase.* +%{_libdir}/erlang/man/man3/wxPopupTransientWindow.* +%{_libdir}/erlang/man/man3/wxPopupWindow.* %{_libdir}/erlang/man/man3/wxPostScriptDC.* %{_libdir}/erlang/man/man3/wxPreviewCanvas.* %{_libdir}/erlang/man/man3/wxPreviewControlBar.* @@ -2313,7 +2188,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif -%if 0%{?el6}%{?fedora} %files -n emacs-erlang %dir %{_emacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README @@ -2331,10 +2205,17 @@ rm -rf $RPM_BUILD_ROOT %files -n xemacs-erlang-el %{_xemacs_sitelispdir}/erlang/*.el -%endif %changelog +* Tue Aug 26 2014 Peter Lemenkov - 17.2.1-1 +- Ver. 17.2.1 +- Removed support for EPEL5 +- The following packages were removed - appmon, pman, toolbar, tv +- The following packages were added - ose +- No longer using a pre-built doc-files +- Erlang no longer requires erlang-examples subpackage (see rhbz #1038314) + * Sat Aug 16 2014 Fedora Release Engineering - R16B-03.7.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 75bf3e5..6aeadc8 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 5c1ce51..5a07855 100644 +index 0cf965f..94e82a8 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -474,10 +474,6 @@ endif +@@ -550,10 +550,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -17,9 +17,9 @@ index 5c1ce51..5a07855 100644 - $(INSTALL_DIR) "$(RELEASE_PATH)/misc" - $(INSTALL_SCRIPT) $(INSTALL_MISC) "$(RELEASE_PATH)/misc" -endif - ifneq ($(INSTALL_ERL_OSE),) - $(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose" - cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE) + ifneq ($(INSTALL_SRC),) + $(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 8eb1db7..9e340bb 100644 --- a/erts/etc/unix/Install.src diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 2a65565..492734f 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index a20ddff..e890927 100644 +index 8c92b5b..5b36c19 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -85,7 +85,7 @@ endif +@@ -89,7 +89,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 821988b..388a738 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,36 +14,37 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 7023833..8bf8eb9 100644 +index a7cd03f..6da4d75 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -107,8 +107,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" +@@ -142,8 +142,6 @@ release_spec: opt + ifneq ($(findstring ose,$(TARGET)),ose) $(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 e890927..1377654 100644 +index 5b36c19..470821e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -160,13 +160,9 @@ docs: +@@ -199,14 +199,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 e36b39c..fd377bb 100644 --- a/lib/erl_interface/src/Makefile.in @@ -131,24 +132,25 @@ index f84ccf7..05d194f 100644 $(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 +index d46b499..4309aae 100644 --- a/lib/runtime_tools/c_src/Makefile.in +++ b/lib/runtime_tools/c_src/Makefile.in -@@ -177,9 +177,7 @@ docs: +@@ -156,10 +156,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 - release_docs_spec: diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index aea5686..a0c8883 100644 +index b1eb69f..1acfdbf 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -189,8 +189,6 @@ include ../vsn.mk +@@ -197,8 +197,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 843e052..02fdb3c 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -20,24 +20,11 @@ index 4ea2d41..e1466c1 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile -index c1620bc..02c0984 100644 ---- a/lib/appmon/src/Makefile -+++ b/lib/appmon/src/Makefile -@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 500f4a1..e707394 100644 +index 6798da0..4e3ae0e 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -153,7 +153,7 @@ release_spec: opt +@@ -154,7 +154,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -171,10 +158,10 @@ index 7b4a9cf..290707c 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 574c207..52320b0 100644 +index c185c15..68bacba 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile -@@ -83,8 +83,6 @@ docs: +@@ -81,8 +81,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -184,10 +171,10 @@ index 574c207..52320b0 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 85754da..5a6f298 100644 +index 90189dd..1e8f51d 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile -@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -197,10 +184,10 @@ index 85754da..5a6f298 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index bb2edd4..6b20995 100644 +index 91fbdca..01fb30c 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -156,7 +156,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -210,10 +197,10 @@ index bb2edd4..6b20995 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 578bbae..647cfde 100644 +index 9afccf2..107d65b 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -242,11 +242,8 @@ release_spec: opt +@@ -250,11 +250,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -241,7 +228,7 @@ index 4e5a418..c0bb0c3 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index ebb7967..b6337cb 100644 +index 2e1110e..b7f9b09 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile @@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -269,7 +256,7 @@ index ef96f5d..d9a2f0d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index 386169f..216b548 100644 +index 377e593..668e278 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -108,7 +108,6 @@ release_spec: opt @@ -294,7 +281,7 @@ index e6dab67..a5e147d 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index 0a63d54..8a49249 100644 +index f0200ca..86d3f74 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -309,7 +296,7 @@ index 0a63d54..8a49249 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 506e993..d74b75c 100644 +index d13dfb3..b09d62b 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -347,6 +334,19 @@ index 87015aa..84f870d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile +index 92f3789..82f3e77 100644 +--- a/lib/hipe/llvm/Makefile ++++ b/lib/hipe/llvm/Makefile +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/llvm +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm ++ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm + $(INSTALL_DIR) $(RELSYSDIR)/ebin + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile index 66e4c3e..2f11670 100644 --- a/lib/hipe/main/Makefile @@ -615,10 +615,10 @@ index ac38fa0..20bce7e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 42f5c19..a98b706 100644 +index c120865..6831d23 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -131,7 +131,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -655,10 +655,10 @@ index 8140620..73df530 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 1c6781e..e471f88 100644 +index 398e481..f079e77 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile -@@ -256,7 +256,7 @@ release_spec: opt +@@ -252,7 +252,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -679,6 +679,20 @@ index 4e78cf8..69d434c 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile +index 88f8957..ab08a88 100644 +--- a/lib/ose/src/Makefile ++++ b/lib/ose/src/Makefile +@@ -93,9 +93,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" +- $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile index 4f03d02..756db7b 100644 --- a/lib/otp_mibs/src/Makefile @@ -718,21 +732,8 @@ index 6bf0af9..e501539 100644 # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile -index eb0413b..4f5419b 100644 ---- a/lib/pman/src/Makefile -+++ b/lib/pman/src/Makefile -@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index a4e36c7..432e73a 100644 +index c1b3bc8..3d021cf 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -95,8 +95,8 @@ release_spec: opt @@ -885,10 +886,10 @@ index 2ef2859..aac91a3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 131b615..c456bfc 100644 +index 7c4c8ec..99efbe4 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -898,10 +899,10 @@ index 131b615..c456bfc 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index f3387d6..4c5e622 100644 +index 9ab2cd4..876bfd2 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -203,7 +203,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -934,19 +935,6 @@ index ab4dd4d..bcb1bc3 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/toolbar/src/Makefile b/lib/toolbar/src/Makefile -index a248469..96c42df 100644 ---- a/lib/toolbar/src/Makefile -+++ b/lib/toolbar/src/Makefile -@@ -85,7 +85,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile index e606b97..1beb8cc 100644 --- a/lib/tools/src/Makefile @@ -960,21 +948,8 @@ index e606b97..1beb8cc 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" -diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile -index 3d680c1..e6ed610 100644 ---- a/lib/tv/src/Makefile -+++ b/lib/tv/src/Makefile -@@ -127,7 +127,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 13af466..c29a597 100644 +index a7059de..0b1ae2a 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile @@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -988,7 +963,7 @@ index 13af466..c29a597 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index f28c777..346ce37 100644 +index af565c8..6c65b26 100644 --- a/lib/webtool/src/Makefile +++ b/lib/webtool/src/Makefile @@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk diff --git a/otp-0013-Added-systemd-notify-support-to-EPMD.patch b/otp-0007-Added-systemd-notify-support-to-EPMD.patch similarity index 91% rename from otp-0013-Added-systemd-notify-support-to-EPMD.patch rename to otp-0007-Added-systemd-notify-support-to-EPMD.patch index b41ce99..dd4ddcd 100644 --- a/otp-0013-Added-systemd-notify-support-to-EPMD.patch +++ b/otp-0007-Added-systemd-notify-support-to-EPMD.patch @@ -8,7 +8,7 @@ Conflicts: erts/configure.in diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c -index fc58882..1757fa9 100644 +index 3cfa7a7..67e8b49 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) @@ -27,10 +27,10 @@ index fc58882..1757fa9 100644 } diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c -index cb8ca96..78524a6 100644 +index 48fd7a5..18d898a 100644 --- a/erts/epmd/src/epmd_srv.c +++ b/erts/epmd/src/epmd_srv.c -@@ -394,8 +394,11 @@ void run(EpmdVars *g) +@@ -399,8 +399,11 @@ void run(EpmdVars *g) } select_fd_set(g, listensock[i]); } diff --git a/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch b/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch deleted file mode 100644 index 33b5973..0000000 --- a/otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Peter Lemenkov -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 -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 diff --git a/otp-0008-Fix-for-armv7hl-architecture.patch b/otp-0008-Fix-for-armv7hl-architecture.patch deleted file mode 100644 index b7d8b32..0000000 --- a/otp-0008-Fix-for-armv7hl-architecture.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Peter Lemenkov -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 - -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 diff --git a/otp-0008-Install-internal-hrl-files-when-necessary.patch b/otp-0008-Install-internal-hrl-files-when-necessary.patch new file mode 100644 index 0000000..9badf49 --- /dev/null +++ b/otp-0008-Install-internal-hrl-files-when-necessary.patch @@ -0,0 +1,97 @@ +From: Peter Lemenkov +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 + +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 1e8f51d..bfdb0c9 100644 +--- a/lib/debugger/src/Makefile ++++ b/lib/debugger/src/Makefile +@@ -63,7 +63,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" diff --git a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch deleted file mode 100644 index 4dc7759..0000000 --- a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 24 Oct 2013 16:44:22 +0400 -Subject: [PATCH] TEMPORARILY disable ECC until dust settles - -Signed-off-by: Peter Lemenkov - -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 - #include diff --git a/otp-0010-Fix-for-powerpc-architecture.patch b/otp-0010-Fix-for-powerpc-architecture.patch deleted file mode 100644 index 8eb1f35..0000000 --- a/otp-0010-Fix-for-powerpc-architecture.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Peter Lemenkov -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 - -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;; diff --git a/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch b/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch deleted file mode 100644 index bb13893..0000000 --- a/otp-0011-Add-systemd-option-to-empd.-Check-for-include-system.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: "Matwey V. Kornilov" -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*,...); diff --git a/otp-0012-Add-systemd-support-to-epmd.patch b/otp-0012-Add-systemd-support-to-epmd.patch deleted file mode 100644 index 3535601..0000000 --- a/otp-0012-Add-systemd-support-to-epmd.patch +++ /dev/null @@ -1,111 +0,0 @@ -From: "Matwey V. Kornilov" -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 - -+#ifdef HAVE_SYSTEMD_SD_DAEMON_H -+# include -+#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"); - diff --git a/sources b/sources index df29746..74711f5 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -d27250e9ee98d6388e7f2e65379a0406 otp_src_R16B03-1.readme -eff44490c9bbae3a5c5741bec2390ba3 otp_doc_html_R16B03-1.tar.gz -39113c0d2515bdd8cd7e0f975a380122 otp_doc_man_R16B03-1.tar.gz -e5ece977375197338c1b93b3d88514f8 otp_src_R16B03-1.tar.gz +d3d62b967033bb684f8537548bdfa456 otp-OTP-17.2.1.tar.gz From 2e0bb69313db035f9e55c72532e66c86095431f9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 7 Sep 2014 16:41:57 +0400 Subject: [PATCH 051/340] Ver. 17.2.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74a0d65..5da57f3 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ otp_src_R14A.tar.gz /otp_doc_man_R16B03-1.tar.gz /otp_src_R16B03-1.tar.gz /otp-OTP-17.2.1.tar.gz +/otp-OTP-17.2.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 7b3b111..29186e7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -9,7 +9,7 @@ %endif Name: erlang -Version: 17.2.1 +Version: 17.2.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2208,6 +2208,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sun Sep 7 2014 Peter Lemenkov - 17.2.2-1 +- Ver. 17.2.2 +- Fixed a race which could make create_table fail if a node was going down + during the transaction. See upstream issue OTP-12124 for a further reference. + * Tue Aug 26 2014 Peter Lemenkov - 17.2.1-1 - Ver. 17.2.1 - Removed support for EPEL5 diff --git a/sources b/sources index 74711f5..e769560 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3d62b967033bb684f8537548bdfa456 otp-OTP-17.2.1.tar.gz +12c6cc0096f0b146234b1698e17d34d1 otp-OTP-17.2.2.tar.gz From 885bb5b7a2bb8e709e75739228c5e906c7a9f735 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 3 Nov 2014 15:54:44 +0300 Subject: [PATCH 052/340] Ver. 17.3.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 34 +++--- otp-0003-Do-not-install-C-sources.patch | 4 +- otp-0004-Do-not-install-Java-sources.patch | 6 +- otp-0006-Do-not-install-erlang-sources.patch | 8 +- ...Added-systemd-notify-support-to-EPMD.patch | 4 +- otp-0009-Expose-NIF-version.patch | 102 ++++++++++++++++++ sources | 2 +- 8 files changed, 134 insertions(+), 27 deletions(-) create mode 100644 otp-0009-Expose-NIF-version.patch diff --git a/.gitignore b/.gitignore index 5da57f3..110111a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ otp_src_R14A.tar.gz /otp_src_R16B03-1.tar.gz /otp-OTP-17.2.1.tar.gz /otp-OTP-17.2.2.tar.gz +/otp-OTP-17.3.3.tar.gz diff --git a/erlang.spec b/erlang.spec index 29186e7..18fa2fa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -9,7 +9,7 @@ %endif Name: erlang -Version: 17.2.2 +Version: 17.3.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -65,6 +65,9 @@ Patch7: otp-0007-Added-systemd-notify-support-to-EPMD.patch # Fedora specific patch # Install internal hrl files when necessary Patch8: otp-0008-Install-internal-hrl-files-when-necessary.patch +# Fedora specific patch +# Expose NIF version +Patch9: otp-0009-Expose-NIF-version.patch # end of autogenerated patch tag list BuildRequires: lksctp-tools-devel @@ -97,6 +100,7 @@ Requires(preun):systemd Requires(postun):systemd Requires: systemd %endif +BuildRequires: erlang-rpm-macros Requires: erlang-asn1%{?_isa} = %{version}-%{release} Requires: erlang-common_test%{?_isa} = %{version}-%{release} @@ -337,6 +341,7 @@ Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} %description diameter Diameter (RFC 3588) library +%if %{with doc} %package doc Summary: Erlang documentation Group: Development/Languages @@ -344,6 +349,7 @@ BuildArch: noarch %description doc Documentation for Erlang. +%endif %package edoc Summary: A utility used to generate documentation out of tags in source files @@ -397,8 +403,12 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} # This library is dlopened so it can't be picked up automatically by the RPM # dependency checker Requires: lksctp-tools -Provides: erlang(erl_drv_version) = 3.0 -Provides: erlang(erl_nif_version) = 2.6 +# See erts/emulator/beam/erl_driver.h or call erlang:system_info(driver_version). +Provides: erlang(erl_drv_version) = 3.1 +#Provides: erlang(erl_drv_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(driver_version)).' -s erlang halt) +# See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). +Provides: erlang(erl_nif_version) = 2.7 +#Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) # These sub-packages were removed once Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder @@ -521,7 +531,6 @@ Main erlang library. %package megaco Summary: Megaco/H.248 support library Group: Development/Languages -# FIXME Error:erlang(megaco_flex_scanner:scan/2) Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -881,22 +890,13 @@ Erlang mode for XEmacs (source lisp files). %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Added_systemd_notify_support_to_EPMD %patch8 -p1 -b .Install_internal_hrl_files_when_necessary +%patch9 -p1 -b .Expose_NIF_version # end of autogenerated prep patch list # FIXME we should come up with a better solution # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] -# Fix 664 file mode -chmod 644 lib/kernel/examples/uds_dist/c_src/Makefile -chmod 644 lib/kernel/examples/uds_dist/src/Makefile -chmod 644 lib/ssl/examples/certs/Makefile -chmod 644 lib/ssl/examples/src/Makefile - -# Remove old txt files -rm -f lib/ssl/examples/certs/etc/otpCA/index.txt.old -rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old - # Reconfigure everything to apply changes to the autotools templates ./otp_build autoconf @@ -1108,6 +1108,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/ct_hooks.* %{_libdir}/erlang/man/man3/ct_master.* %{_libdir}/erlang/man/man3/ct_netconfc.* +%{_libdir}/erlang/man/man3/ct_property_test.* %{_libdir}/erlang/man/man3/ct_rpc.* %{_libdir}/erlang/man/man3/ct_slave.* %{_libdir}/erlang/man/man3/ct_snmp.* @@ -1283,8 +1284,8 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man4/diameter_dict.* %endif -%files doc %if %{with doc} +%files doc %doc %{_docdir}/%{name}-%{version}/doc %doc %{_docdir}/%{name}-%{version}/erts-*/ %doc %{_docdir}/%{name}-%{version}/lib/ @@ -2208,6 +2209,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sun Nov 02 2014 Peter Lemenkov - 17.3.3-1 +- Ver. 17.3.3 + * Sun Sep 7 2014 Peter Lemenkov - 17.2.2-1 - Ver. 17.2.2 - Fixed a race which could make create_table fail if a node was going down diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 388a738..6499e4c 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -46,10 +46,10 @@ index 5b36c19..470821e 100644 endif endif diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index e36b39c..fd377bb 100644 +index 7d914a0..b013939 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -876,14 +876,14 @@ ifneq ($(EXE_TARGETS),) +@@ -892,14 +892,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 378e86d..b5a48ff 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -18,10 +18,10 @@ index 273614e..5b1fb57 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index f476d45..44429a4 100644 +index 8ae1ca0..adaaf55 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -@@ -102,8 +102,6 @@ release release_docs release_tests release_html: +@@ -114,8 +114,6 @@ release release_docs release_tests release_html: $(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) $@_spec release_spec: opt @@ -29,4 +29,4 @@ index f476d45..44429a4 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" diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 02fdb3c..cc923fb 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -34,10 +34,10 @@ index 6798da0..4e3ae0e 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 4600c0a..1675a4a 100644 +index 8d74546..a25d85d 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -873,10 +873,10 @@ index 698c341..3344a0c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 2ef2859..aac91a3 100644 +index 04ce750..ef55c37 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Added-systemd-notify-support-to-EPMD.patch b/otp-0007-Added-systemd-notify-support-to-EPMD.patch index dd4ddcd..8461024 100644 --- a/otp-0007-Added-systemd-notify-support-to-EPMD.patch +++ b/otp-0007-Added-systemd-notify-support-to-EPMD.patch @@ -8,10 +8,10 @@ Conflicts: erts/configure.in diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c -index 3cfa7a7..67e8b49 100644 +index 9630e0c..dff9bc6 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) +@@ -593,9 +593,11 @@ void epmd_cleanup_exit(EpmdVars *g, int exitval) for(i=0; g->argv[i] != NULL; ++i) free(g->argv[i]); free(g->argv); diff --git a/otp-0009-Expose-NIF-version.patch b/otp-0009-Expose-NIF-version.patch new file mode 100644 index 0000000..3448add --- /dev/null +++ b/otp-0009-Expose-NIF-version.patch @@ -0,0 +1,102 @@ +From: Peter Lemenkov +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 + +diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml +index 8416839..81f98cb 100644 +--- a/erts/doc/src/erlang.xml ++++ b/erts/doc/src/erlang.xml +@@ -6133,6 +6133,11 @@ ok + erlang:system_info(multi_scheduling), and + erlang:system_info(schedulers).

+ ++ nif_version ++ ++

Returns a string containing the erlang NIF version ++ used by the runtime system. It will be on the form "<major ver>.<minor ver>".

++ + otp_release + +

Returns a string containing the OTP release number of the +diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c +index 6efe9d9..da38eea 100644 +--- 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" +@@ -2459,6 +2460,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/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl +index 336b618..081789f 100644 +--- a/erts/emulator/test/driver_SUITE.erl ++++ b/erts/emulator/test/driver_SUITE.erl +@@ -1199,8 +1199,8 @@ check_si_res(["sched_thrs", Value]) -> + ?line Value = integer_to_list(erlang:system_info(schedulers)); + + %% Data added in 3rd version of driver_system_info() (driver version 1.5) +-check_si_res(["emu_nif_vsn", _Value]) -> +- true; ++check_si_res(["emu_nif_vsn", Value]) -> ++ ?line Value = erlang:system_info(nif_version); + + %% Data added in 4th version of driver_system_info() (driver version 3.1) + check_si_res(["dirty_sched", _Value]) -> +diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl +index 98d7a94..de6a773 100644 +--- a/erts/preloaded/src/erlang.erl ++++ b/erts/preloaded/src/erlang.erl +@@ -2251,6 +2251,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 f541d6e..04cc33e 100644 +--- a/lib/runtime_tools/src/system_information.erl ++++ b/lib/runtime_tools/src/system_information.erl +@@ -371,6 +371,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 1893837..bdc510e 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,[]}, diff --git a/sources b/sources index e769560..8aeebf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12c6cc0096f0b146234b1698e17d34d1 otp-OTP-17.2.2.tar.gz +18422a0498b882fe043591cf29577d36 otp-OTP-17.3.3.tar.gz From b7c4f00a79aceedf9c2695850f77491d4b9914f8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 9 Nov 2014 12:48:34 +0300 Subject: [PATCH 053/340] Ver. 17.3.4 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 127 ++++++++++-------- ...it-off-webtool-dependency-from-tools.patch | 40 ++++++ sources | 2 +- 4 files changed, 113 insertions(+), 57 deletions(-) create mode 100644 otp-0010-Split-off-webtool-dependency-from-tools.patch diff --git a/.gitignore b/.gitignore index 110111a..2861be6 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ otp_src_R14A.tar.gz /otp-OTP-17.2.1.tar.gz /otp-OTP-17.2.2.tar.gz /otp-OTP-17.3.3.tar.gz +/otp-OTP-17.3.4.tar.gz diff --git a/erlang.spec b/erlang.spec index 18fa2fa..c1223da 100644 --- a/erlang.spec +++ b/erlang.spec @@ -9,7 +9,7 @@ %endif Name: erlang -Version: 17.3.3 +Version: 17.3.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -68,6 +68,9 @@ Patch8: otp-0008-Install-internal-hrl-files-when-necessary.patch # Fedora specific patch # Expose NIF version Patch9: otp-0009-Expose-NIF-version.patch +# Fedora specific patch +# Split off webtool dependency from tools +Patch10: otp-0010-Split-off-webtool-dependency-from-tools.patch # end of autogenerated patch tag list BuildRequires: lksctp-tools-devel @@ -102,58 +105,58 @@ Requires: systemd %endif BuildRequires: erlang-rpm-macros -Requires: erlang-asn1%{?_isa} = %{version}-%{release} -Requires: erlang-common_test%{?_isa} = %{version}-%{release} -Requires: erlang-compiler%{?_isa} = %{version}-%{release} -Requires: erlang-cosEvent%{?_isa} = %{version}-%{release} -Requires: erlang-cosEventDomain%{?_isa} = %{version}-%{release} -Requires: erlang-cosFileTransfer%{?_isa} = %{version}-%{release} -Requires: erlang-cosNotification%{?_isa} = %{version}-%{release} -Requires: erlang-cosProperty%{?_isa} = %{version}-%{release} -Requires: erlang-cosTime%{?_isa} = %{version}-%{release} -Requires: erlang-cosTransactions%{?_isa} = %{version}-%{release} -Requires: erlang-crypto%{?_isa} = %{version}-%{release} -Requires: erlang-debugger%{?_isa} = %{version}-%{release} -Requires: erlang-dialyzer%{?_isa} = %{version}-%{release} -Requires: erlang-diameter%{?_isa} = %{version}-%{release} -Requires: erlang-edoc%{?_isa} = %{version}-%{release} -Requires: erlang-eldap%{?_isa} = %{version}-%{release} -Requires: erlang-erl_docgen%{?_isa} = %{version}-%{release} -Requires: erlang-erl_interface%{?_isa} = %{version}-%{release} -Requires: erlang-erts%{?_isa} = %{version}-%{release} -Requires: erlang-et%{?_isa} = %{version}-%{release} -Requires: erlang-eunit%{?_isa} = %{version}-%{release} -Requires: erlang-gs%{?_isa} = %{version}-%{release} -Requires: erlang-hipe%{?_isa} = %{version}-%{release} -Requires: erlang-ic%{?_isa} = %{version}-%{release} -Requires: erlang-inets%{?_isa} = %{version}-%{release} -Requires: erlang-jinterface%{?_isa} = %{version}-%{release} -Requires: erlang-kernel%{?_isa} = %{version}-%{release} -Requires: erlang-megaco%{?_isa} = %{version}-%{release} -Requires: erlang-mnesia%{?_isa} = %{version}-%{release} -Requires: erlang-observer%{?_isa} = %{version}-%{release} -Requires: erlang-odbc%{?_isa} = %{version}-%{release} -Requires: erlang-orber%{?_isa} = %{version}-%{release} -Requires: erlang-os_mon%{?_isa} = %{version}-%{release} -Requires: erlang-ose%{?_isa} = %{version}-%{release} -Requires: erlang-otp_mibs%{?_isa} = %{version}-%{release} -Requires: erlang-parsetools%{?_isa} = %{version}-%{release} -Requires: erlang-percept%{?_isa} = %{version}-%{release} -Requires: erlang-public_key%{?_isa} = %{version}-%{release} -Requires: erlang-reltool%{?_isa} = %{version}-%{release} -Requires: erlang-runtime_tools%{?_isa} = %{version}-%{release} -Requires: erlang-sasl%{?_isa} = %{version}-%{release} -Requires: erlang-snmp%{?_isa} = %{version}-%{release} -Requires: erlang-ssh%{?_isa} = %{version}-%{release} -Requires: erlang-ssl%{?_isa} = %{version}-%{release} -Requires: erlang-stdlib%{?_isa} = %{version}-%{release} -Requires: erlang-syntax_tools%{?_isa} = %{version}-%{release} -Requires: erlang-test_server%{?_isa} = %{version}-%{release} -Requires: erlang-tools%{?_isa} = %{version}-%{release} -Requires: erlang-typer%{?_isa} = %{version}-%{release} -Requires: erlang-webtool%{?_isa} = %{version}-%{release} -Requires: erlang-wx%{?_isa} = %{version}-%{release} -Requires: erlang-xmerl%{?_isa} = %{version}-%{release} +Requires: %{name}-asn1%{?_isa} = %{version}-%{release} +Requires: %{name}-common_test%{?_isa} = %{version}-%{release} +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} +Requires: %{name}-debugger%{?_isa} = %{version}-%{release} +Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} +Requires: %{name}-diameter%{?_isa} = %{version}-%{release} +Requires: %{name}-edoc%{?_isa} = %{version}-%{release} +Requires: %{name}-eldap%{?_isa} = %{version}-%{release} +Requires: %{name}-erl_docgen%{?_isa} = %{version}-%{release} +Requires: %{name}-erl_interface%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-et%{?_isa} = %{version}-%{release} +Requires: %{name}-eunit%{?_isa} = %{version}-%{release} +Requires: %{name}-gs%{?_isa} = %{version}-%{release} +Requires: %{name}-hipe%{?_isa} = %{version}-%{release} +Requires: %{name}-ic%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} +Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-megaco%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-observer%{?_isa} = %{version}-%{release} +Requires: %{name}-odbc%{?_isa} = %{version}-%{release} +Requires: %{name}-orber%{?_isa} = %{version}-%{release} +Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} +Requires: %{name}-ose%{?_isa} = %{version}-%{release} +Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} +Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} +Requires: %{name}-percept%{?_isa} = %{version}-%{release} +Requires: %{name}-public_key%{?_isa} = %{version}-%{release} +Requires: %{name}-reltool%{?_isa} = %{version}-%{release} +Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-sasl%{?_isa} = %{version}-%{release} +Requires: %{name}-snmp%{?_isa} = %{version}-%{release} +Requires: %{name}-ssh%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-test_server%{?_isa} = %{version}-%{release} +Requires: %{name}-tools%{?_isa} = %{version}-%{release} +Requires: %{name}-typer%{?_isa} = %{version}-%{release} +Requires: %{name}-webtool%{?_isa} = %{version}-%{release} +Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description Erlang is a general-purpose programming language and runtime @@ -404,11 +407,11 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} # dependency checker Requires: lksctp-tools # See erts/emulator/beam/erl_driver.h or call erlang:system_info(driver_version). -Provides: erlang(erl_drv_version) = 3.1 #Provides: erlang(erl_drv_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(driver_version)).' -s erlang halt) +Provides: erlang(erl_drv_version) = 3.1 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). -Provides: erlang(erl_nif_version) = 2.7 #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) +Provides: erlang(erl_nif_version) = 2.7 # These sub-packages were removed once Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder @@ -786,7 +789,12 @@ Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-webtool%{?_isa} = %{version}-%{release} +# This is a weak dependency triggered by the "cover_web" application. +# Unfortunately Recommends/Suggests tags are supported only in Fedora 21+ and +# RHEL 8+ (eventually) +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 +Suggests: %{name}-webtool%{?_isa} = %{version}-%{release} +%endif Provides: emacs-common-erlang = %{version}-%{release} %description tools @@ -891,6 +899,7 @@ Erlang mode for XEmacs (source lisp files). %patch7 -p1 -b .Added_systemd_notify_support_to_EPMD %patch8 -p1 -b .Install_internal_hrl_files_when_necessary %patch9 -p1 -b .Expose_NIF_version +%patch10 -p1 -b .Split_off_webtool_dependency_from_tools # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1310,7 +1319,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %files erl_docgen %{_libdir}/erlang/lib/erl_docgen-*/ +%if %{with doc} %{_libdir}/erlang/man/man6/erl_docgen.* +%endif %files erl_interface %{_libdir}/erlang/lib/erl_interface-*/ @@ -2209,6 +2220,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sat Nov 08 2014 Peter Lemenkov - 17.3.4-1 +- Ver. 17.3.4 (API/ABI compatible release) +- Relax an erlang-tools dependency on erlang-webtool down to Suggests + * Sun Nov 02 2014 Peter Lemenkov - 17.3.3-1 - Ver. 17.3.3 diff --git a/otp-0010-Split-off-webtool-dependency-from-tools.patch b/otp-0010-Split-off-webtool-dependency-from-tools.patch new file mode 100644 index 0000000..85f3f3b --- /dev/null +++ b/otp-0010-Split-off-webtool-dependency-from-tools.patch @@ -0,0 +1,40 @@ +From: Peter Lemenkov +Date: Sat, 8 Nov 2014 22:54:57 +0300 +Subject: [PATCH] Split off webtool dependency from tools + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl +index 69f2f3b..397826a 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. + + + diff --git a/sources b/sources index 8aeebf7..6327b7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18422a0498b882fe043591cf29577d36 otp-OTP-17.3.3.tar.gz +81aa75b5613b7db6f3761f848695e816 otp-OTP-17.3.4.tar.gz From bfc8082501ced0c576f56bb03efa3ade9ddf2534 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 9 Nov 2014 13:11:39 +0300 Subject: [PATCH 054/340] Typo fix Signed-off-by: Peter Lemenkov --- otp-0010-Split-off-webtool-dependency-from-tools.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/otp-0010-Split-off-webtool-dependency-from-tools.patch b/otp-0010-Split-off-webtool-dependency-from-tools.patch index 85f3f3b..f2de8ac 100644 --- a/otp-0010-Split-off-webtool-dependency-from-tools.patch +++ b/otp-0010-Split-off-webtool-dependency-from-tools.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Split off webtool dependency from tools Signed-off-by: Peter Lemenkov diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl -index 69f2f3b..397826a 100644 +index 69f2f3b..9085300 100644 --- a/lib/tools/src/cover_web.erl +++ b/lib/tools/src/cover_web.erl @@ -50,14 +50,25 @@ @@ -29,8 +29,8 @@ index 69f2f3b..397826a 100644 - webtool:stop(). + try + % Disable automatic dependency picking up -+ erlang:apply(webtool, stop_tools, [[],"app=webcover"]) -+ erlang:apply(webtool, stop, []), ++ 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, From 0156fcd2ad6037da945ddc153996945c48966fca Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 1 Dec 2014 16:00:04 +0300 Subject: [PATCH 055/340] Backport useful os:getenv/2 from master See this GitHub pull request for further details: * https://github.com/erlang/otp/pull/535 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +++- otp-0011-Introduce-os-getenv-2.patch | 63 ++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 otp-0011-Introduce-os-getenv-2.patch diff --git a/erlang.spec b/erlang.spec index c1223da..eff8714 100644 --- a/erlang.spec +++ b/erlang.spec @@ -10,7 +10,7 @@ Name: erlang Version: 17.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -71,6 +71,9 @@ Patch9: otp-0009-Expose-NIF-version.patch # Fedora specific patch # Split off webtool dependency from tools Patch10: otp-0010-Split-off-webtool-dependency-from-tools.patch +# Fedora specific patch +# Introduce os:getenv/2 +Patch11: otp-0011-Introduce-os-getenv-2.patch # end of autogenerated patch tag list BuildRequires: lksctp-tools-devel @@ -900,6 +903,7 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .Install_internal_hrl_files_when_necessary %patch9 -p1 -b .Expose_NIF_version %patch10 -p1 -b .Split_off_webtool_dependency_from_tools +%patch11 -p1 -b .Introduce_os_getenv_2 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2220,6 +2224,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Dec 01 2014 Peter Lemenkov - 17.3.4-2 +- Backport useful os:getenv/2 from master (see https://github.com/erlang/otp/pull/535 ) + * Sat Nov 08 2014 Peter Lemenkov - 17.3.4-1 - Ver. 17.3.4 (API/ABI compatible release) - Relax an erlang-tools dependency on erlang-webtool down to Suggests diff --git a/otp-0011-Introduce-os-getenv-2.patch b/otp-0011-Introduce-os-getenv-2.patch new file mode 100644 index 0000000..6c48db2 --- /dev/null +++ b/otp-0011-Introduce-os-getenv-2.patch @@ -0,0 +1,63 @@ +From: Peter Lemenkov +Date: Sat, 8 Nov 2014 15:11:04 +0300 +Subject: [PATCH] Introduce os:getenv/2 + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml +index 2b57e75..8b85f24 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 + + + ++ ++ Get the value of an environment variable ++ ++

Returns the Value of the environment variable ++ VarName, or DefaultValue if the environment variable ++ is undefined.

++

If Unicode file name encoding is in effect (see the erl manual ++ page), the strings (both VarName and ++ Value) may contain characters with codepoints > 255.

++ ++ ++ + + Return the process identifier of the emulator process + +diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl +index 187fd00..8aaf13b 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(). + From 918fdf26b715336be8386b8c865b32ac34d84535 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 1 Dec 2014 17:13:00 +0300 Subject: [PATCH 056/340] Disable SSLv3 See rhbz #1169375 for further details: https://bugzilla.redhat.com/1169375 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +- ...pport-for-SSLv3-protocol-because-it-.patch | 100 ++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch diff --git a/erlang.spec b/erlang.spec index eff8714..66fdfd8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -10,7 +10,7 @@ Name: erlang Version: 17.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -74,6 +74,9 @@ Patch10: otp-0010-Split-off-webtool-dependency-from-tools.patch # Fedora specific patch # Introduce os:getenv/2 Patch11: otp-0011-Introduce-os-getenv-2.patch +# Fedora specific patch +# Patch removes support for SSLv3 protocol because it is proved +Patch12: otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch # end of autogenerated patch tag list BuildRequires: lksctp-tools-devel @@ -904,6 +907,7 @@ Erlang mode for XEmacs (source lisp files). %patch9 -p1 -b .Expose_NIF_version %patch10 -p1 -b .Split_off_webtool_dependency_from_tools %patch11 -p1 -b .Introduce_os_getenv_2 +%patch12 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_ # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2224,6 +2228,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Dec 01 2014 Peter Lemenkov - 17.3.4-3 +- Disable SSLv3 (see rhbz #1169375) + * Mon Dec 01 2014 Peter Lemenkov - 17.3.4-2 - Backport useful os:getenv/2 from master (see https://github.com/erlang/otp/pull/535 ) diff --git a/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch b/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch new file mode 100644 index 0000000..584fa59 --- /dev/null +++ b/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch @@ -0,0 +1,100 @@ +From: Sergei Golovan +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 f14d0b8..3a768e9 100644 +--- a/lib/ssl/doc/src/ssl.xml ++++ b/lib/ssl/doc/src/ssl.xml +@@ -123,7 +123,7 @@ + +

sslsocket() - opaque to the user.

+ +-

protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'

++

protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2'

+ +

ciphers() = [ciphersuite()] | string() (according to old API)

+ +diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml +index 43cb393..ff12e04 100644 +--- a/lib/ssl/doc/src/ssl_app.xml ++++ b/lib/ssl/doc/src/ssl_app.xml +@@ -47,10 +47,10 @@ +

+

Note that the environment parameters can be set on the command line, + for instance,

+-

erl ... -ssl protocol_version '[sslv3, tlsv1]' .... ++

erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' .... +

+ +- ]]>. ++ ]]>. + +

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. +

++

For Debian GNU/Linux distribution the sslv3 protocol was ++ disabled due to its security issues. ++

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

- -+ nif_version -+ -+

Returns a string containing the erlang NIF version -+ used by the runtime system. It will be on the form "<major ver>.<minor ver>".

-+ - otp_release - -

Returns a string containing the OTP release number of the -diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c -index 6efe9d9..da38eea 100644 ---- 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" -@@ -2459,6 +2460,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/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl -index 336b618..081789f 100644 ---- a/erts/emulator/test/driver_SUITE.erl -+++ b/erts/emulator/test/driver_SUITE.erl -@@ -1199,8 +1199,8 @@ check_si_res(["sched_thrs", Value]) -> - ?line Value = integer_to_list(erlang:system_info(schedulers)); - - %% Data added in 3rd version of driver_system_info() (driver version 1.5) --check_si_res(["emu_nif_vsn", _Value]) -> -- true; -+check_si_res(["emu_nif_vsn", Value]) -> -+ ?line Value = erlang:system_info(nif_version); - - %% Data added in 4th version of driver_system_info() (driver version 3.1) - check_si_res(["dirty_sched", _Value]) -> -diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl -index 98d7a94..de6a773 100644 ---- a/erts/preloaded/src/erlang.erl -+++ b/erts/preloaded/src/erlang.erl -@@ -2251,6 +2251,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 f541d6e..04cc33e 100644 ---- a/lib/runtime_tools/src/system_information.erl -+++ b/lib/runtime_tools/src/system_information.erl -@@ -371,6 +371,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 1893837..bdc510e 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,[]}, diff --git a/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch b/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch similarity index 98% rename from otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch rename to otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch index 584fa59..fa55663 100644 --- a/otp-0012-Patch-removes-support-for-SSLv3-protocol-because-it-.patch +++ b/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch removes support for SSLv3 protocol because it is proved diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml -index f14d0b8..3a768e9 100644 +index b53344e..b245621 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -123,7 +123,7 @@ @@ -45,10 +45,10 @@ index 43cb393..ff12e04 100644 ]]> diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl -index 85724de..14013a4 100644 +index 75efb64..155fa81 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl -@@ -64,8 +64,8 @@ +@@ -67,8 +67,8 @@ -define(TRUE, 0). -define(FALSE, 1). diff --git a/sources b/sources index 6327b7c..b22e8a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81aa75b5613b7db6f3761f848695e816 otp-OTP-17.3.4.tar.gz +0d06e7d3802d63992535116e4d37c1a4 otp-OTP-17.4.tar.gz From e58f762146d3f46db7d10793befb73531bb42b33 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 13:29:58 +0200 Subject: [PATCH 058/340] Rebuilt for GCC 5 C++11 ABI change --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 6892e02..a8f71c0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -10,7 +10,7 @@ Name: erlang Version: 17.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2216,6 +2216,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sat May 02 2015 Kalev Lember - 17.4-2 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Dec 12 2014 Peter Lemenkov - 17.4-1 - Ver. 17.4 From 2238368d444f0b33ffb81f5a3524d0ffa045f999 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:34:38 +0000 Subject: [PATCH 059/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index a8f71c0..763da02 100644 --- a/erlang.spec +++ b/erlang.spec @@ -10,7 +10,7 @@ Name: erlang Version: 17.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2216,6 +2216,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 17.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 17.4-2 - Rebuilt for GCC 5 C++11 ABI change From 654b879bc09027e62ed7d66451d4da7af53adccb Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 5 Aug 2015 22:11:41 -0400 Subject: [PATCH 060/340] Add patch for CVE-2015-2774 - TLS-1.0 POODLE vulnerability (rhbz#1206712) --- erlang.spec | 10 +- ...ding-check-for-TLS-1.0-and-provide-b.patch | 576 ++++++++++++++++++ 2 files changed, 585 insertions(+), 1 deletion(-) create mode 100644 otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch diff --git a/erlang.spec b/erlang.spec index 763da02..6f7bac6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -10,7 +10,7 @@ Name: erlang Version: 17.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -70,6 +70,9 @@ Patch8: otp-0008-Introduce-os-getenv-2.patch Patch9: otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch # end of autogenerated patch tag list +# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-2774 +Patch10: otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch + BuildRequires: lksctp-tools-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -898,6 +901,8 @@ Erlang mode for XEmacs (source lisp files). %patch9 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_ # end of autogenerated prep patch list +%patch10 -p1 + # FIXME we should come up with a better solution # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] @@ -2216,6 +2221,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Aug 5 2015 John Eckersberg - 17.4-4 +- Add patch for CVE-2015-2774 - TLS-1.0 POODLE vulnerability (rhbz#1206712) + * Wed Jun 17 2015 Fedora Release Engineering - 17.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch b/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch new file mode 100644 index 0000000..04dd246 --- /dev/null +++ b/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch @@ -0,0 +1,576 @@ +diff -Naur otp-OTP-17.4.orig/lib/ssl/doc/src/ssl.xml otp-OTP-17.4/lib/ssl/doc/src/ssl.xml +--- otp-OTP-17.4.orig/lib/ssl/doc/src/ssl.xml 2015-08-05 16:52:39.988500514 -0400 ++++ otp-OTP-17.4/lib/ssl/doc/src/ssl.xml 2015-08-05 16:52:50.478441422 -0400 +@@ -4,7 +4,7 @@ + +

+ +- 19992014 ++ 19992015 + Ericsson AB. All Rights Reserved. + + +@@ -348,11 +348,23 @@ +

+ + ++ {padding_check, boolean()} ++ ++

This option only affects TLS-1.0 connections. ++ If set to false it disables the block cipher padding check ++ to be able to interoperate with legacy software. ++

++ ++

Using this option makes TLS vulnerable to ++ the Poodle attack

 ++ ++ ++ + +- ++ + +- +-
++ ++
+ SSL OPTION DESCRIPTIONS - CLIENT SIDE + +

Options described here are client specific or has a slightly different +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/dtls_record.erl otp-OTP-17.4/lib/ssl/src/dtls_record.erl +--- otp-OTP-17.4.orig/lib/ssl/src/dtls_record.erl 2015-08-05 16:52:39.989500508 -0400 ++++ otp-OTP-17.4/lib/ssl/src/dtls_record.erl 2015-08-05 16:52:50.478441422 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2013-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2013-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -146,7 +146,7 @@ + = ConnnectionStates0) -> + CompressAlg = SecParams#security_parameters.compression_algorithm, + {PlainFragment, Mac, ReadState1} = ssl_record:decipher(dtls_v1:corresponding_tls_version(Version), +- CipherFragment, ReadState0), ++ CipherFragment, ReadState0, true), + MacHash = calc_mac_hash(ReadState1, Type, Version, Epoch, Seq, PlainFragment), + case ssl_record:is_correct_mac(Mac, MacHash) of + true -> +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_cipher.erl otp-OTP-17.4/lib/ssl/src/ssl_cipher.erl +--- otp-OTP-17.4.orig/lib/ssl/src/ssl_cipher.erl 2015-08-05 16:52:39.989500508 -0400 ++++ otp-OTP-17.4/lib/ssl/src/ssl_cipher.erl 2015-08-05 16:52:50.479441417 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2007-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2007-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -33,8 +33,7 @@ + -include_lib("public_key/include/public_key.hrl"). + + -export([security_parameters/2, security_parameters/3, suite_definition/1, +- decipher/5, cipher/5, +- suite/1, suites/1, all_suites/1, ++ decipher/6, cipher/5, suite/1, suites/1, all_suites/1, + ec_keyed_suites/0, anonymous_suites/0, psk_suites/1, srp_suites/0, + openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1, + hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2]). +@@ -143,17 +142,18 @@ + {T, CS0#cipher_state{iv=NextIV}}. + + %%-------------------------------------------------------------------- +--spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), ssl_record:ssl_version()) -> ++-spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), ++ ssl_record:ssl_version(), boolean()) -> + {binary(), binary(), #cipher_state{}} | #alert{}. + %% + %% Description: Decrypts the data and the MAC using cipher described + %% by cipher_enum() and updating the cipher state. + %%------------------------------------------------------------------- +-decipher(?NULL, _HashSz, CipherState, Fragment, _) -> ++decipher(?NULL, _HashSz, CipherState, Fragment, _, _) -> + {Fragment, <<>>, CipherState}; +-decipher(?RC4, HashSz, CipherState, Fragment, _) -> ++decipher(?RC4, HashSz, CipherState, Fragment, _, _) -> + State0 = case CipherState#cipher_state.state of +- undefined -> crypto:stream_init(rc4, CipherState#cipher_state.key); ++ undefined -> crypto:stream_init(rc4, CipherState#cipher_state.key); + S -> S + end, + try crypto:stream_decrypt(State0, Fragment) of +@@ -171,23 +171,23 @@ + ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC) + end; + +-decipher(?DES, HashSz, CipherState, Fragment, Version) -> ++decipher(?DES, HashSz, CipherState, Fragment, Version, PaddingCheck) -> + block_decipher(fun(Key, IV, T) -> + crypto:block_decrypt(des_cbc, Key, IV, T) +- end, CipherState, HashSz, Fragment, Version); +-decipher(?'3DES', HashSz, CipherState, Fragment, Version) -> ++ end, CipherState, HashSz, Fragment, Version, PaddingCheck); ++decipher(?'3DES', HashSz, CipherState, Fragment, Version, PaddingCheck) -> + block_decipher(fun(<>, IV, T) -> + crypto:block_decrypt(des3_cbc, [K1, K2, K3], IV, T) +- end, CipherState, HashSz, Fragment, Version); +-decipher(?AES, HashSz, CipherState, Fragment, Version) -> ++ end, CipherState, HashSz, Fragment, Version, PaddingCheck); ++decipher(?AES, HashSz, CipherState, Fragment, Version, PaddingCheck) -> + block_decipher(fun(Key, IV, T) when byte_size(Key) =:= 16 -> + crypto:block_decrypt(aes_cbc128, Key, IV, T); + (Key, IV, T) when byte_size(Key) =:= 32 -> + crypto:block_decrypt(aes_cbc256, Key, IV, T) +- end, CipherState, HashSz, Fragment, Version). ++ end, CipherState, HashSz, Fragment, Version, PaddingCheck). + + block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0, +- HashSz, Fragment, Version) -> ++ HashSz, Fragment, Version, PaddingCheck) -> + try + Text = Fun(Key, IV, Fragment), + NextIV = next_iv(Fragment, IV), +@@ -195,7 +195,7 @@ + Content = GBC#generic_block_cipher.content, + Mac = GBC#generic_block_cipher.mac, + CipherState1 = CipherState0#cipher_state{iv=GBC#generic_block_cipher.next_iv}, +- case is_correct_padding(GBC, Version) of ++ case is_correct_padding(GBC, Version, PaddingCheck) of + true -> + {Content, Mac, CipherState1}; + false -> +@@ -1288,16 +1288,18 @@ + #generic_stream_cipher{content=Content, + mac=Mac}. + +-%% For interoperability reasons we do not check the padding content in +-%% SSL 3.0 and TLS 1.0 as it is not strictly required and breaks +-%% interopability with for instance Google. + is_correct_padding(#generic_block_cipher{padding_length = Len, +- padding = Padding}, {3, N}) +- when N == 0; N == 1 -> +- Len == byte_size(Padding); +-%% Padding must be check in TLS 1.1 and after ++ padding = Padding}, {3, 0}, _) -> ++ Len == byte_size(Padding); %% Only length check is done in SSL 3.0 spec ++%% For interoperability reasons it is possible to disable ++%% the padding check when using TLS 1.0, as it is not strictly required ++%% in the spec (only recommended), howerver this makes TLS 1.0 vunrable to the Poodle attack ++%% so by default this clause will not match ++is_correct_padding(GenBlockCipher, {3, 1}, false) -> ++ is_correct_padding(GenBlockCipher, {3, 0}, false); ++%% Padding must be checked in TLS 1.1 and after + is_correct_padding(#generic_block_cipher{padding_length = Len, +- padding = Padding}, _) -> ++ padding = Padding}, _, _) -> + Len == byte_size(Padding) andalso + list_to_binary(lists:duplicate(Len, Len)) == Padding. + +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl.erl otp-OTP-17.4/lib/ssl/src/ssl.erl +--- otp-OTP-17.4.orig/lib/ssl/src/ssl.erl 2015-08-05 16:52:39.989500508 -0400 ++++ otp-OTP-17.4/lib/ssl/src/ssl.erl 2015-08-05 16:52:50.479441417 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 1999-2014. All Rights Reserved. ++%% Copyright Ericsson AB 1999-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -656,7 +656,8 @@ + log_alert = handle_option(log_alert, Opts, true), + server_name_indication = handle_option(server_name_indication, Opts, undefined), + honor_cipher_order = handle_option(honor_cipher_order, Opts, false), +- protocol = proplists:get_value(protocol, Opts, tls) ++ protocol = proplists:get_value(protocol, Opts, tls), ++ padding_check = proplists:get_value(padding_check, Opts, true) + }, + + CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}), +@@ -669,7 +670,7 @@ + cb_info, renegotiate_at, secure_renegotiate, hibernate_after, + erl_dist, next_protocols_advertised, + client_preferred_next_protocols, log_alert, +- server_name_indication, honor_cipher_order], ++ server_name_indication, honor_cipher_order, padding_check], + + SockOpts = lists:foldl(fun(Key, PropList) -> + proplists:delete(Key, PropList) +@@ -847,6 +848,8 @@ + undefined; + validate_option(honor_cipher_order, Value) when is_boolean(Value) -> + Value; ++validate_option(padding_check, Value) when is_boolean(Value) -> ++ Value; + validate_option(Opt, Value) -> + throw({error, {options, {Opt, Value}}}). + +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_internal.hrl otp-OTP-17.4/lib/ssl/src/ssl_internal.hrl +--- otp-OTP-17.4.orig/lib/ssl/src/ssl_internal.hrl 2015-08-05 16:52:39.990500503 -0400 ++++ otp-OTP-17.4/lib/ssl/src/ssl_internal.hrl 2015-08-05 16:52:50.479441417 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2007-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2007-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -117,7 +117,8 @@ + server_name_indication = undefined, + %% Should the server prefer its own cipher order over the one provided by + %% the client? +- honor_cipher_order = false ++ honor_cipher_order = false, ++ padding_check = true + }). + + -record(socket_options, +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_record.erl otp-OTP-17.4/lib/ssl/src/ssl_record.erl +--- otp-OTP-17.4.orig/lib/ssl/src/ssl_record.erl 2015-08-05 16:52:39.989500508 -0400 ++++ otp-OTP-17.4/lib/ssl/src/ssl_record.erl 2015-08-05 16:52:50.479441417 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2013-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2013-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -48,7 +48,7 @@ + -export([compress/3, uncompress/3, compressions/0]). + + %% Payload encryption/decryption +--export([cipher/4, decipher/3, is_correct_mac/2]). ++-export([cipher/4, decipher/4, is_correct_mac/2]). + + -export_type([ssl_version/0, ssl_atom_version/0]). + +@@ -376,8 +376,9 @@ + {CipherFragment, CipherS1} = + ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version), + {CipherFragment, WriteState0#connection_state{cipher_state = CipherS1}}. ++ + %%-------------------------------------------------------------------- +--spec decipher(ssl_version(), binary(), #connection_state{}) -> {binary(), binary(), #connection_state{}} | #alert{}. ++-spec decipher(ssl_version(), binary(), #connection_state{}, boolean()) -> {binary(), binary(), #connection_state{}} | #alert{}. + %% + %% Description: Payload decryption + %%-------------------------------------------------------------------- +@@ -387,8 +388,8 @@ + BulkCipherAlgo, + hash_size = HashSz}, + cipher_state = CipherS0 +- } = ReadState) -> +- case ssl_cipher:decipher(BulkCipherAlgo, HashSz, CipherS0, CipherFragment, Version) of ++ } = ReadState, PaddingCheck) -> ++ case ssl_cipher:decipher(BulkCipherAlgo, HashSz, CipherS0, CipherFragment, Version, PaddingCheck) of + {PlainFragment, Mac, CipherS1} -> + CS1 = ReadState#connection_state{cipher_state = CipherS1}, + {PlainFragment, Mac, CS1}; +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/tls_connection.erl otp-OTP-17.4/lib/ssl/src/tls_connection.erl +--- otp-OTP-17.4.orig/lib/ssl/src/tls_connection.erl 2015-08-05 16:52:39.990500503 -0400 ++++ otp-OTP-17.4/lib/ssl/src/tls_connection.erl 2015-08-05 16:52:50.479441417 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2007-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2007-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -482,8 +482,9 @@ + next_record(#state{protocol_buffers = + #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]} + = Buffers, +- connection_states = ConnStates0} = State) -> +- case tls_record:decode_cipher_text(CT, ConnStates0) of ++ connection_states = ConnStates0, ++ ssl_options = #ssl_options{padding_check = Check}} = State) -> ++ case tls_record:decode_cipher_text(CT, ConnStates0, Check) of + {Plain, ConnStates} -> + {Plain, State#state{protocol_buffers = + Buffers#protocol_buffers{tls_cipher_texts = Rest}, +diff -Naur otp-OTP-17.4.orig/lib/ssl/src/tls_record.erl otp-OTP-17.4/lib/ssl/src/tls_record.erl +--- otp-OTP-17.4.orig/lib/ssl/src/tls_record.erl 2015-08-05 16:52:39.990500503 -0400 ++++ otp-OTP-17.4/lib/ssl/src/tls_record.erl 2015-08-05 16:52:50.480441411 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2007-2014. All Rights Reserved. ++%% Copyright Ericsson AB 2007-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -34,7 +34,7 @@ + -export([get_tls_records/2]). + + %% Decoding +--export([decode_cipher_text/2]). ++-export([decode_cipher_text/3]). + + %% Encoding + -export([encode_plain_text/4]). +@@ -142,19 +142,21 @@ + {CipherText, ConnectionStates#connection_states{current_write = WriteState#connection_state{sequence_number = Seq +1}}}. + + %%-------------------------------------------------------------------- +--spec decode_cipher_text(#ssl_tls{}, #connection_states{}) -> ++-spec decode_cipher_text(#ssl_tls{}, #connection_states{}, boolean()) -> + {#ssl_tls{}, #connection_states{}}| #alert{}. + %% + %% Description: Decode cipher text + %%-------------------------------------------------------------------- + decode_cipher_text(#ssl_tls{type = Type, version = Version, +- fragment = CipherFragment} = CipherText, ConnnectionStates0) -> +- ReadState0 = ConnnectionStates0#connection_states.current_read, +- #connection_state{compression_state = CompressionS0, +- sequence_number = Seq, +- security_parameters = SecParams} = ReadState0, +- CompressAlg = SecParams#security_parameters.compression_algorithm, +- case ssl_record:decipher(Version, CipherFragment, ReadState0) of ++ fragment = CipherFragment} = CipherText, ++ #connection_states{current_read = ++ #connection_state{ ++ compression_state = CompressionS0, ++ sequence_number = Seq, ++ security_parameters= ++ #security_parameters{compression_algorithm = CompressAlg} ++ } = ReadState0} = ConnnectionStates0, PaddingCheck) -> ++ case ssl_record:decipher(Version, CipherFragment, ReadState0, PaddingCheck) of + {PlainFragment, Mac, ReadState1} -> + MacHash = calc_mac_hash(Type, Version, PlainFragment, ReadState1), + case ssl_record:is_correct_mac(Mac, MacHash) of +diff -Naur otp-OTP-17.4.orig/lib/ssl/test/ssl_cipher_SUITE.erl otp-OTP-17.4/lib/ssl/test/ssl_cipher_SUITE.erl +--- otp-OTP-17.4.orig/lib/ssl/test/ssl_cipher_SUITE.erl 2015-08-05 16:52:39.990500503 -0400 ++++ otp-OTP-17.4/lib/ssl/test/ssl_cipher_SUITE.erl 2015-08-05 16:52:50.480441411 -0400 +@@ -1,7 +1,7 @@ + %% + %% %CopyrightBegin% + %% +-%% Copyright Ericsson AB 2008-2013. All Rights Reserved. ++%% Copyright Ericsson AB 2008-2015. All Rights Reserved. + %% + %% The contents of this file are subject to the Erlang Public License, + %% Version 1.1, (the "License"); you may not use this file except in +@@ -38,7 +38,7 @@ + suite() -> [{ct_hooks,[ts_install_cth]}]. + + all() -> +- [aes_decipher_good, aes_decipher_good_tls11, aes_decipher_fail, aes_decipher_fail_tls11]. ++ [aes_decipher_good, aes_decipher_fail, padding_test]. + + groups() -> + []. +@@ -73,93 +73,123 @@ + %% Test Cases -------------------------------------------------------- + %%-------------------------------------------------------------------- + aes_decipher_good() -> +- [{doc,"Decipher a known cryptotext."}]. ++ [{doc,"Decipher a known cryptotext using a correct key"}]. + + aes_decipher_good(Config) when is_list(Config) -> + HashSz = 32, +- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, +- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}, +- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, +- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, +- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, +- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, +- Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56, "HELLO\n">>, +- Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>, +- Version = {3,0}, +- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), +- Version1 = {3,1}, +- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), +- ok. +- +-%%-------------------------------------------------------------------- +- +-aes_decipher_good_tls11() -> +- [{doc,"Decipher a known TLS 1.1 cryptotext."}]. +- +-%% the fragment is actuall a TLS 1.1 record, with +-%% Version = TLS 1.1, we get the correct NextIV in #cipher_state +-aes_decipher_good_tls11(Config) when is_list(Config) -> +- HashSz = 32, +- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, +- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}, +- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, +- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, +- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, +- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, +- Content = <<"HELLO\n">>, +- NextIV = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>>, +- Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>, +- Version = {3,2}, +- {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), +- Version1 = {3,2}, +- {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), +- ok. ++ CipherState = correct_cipher_state(), ++ decipher_check_good(HashSz, CipherState, {3,0}), ++ decipher_check_good(HashSz, CipherState, {3,1}), ++ decipher_check_good(HashSz, CipherState, {3,2}), ++ decipher_check_good(HashSz, CipherState, {3,3}). + + %%-------------------------------------------------------------------- + + aes_decipher_fail() -> +- [{doc,"Decipher a known cryptotext."}]. ++ [{doc,"Decipher a known cryptotext using a incorrect key"}]. + +-%% same as above, last byte of key replaced + aes_decipher_fail(Config) when is_list(Config) -> + HashSz = 32, +- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, +- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}, +- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, +- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, +- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, +- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, +- Version = {3,0}, +- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), +- 32 = byte_size(Content), +- 32 = byte_size(Mac), +- Version1 = {3,1}, +- {Content1, Mac1, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), +- 32 = byte_size(Content1), +- 32 = byte_size(Mac1), +- ok. + +-%%-------------------------------------------------------------------- +- +-aes_decipher_fail_tls11() -> +- [{doc,"Decipher a known TLS 1.1 cryptotext."}]. +- +-%% same as above, last byte of key replaced +-%% stricter padding checks in TLS 1.1 mean we get an alert instead +-aes_decipher_fail_tls11(Config) when is_list(Config) -> +- HashSz = 32, +- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, +- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}, +- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, +- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, +- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, +- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, +- Version = {3,2}, +- #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = +- ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), +- Version1 = {3,3}, +- #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = +- ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), +- ok. +- +-%%-------------------------------------------------------------------- ++ CipherState = incorrect_cipher_state(), ++ decipher_check_fail(HashSz, CipherState, {3,0}), ++ decipher_check_fail(HashSz, CipherState, {3,1}), ++ decipher_check_fail(HashSz, CipherState, {3,2}), ++ decipher_check_fail(HashSz, CipherState, {3,3}). ++ ++%%-------------------------------------------------------------------- ++padding_test(Config) when is_list(Config) -> ++ HashSz = 16, ++ CipherState = correct_cipher_state(), ++ pad_test(HashSz, CipherState, {3,0}), ++ pad_test(HashSz, CipherState, {3,1}), ++ pad_test(HashSz, CipherState, {3,2}), ++ pad_test(HashSz, CipherState, {3,3}). ++ ++%%-------------------------------------------------------------------- ++% Internal functions -------------------------------------------------------- ++%%-------------------------------------------------------------------- ++decipher_check_good(HashSz, CipherState, Version) -> ++ {Content, NextIV, Mac} = content_nextiv_mac(Version), ++ {Content, Mac, #cipher_state{iv = NextIV}} = ++ ssl_cipher:decipher(?AES, HashSz, CipherState, aes_fragment(Version), Version, true). ++ ++decipher_check_fail(HashSz, CipherState, Version) -> ++ {Content, NextIV, Mac} = content_nextiv_mac(Version), ++ true = {Content, Mac, #cipher_state{iv = NextIV}} =/= ++ ssl_cipher:decipher(?AES, HashSz, CipherState, aes_fragment(Version), Version, true). ++ ++pad_test(HashSz, CipherState, {3,0} = Version) -> ++ %% 3.0 does not have padding test ++ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), ++ {Content, Mac, #cipher_state{iv = NextIV}} = ++ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,0}), {3,0}, true), ++ {Content, Mac, #cipher_state{iv = NextIV}} = ++ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,0}), {3,0}, false); ++pad_test(HashSz, CipherState, {3,1} = Version) -> ++ %% 3.1 should have padding test, but may be disabled ++ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), ++ BadCont = badpad_content(Content), ++ {Content, Mac, #cipher_state{iv = NextIV}} = ++ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,1}) , {3,1}, false), ++ {BadCont, Mac, #cipher_state{iv = NextIV}} = ++ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,1}), {3,1}, true); ++pad_test(HashSz, CipherState, Version) -> ++ %% 3.2 and 3.3 must have padding test ++ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), ++ BadCont = badpad_content(Content), ++ {BadCont, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, ++ badpad_aes_fragment(Version), Version, false), ++ {BadCont, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, ++ badpad_aes_fragment(Version), Version, true). ++ ++aes_fragment({3,N}) when N == 0; N == 1-> ++ <<197,9,6,109,242,87,80,154,85,250,110,81,119,95,65,185,53,206,216,153,246,169, ++ 119,177,178,238,248,174,253,220,242,81,33,0,177,251,91,44,247,53,183,198,165, ++ 63,20,194,159,107>>; ++ ++aes_fragment(_) -> ++ <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, ++ 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, ++ 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, ++ 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>. ++ ++badpad_aes_fragment({3,N}) when N == 0; N == 1 -> ++ <<186,139,125,10,118,21,26,248,120,108,193,104,87,118,145,79,225,55,228,10,105, ++ 30,190,37,1,88,139,243,210,99,65,41>>; ++badpad_aes_fragment(_) -> ++ <<137,31,14,77,228,80,76,103,183,125,55,250,68,190,123,131,117,23,229,180,207, ++ 94,121,137,117,157,109,99,113,61,190,138,131,229,201,120,142,179,172,48,77, ++ 234,19,240,33,38,91,93>>. ++ ++content_nextiv_mac({3,N}) when N == 0; N == 1 -> ++ {<<"HELLO\n">>, ++ <<33,0, 177,251, 91,44, 247,53, 183,198, 165,63, 20,194, 159,107>>, ++ <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>}; ++content_nextiv_mac(_) -> ++ {<<"HELLO\n">>, ++ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>>, ++ <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>}. ++ ++badpad_content_nextiv_mac({3,N}) when N == 0; N == 1 -> ++ {<<"HELLO\n">>, ++ <<225,55,228,10,105,30,190,37,1,88,139,243,210,99,65,41>>, ++ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>> ++ }; ++badpad_content_nextiv_mac(_) -> ++ {<<"HELLO\n">>, ++ <<133,211,45,189,179,229,56,86,11,178,239,159,14,160,253,140>>, ++ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>> ++ }. ++ ++badpad_content(Content) -> ++ %% BadContent will fail mac test ++ <<16#F0, Content/binary>>. ++ ++correct_cipher_state() -> ++ #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, ++ key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}. ++ ++incorrect_cipher_state() -> ++ #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, ++ key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}. From 564391e634bbbf4b21763c71485663bfb7a76e6b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 18 Aug 2015 10:58:05 -0400 Subject: [PATCH 061/340] Disable docs by default on ARM until I figure out why fop hangs --- erlang.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 6f7bac6..07d9996 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,7 +2,13 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} +%ifarch %{arm} +# For some reason, fop hangs on arm, so for now don't generate docs by +# default +%bcond_with doc +%else %bcond_without doc +%endif %ifarch %{arm} %{ix86} x86_64 ppc %{power64} %global __with_hipe 1 @@ -10,7 +16,7 @@ Name: erlang Version: 17.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2221,6 +2227,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Aug 18 2015 John Eckersberg - 17.4-5 +- Disable docs by default on ARM until I figure out why fop hangs + * Wed Aug 5 2015 John Eckersberg - 17.4-4 - Add patch for CVE-2015-2774 - TLS-1.0 POODLE vulnerability (rhbz#1206712) From 3e2c6d644c7a479b6703e7d56a08d56cfbd62ff3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 14 Jan 2016 14:15:02 +0300 Subject: [PATCH 062/340] Sort packages Signed-off-by: Peter Lemenkov --- erlang.spec | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/erlang.spec b/erlang.spec index 07d9996..02720c7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -170,6 +170,25 @@ environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication systems from Ericsson. +%package -n emacs-erlang +Summary: Compiled elisp files for erlang-mode under GNU Emacs +Requires: emacs-common-erlang = %{version}-%{release} +Requires: emacs(bin) >= %{_emacs_version} +Group: Applications/Editors +BuildArch: noarch + +%description -n emacs-erlang +Erlang mode for GNU Emacs. + +%package -n emacs-erlang-el +Summary: Elisp source files for erlang-mode under GNU Emacs +Requires: emacs-erlang = %{version}-%{release} +Group: Applications/Editors +BuildArch: noarch + +%description -n emacs-erlang-el +Erlang mode for GNU Emacs (source lisp files). + %package asn1 Summary: Provides support for Abstract Syntax Notation One Group: Development/Languages @@ -854,25 +873,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. -%package -n emacs-erlang -Summary: Compiled elisp files for erlang-mode under GNU Emacs -Requires: emacs-common-erlang = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} -Group: Applications/Editors -BuildArch: noarch - -%description -n emacs-erlang -Erlang mode for GNU Emacs. - -%package -n emacs-erlang-el -Summary: Elisp source files for erlang-mode under GNU Emacs -Requires: emacs-erlang = %{version}-%{release} -Group: Applications/Editors -BuildArch: noarch - -%description -n emacs-erlang-el -Erlang mode for GNU Emacs (source lisp files). - %package -n xemacs-erlang Summary: Compiled elisp files for erlang-mode under XEmacs Requires: emacs-common-erlang = %{version}-%{release} From 8448438f90b66be5e1c020083bd1ef53f13417e2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 14 Jan 2016 18:10:19 +0300 Subject: [PATCH 063/340] Ver. 18.2.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 387 ++++++------ ...n-pages-and-do-not-install-miscellan.patch | 8 +- otp-0002-Remove-rpath.patch | 8 +- otp-0003-Do-not-install-C-sources.patch | 36 +- otp-0004-Do-not-install-Java-sources.patch | 8 +- ...teventlog-and-related-doc-files-on-n.patch | 10 +- otp-0006-Do-not-install-erlang-sources.patch | 308 +++++----- ...it-off-webtool-dependency-from-tools.patch | 4 +- ...-to-crash-dump-on-large-distribution.patch | 31 + otp-0008-Introduce-os-getenv-2.patch | 63 -- ...pport-for-SSLv3-protocol-because-it-.patch | 100 --- ...ding-check-for-TLS-1.0-and-provide-b.patch | 576 ------------------ otp-make-subpackages.py | 150 +++++ sources | 2 +- 15 files changed, 560 insertions(+), 1132 deletions(-) create mode 100644 otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch delete mode 100644 otp-0008-Introduce-os-getenv-2.patch delete mode 100644 otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch delete mode 100644 otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch create mode 100644 otp-make-subpackages.py diff --git a/.gitignore b/.gitignore index 72cea5d..8477df3 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ otp_src_R14A.tar.gz /otp-OTP-17.3.3.tar.gz /otp-OTP-17.3.4.tar.gz /otp-OTP-17.4.tar.gz +/otp-OTP-18.2.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 02720c7..0ed6ce9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -15,12 +15,12 @@ %endif Name: erlang -Version: 17.4 -Release: 5%{?dist} +Version: 18.2.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages -License: ERPL +License: ASL 2.0 URL: http://www.erlang.org %if 0%{?el7}%{?fedora} VCS: scm:git:https://github.com/erlang/otp @@ -30,9 +30,10 @@ Source5: epmd.service Source6: epmd.socket Source7: epmd@.service Source8: epmd@.socket +# These files are intended for Fedora package maintainers only. +Source998: otp-make-subpackages.py Source999: otp-get-patches.sh - # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp # @@ -69,22 +70,11 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch # Split off webtool dependency from tools Patch7: otp-0007-Split-off-webtool-dependency-from-tools.patch # Fedora specific patch -# Introduce os:getenv/2 -Patch8: otp-0008-Introduce-os-getenv-2.patch -# Fedora specific patch -# Patch removes support for SSLv3 protocol because it is proved -Patch9: otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch +# Add patch to crash dump on large distribution +Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch # end of autogenerated patch tag list -# https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2015-2774 -Patch10: otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch - -BuildRequires: lksctp-tools-devel -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: zlib-devel BuildRequires: flex -BuildRequires: m4 %if %{with doc} # BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6, so we cannot regenerate docs here BuildRequires: fop @@ -96,11 +86,6 @@ BuildRequires: erlang %endif %endif -BuildRequires: emacs -BuildRequires: xemacs -BuildRequires: emacs-el -BuildRequires: xemacs-packages-extra-el - %if 0%{?el7}%{?fedora} # for BuildRequires: systemd-devel @@ -170,28 +155,32 @@ environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication systems from Ericsson. +### BEGIN OF AUTOGENERATED LIST ### + %package -n emacs-erlang -Summary: Compiled elisp files for erlang-mode under GNU Emacs -Requires: emacs-common-erlang = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} -Group: Applications/Editors -BuildArch: noarch +Summary: Compiled elisp files for erlang-mode under GNU Emacs +Group: Applications/Editors +BuildRequires: emacs +BuildRequires: emacs-el +Requires: emacs-common-erlang = %{version}-%{release} +Requires: emacs(bin) >= %{_emacs_version} +BuildArch: noarch %description -n emacs-erlang Erlang mode for GNU Emacs. %package -n emacs-erlang-el -Summary: Elisp source files for erlang-mode under GNU Emacs -Requires: emacs-erlang = %{version}-%{release} -Group: Applications/Editors -BuildArch: noarch +Summary: Elisp source files for erlang-mode under GNU Emacs +Group: Applications/Editors +Requires: emacs-erlang = %{version}-%{release} +BuildArch: noarch %description -n emacs-erlang-el Erlang mode for GNU Emacs (source lisp files). %package asn1 -Summary: Provides support for Abstract Syntax Notation One -Group: Development/Languages +Summary: Provides support for Abstract Syntax Notation One +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -200,14 +189,15 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Provides support for Abstract Syntax Notation One. %package common_test -Summary: A portable framework for automatic testing -Group: Development/Languages +Summary: A portable framework for automatic testing +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} @@ -215,15 +205,14 @@ Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-test_server%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} -Requires: %{name}-webtool%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description common_test A portable framework for automatic testing. %package compiler -Summary: A byte code compiler for Erlang which produces highly compact code -Group: Development/Languages +Summary: A byte code compiler for Erlang which produces highly compact code +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} @@ -234,8 +223,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A byte code compiler for Erlang which produces highly compact code. %package cosEvent -Summary: Orber OMG Event Service -Group: Development/Languages +Summary: Orber OMG Event Service +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} @@ -245,8 +234,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Event Service. %package cosEventDomain -Summary: Orber OMG Event Domain Service -Group: Development/Languages +Summary: Orber OMG Event Domain Service +Group: Development/Languages Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -257,8 +246,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Event Domain Service. %package cosFileTransfer -Summary: Orber OMG File Transfer Service -Group: Development/Languages +Summary: Orber OMG File Transfer Service +Group: Development/Languages Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -271,8 +260,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG File Transfer Service. %package cosNotification -Summary: Orber OMG Notification Service -Group: Development/Languages +Summary: Orber OMG Notification Service +Group: Development/Languages Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} Requires: %{name}-cosTime%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -284,8 +273,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Notification Service. %package cosProperty -Summary: Orber OMG Property Service -Group: Development/Languages +Summary: Orber OMG Property Service +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -296,8 +285,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Property Service. %package cosTime -Summary: Orber OMG Timer and TimerEvent Service -Group: Development/Languages +Summary: Orber OMG Timer and TimerEvent Service +Group: Development/Languages Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -308,8 +297,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Timer and TimerEvent Service. %package cosTransactions -Summary: Orber OMG Transaction Service -Group: Development/Languages +Summary: Orber OMG Transaction Service +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} @@ -319,8 +308,9 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Orber OMG Transaction Service. %package crypto -Summary: Cryptographical support -Group: Development/Languages +Summary: Cryptographical support +Group: Development/Languages +BuildRequires: openssl-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -329,8 +319,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Cryptographical support. %package debugger -Summary: A debugger for debugging and testing of Erlang programs -Group: Development/Languages +Summary: A debugger for debugging and testing of Erlang programs +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -341,8 +331,8 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} A debugger for debugging and testing of Erlang programs. %package dialyzer -Summary: A DIscrepancy AnaLYZer for ERlang programs -Group: Development/Languages +Summary: A DIscrepancy AnaLYZer for ERlang programs +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} @@ -356,9 +346,9 @@ Requires: graphviz A DIscrepancy AnaLYZer for ERlang programs. %package diameter -Summary: Diameter (RFC 3588) library -Group: Development/Languages -BuildRequires: ed +Summary: Diameter (RFC 3588) library +Group: Development/Languages +BuildRequires: ed Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} @@ -371,17 +361,17 @@ Diameter (RFC 3588) library %if %{with doc} %package doc -Summary: Erlang documentation -Group: Development/Languages -BuildArch: noarch +Summary: Erlang documentation +Group: Development/Languages +BuildArch: noarch %description doc Documentation for Erlang. %endif %package edoc -Summary: A utility used to generate documentation out of tags in source files -Group: Development/Languages +Summary: A utility used to generate documentation out of tags in source files +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -393,8 +383,8 @@ Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} A utility used to generate documentation out of tags in source files. %package eldap -Summary: Erlang LDAP library -Group: Development/Languages +Summary: Erlang LDAP library +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -405,8 +395,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Erlang LDAP library. %package erl_docgen -Summary: A utility used to generate erlang HTML documentation -Group: Development/Languages +Summary: A utility used to generate erlang HTML documentation +Group: Development/Languages Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -416,28 +406,29 @@ Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} A utility used to generate erlang HTML documentation. %package erl_interface -Summary: Low level interface to C -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Summary: Low level interface to C +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description erl_interface Low level interface to C. %package erts -Summary: Functionality necessary to run the Erlang System itself -Group: Development/Languages +Summary: Functionality necessary to run the Erlang System itself +Group: Development/Languages +BuildRequires: lksctp-tools-devel +BuildRequires: m4 +BuildRequires: ncurses-devel +BuildRequires: zlib-devel Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -# This library is dlopened so it can't be picked up automatically by the RPM -# dependency checker Requires: lksctp-tools # See erts/emulator/beam/erl_driver.h or call erlang:system_info(driver_version). #Provides: erlang(erl_drv_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(driver_version)).' -s erlang halt) -Provides: erlang(erl_drv_version) = 3.1 +Provides: erlang(erl_drv_version) = 3.2 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.7 -# These sub-packages were removed once +Provides: erlang(erl_nif_version) = 2.9 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-inviso @@ -449,8 +440,8 @@ Obsoletes: erlang-tv Functionality necessary to run the Erlang System itself. %package et -Summary: An event tracer for Erlang programs -Group: Development/Languages +Summary: An event tracer for Erlang programs +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} @@ -461,8 +452,8 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} An event tracer for Erlang programs. %package eunit -Summary: Support for unit testing -Group: Development/Languages +Summary: Support for unit testing +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -471,29 +462,35 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Support for unit testing. %package examples -Summary: Examples for some Erlang modules -Group: Development/Languages -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Examples for some Erlang modules +Group: Development/Languages +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-gs%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-public_key%{?_isa} = %{version}-%{release} +Requires: %{name}-sasl%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description examples Examples for some Erlang modules. %package gs -Summary: A library for Tcl/Tk support in Erlang -Group: Development/Languages +Summary: A library for Tcl/Tk support in Erlang +Group: Development/Languages +BuildRequires: tcl-devel +BuildRequires: tk-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -BuildRequires: tcl-devel -BuildRequires: tk-devel -Requires: tk +Requires: tk %description gs A Graphics System used to write platform independent user interfaces. %package hipe -Summary: High Performance Erlang -Group: Development/Languages +Summary: High Performance Erlang +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -504,8 +501,9 @@ Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} High Performance Erlang. %package ic -Summary: IDL compiler -Group: Development/Languages +Summary: IDL compiler +Group: Development/Languages +BuildRequires: java-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -514,42 +512,30 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} IDL compiler. %package inets -Summary: A set of services such as a Web server and a ftp client etc -Group: Development/Languages +Summary: A set of services such as a Web server and a ftp client etc +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -# FIXME see erlang-jinterface also -#Requires: jpackage-utils %description inets A set of services such as a Web server and a ftp client etc. %package jinterface -Summary: A library for accessing Java from Erlang -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -# FIXME see erlang-ic also -#Requires: jpackage-utils -%if 0%{?el7}%{?fedora} -BuildRequires: java-devel -%else -%ifarch %{ix86} x86_64 -BuildRequires: java-devel -%else -BuildRequires: java-devel-gcj -%endif -%endif +Summary: A library for accessing Java from Erlang +Group: Development/Languages +BuildRequires: java-devel +Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description jinterface Low level interface to Java. %package kernel -Summary: Main erlang library -Group: Development/Languages +Summary: Main erlang library +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -557,8 +543,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Main erlang library. %package megaco -Summary: Megaco/H.248 support library -Group: Development/Languages +Summary: Megaco/H.248 support library +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -573,8 +559,8 @@ decomposed multimedia gateway, enabling separation of call control from media conversion. %package mnesia -Summary: A heavy duty real-time distributed database -Group: Development/Languages +Summary: A heavy duty real-time distributed database +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -583,8 +569,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A heavy duty real-time distributed database. %package observer -Summary: A set of tools for tracing and investigation of distributed systems -Group: Development/Languages +Summary: A set of tools for tracing and investigation of distributed systems +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -597,20 +583,20 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} A set of tools for tracing and investigation of distributed systems. %package odbc -Summary: A library for unixODBC support in Erlang -Group: Development/Languages +Summary: A library for unixODBC support in Erlang +Group: Development/Languages +BuildRequires: unixODBC-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -BuildRequires: unixODBC-devel %description odbc An interface to relational SQL-databases built on ODBC (Open Database Connectivity). %package orber -Summary: A CORBA Object Request Broker -Group: Development/Languages +Summary: A CORBA Object Request Broker +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -622,8 +608,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A CORBA Object Request Broker. %package os_mon -Summary: A monitor which allows inspection of the underlying operating system -Group: Development/Languages +Summary: A monitor which allows inspection of the underlying operating system +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -636,8 +622,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A monitor which allows inspection of the underlying operating system. %package ose -Summary: A module for interacting with Enea OSE -Group: Development/Languages +Summary: A module for interacting with Enea OSE +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -645,8 +631,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A module for interacting with Enea OSE. %package otp_mibs -Summary: SNMP management information base for Erlang/OTP nodes -Group: Development/Languages +Summary: SNMP management information base for Erlang/OTP nodes +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -657,8 +643,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} SNMP management information base for Erlang/OTP nodes. %package parsetools -Summary: A set of parsing and lexical analysis tools -Group: Development/Languages +Summary: A set of parsing and lexical analysis tools +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -667,8 +653,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A set of parsing and lexical analysis tools. %package percept -Summary: A concurrency profiler tool -Group: Development/Languages +Summary: A concurrency profiler tool +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -679,8 +665,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A concurrency profiler tool. %package public_key -Summary: API to public key infrastructure -Group: Development/Languages +Summary: API to public key infrastructure +Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -691,8 +677,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} API to public key infrastructure. %package reltool -Summary: A release management tool -Group: Development/Languages +Summary: A release management tool +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} @@ -709,8 +695,8 @@ target system. The backend provides a batch interface for generation of customized target systems. %package runtime_tools -Summary: A set of tools to include in a production system -Group: Development/Languages +Summary: A set of tools to include in a production system +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -720,8 +706,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A set of tools to include in a production system. %package sasl -Summary: The System Architecture Support Libraries -Group: Development/Languages +Summary: The System Architecture Support Libraries +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -732,8 +718,8 @@ The System Architecture Support Libraries is a set of tools for release upgrades and alarm handling etc. %package snmp -Summary: Simple Network Management Protocol (SNMP) support -Group: Development/Languages +Summary: Simple Network Management Protocol (SNMP) support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -746,8 +732,8 @@ Simple Network Management Protocol (SNMP) support including a MIB compiler and tools for creating SNMP agents. %package ssh -Summary: Secure Shell application with sftp and ssh support -Group: Development/Languages +Summary: Secure Shell application with sftp and ssh support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -758,10 +744,11 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Secure Shell application with sftp and ssh support. %package ssl -Summary: Secure Socket Layer support -Group: Development/Languages +Summary: Secure Socket Layer support +Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -770,8 +757,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Secure Socket Layer support. %package stdlib -Summary: The Erlang standard libraries -Group: Development/Languages +Summary: The Erlang standard libraries +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -781,8 +768,9 @@ Requires: %{name}-kernel%{?_isa} = %{version}-%{release} The Erlang standard libraries. %package syntax_tools -Summary: A set of tools for dealing with erlang sources -Group: Development/Languages +Summary: A set of tools for dealing with erlang sources +Group: Development/Languages +Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -792,22 +780,23 @@ A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. %package test_server -Summary: The OTP Test Server -Group: Development/Languages +Summary: The OTP Test Server +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %description test_server The OTP Test Server. %package tools -Summary: A set of programming tools including a coverage analyzer etc -Group: Development/Languages +Summary: A set of programming tools including a coverage analyzer etc +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -820,14 +809,14 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: %{name}-webtool%{?_isa} = %{version}-%{release} %endif -Provides: emacs-common-erlang = %{version}-%{release} +Provides: emacs-common-erlang = %{version}-%{release} %description tools A set of programming tools including a coverage analyzer etc. %package typer -Summary: TYPe annotator for ERlang programs -Group: Development/Languages +Summary: TYPe annotator for ERlang programs +Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -839,8 +828,8 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} TYPe annotator for ERlang programs. %package webtool -Summary: A tool that simplifying the use of web based Erlang tools -Group: Development/Languages +Summary: A tool that simplifying the use of web based Erlang tools +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -851,21 +840,21 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A tool that simplifying the use of web based Erlang tools. %package wx -Summary: A library for wxWidgets support in Erlang -Group: Development/Languages +Summary: A library for wxWidgets support in Erlang +Group: Development/Languages +BuildRequires: wxGTK-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: mesa-libGL -Requires: mesa-libGLU -BuildRequires: wxGTK-devel +Requires: mesa-libGL +Requires: mesa-libGLU %description wx A Graphics System used to write platform independent user interfaces. %package xmerl -Summary: Provides support for XML 1.0 -Group: Development/Languages +Summary: Provides support for XML 1.0 +Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -874,24 +863,28 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Provides support for XML 1.0. %package -n xemacs-erlang -Summary: Compiled elisp files for erlang-mode under XEmacs -Requires: emacs-common-erlang = %{version}-%{release} -Group: Applications/Editors -BuildArch: noarch -Requires: xemacs(bin) >= %{_xemacs_version} +Summary: Compiled elisp files for erlang-mode under XEmacs +Group: Applications/Editors +BuildRequires: xemacs +BuildRequires: xemacs-packages-extra-el +Requires: emacs-common-erlang = %{version}-%{release} +Requires: xemacs(bin) >= %{_xemacs_version} +BuildArch: noarch %description -n xemacs-erlang Erlang mode for XEmacs. %package -n xemacs-erlang-el -Summary: Elisp source files for erlang-mode under XEmacs -Requires: xemacs-erlang = %{version}-%{release} -Group: Applications/Editors -BuildArch: noarch +Summary: Elisp source files for erlang-mode under XEmacs +Group: Applications/Editors +Requires: xemacs-erlang = %{version}-%{release} +BuildArch: noarch %description -n xemacs-erlang-el Erlang mode for XEmacs (source lisp files). +### END OF AUTOGENERATED LIST ### + %prep %setup -q -n otp-OTP-%{version} @@ -903,12 +896,9 @@ Erlang mode for XEmacs (source lisp files). %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Split_off_webtool_dependency_from_tools -%patch8 -p1 -b .Introduce_os_getenv_2 -%patch9 -p1 -b .Patch_removes_support_for_SSLv3_protocol_because_it_ +%patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution # end of autogenerated prep patch list -%patch10 -p1 - # FIXME we should come up with a better solution # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] @@ -1021,7 +1011,7 @@ for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$ cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done popd -cp -av AUTHORS EPLICENCE README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -1098,7 +1088,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %dir %{_docdir}/%{name}-%{version}/ %doc %{_docdir}/%{name}-%{version}/AUTHORS %doc %{_docdir}/%{name}-%{version}/COPYRIGHT -%doc %{_docdir}/%{name}-%{version}/EPLICENCE +%doc %{_docdir}/%{name}-%{version}/LICENSE.txt %doc %{_docdir}/%{name}-%{version}/PR.template %doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/README.md @@ -1458,11 +1448,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %files examples %{_libdir}/erlang/lib/asn1-*/examples/ -#%{_libdir}/erlang/lib/cosFileTransfer-*/examples/ -#%{_libdir}/erlang/lib/cosNotification-*/examples/ -#%{_libdir}/erlang/lib/cosProperty-*/examples/ -#%{_libdir}/erlang/lib/cosTime-*/examples/ -#%{_libdir}/erlang/lib/cosTransactions-*/examples/ %{_libdir}/erlang/lib/diameter-*/examples/ %{_libdir}/erlang/lib/et-*/examples/ %{_libdir}/erlang/lib/eunit-*/examples/ @@ -1478,7 +1463,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/runtime_tools-*/examples/ %{_libdir}/erlang/lib/sasl-*/examples/ %{_libdir}/erlang/lib/snmp-*/examples/ -#%{_libdir}/erlang/lib/ssh-*/examples/ %{_libdir}/erlang/lib/ssl-*/examples/ %{_libdir}/erlang/lib/stdlib-*/examples/ %{_libdir}/erlang/lib/syntax_tools-*/examples/ @@ -1524,7 +1508,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/http_uri.* %{_libdir}/erlang/man/man3/httpc.* %{_libdir}/erlang/man/man3/httpd.* -%{_libdir}/erlang/man/man3/httpd_conf.* +%{_libdir}/erlang/man/man3/httpd_custom_api.* %{_libdir}/erlang/man/man3/httpd_socket.* %{_libdir}/erlang/man/man3/httpd_util.* %{_libdir}/erlang/man/man3/inets.* @@ -1605,7 +1589,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %files mnesia %dir %{_libdir}/erlang/lib/mnesia-*/ %{_libdir}/erlang/lib/mnesia-*/ebin -#%{_libdir}/erlang/lib/mnesia-*/include %{_libdir}/erlang/lib/mnesia-*/src %if %{with doc} %{_libdir}/erlang/man/man3/mnesia.* @@ -1831,6 +1814,8 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/ssl-*/src %if %{with doc} %{_libdir}/erlang/man/man3/ssl.* +%{_libdir}/erlang/man/man3/ssl_crl_cache.* +%{_libdir}/erlang/man/man3/ssl_crl_cache_api.* %{_libdir}/erlang/man/man3/ssl_session_cache_api.* %{_libdir}/erlang/man/man6/ssl.* %endif @@ -1852,6 +1837,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/digraph.* %{_libdir}/erlang/man/man3/digraph_utils.* %{_libdir}/erlang/man/man3/epp.* +%{_libdir}/erlang/man/man3/erl_anno.* %{_libdir}/erlang/man/man3/erl_eval.* %{_libdir}/erlang/man/man3/erl_expand_records.* %{_libdir}/erlang/man/man3/erl_id_trans.* @@ -1880,12 +1866,12 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/ms_transform.* %{_libdir}/erlang/man/man3/orddict.* %{_libdir}/erlang/man/man3/ordsets.* -%{_libdir}/erlang/man/man3/pg.* %{_libdir}/erlang/man/man3/pool.* %{_libdir}/erlang/man/man3/proc_lib.* %{_libdir}/erlang/man/man3/proplists.* %{_libdir}/erlang/man/man3/qlc.* %{_libdir}/erlang/man/man3/queue.* +%{_libdir}/erlang/man/man3/rand.* %{_libdir}/erlang/man/man3/random.* %{_libdir}/erlang/man/man3/re.* %{_libdir}/erlang/man/man3/sets.* @@ -1906,6 +1892,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %files syntax_tools %dir %{_libdir}/erlang/lib/syntax_tools-*/ %{_libdir}/erlang/lib/syntax_tools-*/ebin +%{_libdir}/erlang/lib/syntax_tools-*/include %if %{with doc} %{_libdir}/erlang/man/man3/epp_dodger.* %{_libdir}/erlang/man/man3/erl_comment_scan.* @@ -1915,6 +1902,8 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/erl_syntax_lib.* %{_libdir}/erlang/man/man3/erl_tidy.* %{_libdir}/erlang/man/man3/igor.* +%{_libdir}/erlang/man/man3/merl.* +%{_libdir}/erlang/man/man3/merl_transform.* %{_libdir}/erlang/man/man3/prettypr.* %endif @@ -1952,7 +1941,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/typer %dir %{_libdir}/erlang/lib/typer-*/ %{_libdir}/erlang/lib/typer-*/ebin/ -#%{_libdir}/erlang/lib/typer-*/src/ %files webtool %{_libdir}/erlang/lib/webtool-*/ @@ -1983,6 +1971,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxAuiNotebook.* %{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* %{_libdir}/erlang/man/man3/wxAuiPaneInfo.* +%{_libdir}/erlang/man/man3/wxAuiSimpleTabArt.* %{_libdir}/erlang/man/man3/wxAuiTabArt.* %{_libdir}/erlang/man/man3/wxBitmap.* %{_libdir}/erlang/man/man3/wxBitmapButton.* @@ -2019,6 +2008,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxDateEvent.* %{_libdir}/erlang/man/man3/wxDatePickerCtrl.* %{_libdir}/erlang/man/man3/wxDC.* +%{_libdir}/erlang/man/man3/wxDCOverlay.* %{_libdir}/erlang/man/man3/wxDialog.* %{_libdir}/erlang/man/man3/wxDirDialog.* %{_libdir}/erlang/man/man3/wxDirPickerCtrl.* @@ -2105,6 +2095,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxMiniFrame.* %{_libdir}/erlang/man/man3/wxMirrorDC.* %{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* +%{_libdir}/erlang/man/man3/wxMouseCaptureLostEvent.* %{_libdir}/erlang/man/man3/wxMouseEvent.* %{_libdir}/erlang/man/man3/wxMoveEvent.* %{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* @@ -2112,6 +2103,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxNotebook.* %{_libdir}/erlang/man/man3/wxNotebookEvent.* %{_libdir}/erlang/man/man3/wxNotifyEvent.* +%{_libdir}/erlang/man/man3/wxOverlay.* %{_libdir}/erlang/man/man3/wxPageSetupDialog.* %{_libdir}/erlang/man/man3/wxPageSetupDialogData.* %{_libdir}/erlang/man/man3/wxPaintDC.* @@ -2227,6 +2219,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Jan 11 2016 Peter Lemenkov - 18.2.2-1 +- Ver. 18.2.2 + * Tue Aug 18 2015 John Eckersberg - 17.4-5 - Disable docs by default on ARM until I figure out why fop hangs diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 6aeadc8..2602d40 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 0cf965f..94e82a8 100644 +index 8e55fa7..9512faa 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -550,10 +550,6 @@ endif +@@ -551,10 +551,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,10 +21,10 @@ index 0cf965f..94e82a8 100644 $(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 8eb1db7..9e340bb 100644 +index 6634ae3..fa18956 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src -@@ -140,14 +140,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . +@@ -141,14 +141,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 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 492734f..77418af 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 8c92b5b..5b36c19 100644 +index e66c0ca..574cdf5 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -89,7 +89,7 @@ endif +@@ -90,7 +90,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) @@ -18,10 +18,10 @@ index 8c92b5b..5b36c19 100644 EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile -index 0989f14..0d29444 100644 +index ff9d3e1..d3aba77 100644 --- a/lib/crypto/priv/Makefile +++ b/lib/crypto/priv/Makefile -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o +@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o # ---------------------------------------------------- $(SO_NIFLIB): $(OBJS) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index f89bcb7..d4abd19 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,10 +14,10 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index a7cd03f..6da4d75 100644 +index 2b72e1a..0522562 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -142,8 +142,6 @@ release_spec: opt +@@ -143,8 +143,6 @@ release_spec: opt ifneq ($(findstring ose,$(TARGET)),ose) $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib" endif @@ -27,10 +27,10 @@ index a7cd03f..6da4d75 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 5b36c19..470821e 100644 +index 574cdf5..428c316 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -199,14 +199,10 @@ docs: +@@ -200,14 +200,10 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -46,10 +46,10 @@ index 5b36c19..470821e 100644 endif endif diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 7c09b60..2c14f9e 100644 +index 777d709..57917ae 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -904,14 +904,14 @@ ifneq ($(EXE_TARGETS),) +@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -73,10 +73,10 @@ index 7c09b60..2c14f9e 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index ed860ab..96206ae 100644 +index b9f92a0..9612f24 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in -@@ -144,12 +144,10 @@ $(OBJDIR)/%.o: %.c +@@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -90,10 +90,10 @@ index ed860ab..96206ae 100644 $(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 6111cf2..bd62e8b 100644 +index 045b6d8..39be02a 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -270,7 +270,7 @@ release_spec: opt +@@ -271,7 +271,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,10 +103,10 @@ index 6111cf2..bd62e8b 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 6572d28..c7093ae 100644 +index 685eb5d..6c8a432 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in -@@ -128,11 +128,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -129,11 +129,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt ifdef EXE_TARGET @@ -119,10 +119,10 @@ index 6572d28..c7093ae 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index f84ccf7..05d194f 100644 +index e9fc5f4..ac9fb73 100644 --- a/lib/os_mon/c_src/Makefile.in +++ b/lib/os_mon/c_src/Makefile.in -@@ -125,8 +125,6 @@ $(OBJDIR)/memsup.o: memsup.h +@@ -126,8 +126,6 @@ $(OBJDIR)/memsup.o: memsup.h include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -132,10 +132,10 @@ index f84ccf7..05d194f 100644 $(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 d46b499..4309aae 100644 +index 448b8c6..860d504 100644 --- a/lib/runtime_tools/c_src/Makefile.in +++ b/lib/runtime_tools/c_src/Makefile.in -@@ -156,10 +156,8 @@ docs: +@@ -157,10 +157,8 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -147,10 +147,10 @@ index d46b499..4309aae 100644 endif diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index b1eb69f..1acfdbf 100644 +index 66bba22..eea37fc 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -197,8 +197,6 @@ include ../vsn.mk +@@ -198,8 +198,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 65323fa..d9ba9c4 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov 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 +index d9100cf..6886c71 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: +@@ -113,8 +113,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -18,10 +18,10 @@ index 273614e..5b1fb57 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index ea3ab77..e95757e 100644 +index 1c8364e..34b64a8 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -@@ -119,8 +119,6 @@ release release_docs release_tests release_html: +@@ -120,8 +120,6 @@ release release_docs release_tests release_html: $(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE) $@_spec release_spec: opt diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index cf8e970..b0c843e 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/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 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 08fd23e..5606cfc 100644 +index 0c5acd9..5f8f1e3 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile -@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) +@@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml @@ -29,10 +29,10 @@ index 08fd23e..5606cfc 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index cd2dade..4e78cf8 100644 +index 9aa068c..1003d24 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile -@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) +@@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) # ---------------------------------------------------- # Target Specs # ---------------------------------------------------- @@ -47,7 +47,7 @@ index cd2dade..4e78cf8 100644 INCLUDE=../include CSRC=../c_src -@@ -78,7 +83,11 @@ docs: +@@ -79,7 +84,11 @@ docs: # ---------------------------------------------------- $(APP_TARGET): $(APP_SRC) ../vsn.mk diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 9e0e3a9..933787e 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 4ea2d41..e1466c1 100644 +index 52034a0..56d91b9 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -85,8 +85,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -86,8 +86,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 @@ index 4ea2d41..e1466c1 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 6798da0..4e3ae0e 100644 +index 5b34017..d4677d6 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -154,7 +154,7 @@ release_spec: opt +@@ -155,7 +155,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 @@ index 6798da0..4e3ae0e 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 8d74546..a25d85d 100644 +index 987345c..f53546a 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -47,10 +47,10 @@ index 8d74546..a25d85d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index c6d09d8..46dcdf4 100644 +index 299b289..36a048b 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -165,8 +165,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -62,10 +62,10 @@ index c6d09d8..46dcdf4 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index 2864ee0..0e27bb6 100644 +index b79f0ec..30d1a1d 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile -@@ -202,7 +202,7 @@ release_spec: opt +@@ -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" @@ -75,10 +75,10 @@ index 2864ee0..0e27bb6 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index b4b74bd..420f566 100644 +index da8dcf0..88b3993 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile -@@ -171,7 +171,7 @@ release_spec: opt +@@ -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" @@ -88,10 +88,10 @@ index b4b74bd..420f566 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index 9d3abb9..c3d83a5 100644 +index f9107ff..74d337d 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile -@@ -179,9 +179,7 @@ release_spec: opt +@@ -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" @@ -103,10 +103,10 @@ index 9d3abb9..c3d83a5 100644 release_docs_spec: diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index 13153bd..0860700 100644 +index 72b063f..0fdb82e 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile -@@ -370,8 +370,7 @@ release_spec: opt +@@ -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" @@ -117,10 +117,10 @@ index 13153bd..0860700 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index d7b75d8..fba8746 100644 +index cd559e1..bdf035e 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile -@@ -179,8 +179,7 @@ release_spec: opt +@@ -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" @@ -131,10 +131,10 @@ index d7b75d8..fba8746 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index 0ab2b41..c29caeb 100644 +index 7a14db6..4b55398 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile -@@ -198,8 +198,7 @@ release_spec: opt +@@ -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" @@ -145,10 +145,10 @@ index 0ab2b41..c29caeb 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 7b4a9cf..290707c 100644 +index 90e1e51..05826e0 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile -@@ -173,7 +173,7 @@ release_spec: opt +@@ -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" @@ -158,10 +158,10 @@ index 7b4a9cf..290707c 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index c185c15..68bacba 100644 +index 6e4008e..c2d00fc 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile -@@ -81,8 +81,6 @@ docs: +@@ -82,8 +82,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -171,10 +171,10 @@ index c185c15..68bacba 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index d61519f..bfdb0c9 100644 +index f115f49..e7dc360 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -184,10 +184,10 @@ index d61519f..bfdb0c9 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 91fbdca..01fb30c 100644 +index 770af21..4f8a6d8 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -197,10 +197,10 @@ index 91fbdca..01fb30c 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 9afccf2..107d65b 100644 +index e0bbbdf..10771b2 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -250,11 +250,8 @@ release_spec: opt +@@ -251,11 +251,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -228,10 +228,10 @@ index 4e5a418..c0bb0c3 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index 2e1110e..b7f9b09 100644 +index cd3c102..b55c513 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile -@@ -98,10 +98,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -99,10 +99,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -243,10 +243,10 @@ index 2e1110e..b7f9b09 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index ef96f5d..d9a2f0d 100644 +index 7d41506..3f3562f 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile -@@ -89,8 +89,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -256,10 +256,10 @@ index ef96f5d..d9a2f0d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index 377e593..668e278 100644 +index 461a52d..1f2e885 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile -@@ -108,7 +108,6 @@ release_spec: opt +@@ -109,7 +109,6 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -268,7 +268,7 @@ index 377e593..668e278 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 47aef10..78ddc74 100644 +index 86a6d88..5732fd8 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -120,7 +120,6 @@ release_spec: opt @@ -280,10 +280,10 @@ index 47aef10..78ddc74 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index f0200ca..86d3f74 100644 +index ff3080e..60337dd 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile -@@ -108,8 +108,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -295,10 +295,10 @@ index f0200ca..86d3f74 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index d13dfb3..b09d62b 100644 +index 0938010..134ed7b 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/cerl" @@ -308,10 +308,10 @@ index d13dfb3..b09d62b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index 75e156b..5e394ca 100644 +index f0af6ac..16b512e 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/flow" @@ -321,10 +321,10 @@ index 75e156b..5e394ca 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index 87015aa..84f870d 100644 +index a82e28c..f364a53 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile -@@ -119,7 +119,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/icode" @@ -334,10 +334,10 @@ index 87015aa..84f870d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 92f3789..82f3e77 100644 +index f6f6f6b..4369923 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -103,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/llvm @@ -347,10 +347,10 @@ index 92f3789..82f3e77 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index 66e4c3e..2f11670 100644 +index d44be2d..ed81f10 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile -@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" $(INSTALL_DIR) "$(RELSYSDIR)/main" @@ -360,10 +360,10 @@ index 66e4c3e..2f11670 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index 16166f5..0ba5845 100644 +index be5c9bc..d40b322 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/misc" @@ -373,10 +373,10 @@ index 16166f5..0ba5845 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 751e876..98b7911 100644 +index 1bf52fe..5049bec 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile -@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/rtl" @@ -386,10 +386,10 @@ index 751e876..98b7911 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index a5ee232..f03e41d 100644 +index 4a78ad7..1b1ce05 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile -@@ -49,7 +49,6 @@ HIPE_MODULES = +@@ -50,7 +50,6 @@ HIPE_MODULES = endif MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES) @@ -397,7 +397,7 @@ index a5ee232..f03e41d 100644 ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -103,8 +102,6 @@ $(DOCS)/%.html:%.erl +@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -407,10 +407,10 @@ index a5ee232..f03e41d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index e8769d2..965d0e7 100644 +index a6da81a..60870be 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile -@@ -199,7 +199,7 @@ release_spec: opt +@@ -200,7 +200,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -420,10 +420,10 @@ index e8769d2..965d0e7 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile -index 2c3d2b6..de0450e 100644 +index f8daa2b..48e5d49 100644 --- a/lib/inets/src/ftp/Makefile +++ b/lib/inets/src/ftp/Makefile -@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/ftp" @@ -433,10 +433,10 @@ index 2c3d2b6..de0450e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index f0d4ce1..35c4ffc 100644 +index cb97b52..cb13dfb 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile -@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" @@ -446,10 +446,10 @@ index f0d4ce1..35c4ffc 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 51167b3..a623824 100644 +index 4a4eef9..c779c8e 100644 --- a/lib/inets/src/http_lib/Makefile +++ b/lib/inets/src/http_lib/Makefile -@@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" @@ -459,23 +459,23 @@ index 51167b3..a623824 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 2660d04..c873a27 100644 +index 1c05d45..88f9f62 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" - $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 22426ee..0b0cfb8 100644 +index 82cda6a..edfebd2 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -485,10 +485,10 @@ index 22426ee..0b0cfb8 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile -index b368b12..5eddaf0 100644 +index d5d94e1..5583064 100644 --- a/lib/inets/src/tftp/Makefile +++ b/lib/inets/src/tftp/Makefile -@@ -95,7 +95,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/tftp" @@ -498,10 +498,10 @@ index b368b12..5eddaf0 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index c7c70ad..3e1792f 100644 +index 57daceb..1cebd80 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -199,7 +199,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -510,10 +510,10 @@ index c7c70ad..3e1792f 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index d18da53..4a9f4d2 100644 +index 8f8e6ec..9e0bc82 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile -@@ -113,7 +113,7 @@ release_spec: opt +@@ -114,7 +114,7 @@ release_spec: opt $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/app" @@ -523,10 +523,10 @@ index d18da53..4a9f4d2 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index c1fd66b..0699ffa 100644 +index 711fbb7..1db4593 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile -@@ -175,7 +175,7 @@ release_spec: opt +@@ -176,7 +176,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" @@ -536,10 +536,10 @@ index c1fd66b..0699ffa 100644 release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 7cecef1..841a88a 100644 +index 208942c..d5b7218 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile -@@ -101,7 +101,7 @@ release_spec: opt +@@ -102,7 +102,7 @@ release_spec: opt $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" @@ -549,23 +549,22 @@ index 7cecef1..841a88a 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index bd62e8b..cce5a8d 100644 +index 39be02a..8c6ba31 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -267,8 +267,6 @@ release_spec: opt +@@ -268,7 +268,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" -- $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" - $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index 0c30aba..aa553ff 100644 +index 0c546a8..78f659a 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile -@@ -93,7 +93,7 @@ release_spec: opt +@@ -94,7 +94,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" @@ -575,10 +574,10 @@ index 0c30aba..aa553ff 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index cab4256..d5cf217 100644 +index f4fc56a..1cc73fd 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile -@@ -134,7 +134,7 @@ release_spec: opt +@@ -135,7 +135,7 @@ release_spec: opt $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/text" @@ -588,10 +587,10 @@ index cab4256..d5cf217 100644 release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 9486804..ea4830c 100644 +index 7288c20..aefd9f3 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile -@@ -93,7 +93,7 @@ release_spec: opt +@@ -94,7 +94,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" @@ -601,10 +600,10 @@ index 9486804..ea4830c 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index ac38fa0..20bce7e 100644 +index dae0df7..6294ae9 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -614,10 +613,10 @@ index ac38fa0..20bce7e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index c120865..6831d23 100644 +index 2d42510..7579014 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -152,7 +152,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -626,10 +625,10 @@ index c120865..6831d23 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index bfbda8a..6e4ad54 100644 +index 51c9ed3..50a4c10 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile -@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -639,10 +638,10 @@ index bfbda8a..6e4ad54 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 8140620..73df530 100644 +index 0eca8dd..18d9627 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile -@@ -144,8 +144,8 @@ release_spec: opt +@@ -145,8 +145,8 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming" @@ -654,10 +653,10 @@ index 8140620..73df530 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 398e481..f079e77 100644 +index 30b74c4..9c6708f 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile -@@ -252,7 +252,7 @@ release_spec: opt +@@ -253,7 +253,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -667,10 +666,10 @@ index 398e481..f079e77 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 4e78cf8..69d434c 100644 +index 1003d24..1b12154 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile -@@ -104,7 +104,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -679,10 +678,10 @@ index 4e78cf8..69d434c 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile -index 88f8957..ab08a88 100644 +index a89e939..224d944 100644 --- a/lib/ose/src/Makefile +++ b/lib/ose/src/Makefile -@@ -93,9 +93,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -94,9 +94,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -693,10 +692,10 @@ index 88f8957..ab08a88 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 6096240..cbc41e6 100644 +index 03892cd..c3ad326 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile -@@ -95,8 +95,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -706,10 +705,10 @@ index 6096240..cbc41e6 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index 2ee2285..ea075ed 100644 +index dbecdd2..1d45801 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile -@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -719,10 +718,10 @@ index 2ee2285..ea075ed 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index 0282d63..5902da3 100644 +index 9b963e0..deeb75c 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile -@@ -96,7 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -731,10 +730,10 @@ index 0282d63..5902da3 100644 # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index c1b3bc8..3d021cf 100644 +index 7474297..a510658 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile -@@ -95,8 +95,8 @@ release_spec: opt +@@ -96,8 +96,8 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/asn1" @@ -746,19 +745,10 @@ index c1b3bc8..3d021cf 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 09393e8..eb4c54d 100644 +index 786f244..0463c67 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -49,8 +49,6 @@ MODULES = \ - - HRL_FILES = $(INCLUDE)/public_key.hrl - --INTERNAL_HRL_FILES = -- - ERL_FILES = $(MODULES:%=%.erl) - - TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) -@@ -103,8 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -768,10 +758,10 @@ index 09393e8..eb4c54d 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index b8387ff..2012af9 100644 +index 1fea415..a756470 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile -@@ -99,7 +99,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -781,10 +771,10 @@ index b8387ff..2012af9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 8d2bcfe..d1a9cac 100644 +index 99b90f9..25b3ebb 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -96,8 +96,6 @@ docs: +@@ -97,8 +97,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -794,10 +784,10 @@ index 8d2bcfe..d1a9cac 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index ab2d3a3..bb53a67 100644 +index 7ff6a03..a304900 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -92,7 +92,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -806,10 +796,10 @@ index ab2d3a3..bb53a67 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index beed696..752072d 100644 +index 89037b3..01de885 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile -@@ -130,7 +130,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" @@ -819,10 +809,10 @@ index beed696..752072d 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index b8cc4b8..d806efb 100644 +index 7972d95..78a9f2b 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile -@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/app" @@ -832,10 +822,10 @@ index b8cc4b8..d806efb 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index f63fc18..9759451 100644 +index 54f2e22..488faa4 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -122,7 +122,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -845,10 +835,10 @@ index f63fc18..9759451 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index c76dbac..548823a 100644 +index 382f83b..db50c26 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile -@@ -113,7 +113,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" @@ -858,10 +848,10 @@ index c76dbac..548823a 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index 698c341..3344a0c 100644 +index c71ecf9..d17e699 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile -@@ -111,7 +111,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" @@ -871,7 +861,7 @@ index 698c341..3344a0c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 90d7110..e725c6c 100644 +index b44c8ee..8f8b58d 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -884,10 +874,10 @@ index 90d7110..e725c6c 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 0c00a65..acec405 100644 +index 790328d..db08822 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -897,10 +887,10 @@ index 0c00a65..acec405 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 9ab2cd4..876bfd2 100644 +index 9f4a446..50ac11e 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -203,7 +203,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -207,7 +207,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -909,23 +899,23 @@ index 9ab2cd4..876bfd2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index c9fbad8..2fc7f18 100644 +index 2e91adf..0085fca 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile -@@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" - - release_docs_spec: + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 35bbad3..deb7caf 100644 +index 6a26ee2..7336477 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile -@@ -123,7 +123,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -124,7 +124,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -934,10 +924,10 @@ index 35bbad3..deb7caf 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index e606b97..1beb8cc 100644 +index 9fcfb79..b30b173 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile -@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -107,7 +107,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -947,10 +937,10 @@ index e606b97..1beb8cc 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index a7059de..0b1ae2a 100644 +index 620ca21..9c9390e 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile -@@ -101,9 +101,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -961,10 +951,10 @@ index a7059de..0b1ae2a 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index af565c8..6c65b26 100644 +index a5a8eaf..be80ba7 100644 --- a/lib/webtool/src/Makefile +++ b/lib/webtool/src/Makefile -@@ -87,8 +87,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -88,8 +88,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -974,10 +964,10 @@ index af565c8..6c65b26 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 26574ed..266a5d6 100644 +index b345e34..153a270 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) +@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -990,10 +980,10 @@ index 26574ed..266a5d6 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index d5ce3fe..e21e4b1 100644 +index f8f0320..099513e 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile -@@ -217,9 +217,7 @@ release_spec: opt +@@ -218,9 +218,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Split-off-webtool-dependency-from-tools.patch b/otp-0007-Split-off-webtool-dependency-from-tools.patch index f2de8ac..9a06884 100644 --- a/otp-0007-Split-off-webtool-dependency-from-tools.patch +++ b/otp-0007-Split-off-webtool-dependency-from-tools.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Split off webtool dependency from tools Signed-off-by: Peter Lemenkov diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl -index 69f2f3b..9085300 100644 +index ae8b3f2..539ca96 100644 --- a/lib/tools/src/cover_web.erl +++ b/lib/tools/src/cover_web.erl -@@ -50,14 +50,25 @@ +@@ -51,14 +51,25 @@ %%%---------------------------------------------------------------------- %% Start webtool and webcover from erlang shell start() -> diff --git a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch new file mode 100644 index 0000000..9a60730 --- /dev/null +++ b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch @@ -0,0 +1,31 @@ +From: John Eckersberg +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 7be2b77..c3b6a7d 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) +- erl_exit(ERTS_ABORT_EXIT, ++ erl_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) +- erl_exit(ERTS_ABORT_EXIT, ++ erl_exit(ERTS_DUMP_EXIT, + "Absurdly large distribution output data buffer " + "(%beu bytes) passed.\n", + size); diff --git a/otp-0008-Introduce-os-getenv-2.patch b/otp-0008-Introduce-os-getenv-2.patch deleted file mode 100644 index 6c48db2..0000000 --- a/otp-0008-Introduce-os-getenv-2.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 8 Nov 2014 15:11:04 +0300 -Subject: [PATCH] Introduce os:getenv/2 - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml -index 2b57e75..8b85f24 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 - - - -+ -+ Get the value of an environment variable -+ -+

Returns the Value of the environment variable -+ VarName, or DefaultValue if the environment variable -+ is undefined.

-+

If Unicode file name encoding is in effect (see the erl manual -+ page), the strings (both VarName and -+ Value) may contain characters with codepoints > 255.

-+ -+ -+ - - Return the process identifier of the emulator process - -diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl -index 187fd00..8aaf13b 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(). - diff --git a/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch b/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch deleted file mode 100644 index fa55663..0000000 --- a/otp-0009-Patch-removes-support-for-SSLv3-protocol-because-it-.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Sergei Golovan -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 b53344e..b245621 100644 ---- a/lib/ssl/doc/src/ssl.xml -+++ b/lib/ssl/doc/src/ssl.xml -@@ -123,7 +123,7 @@ - -

sslsocket() - opaque to the user.

- --

protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'

-+

protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2'

- -

ciphers() = [ciphersuite()] | string() (according to old API)

- -diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml -index 43cb393..ff12e04 100644 ---- a/lib/ssl/doc/src/ssl_app.xml -+++ b/lib/ssl/doc/src/ssl_app.xml -@@ -47,10 +47,10 @@ -

-

Note that the environment parameters can be set on the command line, - for instance,

--

erl ... -ssl protocol_version '[sslv3, tlsv1]' .... -+

erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' .... -

- -- ]]>. -+ ]]>. - -

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. -

-+

For Debian GNU/Linux distribution the sslv3 protocol was -+ disabled due to its security issues. -+

- - - ]]> -diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl -index 75efb64..155fa81 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 6aab35d..1511abd 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 f50ea22..aa4fc8d 100644 ---- a/lib/ssl/src/tls_record.erl -+++ b/lib/ssl/src/tls_record.erl -@@ -276,14 +276,20 @@ supported_protocol_versions([_|_] = Vsns) -> - %%-------------------------------------------------------------------- - -spec is_acceptable_version(tls_version()) -> boolean(). - 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. - - -spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean(). - 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. diff --git a/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch b/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch deleted file mode 100644 index 04dd246..0000000 --- a/otp-0010-ssl-Reenable-padding-check-for-TLS-1.0-and-provide-b.patch +++ /dev/null @@ -1,576 +0,0 @@ -diff -Naur otp-OTP-17.4.orig/lib/ssl/doc/src/ssl.xml otp-OTP-17.4/lib/ssl/doc/src/ssl.xml ---- otp-OTP-17.4.orig/lib/ssl/doc/src/ssl.xml 2015-08-05 16:52:39.988500514 -0400 -+++ otp-OTP-17.4/lib/ssl/doc/src/ssl.xml 2015-08-05 16:52:50.478441422 -0400 -@@ -4,7 +4,7 @@ - -
- -- 19992014 -+ 19992015 - Ericsson AB. All Rights Reserved. - - -@@ -348,11 +348,23 @@ -

- - -+ {padding_check, boolean()} -+ -+

This option only affects TLS-1.0 connections. -+ If set to false it disables the block cipher padding check -+ to be able to interoperate with legacy software. -+

-+ -+

Using this option makes TLS vulnerable to -+ the Poodle attack

 -+ -+ -+ - -- -+ -
-- --
-+ -+
- SSL OPTION DESCRIPTIONS - CLIENT SIDE - -

Options described here are client specific or has a slightly different -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/dtls_record.erl otp-OTP-17.4/lib/ssl/src/dtls_record.erl ---- otp-OTP-17.4.orig/lib/ssl/src/dtls_record.erl 2015-08-05 16:52:39.989500508 -0400 -+++ otp-OTP-17.4/lib/ssl/src/dtls_record.erl 2015-08-05 16:52:50.478441422 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2013-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2013-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -146,7 +146,7 @@ - = ConnnectionStates0) -> - CompressAlg = SecParams#security_parameters.compression_algorithm, - {PlainFragment, Mac, ReadState1} = ssl_record:decipher(dtls_v1:corresponding_tls_version(Version), -- CipherFragment, ReadState0), -+ CipherFragment, ReadState0, true), - MacHash = calc_mac_hash(ReadState1, Type, Version, Epoch, Seq, PlainFragment), - case ssl_record:is_correct_mac(Mac, MacHash) of - true -> -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_cipher.erl otp-OTP-17.4/lib/ssl/src/ssl_cipher.erl ---- otp-OTP-17.4.orig/lib/ssl/src/ssl_cipher.erl 2015-08-05 16:52:39.989500508 -0400 -+++ otp-OTP-17.4/lib/ssl/src/ssl_cipher.erl 2015-08-05 16:52:50.479441417 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2007-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2007-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -33,8 +33,7 @@ - -include_lib("public_key/include/public_key.hrl"). - - -export([security_parameters/2, security_parameters/3, suite_definition/1, -- decipher/5, cipher/5, -- suite/1, suites/1, all_suites/1, -+ decipher/6, cipher/5, suite/1, suites/1, all_suites/1, - ec_keyed_suites/0, anonymous_suites/0, psk_suites/1, srp_suites/0, - openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1, - hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2]). -@@ -143,17 +142,18 @@ - {T, CS0#cipher_state{iv=NextIV}}. - - %%-------------------------------------------------------------------- ---spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), ssl_record:ssl_version()) -> -+-spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), -+ ssl_record:ssl_version(), boolean()) -> - {binary(), binary(), #cipher_state{}} | #alert{}. - %% - %% Description: Decrypts the data and the MAC using cipher described - %% by cipher_enum() and updating the cipher state. - %%------------------------------------------------------------------- --decipher(?NULL, _HashSz, CipherState, Fragment, _) -> -+decipher(?NULL, _HashSz, CipherState, Fragment, _, _) -> - {Fragment, <<>>, CipherState}; --decipher(?RC4, HashSz, CipherState, Fragment, _) -> -+decipher(?RC4, HashSz, CipherState, Fragment, _, _) -> - State0 = case CipherState#cipher_state.state of -- undefined -> crypto:stream_init(rc4, CipherState#cipher_state.key); -+ undefined -> crypto:stream_init(rc4, CipherState#cipher_state.key); - S -> S - end, - try crypto:stream_decrypt(State0, Fragment) of -@@ -171,23 +171,23 @@ - ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC) - end; - --decipher(?DES, HashSz, CipherState, Fragment, Version) -> -+decipher(?DES, HashSz, CipherState, Fragment, Version, PaddingCheck) -> - block_decipher(fun(Key, IV, T) -> - crypto:block_decrypt(des_cbc, Key, IV, T) -- end, CipherState, HashSz, Fragment, Version); --decipher(?'3DES', HashSz, CipherState, Fragment, Version) -> -+ end, CipherState, HashSz, Fragment, Version, PaddingCheck); -+decipher(?'3DES', HashSz, CipherState, Fragment, Version, PaddingCheck) -> - block_decipher(fun(<>, IV, T) -> - crypto:block_decrypt(des3_cbc, [K1, K2, K3], IV, T) -- end, CipherState, HashSz, Fragment, Version); --decipher(?AES, HashSz, CipherState, Fragment, Version) -> -+ end, CipherState, HashSz, Fragment, Version, PaddingCheck); -+decipher(?AES, HashSz, CipherState, Fragment, Version, PaddingCheck) -> - block_decipher(fun(Key, IV, T) when byte_size(Key) =:= 16 -> - crypto:block_decrypt(aes_cbc128, Key, IV, T); - (Key, IV, T) when byte_size(Key) =:= 32 -> - crypto:block_decrypt(aes_cbc256, Key, IV, T) -- end, CipherState, HashSz, Fragment, Version). -+ end, CipherState, HashSz, Fragment, Version, PaddingCheck). - - block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0, -- HashSz, Fragment, Version) -> -+ HashSz, Fragment, Version, PaddingCheck) -> - try - Text = Fun(Key, IV, Fragment), - NextIV = next_iv(Fragment, IV), -@@ -195,7 +195,7 @@ - Content = GBC#generic_block_cipher.content, - Mac = GBC#generic_block_cipher.mac, - CipherState1 = CipherState0#cipher_state{iv=GBC#generic_block_cipher.next_iv}, -- case is_correct_padding(GBC, Version) of -+ case is_correct_padding(GBC, Version, PaddingCheck) of - true -> - {Content, Mac, CipherState1}; - false -> -@@ -1288,16 +1288,18 @@ - #generic_stream_cipher{content=Content, - mac=Mac}. - --%% For interoperability reasons we do not check the padding content in --%% SSL 3.0 and TLS 1.0 as it is not strictly required and breaks --%% interopability with for instance Google. - is_correct_padding(#generic_block_cipher{padding_length = Len, -- padding = Padding}, {3, N}) -- when N == 0; N == 1 -> -- Len == byte_size(Padding); --%% Padding must be check in TLS 1.1 and after -+ padding = Padding}, {3, 0}, _) -> -+ Len == byte_size(Padding); %% Only length check is done in SSL 3.0 spec -+%% For interoperability reasons it is possible to disable -+%% the padding check when using TLS 1.0, as it is not strictly required -+%% in the spec (only recommended), howerver this makes TLS 1.0 vunrable to the Poodle attack -+%% so by default this clause will not match -+is_correct_padding(GenBlockCipher, {3, 1}, false) -> -+ is_correct_padding(GenBlockCipher, {3, 0}, false); -+%% Padding must be checked in TLS 1.1 and after - is_correct_padding(#generic_block_cipher{padding_length = Len, -- padding = Padding}, _) -> -+ padding = Padding}, _, _) -> - Len == byte_size(Padding) andalso - list_to_binary(lists:duplicate(Len, Len)) == Padding. - -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl.erl otp-OTP-17.4/lib/ssl/src/ssl.erl ---- otp-OTP-17.4.orig/lib/ssl/src/ssl.erl 2015-08-05 16:52:39.989500508 -0400 -+++ otp-OTP-17.4/lib/ssl/src/ssl.erl 2015-08-05 16:52:50.479441417 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 1999-2014. All Rights Reserved. -+%% Copyright Ericsson AB 1999-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -656,7 +656,8 @@ - log_alert = handle_option(log_alert, Opts, true), - server_name_indication = handle_option(server_name_indication, Opts, undefined), - honor_cipher_order = handle_option(honor_cipher_order, Opts, false), -- protocol = proplists:get_value(protocol, Opts, tls) -+ protocol = proplists:get_value(protocol, Opts, tls), -+ padding_check = proplists:get_value(padding_check, Opts, true) - }, - - CbInfo = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}), -@@ -669,7 +670,7 @@ - cb_info, renegotiate_at, secure_renegotiate, hibernate_after, - erl_dist, next_protocols_advertised, - client_preferred_next_protocols, log_alert, -- server_name_indication, honor_cipher_order], -+ server_name_indication, honor_cipher_order, padding_check], - - SockOpts = lists:foldl(fun(Key, PropList) -> - proplists:delete(Key, PropList) -@@ -847,6 +848,8 @@ - undefined; - validate_option(honor_cipher_order, Value) when is_boolean(Value) -> - Value; -+validate_option(padding_check, Value) when is_boolean(Value) -> -+ Value; - validate_option(Opt, Value) -> - throw({error, {options, {Opt, Value}}}). - -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_internal.hrl otp-OTP-17.4/lib/ssl/src/ssl_internal.hrl ---- otp-OTP-17.4.orig/lib/ssl/src/ssl_internal.hrl 2015-08-05 16:52:39.990500503 -0400 -+++ otp-OTP-17.4/lib/ssl/src/ssl_internal.hrl 2015-08-05 16:52:50.479441417 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2007-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2007-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -117,7 +117,8 @@ - server_name_indication = undefined, - %% Should the server prefer its own cipher order over the one provided by - %% the client? -- honor_cipher_order = false -+ honor_cipher_order = false, -+ padding_check = true - }). - - -record(socket_options, -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/ssl_record.erl otp-OTP-17.4/lib/ssl/src/ssl_record.erl ---- otp-OTP-17.4.orig/lib/ssl/src/ssl_record.erl 2015-08-05 16:52:39.989500508 -0400 -+++ otp-OTP-17.4/lib/ssl/src/ssl_record.erl 2015-08-05 16:52:50.479441417 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2013-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2013-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -48,7 +48,7 @@ - -export([compress/3, uncompress/3, compressions/0]). - - %% Payload encryption/decryption ---export([cipher/4, decipher/3, is_correct_mac/2]). -+-export([cipher/4, decipher/4, is_correct_mac/2]). - - -export_type([ssl_version/0, ssl_atom_version/0]). - -@@ -376,8 +376,9 @@ - {CipherFragment, CipherS1} = - ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version), - {CipherFragment, WriteState0#connection_state{cipher_state = CipherS1}}. -+ - %%-------------------------------------------------------------------- ---spec decipher(ssl_version(), binary(), #connection_state{}) -> {binary(), binary(), #connection_state{}} | #alert{}. -+-spec decipher(ssl_version(), binary(), #connection_state{}, boolean()) -> {binary(), binary(), #connection_state{}} | #alert{}. - %% - %% Description: Payload decryption - %%-------------------------------------------------------------------- -@@ -387,8 +388,8 @@ - BulkCipherAlgo, - hash_size = HashSz}, - cipher_state = CipherS0 -- } = ReadState) -> -- case ssl_cipher:decipher(BulkCipherAlgo, HashSz, CipherS0, CipherFragment, Version) of -+ } = ReadState, PaddingCheck) -> -+ case ssl_cipher:decipher(BulkCipherAlgo, HashSz, CipherS0, CipherFragment, Version, PaddingCheck) of - {PlainFragment, Mac, CipherS1} -> - CS1 = ReadState#connection_state{cipher_state = CipherS1}, - {PlainFragment, Mac, CS1}; -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/tls_connection.erl otp-OTP-17.4/lib/ssl/src/tls_connection.erl ---- otp-OTP-17.4.orig/lib/ssl/src/tls_connection.erl 2015-08-05 16:52:39.990500503 -0400 -+++ otp-OTP-17.4/lib/ssl/src/tls_connection.erl 2015-08-05 16:52:50.479441417 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2007-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2007-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -482,8 +482,9 @@ - next_record(#state{protocol_buffers = - #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]} - = Buffers, -- connection_states = ConnStates0} = State) -> -- case tls_record:decode_cipher_text(CT, ConnStates0) of -+ connection_states = ConnStates0, -+ ssl_options = #ssl_options{padding_check = Check}} = State) -> -+ case tls_record:decode_cipher_text(CT, ConnStates0, Check) of - {Plain, ConnStates} -> - {Plain, State#state{protocol_buffers = - Buffers#protocol_buffers{tls_cipher_texts = Rest}, -diff -Naur otp-OTP-17.4.orig/lib/ssl/src/tls_record.erl otp-OTP-17.4/lib/ssl/src/tls_record.erl ---- otp-OTP-17.4.orig/lib/ssl/src/tls_record.erl 2015-08-05 16:52:39.990500503 -0400 -+++ otp-OTP-17.4/lib/ssl/src/tls_record.erl 2015-08-05 16:52:50.480441411 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2007-2014. All Rights Reserved. -+%% Copyright Ericsson AB 2007-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -34,7 +34,7 @@ - -export([get_tls_records/2]). - - %% Decoding ---export([decode_cipher_text/2]). -+-export([decode_cipher_text/3]). - - %% Encoding - -export([encode_plain_text/4]). -@@ -142,19 +142,21 @@ - {CipherText, ConnectionStates#connection_states{current_write = WriteState#connection_state{sequence_number = Seq +1}}}. - - %%-------------------------------------------------------------------- ---spec decode_cipher_text(#ssl_tls{}, #connection_states{}) -> -+-spec decode_cipher_text(#ssl_tls{}, #connection_states{}, boolean()) -> - {#ssl_tls{}, #connection_states{}}| #alert{}. - %% - %% Description: Decode cipher text - %%-------------------------------------------------------------------- - decode_cipher_text(#ssl_tls{type = Type, version = Version, -- fragment = CipherFragment} = CipherText, ConnnectionStates0) -> -- ReadState0 = ConnnectionStates0#connection_states.current_read, -- #connection_state{compression_state = CompressionS0, -- sequence_number = Seq, -- security_parameters = SecParams} = ReadState0, -- CompressAlg = SecParams#security_parameters.compression_algorithm, -- case ssl_record:decipher(Version, CipherFragment, ReadState0) of -+ fragment = CipherFragment} = CipherText, -+ #connection_states{current_read = -+ #connection_state{ -+ compression_state = CompressionS0, -+ sequence_number = Seq, -+ security_parameters= -+ #security_parameters{compression_algorithm = CompressAlg} -+ } = ReadState0} = ConnnectionStates0, PaddingCheck) -> -+ case ssl_record:decipher(Version, CipherFragment, ReadState0, PaddingCheck) of - {PlainFragment, Mac, ReadState1} -> - MacHash = calc_mac_hash(Type, Version, PlainFragment, ReadState1), - case ssl_record:is_correct_mac(Mac, MacHash) of -diff -Naur otp-OTP-17.4.orig/lib/ssl/test/ssl_cipher_SUITE.erl otp-OTP-17.4/lib/ssl/test/ssl_cipher_SUITE.erl ---- otp-OTP-17.4.orig/lib/ssl/test/ssl_cipher_SUITE.erl 2015-08-05 16:52:39.990500503 -0400 -+++ otp-OTP-17.4/lib/ssl/test/ssl_cipher_SUITE.erl 2015-08-05 16:52:50.480441411 -0400 -@@ -1,7 +1,7 @@ - %% - %% %CopyrightBegin% - %% --%% Copyright Ericsson AB 2008-2013. All Rights Reserved. -+%% Copyright Ericsson AB 2008-2015. All Rights Reserved. - %% - %% The contents of this file are subject to the Erlang Public License, - %% Version 1.1, (the "License"); you may not use this file except in -@@ -38,7 +38,7 @@ - suite() -> [{ct_hooks,[ts_install_cth]}]. - - all() -> -- [aes_decipher_good, aes_decipher_good_tls11, aes_decipher_fail, aes_decipher_fail_tls11]. -+ [aes_decipher_good, aes_decipher_fail, padding_test]. - - groups() -> - []. -@@ -73,93 +73,123 @@ - %% Test Cases -------------------------------------------------------- - %%-------------------------------------------------------------------- - aes_decipher_good() -> -- [{doc,"Decipher a known cryptotext."}]. -+ [{doc,"Decipher a known cryptotext using a correct key"}]. - - aes_decipher_good(Config) when is_list(Config) -> - HashSz = 32, -- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}, -- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, -- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, -- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, -- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, -- Content = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56, "HELLO\n">>, -- Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>, -- Version = {3,0}, -- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), -- Version1 = {3,1}, -- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), -- ok. -- --%%-------------------------------------------------------------------- -- --aes_decipher_good_tls11() -> -- [{doc,"Decipher a known TLS 1.1 cryptotext."}]. -- --%% the fragment is actuall a TLS 1.1 record, with --%% Version = TLS 1.1, we get the correct NextIV in #cipher_state --aes_decipher_good_tls11(Config) when is_list(Config) -> -- HashSz = 32, -- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}, -- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, -- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, -- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, -- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, -- Content = <<"HELLO\n">>, -- NextIV = <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>>, -- Mac = <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>, -- Version = {3,2}, -- {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), -- Version1 = {3,2}, -- {Content, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), -- ok. -+ CipherState = correct_cipher_state(), -+ decipher_check_good(HashSz, CipherState, {3,0}), -+ decipher_check_good(HashSz, CipherState, {3,1}), -+ decipher_check_good(HashSz, CipherState, {3,2}), -+ decipher_check_good(HashSz, CipherState, {3,3}). - - %%-------------------------------------------------------------------- - - aes_decipher_fail() -> -- [{doc,"Decipher a known cryptotext."}]. -+ [{doc,"Decipher a known cryptotext using a incorrect key"}]. - --%% same as above, last byte of key replaced - aes_decipher_fail(Config) when is_list(Config) -> - HashSz = 32, -- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}, -- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, -- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, -- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, -- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, -- Version = {3,0}, -- {Content, Mac, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), -- 32 = byte_size(Content), -- 32 = byte_size(Mac), -- Version1 = {3,1}, -- {Content1, Mac1, _} = ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), -- 32 = byte_size(Content1), -- 32 = byte_size(Mac1), -- ok. - --%%-------------------------------------------------------------------- -- --aes_decipher_fail_tls11() -> -- [{doc,"Decipher a known TLS 1.1 cryptotext."}]. -- --%% same as above, last byte of key replaced --%% stricter padding checks in TLS 1.1 mean we get an alert instead --aes_decipher_fail_tls11(Config) when is_list(Config) -> -- HashSz = 32, -- CipherState = #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -- key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}, -- Fragment = <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, -- 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, -- 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, -- 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>, -- Version = {3,2}, -- #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = -- ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version), -- Version1 = {3,3}, -- #alert{level = ?FATAL, description = ?BAD_RECORD_MAC} = -- ssl_cipher:decipher(?AES, HashSz, CipherState, Fragment, Version1), -- ok. -- --%%-------------------------------------------------------------------- -+ CipherState = incorrect_cipher_state(), -+ decipher_check_fail(HashSz, CipherState, {3,0}), -+ decipher_check_fail(HashSz, CipherState, {3,1}), -+ decipher_check_fail(HashSz, CipherState, {3,2}), -+ decipher_check_fail(HashSz, CipherState, {3,3}). -+ -+%%-------------------------------------------------------------------- -+padding_test(Config) when is_list(Config) -> -+ HashSz = 16, -+ CipherState = correct_cipher_state(), -+ pad_test(HashSz, CipherState, {3,0}), -+ pad_test(HashSz, CipherState, {3,1}), -+ pad_test(HashSz, CipherState, {3,2}), -+ pad_test(HashSz, CipherState, {3,3}). -+ -+%%-------------------------------------------------------------------- -+% Internal functions -------------------------------------------------------- -+%%-------------------------------------------------------------------- -+decipher_check_good(HashSz, CipherState, Version) -> -+ {Content, NextIV, Mac} = content_nextiv_mac(Version), -+ {Content, Mac, #cipher_state{iv = NextIV}} = -+ ssl_cipher:decipher(?AES, HashSz, CipherState, aes_fragment(Version), Version, true). -+ -+decipher_check_fail(HashSz, CipherState, Version) -> -+ {Content, NextIV, Mac} = content_nextiv_mac(Version), -+ true = {Content, Mac, #cipher_state{iv = NextIV}} =/= -+ ssl_cipher:decipher(?AES, HashSz, CipherState, aes_fragment(Version), Version, true). -+ -+pad_test(HashSz, CipherState, {3,0} = Version) -> -+ %% 3.0 does not have padding test -+ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), -+ {Content, Mac, #cipher_state{iv = NextIV}} = -+ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,0}), {3,0}, true), -+ {Content, Mac, #cipher_state{iv = NextIV}} = -+ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,0}), {3,0}, false); -+pad_test(HashSz, CipherState, {3,1} = Version) -> -+ %% 3.1 should have padding test, but may be disabled -+ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), -+ BadCont = badpad_content(Content), -+ {Content, Mac, #cipher_state{iv = NextIV}} = -+ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,1}) , {3,1}, false), -+ {BadCont, Mac, #cipher_state{iv = NextIV}} = -+ ssl_cipher:decipher(?AES, HashSz, CipherState, badpad_aes_fragment({3,1}), {3,1}, true); -+pad_test(HashSz, CipherState, Version) -> -+ %% 3.2 and 3.3 must have padding test -+ {Content, NextIV, Mac} = badpad_content_nextiv_mac(Version), -+ BadCont = badpad_content(Content), -+ {BadCont, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, -+ badpad_aes_fragment(Version), Version, false), -+ {BadCont, Mac, #cipher_state{iv = NextIV}} = ssl_cipher:decipher(?AES, HashSz, CipherState, -+ badpad_aes_fragment(Version), Version, true). -+ -+aes_fragment({3,N}) when N == 0; N == 1-> -+ <<197,9,6,109,242,87,80,154,85,250,110,81,119,95,65,185,53,206,216,153,246,169, -+ 119,177,178,238,248,174,253,220,242,81,33,0,177,251,91,44,247,53,183,198,165, -+ 63,20,194,159,107>>; -+ -+aes_fragment(_) -> -+ <<220,193,179,139,171,33,143,245,202,47,123,251,13,232,114,8, -+ 190,162,74,31,186,227,119,155,94,74,119,79,169,193,240,160, -+ 198,181,81,19,98,162,213,228,74,224,253,168,156,59,195,122, -+ 108,101,107,242,20,15,169,150,163,107,101,94,93,104,241,165>>. -+ -+badpad_aes_fragment({3,N}) when N == 0; N == 1 -> -+ <<186,139,125,10,118,21,26,248,120,108,193,104,87,118,145,79,225,55,228,10,105, -+ 30,190,37,1,88,139,243,210,99,65,41>>; -+badpad_aes_fragment(_) -> -+ <<137,31,14,77,228,80,76,103,183,125,55,250,68,190,123,131,117,23,229,180,207, -+ 94,121,137,117,157,109,99,113,61,190,138,131,229,201,120,142,179,172,48,77, -+ 234,19,240,33,38,91,93>>. -+ -+content_nextiv_mac({3,N}) when N == 0; N == 1 -> -+ {<<"HELLO\n">>, -+ <<33,0, 177,251, 91,44, 247,53, 183,198, 165,63, 20,194, 159,107>>, -+ <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>}; -+content_nextiv_mac(_) -> -+ {<<"HELLO\n">>, -+ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>>, -+ <<71,136,212,107,223,200,70,232,127,116,148,205,232,35,158,113,237,174,15,217,192,168,35,8,6,107,107,233,25,174,90,111>>}. -+ -+badpad_content_nextiv_mac({3,N}) when N == 0; N == 1 -> -+ {<<"HELLO\n">>, -+ <<225,55,228,10,105,30,190,37,1,88,139,243,210,99,65,41>>, -+ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>> -+ }; -+badpad_content_nextiv_mac(_) -> -+ {<<"HELLO\n">>, -+ <<133,211,45,189,179,229,56,86,11,178,239,159,14,160,253,140>>, -+ <<183,139,16,132,10,209,67,86,168,100,61,217,145,57,36,56>> -+ }. -+ -+badpad_content(Content) -> -+ %% BadContent will fail mac test -+ <<16#F0, Content/binary>>. -+ -+correct_cipher_state() -> -+ #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -+ key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,148>>}. -+ -+incorrect_cipher_state() -> -+ #cipher_state{iv = <<59,201,85,117,188,206,224,136,5,109,46,70,104,79,4,9>>, -+ key = <<72,196,247,97,62,213,222,109,210,204,217,186,172,184,197,254>>}. diff --git a/otp-make-subpackages.py b/otp-make-subpackages.py new file mode 100644 index 0000000..67c21c9 --- /dev/null +++ b/otp-make-subpackages.py @@ -0,0 +1,150 @@ +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", "xemacs-erlang", "xemacs-erlang-el"] + +# 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 is dlopened so it can't be picked up automatically by the RPM + # dependency checker + "erlang-erts": ["lksctp-tools"], + "erlang-gs": ["tk"], + # FIXME stores files/links in jpackage-utils' directory "erlang-ic": ["jpackage-utils"], + # FIXME stores files/links in jpackage-utils' directory "erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}, "jpackage-utils"], + "erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}"], + "erlang-wx": ["mesa-libGL", "mesa-libGLU"], + "xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"], + "xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"] + } + +package_additional_buildrequires = { + "erlang-diameter": ["ed"], + "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 + "erlang-ic": ["java-devel"], + "erlang-jinterface": ["java-devel"], + "erlang-odbc": ["unixODBC-devel"], + "erlang-wx": ["wxGTK-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)]): + 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 ###" diff --git a/sources b/sources index b22e8a6..7a59318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d06e7d3802d63992535116e4d37c1a4 otp-OTP-17.4.tar.gz +49d9ef3ccffc028100e35ff80e7d4d06 otp-OTP-18.2.2.tar.gz From b2acbda3c9ea1caa793218e855cdd9ebc11f0b5e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jan 2016 17:02:31 +0300 Subject: [PATCH 064/340] Update autogenerated subpackages list Signed-off-by: Peter Lemenkov --- erlang.spec | 10 ++++----- otp-make-subpackages.py | 46 ++++++++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0ed6ce9..3850bf9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -75,11 +75,8 @@ Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch # end of autogenerated patch tag list BuildRequires: flex -%if %{with doc} -# BEWARE. No fop for EPEL5, and only for x86/x86_64 in EPEL6, so we cannot regenerate docs here -BuildRequires: fop -BuildRequires: libxslt +%if %{with doc} %if 0%{?need_bootstrap} < 1 # Required for building docs (escript) BuildRequires: erlang @@ -363,6 +360,8 @@ Diameter (RFC 3588) library %package doc Summary: Erlang documentation Group: Development/Languages +BuildRequires: fop +BuildRequires: libxslt BuildArch: noarch %description doc @@ -1054,12 +1053,11 @@ install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" # erlang-ic ic_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$ic_lib_dir" -ln -s "${ic_lib_dir}/priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" +ln -s "${ic_lib_dir}priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" # erlang-jinterface jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" -install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}" ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" # systemd-related stuff diff --git a/otp-make-subpackages.py b/otp-make-subpackages.py index 67c21c9..e004bf3 100644 --- a/otp-make-subpackages.py +++ b/otp-make-subpackages.py @@ -21,7 +21,12 @@ package_headers = {} ## # These packages should be marked as noarch -package_noarch = ["emacs-erlang", "emacs-erlang-el", "erlang-doc", "xemacs-erlang", "xemacs-erlang-el"] +package_noarch = [ + "emacs-erlang", + "emacs-erlang-el", + "erlang-doc", + "xemacs-erlang", + "xemacs-erlang-el"] # These are additional Requires which cannot be picked up automatically (yet). # TODO these should be added automatically @@ -30,33 +35,53 @@ package_additional_requires = { "emacs-erlang-el": ["emacs-erlang = %{version}-%{release}"], "erlang-dialyzer": ["graphviz"], "erlang-erl_interface": ["%{name}-erts%{?_isa} = %{version}-%{release}"], - # This library is dlopened so it can't be picked up automatically by the RPM - # dependency checker + # 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"], - # FIXME stores files/links in jpackage-utils' directory "erlang-ic": ["jpackage-utils"], - # FIXME stores files/links in jpackage-utils' directory "erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}, "jpackage-utils"], - "erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}"], + # 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"], "xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"], "xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"] } 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 + # already dropped full support for EPEL6 and older versions. "erlang-ic": ["java-devel"], "erlang-jinterface": ["java-devel"], + "erlang-odbc": ["unixODBC-devel"], "erlang-wx": ["wxGTK-devel"], + "xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"], } package_additional_obsoletes = { - "erlang-erts": ["erlang-appmon", "erlang-docbuilder", "erlang-inviso", "erlang-pman", "erlang-toolbar", "erlang-tv"], + "erlang-erts": [ + "erlang-appmon", + "erlang-docbuilder", + "erlang-inviso", + "erlang-pman", + "erlang-toolbar", + "erlang-tv"], } ## @@ -69,6 +94,11 @@ 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) From 0a27f9ce58e03c2bf5898b30e86504e857b59e5a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jan 2016 17:52:56 +0300 Subject: [PATCH 065/340] Add notice about bundled library - pcre Signed-off-by: Peter Lemenkov --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index 3850bf9..bf50a3b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -428,6 +428,7 @@ Provides: erlang(erl_drv_version) = 3.2 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) Provides: erlang(erl_nif_version) = 2.9 +Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-inviso From 9b16dc497fad450d95fa1ccd2f81391de07fc9b2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 16 Jan 2016 21:35:57 +0300 Subject: [PATCH 066/340] Possible workaround for build failures on i686 See this link for further details: http://thread.gmane.org/gmane.linux.redhat.fedora.devel/215700 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index bf50a3b..4c859f2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -952,7 +952,7 @@ make %if %{with doc} # should use FOP_OPTS after #832323 is resolved %ifnarch ppc %{power64} -export BASE_OPTIONS=-Xmx1024m +export BASE_OPTIONS=-Xmx512m %else export BASE_OPTIONS=-Xmx1536m %endif From da1dfd6d90b984354abb0f6dcb0d7a9b7dd489da Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Sun, 17 Jan 2016 16:53:54 -0500 Subject: [PATCH 067/340] Add patch for epmd ipv6 support Resolves: rhbz#1299253 --- erlang.spec | 9 +- ...-epmd-support-IPv6-node-registration.patch | 701 ++++++++++++++++++ 2 files changed, 709 insertions(+), 1 deletion(-) create mode 100644 otp-0009-epmd-support-IPv6-node-registration.patch diff --git a/erlang.spec b/erlang.spec index 4c859f2..bb87f85 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -72,6 +72,9 @@ 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 +# epmd: support IPv6 node registration +Patch9: otp-0009-epmd-support-IPv6-node-registration.patch # end of autogenerated patch tag list BuildRequires: flex @@ -897,6 +900,7 @@ Erlang mode for XEmacs (source lisp files). %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Split_off_webtool_dependency_from_tools %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution +%patch9 -p1 -b .epmd_support_IPv6_node_registration # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2218,6 +2222,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sun Jan 17 2016 John Eckersberg - 18.2.2-2 +- Add patch for epmd ipv6 support (rhbz#1299253) + * Mon Jan 11 2016 Peter Lemenkov - 18.2.2-1 - Ver. 18.2.2 diff --git a/otp-0009-epmd-support-IPv6-node-registration.patch b/otp-0009-epmd-support-IPv6-node-registration.patch new file mode 100644 index 0000000..0347c7e --- /dev/null +++ b/otp-0009-epmd-support-IPv6-node-registration.patch @@ -0,0 +1,701 @@ +From: Michael Santos +Date: Sun, 18 Oct 2015 16:20:37 -0400 +Subject: [PATCH] epmd: support IPv6 node registration + +Allow IPv6 nodes to register with and query epmd. On systems with +IPv6 support: + +* epmd listens on both the IPv4 and IPv6 ANY or loopback sockets + +* the epmd cli client connects to epmd over the IPv6 loopback + +* distributed nodes started with "-proto_dist inet6_tcp" will register + with epmd over IPv6 + +To work on IPv6 capable systems that have IPv6 support disabled, +epmd ignores errors opening the socket if the protocol is not +supported. Similarly, the epmd client will fall back to IPv4 if the IPv6 +socket is not available. + +The interaction between IPv4 and IPv6 sockets depends on the platform: + +* FreeBSD allows multiple "specific" sockets to bind the same port (such + as 2 sockets listening to the same port on ANY and the loopback). + Binding port 4369 to IPv4 and IPv6 sockets simulataneously is allowed. + +* Linux does not allow the same port to be bound by different sockets. + Setting the IPV6_V6ONLY socket option is required. + +* Windows + + The behaviour differs depending on the version of Windows: + + http://msdn.microsoft.com/en-us/library/windows/desktop/bb513665(v=vs.85).aspx + + According to the site, sockets on Windows XP with Service Pack 1 (SP1) + and Windows Server 2003 will only listen on either IPv4 or IPv6, so + creating two sockets is required to service IPv4 and IPv6 traffic on + the same port. The IPV6_V6ONLY socket option is not supported. + + For Windows Vista and later, a single socket can handle IPv4 and IPv6 + traffic for the same port. The IPV6_V6ONLY socket option is supported + and is enabled for IPv6 sockets by default. + +diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml +index 28fcc8f..7f61804 100644 +--- a/erts/doc/src/epmd.xml ++++ b/erts/doc/src/epmd.xml +@@ -37,7 +37,7 @@ + +

Erlang Port Mapper Daemon

+ +- ++ + +

Starts the port mapper daemon

+ +diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml +index ec4a0de..cdf8aef 100644 +--- a/erts/doc/src/erl.xml ++++ b/erts/doc/src/erl.xml +@@ -382,6 +382,28 @@ + similar to . See + code(3).

+ ++ ++ ++

Specify a protocol for Erlang distribution.

++ ++ inet_tcp ++ ++

TCP over IPv4 (the default)

++ ++ inet_tls ++ ++

distribution over TLS/SSL

++ ++ inet6_tcp ++ ++

TCP over IPv6

++ ++ ++

For example, to start up IPv6 distributed nodes:

++
++% erl -name test@ipv6node.example.com -proto_dist inet6_tcp
++
++ + + +

Starts Erlang with a remote shell connected to .

+diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c +index 63ec18d..5513cb2 100644 +--- a/erts/epmd/src/epmd.c ++++ b/erts/epmd/src/epmd.c +@@ -343,7 +343,7 @@ static void run_daemon(EpmdVars *g) + for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */ + close(fd); + /* Syslog on linux will try to write to whatever if we dont +- inform it of that the log is closed. */ ++ inform it that the log is closed. */ + closelog(); + + /* These shouldn't be needed but for safety... */ +diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c +index a8fe865..6fc05e1 100644 +--- a/erts/epmd/src/epmd_cli.c ++++ b/erts/epmd/src/epmd_cli.c +@@ -136,19 +136,33 @@ void epmd_call(EpmdVars *g,int what) + static int conn_to_epmd(EpmdVars *g) + { + struct EPMD_SOCKADDR_IN address; ++ size_t salen = 0; + int connect_sock; +- +- connect_sock = socket(FAMILY, SOCK_STREAM, 0); +- if (connect_sock<0) +- goto error; ++ unsigned short sport = g->port; ++ ++#if defined(EPMD6) ++ SET_ADDR6(address, in6addr_loopback, sport); ++ salen = sizeof(struct sockaddr_in6); ++ ++ connect_sock = socket(AF_INET6, SOCK_STREAM, 0); ++ if (connect_sock>=0) { ++ ++ if (connect(connect_sock, (struct sockaddr*)&address, salen) == 0) ++ return connect_sock; + +- { /* store port number in unsigned short */ +- unsigned short sport = g->port; +- SET_ADDR(address, EPMD_ADDR_LOOPBACK, sport); ++ close(connect_sock); + } ++#endif ++ SET_ADDR(address, htonl(INADDR_LOOPBACK), sport); ++ salen = sizeof(struct sockaddr_in); + +- if (connect(connect_sock, (struct sockaddr*)&address, sizeof address) < 0) ++ connect_sock = socket(AF_INET, SOCK_STREAM, 0); ++ if (connect_sock<0) + goto error; ++ ++ if (connect(connect_sock, (struct sockaddr*)&address, salen) < 0) ++ goto error; ++ + return connect_sock; + + error: +diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h +index 26100af..8f44c2a 100644 +--- a/erts/epmd/src/epmd_int.h ++++ b/erts/epmd/src/epmd_int.h +@@ -55,6 +55,7 @@ + # ifndef WINDOWS_H_INCLUDES_WINSOCK2_H + # include + # endif ++# include + # include + # include + #endif +@@ -130,6 +131,12 @@ + # include + #endif /* HAVE_SYSTEMD_DAEMON */ + ++#if defined(HAVE_IN6) && defined(AF_INET6) ++#if !defined(__WIN32__) ++# define EPMD6 ++#endif ++#endif ++ + /* ************************************************************************ */ + /* Replace some functions by others by making the function name a macro */ + +@@ -183,33 +190,53 @@ + /* ************************************************************************ */ + /* Macros that let us use IPv6 */ + +-#if defined(HAVE_IN6) && defined(AF_INET6) && defined(EPMD6) ++#if HAVE_IN6 ++# if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY ++# if HAVE_DECL_IN6ADDR_ANY_INIT ++static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } }; ++# else ++static const struct in6_addr in6addr_any = ++ { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }; ++# endif /* HAVE_IN6ADDR_ANY_INIT */ ++# endif /* ! HAVE_DECL_IN6ADDR_ANY */ ++ ++# if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK ++# if HAVE_DECL_IN6ADDR_LOOPBACK_INIT ++static const struct in6_addr in6addr_loopback = ++ { { IN6ADDR_LOOPBACK_INIT } }; ++# else ++static const struct in6_addr in6addr_loopback = ++ { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }; ++# endif /* HAVE_IN6ADDR_LOOPBACK_INIT */ ++# endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */ ++#endif /* HAVE_IN6 */ ++ ++#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) + +-#define EPMD_SOCKADDR_IN sockaddr_in6 +-#define EPMD_IN_ADDR in6_addr +-#define EPMD_S_ADDR s6_addr +-#define EPMD_ADDR_LOOPBACK in6addr_loopback.s6_addr +-#define EPMD_ADDR_ANY in6addr_any.s6_addr ++#if defined(EPMD6) ++ ++#define EPMD_SOCKADDR_IN sockaddr_storage + #define FAMILY AF_INET6 + +-#define SET_ADDR(dst, addr, port) do { \ +- memset((char*)&(dst), 0, sizeof(dst)); \ +- memcpy((char*)&(dst).sin6_addr.s6_addr, (char*)&(addr), 16); \ +- (dst).sin6_family = AF_INET6; \ +- (dst).sin6_flowinfo = 0; \ +- (dst).sin6_port = htons(port); \ ++#define SET_ADDR6(dst, addr, port) do { \ ++ struct sockaddr_in6 *sa = (struct sockaddr_in6 *)&(dst); \ ++ memset(sa, 0, sizeof(dst)); \ ++ sa->sin6_family = AF_INET6; \ ++ sa->sin6_addr = (addr); \ ++ sa->sin6_port = htons(port); \ + } while(0) + +-#define IS_ADDR_LOOPBACK(addr) \ +- (memcmp((addr).s6_addr, in6addr_loopback.s6_addr, 16) == 0) ++#define SET_ADDR(dst, addr, port) do { \ ++ struct sockaddr_in *sa = (struct sockaddr_in *)&(dst); \ ++ memset(sa, 0, sizeof(dst)); \ ++ sa->sin_family = AF_INET; \ ++ sa->sin_addr.s_addr = (addr); \ ++ sa->sin_port = htons(port); \ ++ } while(0) + + #else /* Not IP v6 */ + + #define EPMD_SOCKADDR_IN sockaddr_in +-#define EPMD_IN_ADDR in_addr +-#define EPMD_S_ADDR s_addr +-#define EPMD_ADDR_LOOPBACK htonl(INADDR_LOOPBACK) +-#define EPMD_ADDR_ANY htonl(INADDR_ANY) + #define FAMILY AF_INET + + #define SET_ADDR(dst, addr, port) do { \ +@@ -219,8 +246,6 @@ + (dst).sin_port = htons(port); \ + } while(0) + +-#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) +- + #endif /* Not IP v6 */ + + /* ************************************************************************ */ +diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c +index 8c8d730..28a2968 100644 +--- a/erts/epmd/src/epmd_srv.c ++++ b/erts/epmd/src/epmd_srv.c +@@ -76,6 +76,7 @@ static time_t current_time(EpmdVars*); + + static Connection *conn_init(EpmdVars*); + static int conn_open(EpmdVars*,int); ++static int conn_local_peer_check(EpmdVars*, int); + static int conn_close_fd(EpmdVars*,int); + + static void node_init(EpmdVars*); +@@ -206,10 +207,11 @@ void run(EpmdVars *g) + { + struct EPMD_SOCKADDR_IN iserv_addr[MAX_LISTEN_SOCKETS]; + int listensock[MAX_LISTEN_SOCKETS]; +- int num_sockets; ++ int num_sockets = 0; + int i; + int opt; + unsigned short sport = g->port; ++ int bound = 0; + + node_init(g); + g->conn = conn_init(g); +@@ -252,64 +254,82 @@ void run(EpmdVars *g) + if (g->addresses != NULL && /* String contains non-separator characters if: */ + g->addresses[strspn(g->addresses," ,")] != '\000') + { +- char *tmp; +- char *token; +- int loopback_ok = 0; ++ char *tmp = NULL; ++ char *token = NULL; ++ ++ /* Always listen on the loopback. */ ++ SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport); ++ num_sockets++; ++#if defined(EPMD6) ++ SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport); ++ num_sockets++; ++#endif + +- if ((tmp = (char *)malloc(strlen(g->addresses) + 1)) == NULL) ++ if ((tmp = strdup(g->addresses)) == NULL) + { + dbg_perror(g,"cannot allocate memory"); + epmd_cleanup_exit(g,1); + } +- strcpy(tmp,g->addresses); + +- for(token = strtok(tmp,", "), num_sockets = 0; ++ for(token = strtok(tmp,", "); + token != NULL; +- token = strtok(NULL,", "), num_sockets++) ++ token = strtok(NULL,", ")) + { +- struct EPMD_IN_ADDR addr; +-#ifdef HAVE_INET_PTON +- int ret; ++ struct in_addr addr; ++#if defined(EPMD6) ++ struct in6_addr addr6; ++ struct sockaddr_storage *sa = &iserv_addr[num_sockets]; + +- if ((ret = inet_pton(FAMILY,token,&addr)) == -1) ++ if (inet_pton(AF_INET6,token,&addr6) == 1) + { +- dbg_perror(g,"cannot convert IP address to network format"); +- epmd_cleanup_exit(g,1); ++ SET_ADDR6(iserv_addr[num_sockets],addr6,sport); ++ } ++ else if (inet_pton(AF_INET,token,&addr) == 1) ++ { ++ SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); ++ } ++ else ++#else ++ if ((addr.s_addr = inet_addr(token)) != INADDR_NONE) ++ { ++ SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); + } +- else if (ret == 0) +-#elif !defined(EPMD6) +- if ((addr.EPMD_S_ADDR = inet_addr(token)) == INADDR_NONE) ++ else + #endif + { + dbg_tty_printf(g,0,"cannot parse IP address \"%s\"",token); + epmd_cleanup_exit(g,1); + } + ++#if defined(EPMD6) ++ if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6)) ++ continue; ++ ++ if (sa->ss_family == AF_INET) ++#endif + if (IS_ADDR_LOOPBACK(addr)) +- loopback_ok = 1; ++ continue; ++ ++ num_sockets++; + +- if (num_sockets - loopback_ok == MAX_LISTEN_SOCKETS - 1) ++ if (num_sockets >= MAX_LISTEN_SOCKETS) + { + dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses", + MAX_LISTEN_SOCKETS); + epmd_cleanup_exit(g,1); + } +- +- SET_ADDR(iserv_addr[num_sockets],addr.EPMD_S_ADDR,sport); + } + + free(tmp); +- +- if (!loopback_ok) +- { +- SET_ADDR(iserv_addr[num_sockets],EPMD_ADDR_LOOPBACK,sport); +- num_sockets++; +- } + } + else + { +- SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport); +- num_sockets = 1; ++ SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_ANY),sport); ++ num_sockets++; ++#if defined(EPMD6) ++ SET_ADDR6(iserv_addr[num_sockets],in6addr_any,sport); ++ num_sockets++; ++#endif + } + #ifdef HAVE_SYSTEMD_DAEMON + } +@@ -340,13 +360,39 @@ void run(EpmdVars *g) + #endif /* HAVE_SYSTEMD_DAEMON */ + for (i = 0; i < num_sockets; i++) + { +- if ((listensock[i] = socket(FAMILY,SOCK_STREAM,0)) < 0) ++ struct sockaddr *sa = (struct sockaddr *)&iserv_addr[i]; ++#if defined(EPMD6) ++ size_t salen = (sa->sa_family == AF_INET6 ? ++ sizeof(struct sockaddr_in6) : ++ sizeof(struct sockaddr_in)); ++#else ++ size_t salen = sizeof(struct sockaddr_in); ++#endif ++ ++ if ((listensock[i] = socket(sa->sa_family,SOCK_STREAM,0)) < 0) + { +- dbg_perror(g,"error opening stream socket"); +- epmd_cleanup_exit(g,1); ++ switch (errno) { ++ case EAFNOSUPPORT: ++ case EPROTONOSUPPORT: ++ continue; ++ default: ++ dbg_perror(g,"error opening stream socket"); ++ epmd_cleanup_exit(g,1); ++ } + } + g->listenfd[i] = listensock[i]; +- ++ ++#if HAVE_DECL_IPV6_V6ONLY ++ opt = 1; ++ if (sa->sa_family == AF_INET6 && ++ setsockopt(listensock[i],IPPROTO_IPV6,IPV6_V6ONLY,&opt, ++ sizeof(opt)) <0) ++ { ++ dbg_perror(g,"can't set IPv6 only socket option"); ++ epmd_cleanup_exit(g,1); ++ } ++#endif ++ + /* + * Note that we must not enable the SO_REUSEADDR on Windows, + * because addresses will be reused even if they are still in use. +@@ -378,8 +424,7 @@ void run(EpmdVars *g) + dbg_perror(g,"failed to set non-blocking mode of listening socket %d", + listensock[i]); + +- if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], +- sizeof(iserv_addr[i])) < 0) ++ if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], salen) < 0) + { + if (errno == EADDRINUSE) + { +@@ -394,12 +439,18 @@ void run(EpmdVars *g) + } + } + ++ bound++; ++ + if(listen(listensock[i], SOMAXCONN) < 0) { + dbg_perror(g,"failed to listen on socket"); + epmd_cleanup_exit(g,1); + } + select_fd_set(g, listensock[i]); + } ++ if (bound == 0) { ++ dbg_perror(g,"unable to bind any address"); ++ epmd_cleanup_exit(g,1); ++ } + #ifdef HAVE_SYSTEMD_DAEMON + } + sd_notifyf(0, "READY=1\n" +@@ -1007,15 +1058,6 @@ static int conn_open(EpmdVars *g,int fd) + + for (i = 0; i < g->max_conn; i++) { + if (g->conn[i].open == EPMD_FALSE) { +- struct sockaddr_in si; +- struct sockaddr_in di; +-#ifdef HAVE_SOCKLEN_T +- socklen_t st; +-#else +- int st; +-#endif +- st = sizeof(si); +- + g->active_conn++; + s = &g->conn[i]; + +@@ -1026,20 +1068,7 @@ static int conn_open(EpmdVars *g,int fd) + s->open = EPMD_TRUE; + s->keep = EPMD_FALSE; + +- /* Determine if connection is from localhost */ +- if (getpeername(s->fd,(struct sockaddr*) &si,&st) || +- st < sizeof(si)) { +- /* Failure to get peername is regarded as non local host */ +- s->local_peer = EPMD_FALSE; +- } else { +- /* Only 127.x.x.x and connections from the host's IP address +- allowed, no false positives */ +- s->local_peer = +- (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) == +- 0x7F000000U) || +- (getsockname(s->fd,(struct sockaddr*) &di,&st) ? +- EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr)); +- } ++ s->local_peer = conn_local_peer_check(g, s->fd); + dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" : + "Non-local peer connected"); + +@@ -1047,7 +1076,7 @@ static int conn_open(EpmdVars *g,int fd) + s->got = 0; + s->mod_time = current_time(g); /* Note activity */ + +- s->buf = (char *)malloc(INBUF_SIZE); ++ s->buf = malloc(INBUF_SIZE); + + if (s->buf == NULL) { + dbg_printf(g,0,"epmd: Insufficient memory"); +@@ -1065,6 +1094,60 @@ static int conn_open(EpmdVars *g,int fd) + return EPMD_FALSE; + } + ++static int conn_local_peer_check(EpmdVars *g, int fd) ++{ ++ struct EPMD_SOCKADDR_IN si; ++ struct EPMD_SOCKADDR_IN di; ++ ++ struct sockaddr_in *si4 = (struct sockaddr_in *)&si; ++ struct sockaddr_in *di4 = (struct sockaddr_in *)&di; ++ ++#if defined(EPMD6) ++ struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&si; ++ struct sockaddr_in6 *di6 = (struct sockaddr_in6 *)&di; ++#endif ++ ++#ifdef HAVE_SOCKLEN_T ++ socklen_t st; ++#else ++ int st; ++#endif ++ ++ st = sizeof(si); ++ ++ /* Determine if connection is from localhost */ ++ if (getpeername(fd,(struct sockaddr*) &si,&st) || ++ st > sizeof(si)) { ++ /* Failure to get peername is regarded as non local host */ ++ return EPMD_FALSE; ++ } ++ ++ /* Only 127.x.x.x and connections from the host's IP address ++ allowed, no false positives */ ++#if defined(EPMD6) ++ if (si.ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&(si6->sin6_addr))) ++ return EPMD_TRUE; ++ ++ if (si.ss_family == AF_INET) ++#endif ++ if ((((unsigned) ntohl(si4->sin_addr.s_addr)) & 0xFF000000U) == ++ 0x7F000000U) ++ return EPMD_TRUE; ++ ++ if (getsockname(fd,(struct sockaddr*) &di,&st)) ++ return EPMD_FALSE; ++ ++#if defined(EPMD6) ++ if (si.ss_family == AF_INET6) ++ return IN6_ARE_ADDR_EQUAL( &(si6->sin6_addr), &(di6->sin6_addr)); ++ if (si.ss_family == AF_INET) ++#endif ++ return si4->sin_addr.s_addr == di4->sin_addr.s_addr; ++#if defined(EPMD6) ++ return EPMD_FALSE; ++#endif ++} ++ + static int conn_close_fd(EpmdVars *g,int fd) + { + int i; +diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl +index e8bbfdb..f3c0ada 100644 +--- a/erts/epmd/test/epmd_SUITE.erl ++++ b/erts/epmd/test/epmd_SUITE.erl +@@ -43,6 +43,7 @@ + -export( + [ + register_name/1, ++ register_name_ipv6/1, + register_names_1/1, + register_names_2/1, + register_duplicate_name/1, +@@ -111,7 +112,8 @@ + suite() -> [{ct_hooks,[ts_install_cth]}]. + + all() -> +- [register_name, register_names_1, register_names_2, ++ [register_name, register_name_ipv6, ++ register_names_1, register_names_2, + register_duplicate_name, unicode_name, long_unicode_name, + get_port_nr, slow_get_port_nr, + unregister_others_name_1, unregister_others_name_2, +@@ -169,6 +171,24 @@ register_name(Config) when is_list(Config) -> + ?line ok = close(Sock), % Unregister + ok. + ++register_name_ipv6(doc) -> ++ ["Register a name over IPv6"]; ++register_name_ipv6(suite) -> ++ []; ++register_name_ipv6(Config) when is_list(Config) -> ++ % Test if the host has an IPv6 loopback address ++ Res = gen_tcp:listen(0, [inet6, {ip, {0,0,0,0,0,0,0,1}}]), ++ case Res of ++ {ok,LSock} -> ++ gen_tcp:close(LSock), ++ ?line ok = epmdrun(), ++ ?line {ok,Sock} = register_node6("foobar6"), ++ ?line ok = close(Sock), % Unregister ++ ok; ++ _Error -> ++ {skip, "Host does not have an IPv6 loopback address"} ++ end. ++ + register_names_1(doc) -> + ["Register and unregister two nodes"]; + register_names_1(suite) -> +@@ -242,13 +262,18 @@ register_node(Name) -> + register_node(Name,Port) -> + register_node_v2(Port,$M,0,5,5,Name,""). + ++register_node6(Name) -> ++ register_node_v2({0,0,0,0,0,0,0,1},?DUMMY_PORT,$M,0,5,5,Name,""). ++ + register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> ++ register_node_v2("localhost", Port, NodeType, Prot, HVsn, LVsn, Name, Extra). ++register_node_v2(Addr, Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> + Utf8Name = unicode:characters_to_binary(Name), + Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot, + put16(HVsn), put16(LVsn), + put16(size(Utf8Name)), binary_to_list(Utf8Name), + size16(Extra), Extra], +- case send_req(Req) of ++ case send_req(Req, Addr) of + {ok,Sock} -> + case recv(Sock,4) of + {ok, [?EPMD_ALIVE2_RESP,_Res=0,_C0,_C1]} -> +@@ -1151,7 +1176,9 @@ send_direct(Sock, Bytes) -> + end. + + send_req(Req) -> +- case connect() of ++ send_req(Req, "localhost"). ++send_req(Req, Addr) -> ++ case connect(Addr) of + {ok,Sock} -> + case send(Sock, [size16(Req), Req]) of + ok -> +diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl +index 55ce9a7..c6202dd 100644 +--- a/lib/kernel/src/erl_epmd.erl ++++ b/lib/kernel/src/erl_epmd.erl +@@ -32,7 +32,7 @@ + %% External exports + -export([start/0, start_link/0, stop/0, port_please/2, + port_please/3, names/0, names/1, +- register_node/2, open/0, open/1, open/2]). ++ register_node/2, register_node/3, open/0, open/1, open/2]). + + %% gen_server callbacks + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, +@@ -102,7 +102,9 @@ names(EpmdAddr) -> + + + register_node(Name, PortNo) -> +- gen_server:call(erl_epmd, {register, Name, PortNo}, infinity). ++ register_node(Name, PortNo, inet). ++register_node(Name, PortNo, Family) -> ++ gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity). + + %%%---------------------------------------------------------------------- + %%% Callback functions from gen_server +@@ -120,10 +122,10 @@ init(_) -> + -spec handle_call(calls(), term(), state()) -> + {'reply', term(), state()} | {'stop', 'shutdown', 'ok', state()}. + +-handle_call({register, Name, PortNo}, _From, State) -> ++handle_call({register, Name, PortNo, Family}, _From, State) -> + case State#state.socket of + P when P < 0 -> +- case do_register_node(Name, PortNo) of ++ case do_register_node(Name, PortNo, Family) of + {alive, Socket, Creation} -> + S = State#state{socket = Socket, + port_no = PortNo, +@@ -206,8 +208,12 @@ open({A,B,C,D,E,F,G,H}=EpmdAddr, Timeout) when ?ip6(A,B,C,D,E,F,G,H) -> + close(Socket) -> + gen_tcp:close(Socket). + +-do_register_node(NodeName, TcpPort) -> +- case open() of ++do_register_node(NodeName, TcpPort, Family) -> ++ Localhost = case Family of ++ inet -> open({127,0,0,1}); ++ inet6 -> open({0,0,0,0,0,0,0,1}) ++ end, ++ case Localhost of + {ok, Socket} -> + Name = to_string(NodeName), + Extra = "", From 0fa35dd5bddcd00326797afa292886d228ebfbae Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 22 Jan 2016 23:12:38 +0300 Subject: [PATCH 068/340] Disable optimizations for Intel Atom CPU on ix86 arches See https://bugzilla.redhat.com/1240487#c13 Signed-off-by: Peter Lemenkov --- erlang.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index bb87f85..d1af693 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -915,9 +915,17 @@ Erlang mode for XEmacs (source lisp files). %ifarch sparcv9 sparc64 CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} %else + +%ifarch %{ix86} +# We have to disable optimizations for Intel Atom +# See https://bugzilla.redhat.com/1240487#c13 +CFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" CXXFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} +%else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} %endif +%endif + # Remove pre-built BEAM files make clean @@ -956,7 +964,7 @@ make %if %{with doc} # should use FOP_OPTS after #832323 is resolved %ifnarch ppc %{power64} -export BASE_OPTIONS=-Xmx512m +export BASE_OPTIONS=-Xmx1024m %else export BASE_OPTIONS=-Xmx1536m %endif @@ -2222,6 +2230,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri Jan 22 2016 Peter Lemenkov - 18.2.2-3 +- Disable optimizations for Intel Atom CPU on ix86 arches +- Restore Java memory limits, applied during docs building, back + * Sun Jan 17 2016 John Eckersberg - 18.2.2-2 - Add patch for epmd ipv6 support (rhbz#1299253) From af96aadbce4e308b29a2229554f1be352a813703 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 22 Jan 2016 23:53:38 +0300 Subject: [PATCH 069/340] Decrease Java memory limits again Signed-off-by: Peter Lemenkov --- erlang.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index d1af693..dc56562 100644 --- a/erlang.spec +++ b/erlang.spec @@ -964,7 +964,7 @@ make %if %{with doc} # should use FOP_OPTS after #832323 is resolved %ifnarch ppc %{power64} -export BASE_OPTIONS=-Xmx1024m +export BASE_OPTIONS=-Xmx512m %else export BASE_OPTIONS=-Xmx1536m %endif @@ -2232,7 +2232,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog * Fri Jan 22 2016 Peter Lemenkov - 18.2.2-3 - Disable optimizations for Intel Atom CPU on ix86 arches -- Restore Java memory limits, applied during docs building, back * Sun Jan 17 2016 John Eckersberg - 18.2.2-2 - Add patch for epmd ipv6 support (rhbz#1299253) From 4244d3482c1aec2f8d8dc85f69d195eacbe9b99f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 19:54:32 +0000 Subject: [PATCH 070/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index dc56562..d029675 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2230,6 +2230,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 18.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jan 22 2016 Peter Lemenkov - 18.2.2-3 - Disable optimizations for Intel Atom CPU on ix86 arches From bc2facf340b2fecf8e5cfdfa4493b04c9cdc83eb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 9 Feb 2016 16:21:43 +0300 Subject: [PATCH 071/340] Ver. 18.2.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 17 ++++++++++++----- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8477df3..d0b1f42 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ otp_src_R14A.tar.gz /otp-OTP-17.3.4.tar.gz /otp-OTP-17.4.tar.gz /otp-OTP-18.2.2.tar.gz +/otp-OTP-18.2.3.tar.gz diff --git a/erlang.spec b/erlang.spec index d029675..bc3f5be 100644 --- a/erlang.spec +++ b/erlang.spec @@ -15,8 +15,8 @@ %endif Name: erlang -Version: 18.2.2 -Release: 4%{?dist} +Version: 18.2.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -912,20 +912,24 @@ Erlang mode for XEmacs (source lisp files). %build + +# Set up proper cflags/cxxflags first %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} +ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" %else %ifarch %{ix86} # We have to disable optimizations for Intel Atom # See https://bugzilla.redhat.com/1240487#c13 -CFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" CXXFLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} +ERL_FLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} +ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif %endif +CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} + # Remove pre-built BEAM files make clean @@ -2230,6 +2234,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Feb 9 2016 Peter Lemenkov - 18.2.3-1 +- Ver. 18.2.3 + * Wed Feb 03 2016 Fedora Release Engineering - 18.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 933787e..3091632 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -472,10 +472,10 @@ index 1c05d45..88f9f62 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 82cda6a..edfebd2 100644 +index 0a4b625..1b1d83d 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" diff --git a/sources b/sources index 7a59318..b3b8f94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49d9ef3ccffc028100e35ff80e7d4d06 otp-OTP-18.2.2.tar.gz +236741d3893b09cdd1699edd1549db6b otp-OTP-18.2.3.tar.gz From 2038287893c4b997147523a50c833c10bfd5d009 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Feb 2016 13:58:34 +0300 Subject: [PATCH 072/340] Workaround for broken cmpxchg8b inlining on ix86 - Workaround for broken cmpxchg8b inlining on ix86 - Don't use generic optimization on ix86 - Increase memory up to 1024 mbytes while generating docs on non-ppc arches Signed-off-by: Peter Lemenkov --- erlang.spec | 16 ++++++++--- ...xchg8b-inline-asm-when-pic-and-gcc-5.patch | 27 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch diff --git a/erlang.spec b/erlang.spec index bc3f5be..7d3aa37 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -75,6 +75,9 @@ Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch # Fedora specific patch # epmd: support IPv6 node registration Patch9: otp-0009-epmd-support-IPv6-node-registration.patch +# Fedora specific patch +# Quickfix for cmpxchg8b inline asm when pic and gcc >= 5.0 is +Patch10: otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch # end of autogenerated patch tag list BuildRequires: flex @@ -901,6 +904,7 @@ Erlang mode for XEmacs (source lisp files). %patch7 -p1 -b .Split_off_webtool_dependency_from_tools %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution %patch9 -p1 -b .epmd_support_IPv6_node_registration +%patch10 -p1 -b .Quickfix_for_cmpxchg8b_inline_asm_when_pic_and_gcc_5 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -921,7 +925,8 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" %ifarch %{ix86} # We have to disable optimizations for Intel Atom # See https://bugzilla.redhat.com/1240487#c13 -ERL_FLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" +#ERL_FLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" +ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %else ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif @@ -968,7 +973,7 @@ make %if %{with doc} # should use FOP_OPTS after #832323 is resolved %ifnarch ppc %{power64} -export BASE_OPTIONS=-Xmx512m +export BASE_OPTIONS=-Xmx1024m %else export BASE_OPTIONS=-Xmx1536m %endif @@ -2234,6 +2239,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Feb 10 2016 Peter Lemenkov - 18.2.3-2 +- Workaround for broken cmpxchg8b inlining on ix86 (rhbz#1240487) +- Don't use generic optimization on ix86 +- Increase memory up to 1024 mbytes while generating docs on non-ppc arches + * Tue Feb 9 2016 Peter Lemenkov - 18.2.3-1 - Ver. 18.2.3 diff --git a/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch b/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch new file mode 100644 index 0000000..cc8a9d1 --- /dev/null +++ b/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch @@ -0,0 +1,27 @@ +From: Rickard Green +Date: Tue, 9 Feb 2016 18:23:26 +0100 +Subject: [PATCH] Quickfix for cmpxchg8b inline asm when pic and gcc >= 5.0 is + used + + +diff --git a/erts/include/internal/i386/ethr_dw_atomic.h b/erts/include/internal/i386/ethr_dw_atomic.h +index e8c4119..caba633 100644 +--- a/erts/include/internal/i386/ethr_dw_atomic.h ++++ b/erts/include/internal/i386/ethr_dw_atomic.h +@@ -115,6 +115,8 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var) + return (ethr_sint_t *) ETHR_DW_NATMC_MEM__(var); + } + ++#if !ETHR_AT_LEAST_GCC_VSN__(5, 0, 0) ++ + #if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ + /* + * When position independent code is used in 32-bit mode, the EBX register +@@ -138,6 +140,7 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var) + # endif + #endif + ++#endif /* < gcc-5.0 */ + + #define ETHR_HAVE_ETHR_NATIVE_DW_ATOMIC_CMPXCHG_MB + From cf1ebfcf6cd75786ebb80fca876dfd17a1146261 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 19 Feb 2016 18:42:20 +0300 Subject: [PATCH 073/340] Add missing dependency Signed-off-by: Peter Lemenkov --- erlang.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 7d3aa37..83c691c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -425,6 +425,8 @@ BuildRequires: lksctp-tools-devel BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: zlib-devel +# epmd user, epmd group +Requires(pre): shadow-utils Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: lksctp-tools @@ -921,16 +923,7 @@ Erlang mode for XEmacs (source lisp files). %ifarch sparcv9 sparc64 ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" %else - -%ifarch %{ix86} -# We have to disable optimizations for Intel Atom -# See https://bugzilla.redhat.com/1240487#c13 -#ERL_FLAGS="${RPM_OPT_FLAGS/-mtune=atom/-mtune=generic} -fno-strict-aliasing" ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" -%else -ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" -%endif - %endif CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} @@ -2239,6 +2232,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri Feb 19 2016 Peter Lemenkov - 18.2.3-3 +- Add missing dependency + * Wed Feb 10 2016 Peter Lemenkov - 18.2.3-2 - Workaround for broken cmpxchg8b inlining on ix86 (rhbz#1240487) - Don't use generic optimization on ix86 From dca1aea1d4760405a0cd2d61454ecd30b412462d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 23 Feb 2016 15:14:54 +0300 Subject: [PATCH 074/340] Ver. 18.2.4 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d0b1f42..0e151bd 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ otp_src_R14A.tar.gz /otp-OTP-17.4.tar.gz /otp-OTP-18.2.2.tar.gz /otp-OTP-18.2.3.tar.gz +/otp-OTP-18.2.4.tar.gz diff --git a/erlang.spec b/erlang.spec index 83c691c..244f220 100644 --- a/erlang.spec +++ b/erlang.spec @@ -15,8 +15,8 @@ %endif Name: erlang -Version: 18.2.3 -Release: 3%{?dist} +Version: 18.2.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -850,7 +850,7 @@ A tool that simplifying the use of web based Erlang tools. %package wx Summary: A library for wxWidgets support in Erlang Group: Development/Languages -BuildRequires: wxGTK-devel +BuildRequires: wxGTK3-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -2232,6 +2232,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Feb 23 2016 Peter Lemenkov - 18.2.4-1 +- Ver. 18.2.4 +- Build against wxGTK-3.x.y as recommended by upstream. This change won't + affect "headless" installations. + * Fri Feb 19 2016 Peter Lemenkov - 18.2.3-3 - Add missing dependency diff --git a/sources b/sources index b3b8f94..92f198a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -236741d3893b09cdd1699edd1549db6b otp-OTP-18.2.3.tar.gz +0ea13f170092d73f014c27296825bfc9 otp-OTP-18.2.4.tar.gz From 6beeb43ea16ed67d993186ff268d39bbeee09cfe Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 23 Feb 2016 15:35:58 +0300 Subject: [PATCH 075/340] Add missing BuildRequires Signed-off-by: Peter Lemenkov --- erlang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erlang.spec b/erlang.spec index 244f220..390471f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -97,6 +97,8 @@ Requires(preun):systemd Requires(postun):systemd Requires: systemd %endif +BuildRequires: autoconf +BuildRequires: automake BuildRequires: erlang-rpm-macros Requires: %{name}-asn1%{?_isa} = %{version}-%{release} From 2b7cc88703677d871551257827d3723683a85fc1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 23 Feb 2016 16:25:11 +0300 Subject: [PATCH 076/340] Use proper wx-config path for wxWidgets-3.x.y Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 390471f..5264f1a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -928,7 +928,7 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif -CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} +CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} --with-wx-config=/usr/bin/wx-config-3.0 # Remove pre-built BEAM files make clean From 7f00bd87226a953ee41efdd55c57cc0011bbc32d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 28 Feb 2016 00:05:49 +0300 Subject: [PATCH 077/340] Fixed issue with nodes registration over IPv6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 +- ...-epmd-support-IPv6-node-registration.patch | 172 +++++++++++------- 2 files changed, 108 insertions(+), 69 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5264f1a..81c2a53 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2234,6 +2234,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Sun Feb 28 2016 Peter Lemenkov - 18.2.4-2 +- Fixed issue with nodes registration over IPv6 + * Tue Feb 23 2016 Peter Lemenkov - 18.2.4-1 - Ver. 18.2.4 - Build against wxGTK-3.x.y as recommended by upstream. This change won't diff --git a/otp-0009-epmd-support-IPv6-node-registration.patch b/otp-0009-epmd-support-IPv6-node-registration.patch index 0347c7e..b6c98b2 100644 --- a/otp-0009-epmd-support-IPv6-node-registration.patch +++ b/otp-0009-epmd-support-IPv6-node-registration.patch @@ -17,30 +17,22 @@ epmd ignores errors opening the socket if the protocol is not supported. Similarly, the epmd client will fall back to IPv4 if the IPv6 socket is not available. -The interaction between IPv4 and IPv6 sockets depends on the platform: - -* FreeBSD allows multiple "specific" sockets to bind the same port (such - as 2 sockets listening to the same port on ANY and the loopback). - Binding port 4369 to IPv4 and IPv6 sockets simulataneously is allowed. - -* Linux does not allow the same port to be bound by different sockets. - Setting the IPV6_V6ONLY socket option is required. - -* Windows - - The behaviour differs depending on the version of Windows: - - http://msdn.microsoft.com/en-us/library/windows/desktop/bb513665(v=vs.85).aspx - - According to the site, sockets on Windows XP with Service Pack 1 (SP1) - and Windows Server 2003 will only listen on either IPv4 or IPv6, so - creating two sockets is required to service IPv4 and IPv6 traffic on - the same port. The IPV6_V6ONLY socket option is not supported. - - For Windows Vista and later, a single socket can handle IPv4 and IPv6 - traffic for the same port. The IPV6_V6ONLY socket option is supported - and is enabled for IPv6 sockets by default. +Update the minimum supported version of Windows to Windows Vista to +support IPv6. +diff --git a/erts/configure.in b/erts/configure.in +index 4fb725f..368c563 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -468,7 +468,7 @@ case $host_os in + win32) + # The ethread library requires _WIN32_WINNT of at least 0x0403. + # -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS. +- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501" ++ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" + ;; + darwin*) + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE" diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml index 28fcc8f..7f61804 100644 --- a/erts/doc/src/epmd.xml @@ -55,13 +47,18 @@ index 28fcc8f..7f61804 100644

Starts the port mapper daemon

 diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml -index ec4a0de..cdf8aef 100644 +index ec4a0de..9016a94 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml -@@ -382,6 +382,28 @@ +@@ -382,6 +382,33 @@ similar to . See code(3).

++ ++ ++

Replaces the path specified in the boot script. See ++ script(4).

++ + + +

Specify a protocol for Erlang distribution.

@@ -80,9 +77,9 @@ index ec4a0de..cdf8aef 100644 + + +

For example, to start up IPv6 distributed nodes:

-+
-+% erl -name test@ipv6node.example.com -proto_dist inet6_tcp
-+
++ 
++		% erl -name test@ipv6node.example.com -proto_dist inet6_tcp
++
+ @@ -147,7 +144,7 @@ index a8fe865..6fc05e1 100644 error: diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h -index 26100af..8f44c2a 100644 +index 26100af..0931709 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -55,6 +55,7 @@ @@ -158,20 +155,18 @@ index 26100af..8f44c2a 100644 # include # include #endif -@@ -130,6 +131,12 @@ +@@ -130,6 +131,10 @@ # include #endif /* HAVE_SYSTEMD_DAEMON */ -+#if defined(HAVE_IN6) && defined(AF_INET6) -+#if !defined(__WIN32__) ++#if defined(HAVE_IN6) && defined(AF_INET6) && defined(HAVE_INET_PTON) +# define EPMD6 +#endif -+#endif + /* ************************************************************************ */ /* Replace some functions by others by making the function name a macro */ -@@ -183,33 +190,53 @@ +@@ -183,33 +188,53 @@ /* ************************************************************************ */ /* Macros that let us use IPv6 */ @@ -198,14 +193,14 @@ index 26100af..8f44c2a 100644 +#endif /* HAVE_IN6 */ + +#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) ++ ++#if defined(EPMD6) -#define EPMD_SOCKADDR_IN sockaddr_in6 -#define EPMD_IN_ADDR in6_addr -#define EPMD_S_ADDR s6_addr -#define EPMD_ADDR_LOOPBACK in6addr_loopback.s6_addr -#define EPMD_ADDR_ANY in6addr_any.s6_addr -+#if defined(EPMD6) -+ +#define EPMD_SOCKADDR_IN sockaddr_storage #define FAMILY AF_INET6 @@ -243,7 +238,7 @@ index 26100af..8f44c2a 100644 #define FAMILY AF_INET #define SET_ADDR(dst, addr, port) do { \ -@@ -219,8 +246,6 @@ +@@ -219,8 +244,6 @@ (dst).sin_port = htons(port); \ } while(0) @@ -253,7 +248,7 @@ index 26100af..8f44c2a 100644 /* ************************************************************************ */ diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c -index 8c8d730..28a2968 100644 +index 8c8d730..d092d98 100644 --- a/erts/epmd/src/epmd_srv.c +++ b/erts/epmd/src/epmd_srv.c @@ -76,6 +76,7 @@ static time_t current_time(EpmdVars*); @@ -353,10 +348,10 @@ index 8c8d730..28a2968 100644 if (IS_ADDR_LOOPBACK(addr)) - loopback_ok = 1; + continue; -+ -+ num_sockets++; - if (num_sockets - loopback_ok == MAX_LISTEN_SOCKETS - 1) ++ num_sockets++; ++ + if (num_sockets >= MAX_LISTEN_SOCKETS) { dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses", @@ -405,7 +400,6 @@ index 8c8d730..28a2968 100644 + if ((listensock[i] = socket(sa->sa_family,SOCK_STREAM,0)) < 0) { - dbg_perror(g,"error opening stream socket"); -- epmd_cleanup_exit(g,1); + switch (errno) { + case EAFNOSUPPORT: + case EPROTONOSUPPORT: @@ -414,9 +408,8 @@ index 8c8d730..28a2968 100644 + dbg_perror(g,"error opening stream socket"); + epmd_cleanup_exit(g,1); + } - } - g->listenfd[i] = listensock[i]; -- ++ } ++ g->listenfd[bound++] = listensock[i]; + +#if HAVE_DECL_IPV6_V6ONLY + opt = 1; @@ -425,8 +418,10 @@ index 8c8d730..28a2968 100644 + sizeof(opt)) <0) + { + dbg_perror(g,"can't set IPv6 only socket option"); -+ epmd_cleanup_exit(g,1); -+ } + epmd_cleanup_exit(g,1); + } +- g->listenfd[i] = listensock[i]; +- +#endif + /* @@ -442,15 +437,7 @@ index 8c8d730..28a2968 100644 { if (errno == EADDRINUSE) { -@@ -394,12 +439,18 @@ void run(EpmdVars *g) - } - } - -+ bound++; -+ - if(listen(listensock[i], SOMAXCONN) < 0) { - dbg_perror(g,"failed to listen on socket"); - epmd_cleanup_exit(g,1); +@@ -400,6 +445,11 @@ void run(EpmdVars *g) } select_fd_set(g, listensock[i]); } @@ -458,10 +445,22 @@ index 8c8d730..28a2968 100644 + dbg_perror(g,"unable to bind any address"); + epmd_cleanup_exit(g,1); + } ++ num_sockets = bound; #ifdef HAVE_SYSTEMD_DAEMON } sd_notifyf(0, "READY=1\n" -@@ -1007,15 +1058,6 @@ static int conn_open(EpmdVars *g,int fd) +@@ -444,8 +494,8 @@ void run(EpmdVars *g) + } + + for (i = 0; i < num_sockets; i++) +- if (FD_ISSET(listensock[i],&read_mask)) { +- if (do_accept(g, listensock[i]) && g->active_conn < g->max_conn) { ++ if (FD_ISSET(g->listenfd[i],&read_mask)) { ++ if (do_accept(g, g->listenfd[i]) && g->active_conn < g->max_conn) { + /* + * The accept() succeeded, and we have at least one file + * descriptor still free, which means that another accept() +@@ -1007,15 +1057,6 @@ static int conn_open(EpmdVars *g,int fd) for (i = 0; i < g->max_conn; i++) { if (g->conn[i].open == EPMD_FALSE) { @@ -477,7 +476,7 @@ index 8c8d730..28a2968 100644 g->active_conn++; s = &g->conn[i]; -@@ -1026,20 +1068,7 @@ static int conn_open(EpmdVars *g,int fd) +@@ -1026,20 +1067,7 @@ static int conn_open(EpmdVars *g,int fd) s->open = EPMD_TRUE; s->keep = EPMD_FALSE; @@ -499,7 +498,7 @@ index 8c8d730..28a2968 100644 dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" : "Non-local peer connected"); -@@ -1047,7 +1076,7 @@ static int conn_open(EpmdVars *g,int fd) +@@ -1047,7 +1075,7 @@ static int conn_open(EpmdVars *g,int fd) s->got = 0; s->mod_time = current_time(g); /* Note activity */ @@ -508,7 +507,7 @@ index 8c8d730..28a2968 100644 if (s->buf == NULL) { dbg_printf(g,0,"epmd: Insufficient memory"); -@@ -1065,6 +1094,60 @@ static int conn_open(EpmdVars *g,int fd) +@@ -1065,6 +1093,60 @@ static int conn_open(EpmdVars *g,int fd) return EPMD_FALSE; } @@ -570,7 +569,7 @@ index 8c8d730..28a2968 100644 { int i; diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl -index e8bbfdb..f3c0ada 100644 +index e8bbfdb..58fe23c 100644 --- a/erts/epmd/test/epmd_SUITE.erl +++ b/erts/epmd/test/epmd_SUITE.erl @@ -43,6 +43,7 @@ @@ -616,7 +615,7 @@ index e8bbfdb..f3c0ada 100644 register_names_1(doc) -> ["Register and unregister two nodes"]; register_names_1(suite) -> -@@ -242,13 +262,18 @@ register_node(Name) -> +@@ -242,13 +262,14 @@ register_node(Name) -> register_node(Name,Port) -> register_node_v2(Port,$M,0,5,5,Name,""). @@ -624,19 +623,20 @@ index e8bbfdb..f3c0ada 100644 + register_node_v2({0,0,0,0,0,0,0,1},?DUMMY_PORT,$M,0,5,5,Name,""). + register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> +- Utf8Name = unicode:characters_to_binary(Name), +- Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot, +- put16(HVsn), put16(LVsn), +- put16(size(Utf8Name)), binary_to_list(Utf8Name), +- size16(Extra), Extra], +- case send_req(Req) of + register_node_v2("localhost", Port, NodeType, Prot, HVsn, LVsn, Name, Extra). +register_node_v2(Addr, Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> - Utf8Name = unicode:characters_to_binary(Name), - Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot, - put16(HVsn), put16(LVsn), - put16(size(Utf8Name)), binary_to_list(Utf8Name), - size16(Extra), Extra], -- case send_req(Req) of ++ Req = alive2_req(Port, NodeType, Prot, HVsn, LVsn, Name, Extra), + case send_req(Req, Addr) of {ok,Sock} -> case recv(Sock,4) of {ok, [?EPMD_ALIVE2_RESP,_Res=0,_C0,_C1]} -> -@@ -1151,7 +1176,9 @@ send_direct(Sock, Bytes) -> +@@ -1151,7 +1172,9 @@ send_direct(Sock, Bytes) -> end. send_req(Req) -> @@ -647,6 +647,19 @@ index e8bbfdb..f3c0ada 100644 {ok,Sock} -> case send(Sock, [size16(Req), Req]) of ok -> +diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in +index 3ac9212..7a3b5ce 100644 +--- a/lib/erl_interface/configure.in ++++ b/lib/erl_interface/configure.in +@@ -251,7 +251,7 @@ case "$threads_disabled" in + ;; + win32_threads) + EI_THREADS="true" +- THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" ++ THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" + ;; + pthread) + EI_THREADS="true" diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl index 55ce9a7..c6202dd 100644 --- a/lib/kernel/src/erl_epmd.erl @@ -699,3 +712,26 @@ index 55ce9a7..c6202dd 100644 {ok, Socket} -> Name = to_string(NodeName), Extra = "", +diff --git a/lib/wx/configure.in b/lib/wx/configure.in +index 48fcca6..bf27b72 100644 +--- a/lib/wx/configure.in ++++ b/lib/wx/configure.in +@@ -164,14 +164,14 @@ case $host_os in + CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS" + ;; + mingw32) +- CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" +- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" ++ CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" ++ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" + AC_MSG_WARN([Reverting to 32-bit time_t]) + CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" + ;; + win32) +- CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" +- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" ++ CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" ++ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" + ;; + *) + CFLAGS="$CFLAGS -Wno-deprecated-declarations" From 07f0adc4db6733d310887343ef14177b313cbeda Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 24 Mar 2016 22:47:57 +0300 Subject: [PATCH 078/340] Ver. 18.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 24 +- otp-0006-Do-not-install-erlang-sources.patch | 4 +- ...-to-crash-dump-on-large-distribution.patch | 10 +- ...-epmd-support-IPv6-node-registration.patch | 737 ------------------ ...xchg8b-inline-asm-when-pic-and-gcc-5.patch | 27 - 5 files changed, 19 insertions(+), 783 deletions(-) delete mode 100644 otp-0009-epmd-support-IPv6-node-registration.patch delete mode 100644 otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch diff --git a/erlang.spec b/erlang.spec index 81c2a53..a89db79 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,11 +2,16 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} +%global __minimal 0 + %ifarch %{arm} # For some reason, fop hangs on arm, so for now don't generate docs by # default %bcond_with doc %else +%if 0%{__minimal} +%bcond_with doc +%else %bcond_without doc %endif @@ -15,8 +20,8 @@ %endif Name: erlang -Version: 18.2.4 -Release: 2%{?dist} +Version: 18.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -72,12 +77,6 @@ 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 -# epmd: support IPv6 node registration -Patch9: otp-0009-epmd-support-IPv6-node-registration.patch -# Fedora specific patch -# Quickfix for cmpxchg8b inline asm when pic and gcc >= 5.0 is -Patch10: otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch # end of autogenerated patch tag list BuildRequires: flex @@ -434,10 +433,10 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: lksctp-tools # See erts/emulator/beam/erl_driver.h or call erlang:system_info(driver_version). #Provides: erlang(erl_drv_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(driver_version)).' -s erlang halt) -Provides: erlang(erl_drv_version) = 3.2 +Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.9 +Provides: erlang(erl_nif_version) = 2.10 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder @@ -907,8 +906,6 @@ Erlang mode for XEmacs (source lisp files). %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Split_off_webtool_dependency_from_tools %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution -%patch9 -p1 -b .epmd_support_IPv6_node_registration -%patch10 -p1 -b .Quickfix_for_cmpxchg8b_inline_asm_when_pic_and_gcc_5 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2234,6 +2231,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Thu Mar 24 2016 Peter Lemenkov - 18.3-1 +- Ver. 18.3 + * Sun Feb 28 2016 Peter Lemenkov - 18.2.4-2 - Fixed issue with nodes registration over IPv6 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 3091632..00038c5 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -874,10 +874,10 @@ index b44c8ee..8f8b58d 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 790328d..db08822 100644 +index 7a7a373..419fa9e 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -142,7 +142,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch index 9a60730..d148331 100644 --- a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch +++ b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch @@ -8,15 +8,15 @@ 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 7be2b77..c3b6a7d 100644 +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) -- erl_exit(ERTS_ABORT_EXIT, -+ erl_exit(ERTS_DUMP_EXIT, +- erts_exit(ERTS_ABORT_EXIT, ++ erts_exit(ERTS_DUMP_EXIT, "Absurdly large distribution output data buffer " "(%beu bytes) passed.\n", size); @@ -24,8 +24,8 @@ index 7be2b77..c3b6a7d 100644 ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)); if (size > (Uint) INT_MAX) -- erl_exit(ERTS_ABORT_EXIT, -+ erl_exit(ERTS_DUMP_EXIT, +- erts_exit(ERTS_ABORT_EXIT, ++ erts_exit(ERTS_DUMP_EXIT, "Absurdly large distribution output data buffer " "(%beu bytes) passed.\n", size); diff --git a/otp-0009-epmd-support-IPv6-node-registration.patch b/otp-0009-epmd-support-IPv6-node-registration.patch deleted file mode 100644 index b6c98b2..0000000 --- a/otp-0009-epmd-support-IPv6-node-registration.patch +++ /dev/null @@ -1,737 +0,0 @@ -From: Michael Santos -Date: Sun, 18 Oct 2015 16:20:37 -0400 -Subject: [PATCH] epmd: support IPv6 node registration - -Allow IPv6 nodes to register with and query epmd. On systems with -IPv6 support: - -* epmd listens on both the IPv4 and IPv6 ANY or loopback sockets - -* the epmd cli client connects to epmd over the IPv6 loopback - -* distributed nodes started with "-proto_dist inet6_tcp" will register - with epmd over IPv6 - -To work on IPv6 capable systems that have IPv6 support disabled, -epmd ignores errors opening the socket if the protocol is not -supported. Similarly, the epmd client will fall back to IPv4 if the IPv6 -socket is not available. - -Update the minimum supported version of Windows to Windows Vista to -support IPv6. - -diff --git a/erts/configure.in b/erts/configure.in -index 4fb725f..368c563 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -468,7 +468,7 @@ case $host_os in - win32) - # The ethread library requires _WIN32_WINNT of at least 0x0403. - # -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS. -- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501" -+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" - ;; - darwin*) - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE" -diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml -index 28fcc8f..7f61804 100644 ---- a/erts/doc/src/epmd.xml -+++ b/erts/doc/src/epmd.xml -@@ -37,7 +37,7 @@ - -

Erlang Port Mapper Daemon

- -- -+ - -

Starts the port mapper daemon

- -diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml -index ec4a0de..9016a94 100644 ---- a/erts/doc/src/erl.xml -+++ b/erts/doc/src/erl.xml -@@ -382,6 +382,33 @@ - similar to . See - code(3).

- -+ -+ -+

Replaces the path specified in the boot script. See -+ script(4).

-+ -+ -+ -+

Specify a protocol for Erlang distribution.

-+ -+ inet_tcp -+ -+

TCP over IPv4 (the default)

-+ -+ inet_tls -+ -+

distribution over TLS/SSL

-+ -+ inet6_tcp -+ -+

TCP over IPv6

-+ -+ -+

For example, to start up IPv6 distributed nodes:

-+ 
-+		% erl -name test@ipv6node.example.com -proto_dist inet6_tcp
-+
-+ - - -

Starts Erlang with a remote shell connected to .

-diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c -index 63ec18d..5513cb2 100644 ---- a/erts/epmd/src/epmd.c -+++ b/erts/epmd/src/epmd.c -@@ -343,7 +343,7 @@ static void run_daemon(EpmdVars *g) - for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */ - close(fd); - /* Syslog on linux will try to write to whatever if we dont -- inform it of that the log is closed. */ -+ inform it that the log is closed. */ - closelog(); - - /* These shouldn't be needed but for safety... */ -diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c -index a8fe865..6fc05e1 100644 ---- a/erts/epmd/src/epmd_cli.c -+++ b/erts/epmd/src/epmd_cli.c -@@ -136,19 +136,33 @@ void epmd_call(EpmdVars *g,int what) - static int conn_to_epmd(EpmdVars *g) - { - struct EPMD_SOCKADDR_IN address; -+ size_t salen = 0; - int connect_sock; -- -- connect_sock = socket(FAMILY, SOCK_STREAM, 0); -- if (connect_sock<0) -- goto error; -+ unsigned short sport = g->port; -+ -+#if defined(EPMD6) -+ SET_ADDR6(address, in6addr_loopback, sport); -+ salen = sizeof(struct sockaddr_in6); -+ -+ connect_sock = socket(AF_INET6, SOCK_STREAM, 0); -+ if (connect_sock>=0) { -+ -+ if (connect(connect_sock, (struct sockaddr*)&address, salen) == 0) -+ return connect_sock; - -- { /* store port number in unsigned short */ -- unsigned short sport = g->port; -- SET_ADDR(address, EPMD_ADDR_LOOPBACK, sport); -+ close(connect_sock); - } -+#endif -+ SET_ADDR(address, htonl(INADDR_LOOPBACK), sport); -+ salen = sizeof(struct sockaddr_in); - -- if (connect(connect_sock, (struct sockaddr*)&address, sizeof address) < 0) -+ connect_sock = socket(AF_INET, SOCK_STREAM, 0); -+ if (connect_sock<0) - goto error; -+ -+ if (connect(connect_sock, (struct sockaddr*)&address, salen) < 0) -+ goto error; -+ - return connect_sock; - - error: -diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h -index 26100af..0931709 100644 ---- a/erts/epmd/src/epmd_int.h -+++ b/erts/epmd/src/epmd_int.h -@@ -55,6 +55,7 @@ - # ifndef WINDOWS_H_INCLUDES_WINSOCK2_H - # include - # endif -+# include - # include - # include - #endif -@@ -130,6 +131,10 @@ - # include - #endif /* HAVE_SYSTEMD_DAEMON */ - -+#if defined(HAVE_IN6) && defined(AF_INET6) && defined(HAVE_INET_PTON) -+# define EPMD6 -+#endif -+ - /* ************************************************************************ */ - /* Replace some functions by others by making the function name a macro */ - -@@ -183,33 +188,53 @@ - /* ************************************************************************ */ - /* Macros that let us use IPv6 */ - --#if defined(HAVE_IN6) && defined(AF_INET6) && defined(EPMD6) -+#if HAVE_IN6 -+# if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY -+# if HAVE_DECL_IN6ADDR_ANY_INIT -+static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } }; -+# else -+static const struct in6_addr in6addr_any = -+ { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }; -+# endif /* HAVE_IN6ADDR_ANY_INIT */ -+# endif /* ! HAVE_DECL_IN6ADDR_ANY */ -+ -+# if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK -+# if HAVE_DECL_IN6ADDR_LOOPBACK_INIT -+static const struct in6_addr in6addr_loopback = -+ { { IN6ADDR_LOOPBACK_INIT } }; -+# else -+static const struct in6_addr in6addr_loopback = -+ { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }; -+# endif /* HAVE_IN6ADDR_LOOPBACK_INIT */ -+# endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */ -+#endif /* HAVE_IN6 */ -+ -+#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) -+ -+#if defined(EPMD6) - --#define EPMD_SOCKADDR_IN sockaddr_in6 --#define EPMD_IN_ADDR in6_addr --#define EPMD_S_ADDR s6_addr --#define EPMD_ADDR_LOOPBACK in6addr_loopback.s6_addr --#define EPMD_ADDR_ANY in6addr_any.s6_addr -+#define EPMD_SOCKADDR_IN sockaddr_storage - #define FAMILY AF_INET6 - --#define SET_ADDR(dst, addr, port) do { \ -- memset((char*)&(dst), 0, sizeof(dst)); \ -- memcpy((char*)&(dst).sin6_addr.s6_addr, (char*)&(addr), 16); \ -- (dst).sin6_family = AF_INET6; \ -- (dst).sin6_flowinfo = 0; \ -- (dst).sin6_port = htons(port); \ -+#define SET_ADDR6(dst, addr, port) do { \ -+ struct sockaddr_in6 *sa = (struct sockaddr_in6 *)&(dst); \ -+ memset(sa, 0, sizeof(dst)); \ -+ sa->sin6_family = AF_INET6; \ -+ sa->sin6_addr = (addr); \ -+ sa->sin6_port = htons(port); \ - } while(0) - --#define IS_ADDR_LOOPBACK(addr) \ -- (memcmp((addr).s6_addr, in6addr_loopback.s6_addr, 16) == 0) -+#define SET_ADDR(dst, addr, port) do { \ -+ struct sockaddr_in *sa = (struct sockaddr_in *)&(dst); \ -+ memset(sa, 0, sizeof(dst)); \ -+ sa->sin_family = AF_INET; \ -+ sa->sin_addr.s_addr = (addr); \ -+ sa->sin_port = htons(port); \ -+ } while(0) - - #else /* Not IP v6 */ - - #define EPMD_SOCKADDR_IN sockaddr_in --#define EPMD_IN_ADDR in_addr --#define EPMD_S_ADDR s_addr --#define EPMD_ADDR_LOOPBACK htonl(INADDR_LOOPBACK) --#define EPMD_ADDR_ANY htonl(INADDR_ANY) - #define FAMILY AF_INET - - #define SET_ADDR(dst, addr, port) do { \ -@@ -219,8 +244,6 @@ - (dst).sin_port = htons(port); \ - } while(0) - --#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK)) -- - #endif /* Not IP v6 */ - - /* ************************************************************************ */ -diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c -index 8c8d730..d092d98 100644 ---- a/erts/epmd/src/epmd_srv.c -+++ b/erts/epmd/src/epmd_srv.c -@@ -76,6 +76,7 @@ static time_t current_time(EpmdVars*); - - static Connection *conn_init(EpmdVars*); - static int conn_open(EpmdVars*,int); -+static int conn_local_peer_check(EpmdVars*, int); - static int conn_close_fd(EpmdVars*,int); - - static void node_init(EpmdVars*); -@@ -206,10 +207,11 @@ void run(EpmdVars *g) - { - struct EPMD_SOCKADDR_IN iserv_addr[MAX_LISTEN_SOCKETS]; - int listensock[MAX_LISTEN_SOCKETS]; -- int num_sockets; -+ int num_sockets = 0; - int i; - int opt; - unsigned short sport = g->port; -+ int bound = 0; - - node_init(g); - g->conn = conn_init(g); -@@ -252,64 +254,82 @@ void run(EpmdVars *g) - if (g->addresses != NULL && /* String contains non-separator characters if: */ - g->addresses[strspn(g->addresses," ,")] != '\000') - { -- char *tmp; -- char *token; -- int loopback_ok = 0; -+ char *tmp = NULL; -+ char *token = NULL; -+ -+ /* Always listen on the loopback. */ -+ SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport); -+ num_sockets++; -+#if defined(EPMD6) -+ SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport); -+ num_sockets++; -+#endif - -- if ((tmp = (char *)malloc(strlen(g->addresses) + 1)) == NULL) -+ if ((tmp = strdup(g->addresses)) == NULL) - { - dbg_perror(g,"cannot allocate memory"); - epmd_cleanup_exit(g,1); - } -- strcpy(tmp,g->addresses); - -- for(token = strtok(tmp,", "), num_sockets = 0; -+ for(token = strtok(tmp,", "); - token != NULL; -- token = strtok(NULL,", "), num_sockets++) -+ token = strtok(NULL,", ")) - { -- struct EPMD_IN_ADDR addr; --#ifdef HAVE_INET_PTON -- int ret; -+ struct in_addr addr; -+#if defined(EPMD6) -+ struct in6_addr addr6; -+ struct sockaddr_storage *sa = &iserv_addr[num_sockets]; - -- if ((ret = inet_pton(FAMILY,token,&addr)) == -1) -+ if (inet_pton(AF_INET6,token,&addr6) == 1) - { -- dbg_perror(g,"cannot convert IP address to network format"); -- epmd_cleanup_exit(g,1); -+ SET_ADDR6(iserv_addr[num_sockets],addr6,sport); -+ } -+ else if (inet_pton(AF_INET,token,&addr) == 1) -+ { -+ SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); -+ } -+ else -+#else -+ if ((addr.s_addr = inet_addr(token)) != INADDR_NONE) -+ { -+ SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport); - } -- else if (ret == 0) --#elif !defined(EPMD6) -- if ((addr.EPMD_S_ADDR = inet_addr(token)) == INADDR_NONE) -+ else - #endif - { - dbg_tty_printf(g,0,"cannot parse IP address \"%s\"",token); - epmd_cleanup_exit(g,1); - } - -+#if defined(EPMD6) -+ if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6)) -+ continue; -+ -+ if (sa->ss_family == AF_INET) -+#endif - if (IS_ADDR_LOOPBACK(addr)) -- loopback_ok = 1; -+ continue; - -- if (num_sockets - loopback_ok == MAX_LISTEN_SOCKETS - 1) -+ num_sockets++; -+ -+ if (num_sockets >= MAX_LISTEN_SOCKETS) - { - dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses", - MAX_LISTEN_SOCKETS); - epmd_cleanup_exit(g,1); - } -- -- SET_ADDR(iserv_addr[num_sockets],addr.EPMD_S_ADDR,sport); - } - - free(tmp); -- -- if (!loopback_ok) -- { -- SET_ADDR(iserv_addr[num_sockets],EPMD_ADDR_LOOPBACK,sport); -- num_sockets++; -- } - } - else - { -- SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport); -- num_sockets = 1; -+ SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_ANY),sport); -+ num_sockets++; -+#if defined(EPMD6) -+ SET_ADDR6(iserv_addr[num_sockets],in6addr_any,sport); -+ num_sockets++; -+#endif - } - #ifdef HAVE_SYSTEMD_DAEMON - } -@@ -340,13 +360,39 @@ void run(EpmdVars *g) - #endif /* HAVE_SYSTEMD_DAEMON */ - for (i = 0; i < num_sockets; i++) - { -- if ((listensock[i] = socket(FAMILY,SOCK_STREAM,0)) < 0) -+ struct sockaddr *sa = (struct sockaddr *)&iserv_addr[i]; -+#if defined(EPMD6) -+ size_t salen = (sa->sa_family == AF_INET6 ? -+ sizeof(struct sockaddr_in6) : -+ sizeof(struct sockaddr_in)); -+#else -+ size_t salen = sizeof(struct sockaddr_in); -+#endif -+ -+ if ((listensock[i] = socket(sa->sa_family,SOCK_STREAM,0)) < 0) - { -- dbg_perror(g,"error opening stream socket"); -+ switch (errno) { -+ case EAFNOSUPPORT: -+ case EPROTONOSUPPORT: -+ continue; -+ default: -+ dbg_perror(g,"error opening stream socket"); -+ epmd_cleanup_exit(g,1); -+ } -+ } -+ g->listenfd[bound++] = listensock[i]; -+ -+#if HAVE_DECL_IPV6_V6ONLY -+ opt = 1; -+ if (sa->sa_family == AF_INET6 && -+ setsockopt(listensock[i],IPPROTO_IPV6,IPV6_V6ONLY,&opt, -+ sizeof(opt)) <0) -+ { -+ dbg_perror(g,"can't set IPv6 only socket option"); - epmd_cleanup_exit(g,1); - } -- g->listenfd[i] = listensock[i]; -- -+#endif -+ - /* - * Note that we must not enable the SO_REUSEADDR on Windows, - * because addresses will be reused even if they are still in use. -@@ -378,8 +424,7 @@ void run(EpmdVars *g) - dbg_perror(g,"failed to set non-blocking mode of listening socket %d", - listensock[i]); - -- if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], -- sizeof(iserv_addr[i])) < 0) -+ if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], salen) < 0) - { - if (errno == EADDRINUSE) - { -@@ -400,6 +445,11 @@ void run(EpmdVars *g) - } - select_fd_set(g, listensock[i]); - } -+ if (bound == 0) { -+ dbg_perror(g,"unable to bind any address"); -+ epmd_cleanup_exit(g,1); -+ } -+ num_sockets = bound; - #ifdef HAVE_SYSTEMD_DAEMON - } - sd_notifyf(0, "READY=1\n" -@@ -444,8 +494,8 @@ void run(EpmdVars *g) - } - - for (i = 0; i < num_sockets; i++) -- if (FD_ISSET(listensock[i],&read_mask)) { -- if (do_accept(g, listensock[i]) && g->active_conn < g->max_conn) { -+ if (FD_ISSET(g->listenfd[i],&read_mask)) { -+ if (do_accept(g, g->listenfd[i]) && g->active_conn < g->max_conn) { - /* - * The accept() succeeded, and we have at least one file - * descriptor still free, which means that another accept() -@@ -1007,15 +1057,6 @@ static int conn_open(EpmdVars *g,int fd) - - for (i = 0; i < g->max_conn; i++) { - if (g->conn[i].open == EPMD_FALSE) { -- struct sockaddr_in si; -- struct sockaddr_in di; --#ifdef HAVE_SOCKLEN_T -- socklen_t st; --#else -- int st; --#endif -- st = sizeof(si); -- - g->active_conn++; - s = &g->conn[i]; - -@@ -1026,20 +1067,7 @@ static int conn_open(EpmdVars *g,int fd) - s->open = EPMD_TRUE; - s->keep = EPMD_FALSE; - -- /* Determine if connection is from localhost */ -- if (getpeername(s->fd,(struct sockaddr*) &si,&st) || -- st < sizeof(si)) { -- /* Failure to get peername is regarded as non local host */ -- s->local_peer = EPMD_FALSE; -- } else { -- /* Only 127.x.x.x and connections from the host's IP address -- allowed, no false positives */ -- s->local_peer = -- (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) == -- 0x7F000000U) || -- (getsockname(s->fd,(struct sockaddr*) &di,&st) ? -- EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr)); -- } -+ s->local_peer = conn_local_peer_check(g, s->fd); - dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" : - "Non-local peer connected"); - -@@ -1047,7 +1075,7 @@ static int conn_open(EpmdVars *g,int fd) - s->got = 0; - s->mod_time = current_time(g); /* Note activity */ - -- s->buf = (char *)malloc(INBUF_SIZE); -+ s->buf = malloc(INBUF_SIZE); - - if (s->buf == NULL) { - dbg_printf(g,0,"epmd: Insufficient memory"); -@@ -1065,6 +1093,60 @@ static int conn_open(EpmdVars *g,int fd) - return EPMD_FALSE; - } - -+static int conn_local_peer_check(EpmdVars *g, int fd) -+{ -+ struct EPMD_SOCKADDR_IN si; -+ struct EPMD_SOCKADDR_IN di; -+ -+ struct sockaddr_in *si4 = (struct sockaddr_in *)&si; -+ struct sockaddr_in *di4 = (struct sockaddr_in *)&di; -+ -+#if defined(EPMD6) -+ struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&si; -+ struct sockaddr_in6 *di6 = (struct sockaddr_in6 *)&di; -+#endif -+ -+#ifdef HAVE_SOCKLEN_T -+ socklen_t st; -+#else -+ int st; -+#endif -+ -+ st = sizeof(si); -+ -+ /* Determine if connection is from localhost */ -+ if (getpeername(fd,(struct sockaddr*) &si,&st) || -+ st > sizeof(si)) { -+ /* Failure to get peername is regarded as non local host */ -+ return EPMD_FALSE; -+ } -+ -+ /* Only 127.x.x.x and connections from the host's IP address -+ allowed, no false positives */ -+#if defined(EPMD6) -+ if (si.ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&(si6->sin6_addr))) -+ return EPMD_TRUE; -+ -+ if (si.ss_family == AF_INET) -+#endif -+ if ((((unsigned) ntohl(si4->sin_addr.s_addr)) & 0xFF000000U) == -+ 0x7F000000U) -+ return EPMD_TRUE; -+ -+ if (getsockname(fd,(struct sockaddr*) &di,&st)) -+ return EPMD_FALSE; -+ -+#if defined(EPMD6) -+ if (si.ss_family == AF_INET6) -+ return IN6_ARE_ADDR_EQUAL( &(si6->sin6_addr), &(di6->sin6_addr)); -+ if (si.ss_family == AF_INET) -+#endif -+ return si4->sin_addr.s_addr == di4->sin_addr.s_addr; -+#if defined(EPMD6) -+ return EPMD_FALSE; -+#endif -+} -+ - static int conn_close_fd(EpmdVars *g,int fd) - { - int i; -diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl -index e8bbfdb..58fe23c 100644 ---- a/erts/epmd/test/epmd_SUITE.erl -+++ b/erts/epmd/test/epmd_SUITE.erl -@@ -43,6 +43,7 @@ - -export( - [ - register_name/1, -+ register_name_ipv6/1, - register_names_1/1, - register_names_2/1, - register_duplicate_name/1, -@@ -111,7 +112,8 @@ - suite() -> [{ct_hooks,[ts_install_cth]}]. - - all() -> -- [register_name, register_names_1, register_names_2, -+ [register_name, register_name_ipv6, -+ register_names_1, register_names_2, - register_duplicate_name, unicode_name, long_unicode_name, - get_port_nr, slow_get_port_nr, - unregister_others_name_1, unregister_others_name_2, -@@ -169,6 +171,24 @@ register_name(Config) when is_list(Config) -> - ?line ok = close(Sock), % Unregister - ok. - -+register_name_ipv6(doc) -> -+ ["Register a name over IPv6"]; -+register_name_ipv6(suite) -> -+ []; -+register_name_ipv6(Config) when is_list(Config) -> -+ % Test if the host has an IPv6 loopback address -+ Res = gen_tcp:listen(0, [inet6, {ip, {0,0,0,0,0,0,0,1}}]), -+ case Res of -+ {ok,LSock} -> -+ gen_tcp:close(LSock), -+ ?line ok = epmdrun(), -+ ?line {ok,Sock} = register_node6("foobar6"), -+ ?line ok = close(Sock), % Unregister -+ ok; -+ _Error -> -+ {skip, "Host does not have an IPv6 loopback address"} -+ end. -+ - register_names_1(doc) -> - ["Register and unregister two nodes"]; - register_names_1(suite) -> -@@ -242,13 +262,14 @@ register_node(Name) -> - register_node(Name,Port) -> - register_node_v2(Port,$M,0,5,5,Name,""). - -+register_node6(Name) -> -+ register_node_v2({0,0,0,0,0,0,0,1},?DUMMY_PORT,$M,0,5,5,Name,""). -+ - register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> -- Utf8Name = unicode:characters_to_binary(Name), -- Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot, -- put16(HVsn), put16(LVsn), -- put16(size(Utf8Name)), binary_to_list(Utf8Name), -- size16(Extra), Extra], -- case send_req(Req) of -+ register_node_v2("localhost", Port, NodeType, Prot, HVsn, LVsn, Name, Extra). -+register_node_v2(Addr, Port, NodeType, Prot, HVsn, LVsn, Name, Extra) -> -+ Req = alive2_req(Port, NodeType, Prot, HVsn, LVsn, Name, Extra), -+ case send_req(Req, Addr) of - {ok,Sock} -> - case recv(Sock,4) of - {ok, [?EPMD_ALIVE2_RESP,_Res=0,_C0,_C1]} -> -@@ -1151,7 +1172,9 @@ send_direct(Sock, Bytes) -> - end. - - send_req(Req) -> -- case connect() of -+ send_req(Req, "localhost"). -+send_req(Req, Addr) -> -+ case connect(Addr) of - {ok,Sock} -> - case send(Sock, [size16(Req), Req]) of - ok -> -diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in -index 3ac9212..7a3b5ce 100644 ---- a/lib/erl_interface/configure.in -+++ b/lib/erl_interface/configure.in -@@ -251,7 +251,7 @@ case "$threads_disabled" in - ;; - win32_threads) - EI_THREADS="true" -- THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500" -+ THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600" - ;; - pthread) - EI_THREADS="true" -diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl -index 55ce9a7..c6202dd 100644 ---- a/lib/kernel/src/erl_epmd.erl -+++ b/lib/kernel/src/erl_epmd.erl -@@ -32,7 +32,7 @@ - %% External exports - -export([start/0, start_link/0, stop/0, port_please/2, - port_please/3, names/0, names/1, -- register_node/2, open/0, open/1, open/2]). -+ register_node/2, register_node/3, open/0, open/1, open/2]). - - %% gen_server callbacks - -export([init/1, handle_call/3, handle_cast/2, handle_info/2, -@@ -102,7 +102,9 @@ names(EpmdAddr) -> - - - register_node(Name, PortNo) -> -- gen_server:call(erl_epmd, {register, Name, PortNo}, infinity). -+ register_node(Name, PortNo, inet). -+register_node(Name, PortNo, Family) -> -+ gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity). - - %%%---------------------------------------------------------------------- - %%% Callback functions from gen_server -@@ -120,10 +122,10 @@ init(_) -> - -spec handle_call(calls(), term(), state()) -> - {'reply', term(), state()} | {'stop', 'shutdown', 'ok', state()}. - --handle_call({register, Name, PortNo}, _From, State) -> -+handle_call({register, Name, PortNo, Family}, _From, State) -> - case State#state.socket of - P when P < 0 -> -- case do_register_node(Name, PortNo) of -+ case do_register_node(Name, PortNo, Family) of - {alive, Socket, Creation} -> - S = State#state{socket = Socket, - port_no = PortNo, -@@ -206,8 +208,12 @@ open({A,B,C,D,E,F,G,H}=EpmdAddr, Timeout) when ?ip6(A,B,C,D,E,F,G,H) -> - close(Socket) -> - gen_tcp:close(Socket). - --do_register_node(NodeName, TcpPort) -> -- case open() of -+do_register_node(NodeName, TcpPort, Family) -> -+ Localhost = case Family of -+ inet -> open({127,0,0,1}); -+ inet6 -> open({0,0,0,0,0,0,0,1}) -+ end, -+ case Localhost of - {ok, Socket} -> - Name = to_string(NodeName), - Extra = "", -diff --git a/lib/wx/configure.in b/lib/wx/configure.in -index 48fcca6..bf27b72 100644 ---- a/lib/wx/configure.in -+++ b/lib/wx/configure.in -@@ -164,14 +164,14 @@ case $host_os in - CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS" - ;; - mingw32) -- CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" -- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" -+ CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" -+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" - AC_MSG_WARN([Reverting to 32-bit time_t]) - CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" - ;; - win32) -- CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" -- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" -+ CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" -+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" - ;; - *) - CFLAGS="$CFLAGS -Wno-deprecated-declarations" diff --git a/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch b/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch deleted file mode 100644 index cc8a9d1..0000000 --- a/otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Rickard Green -Date: Tue, 9 Feb 2016 18:23:26 +0100 -Subject: [PATCH] Quickfix for cmpxchg8b inline asm when pic and gcc >= 5.0 is - used - - -diff --git a/erts/include/internal/i386/ethr_dw_atomic.h b/erts/include/internal/i386/ethr_dw_atomic.h -index e8c4119..caba633 100644 ---- a/erts/include/internal/i386/ethr_dw_atomic.h -+++ b/erts/include/internal/i386/ethr_dw_atomic.h -@@ -115,6 +115,8 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var) - return (ethr_sint_t *) ETHR_DW_NATMC_MEM__(var); - } - -+#if !ETHR_AT_LEAST_GCC_VSN__(5, 0, 0) -+ - #if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__ - /* - * When position independent code is used in 32-bit mode, the EBX register -@@ -138,6 +140,7 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var) - # endif - #endif - -+#endif /* < gcc-5.0 */ - - #define ETHR_HAVE_ETHR_NATIVE_DW_ATOMIC_CMPXCHG_MB - From b6c7bd6af47eabac0fbcbb398c7e4c49d48b492d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 24 Mar 2016 23:04:16 +0300 Subject: [PATCH 079/340] Leftover Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index a89db79..4c830f3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,16 +2,11 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%global __minimal 0 - %ifarch %{arm} # For some reason, fop hangs on arm, so for now don't generate docs by # default %bcond_with doc %else -%if 0%{__minimal} -%bcond_with doc -%else %bcond_without doc %endif From e6fdb0b601d2e3f1cd3d61e1043a132e1d6d5df0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 24 Mar 2016 23:14:57 +0300 Subject: [PATCH 080/340] Uploaded sources Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0e151bd..91ca00d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.2.2.tar.gz /otp-OTP-18.2.3.tar.gz /otp-OTP-18.2.4.tar.gz +/otp-OTP-18.3.tar.gz diff --git a/sources b/sources index 92f198a..5588a52 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0ea13f170092d73f014c27296825bfc9 otp-OTP-18.2.4.tar.gz +9302351b5dcd74d86fb67d8c28ad94d2 otp-OTP-18.3.tar.gz From 8d530e97f03c8d7bd950f28619d7b43dc19405bb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 31 Mar 2016 14:18:34 +0300 Subject: [PATCH 081/340] Disallow epmd to send systemd notifications every time Signed-off-by: Peter Lemenkov --- erlang.spec | 10 +++- ...nd-unasked-for-systemd-notifications.patch | 56 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 otp-0009-Don-t-send-unasked-for-systemd-notifications.patch diff --git a/erlang.spec b/erlang.spec index 4c830f3..16192d8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,7 +16,7 @@ Name: erlang Version: 18.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -72,6 +72,9 @@ 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 # end of autogenerated patch tag list BuildRequires: flex @@ -901,6 +904,7 @@ Erlang mode for XEmacs (source lisp files). %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Split_off_webtool_dependency_from_tools %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution +%patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2226,6 +2230,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Thu Mar 31 2016 Peter Lemenkov - 18.3-2 +- Added patch to suppress sending systemd notifications from epmd if not + started as a systemd service. + * Thu Mar 24 2016 Peter Lemenkov - 18.3-1 - Ver. 18.3 diff --git a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch b/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch new file mode 100644 index 0000000..1d19ace --- /dev/null +++ b/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch @@ -0,0 +1,56 @@ +From: Alexey Lebedeff +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"); From 008a6c63fbd747ac1e313d0bb2b648ae371ed6f8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 Apr 2016 12:15:04 +0300 Subject: [PATCH 082/340] Ver. 18.3.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 16192d8..49ad40b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -15,8 +15,8 @@ %endif Name: erlang -Version: 18.3 -Release: 2%{?dist} +Version: 18.3.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2230,6 +2230,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Thu Apr 7 2016 Peter Lemenkov - 18.3.1-1 +- Ver. 18.3.1 + * Thu Mar 31 2016 Peter Lemenkov - 18.3-2 - Added patch to suppress sending systemd notifications from epmd if not started as a systemd service. From 63f978a130cfa8642242d08e79d97344f5f4a743 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 Apr 2016 12:19:26 +0300 Subject: [PATCH 083/340] Forgot to upload sources Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 91ca00d..2fc3419 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.2.3.tar.gz /otp-OTP-18.2.4.tar.gz /otp-OTP-18.3.tar.gz +/otp-OTP-18.3.1.tar.gz diff --git a/sources b/sources index 5588a52..a073951 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -0ea13f170092d73f014c27296825bfc9 otp-OTP-18.2.4.tar.gz -9302351b5dcd74d86fb67d8c28ad94d2 otp-OTP-18.3.tar.gz +03fd1ccf4e82bc093dd0e514275909df otp-OTP-18.3.1.tar.gz From 835935939d225f717aedd434f058696066fc1445 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 11 Apr 2016 10:27:19 +0300 Subject: [PATCH 084/340] Enable selective building Signed-off-by: Peter Lemenkov --- erlang.spec | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 225 insertions(+), 7 deletions(-) diff --git a/erlang.spec b/erlang.spec index 49ad40b..de69c4d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -14,9 +14,62 @@ %global __with_hipe 1 %endif +## +## Optional components +## + +%global __with_emacs 1 +%global __with_examples 1 +%global __with_java 1 +%global __with_tcltk 1 +# +# wxWidgets plugin blocks the following ones: +# +# * debugger - https://bugzilla.redhat.com/1095715 +# * dialyzer - https://bugzilla.redhat.com/1095717 +# * et - https://bugzilla.redhat.com/1095718 +# * observer - https://bugzilla.redhat.com/1095721 +# * reltool - https://bugzilla.redhat.com/1095727 +# +# debugger blocks: +# +# * common_test +# * megaco +# +# dialyzer blocks: +# +# * typer +# +# et blocks: +# +# * megaco +# +# observer blocks: +# +# * common_test +# * test_server +# * webtool +# +# So finally we have to disable the following plugins: +# +# common_test +# debugger +# dialyzer +# et +# megaco +# observer +# reltool (*) +# test_server +# typer +# webtool +# wx +# +%global __with_wxwidgets 1 + + Name: erlang Version: 18.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -89,6 +142,7 @@ BuildRequires: erlang %if 0%{?el7}%{?fedora} # for BuildRequires: systemd-devel +BuildRequires: systemd Requires(post): systemd Requires(preun):systemd Requires(postun):systemd @@ -96,10 +150,12 @@ Requires: systemd %endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: erlang-rpm-macros +#BuildRequires: erlang-rpm-macros Requires: %{name}-asn1%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-common_test%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} Requires: %{name}-cosEventDomain%{?_isa} = %{version}-%{release} @@ -109,25 +165,41 @@ 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} +%if %{__with_wxwidgets} Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-diameter%{?_isa} = %{version}-%{release} Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-eldap%{?_isa} = %{version}-%{release} Requires: %{name}-erl_docgen%{?_isa} = %{version}-%{release} Requires: %{name}-erl_interface%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-et%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-eunit%{?_isa} = %{version}-%{release} +%if %{__with_tcltk} Requires: %{name}-gs%{?_isa} = %{version}-%{release} +%endif %{__with_tcltk} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} +%if %{__with_java} Requires: %{name}-ic%{?_isa} = %{version}-%{release} +%endif %{__with_java} Requires: %{name}-inets%{?_isa} = %{version}-%{release} +%if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} +%endif %{__with_java} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-megaco%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-observer%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} @@ -136,7 +208,9 @@ Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} Requires: %{name}-percept%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-reltool%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} @@ -144,11 +218,19 @@ Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-test_server%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-tools%{?_isa} = %{version}-%{release} +%if %{__with_wxwidgets} Requires: %{name}-typer%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} Requires: %{name}-webtool%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} +%endif %{__with_wxwidgets} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description @@ -159,6 +241,7 @@ systems from Ericsson. ### BEGIN OF AUTOGENERATED LIST ### +%if %{__with_emacs} %package -n emacs-erlang Summary: Compiled elisp files for erlang-mode under GNU Emacs Group: Applications/Editors @@ -179,6 +262,7 @@ BuildArch: noarch %description -n emacs-erlang-el Erlang mode for GNU Emacs (source lisp files). +%endif %{__with_emacs} %package asn1 Summary: Provides support for Abstract Syntax Notation One @@ -190,6 +274,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description asn1 Provides support for Abstract Syntax Notation One. +%if %{__with_wxwidgets} %package common_test Summary: A portable framework for automatic testing Group: Development/Languages @@ -211,6 +296,7 @@ Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description common_test A portable framework for automatic testing. +%endif %{__with_wxwidgets} %package compiler Summary: A byte code compiler for Erlang which produces highly compact code @@ -320,6 +406,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description crypto Cryptographical support. +%if %{__with_wxwidgets} %package debugger Summary: A debugger for debugging and testing of Erlang programs Group: Development/Languages @@ -331,7 +418,9 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description debugger A debugger for debugging and testing of Erlang programs. +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %package dialyzer Summary: A DIscrepancy AnaLYZer for ERlang programs Group: Development/Languages @@ -346,6 +435,7 @@ Requires: graphviz %description dialyzer A DIscrepancy AnaLYZer for ERlang programs. +%endif %{__with_wxwidgets} %package diameter Summary: Diameter (RFC 3588) library @@ -446,6 +536,7 @@ Obsoletes: erlang-tv %description erts Functionality necessary to run the Erlang System itself. +%if %{__with_wxwidgets} %package et Summary: An event tracer for Erlang programs Group: Development/Languages @@ -457,6 +548,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description et An event tracer for Erlang programs. +%endif %{__with_wxwidgets} %package eunit Summary: Support for unit testing @@ -468,11 +560,14 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description eunit Support for unit testing. +%if %{__with_examples} %package examples Summary: Examples for some Erlang modules Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} +%if %{__with_tcltk} Requires: %{name}-gs%{?_isa} = %{version}-%{release} +%endif %{__with_tcltk} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} @@ -481,7 +576,9 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description examples Examples for some Erlang modules. +%endif %{__with_examples} +%if %{__with_tcltk} %package gs Summary: A library for Tcl/Tk support in Erlang Group: Development/Languages @@ -494,6 +591,7 @@ Requires: tk %description gs A Graphics System used to write platform independent user interfaces. +%endif %{__with_tcltk} %package hipe Summary: High Performance Erlang @@ -510,7 +608,9 @@ High Performance Erlang. %package ic Summary: IDL compiler Group: Development/Languages +%if %{__with_java} BuildRequires: java-devel +%endif %{__with_java} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -531,6 +631,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description inets A set of services such as a Web server and a ftp client etc. +%if %{__with_java} %package jinterface Summary: A library for accessing Java from Erlang Group: Development/Languages @@ -539,6 +640,7 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description jinterface Low level interface to Java. +%endif %{__with_java} %package kernel Summary: Main erlang library @@ -549,6 +651,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description kernel Main erlang library. +%if %{__with_wxwidgets} %package megaco Summary: Megaco/H.248 support library Group: Development/Languages @@ -564,6 +667,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Megaco/H.248 is a protocol for control of elements in a physically decomposed multimedia gateway, enabling separation of call control from media conversion. +%endif %{__with_wxwidgets} %package mnesia Summary: A heavy duty real-time distributed database @@ -575,6 +679,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description mnesia A heavy duty real-time distributed database. +%if %{__with_wxwidgets} %package observer Summary: A set of tools for tracing and investigation of distributed systems Group: Development/Languages @@ -588,6 +693,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description observer A set of tools for tracing and investigation of distributed systems. +%endif %{__with_wxwidgets} %package odbc Summary: A library for unixODBC support in Erlang @@ -683,6 +789,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description public_key API to public key infrastructure. +%if %{__with_wxwidgets} %package reltool Summary: A release management tool Group: Development/Languages @@ -700,6 +807,7 @@ between applications. The graphical frontend depicts the dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. +%endif %{__with_wxwidgets} %package runtime_tools Summary: A set of tools to include in a production system @@ -786,6 +894,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. +%if %{__with_wxwidgets} %package test_server Summary: The OTP Test Server Group: Development/Languages @@ -800,6 +909,7 @@ Requires: %{name}-tools%{?_isa} = %{version}-%{release} %description test_server The OTP Test Server. +%endif %{__with_wxwidgets} %package tools Summary: A set of programming tools including a coverage analyzer etc @@ -816,11 +926,14 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: %{name}-webtool%{?_isa} = %{version}-%{release} %endif +%if %{__with_emacs} Provides: emacs-common-erlang = %{version}-%{release} +%endif %{__with_emacs} %description tools A set of programming tools including a coverage analyzer etc. +%if %{__with_wxwidgets} %package typer Summary: TYPe annotator for ERlang programs Group: Development/Languages @@ -833,7 +946,9 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description typer TYPe annotator for ERlang programs. +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %package webtool Summary: A tool that simplifying the use of web based Erlang tools Group: Development/Languages @@ -845,7 +960,9 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description webtool A tool that simplifying the use of web based Erlang tools. +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang Group: Development/Languages @@ -858,6 +975,7 @@ Requires: mesa-libGLU %description wx A Graphics System used to write platform independent user interfaces. +%endif %{__with_wxwidgets} %package xmerl Summary: Provides support for XML 1.0 @@ -869,6 +987,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. +%if %{__with_emacs} %package -n xemacs-erlang Summary: Compiled elisp files for erlang-mode under XEmacs Group: Applications/Editors @@ -889,6 +1008,7 @@ BuildArch: noarch %description -n xemacs-erlang-el Erlang mode for XEmacs (source lisp files). +%endif %{__with_emacs} ### END OF AUTOGENERATED LIST ### @@ -924,11 +1044,38 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif -CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd %{?__with_hipe:--enable-hipe} --with-wx-config=/usr/bin/wx-config-3.0 +CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd \ + %{?__with_hipe:--enable-hipe} \ +%if %{__with_java} + \ +%else + --without-jinterface \ +%endif %{__with_java} +%if %{__with_tcltk} + \ +%else + --without-gs \ +%endif %{__with_tcltk} +%if %{__with_wxwidgets} + --with-wx-config=/usr/bin/wx-config-3.0 +%else + --without-common_test \ + --without-debugger \ + --without-dialyzer \ + --without-et \ + --without-megaco \ + --without-observer \ + --without-reltool \ + --without-test_server \ + --without-typer \ + --without-webtool \ + --without-wx +%endif %{__with_wxwidgets} # Remove pre-built BEAM files make clean +%if %{__with_emacs} # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -958,6 +1105,7 @@ rm -f xemacs-erlang/erlang-flymake.el pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd +%endif %{__with_emacs} make @@ -973,6 +1121,7 @@ make docs %install +%if %{__with_emacs} # GNU Emacs/XEmacs related stuff erlang_tools_vsn="$(sed -n 's/TOOLS_VSN = //p' lib/tools/vsn.mk)" @@ -998,6 +1147,7 @@ for f in lib/tools/emacs/{README,*.el}; do done rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el" install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" +%endif %{__with_emacs} make DESTDIR=$RPM_BUILD_ROOT install @@ -1008,9 +1158,15 @@ env ERL_LIBS="$RPM_BUILD_ROOT%{_libdir}/erlang/lib" make DESTDIR=$RPM_BUILD_ROOT # Do not install info files - they are almost empty and useless find $RPM_BUILD_ROOT%{_libdir}/erlang -type f -name info -exec rm -f {} \; +%if %{__with_examples} # fix 0775 permission on some directories find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 | xargs chmod 755 find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 | xargs chmod 755 +%else +# Remove all examples +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -mindepth 1 -maxdepth 2 -type d -name examples -exec rm -rf {} \; +%endif %{__with_examples} + chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin # Relocate doc-files into the proper directory @@ -1060,6 +1216,7 @@ do fi done +%if %{__with_java} # symlink *.jar files to appropriate places for subpackages install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" @@ -1072,6 +1229,7 @@ ln -s "${ic_lib_dir}priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" +%endif %{__with_java} # systemd-related stuff %if 0%{?el7}%{?fedora} @@ -1082,6 +1240,19 @@ install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket %endif +%if %{__with_wxwidgets} +echo "No need to fix additional scripts" +%else +# FIXME workaround for broken Erlang install procedure +for exe in ct_run dialyzer typer +do + rm -f $RPM_BUILD_ROOT/%{_bindir}/${exe} + rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/bin/${exe} + rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/erts-*/bin/${exe} +done +%endif %{__with_wxwidgets} + + %check # FIXME run tests somehow # make tests || exit 0 @@ -1115,10 +1286,14 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/asn1rt.* %endif +%if %{__with_wxwidgets} %files common_test %{_bindir}/ct_run +%{_libdir}/erlang/bin/ct_run +%{_libdir}/erlang/erts-*/bin/ct_run %{_libdir}/erlang/lib/common_test-*/ %if %{with doc} +%{_libdir}/erlang/man/man1/ct_run.* %{_libdir}/erlang/man/man3/ct.* %{_libdir}/erlang/man/man3/ct_cover.* %{_libdir}/erlang/man/man3/ct_ftp.* @@ -1134,6 +1309,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/unix_telnet.* %{_libdir}/erlang/man/man6/common_test.* %endif +%endif %{__with_wxwidgets} %files compiler %{_libdir}/erlang/lib/compiler-*/ @@ -1266,6 +1442,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man6/crypto.* %endif +%if %{__with_wxwidgets} %files debugger %{_libdir}/erlang/lib/debugger-*/ %if %{with doc} @@ -1273,7 +1450,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/i.* %{_libdir}/erlang/man/man3/int.* %endif +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %files dialyzer %{_bindir}/dialyzer %{_libdir}/erlang/bin/dialyzer @@ -1282,6 +1461,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{with doc} %{_libdir}/erlang/man/man3/dialyzer.* %endif +%endif %{__with_wxwidgets} %files diameter %dir %{_libdir}/erlang/lib/diameter-*/ @@ -1370,7 +1550,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_bindir}/escript %{_bindir}/run_erl %{_bindir}/to_erl -%{_libdir}/erlang/bin/ct_run %{_libdir}/erlang/bin/epmd %{_libdir}/erlang/bin/erl %{_libdir}/erlang/bin/erlc @@ -1389,7 +1568,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/beam %{_libdir}/erlang/erts-*/bin/beam.smp %{_libdir}/erlang/erts-*/bin/child_setup -%{_libdir}/erlang/erts-*/bin/ct_run %{_libdir}/erlang/erts-*/bin/dyn_erl %{_libdir}/erlang/erts-*/bin/epmd %{_libdir}/erlang/erts-*/bin/erl @@ -1409,7 +1587,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/erts-*/src/ %{_libdir}/erlang/lib/erts-*/ %if %{with doc} -%{_libdir}/erlang/man/man1/ct_run.* %{_libdir}/erlang/man/man1/epmd.* %{_libdir}/erlang/man/man1/erl.* %{_libdir}/erlang/man/man1/erlc.* @@ -1435,6 +1612,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_unitdir}/epmd@.socket %endif +%if %{__with_wxwidgets} %files et %dir %{_libdir}/erlang/lib/et-*/ %{_libdir}/erlang/lib/et-*/ebin @@ -1446,6 +1624,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/et_selector.* %{_libdir}/erlang/man/man3/et_viewer.* %endif +%endif %{__with_wxwidgets} %files eunit %dir %{_libdir}/erlang/lib/eunit-*/ @@ -1457,20 +1636,31 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/eunit_surefire.* %endif +%if %{__with_examples} %files examples %{_libdir}/erlang/lib/asn1-*/examples/ %{_libdir}/erlang/lib/diameter-*/examples/ +%if %{__with_wxwidgets} %{_libdir}/erlang/lib/et-*/examples/ +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/eunit-*/examples/ +%if %{__with_tcltk} %{_libdir}/erlang/lib/gs-*/examples/ +%endif %{__with_tcltk} +%if %{__with_java} %{_libdir}/erlang/lib/ic-*/examples/ +%endif %{__with_java} %{_libdir}/erlang/lib/inets-*/examples/ %{_libdir}/erlang/lib/kernel-*/examples/ %{_libdir}/erlang/lib/megaco-*/examples/ %{_libdir}/erlang/lib/mnesia-*/examples/ +%if %{__with_wxwidgets} %{_libdir}/erlang/lib/observer-*/examples/ +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/orber-*/examples/ +%if %{__with_wxwidgets} %{_libdir}/erlang/lib/reltool-*/examples/ +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/runtime_tools-*/examples/ %{_libdir}/erlang/lib/sasl-*/examples/ %{_libdir}/erlang/lib/snmp-*/examples/ @@ -1478,8 +1668,12 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/stdlib-*/examples/ %{_libdir}/erlang/lib/syntax_tools-*/examples/ %{_libdir}/erlang/lib/tools-*/examples/ +%if %{__with_wxwidgets} %{_libdir}/erlang/lib/wx-*/examples/ +%endif %{__with_wxwidgets} +%endif %{__with_examples} +%if %{__with_tcltk} %files gs %dir %{_libdir}/erlang/lib/gs-*/ %{_libdir}/erlang/lib/gs-*/contribs @@ -1489,6 +1683,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{with doc} %{_libdir}/erlang/man/man3/gs.* %endif +%endif %{__with_tcltk} %files hipe %{_libdir}/erlang/lib/hipe-*/ @@ -1501,7 +1696,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/ic-*/src # FIXME see erlang-jinterface also #%dir %{_javadir}/%{name}/ +%if %{__with_java} %{_javadir}/%{name}/ic.jar +%endif %{__with_java} %if %{with doc} %{_libdir}/erlang/man/man3/ic.* %{_libdir}/erlang/man/man3/ic_clib.* @@ -1530,11 +1727,13 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/tftp.* %endif +%if %{__with_java} %files jinterface # FIXME see erlang-ic also #%dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ +%endif %{__with_java} %files kernel %dir %{_libdir}/erlang/lib/kernel-*/ @@ -1576,6 +1775,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man6/kernel.* %endif +%if %{__with_wxwidgets} %files megaco %dir %{_libdir}/erlang/lib/megaco-*/ %{_libdir}/erlang/lib/megaco-*/ebin @@ -1596,6 +1796,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/megaco_udp.* %{_libdir}/erlang/man/man3/megaco_user.* %endif +%endif %{__with_wxwidgets} %files mnesia %dir %{_libdir}/erlang/lib/mnesia-*/ @@ -1607,6 +1808,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/mnesia_registry.* %endif +%if %{__with_wxwidgets} %files observer %dir %{_libdir}/erlang/lib/observer-*/ %{_libdir}/erlang/lib/observer-*/ebin/ @@ -1616,10 +1818,12 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{with doc} %{_libdir}/erlang/man/man1/cdv.* %{_libdir}/erlang/man/man3/crashdump.* +%{_libdir}/erlang/man/man3/etop.* %{_libdir}/erlang/man/man3/observer.* %{_libdir}/erlang/man/man3/ttb.* %{_libdir}/erlang/man/man6/observer.* %endif +%endif %{__with_wxwidgets} %files odbc %{_libdir}/erlang/lib/odbc-*/ @@ -1644,7 +1848,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/any.* %{_libdir}/erlang/man/man3/corba.* %{_libdir}/erlang/man/man3/corba_object.* -%{_libdir}/erlang/man/man3/etop.* %{_libdir}/erlang/man/man3/fixed.* %{_libdir}/erlang/man/man3/interceptors.* %{_libdir}/erlang/man/man3/lname.* @@ -1703,6 +1906,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/public_key.* %endif +%if %{__with_wxwidgets} %files reltool %dir %{_libdir}/erlang/lib/reltool-*/ %{_libdir}/erlang/lib/reltool-*/ebin @@ -1710,6 +1914,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{with doc} %{_libdir}/erlang/man/man3/reltool.* %endif +%endif %{__with_wxwidgets} %files runtime_tools %dir %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1918,6 +2123,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/prettypr.* %endif +%if %{__with_wxwidgets} %files test_server %{_libdir}/erlang/lib/test_server-*/ %if %{with doc} @@ -1925,6 +2131,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/test_server_ctrl.* %{_libdir}/erlang/man/man6/test_server.* %endif +%endif %{__with_wxwidgets} %files tools %dir %{_libdir}/erlang/lib/tools-*/ @@ -1946,20 +2153,25 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/xref.* %endif +%if %{__with_wxwidgets} %files typer %{_bindir}/typer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/typer %dir %{_libdir}/erlang/lib/typer-*/ %{_libdir}/erlang/lib/typer-*/ebin/ +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %files webtool %{_libdir}/erlang/lib/webtool-*/ %if %{with doc} %{_libdir}/erlang/man/man1/start_webtool.* %{_libdir}/erlang/man/man3/webtool.* %endif +%endif %{__with_wxwidgets} +%if %{__with_wxwidgets} %files wx %dir %{_libdir}/erlang/lib/wx-*/ %{_libdir}/erlang/lib/wx-*/ebin @@ -2197,6 +2409,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* %{_libdir}/erlang/man/man3/wxXmlResource.* %endif +%endif %{__with_wxwidgets} %files xmerl %{_libdir}/erlang/lib/xmerl-*/ @@ -2210,6 +2423,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif +%if %{__with_emacs} %files -n emacs-erlang %dir %{_emacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README @@ -2227,9 +2441,13 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %files -n xemacs-erlang-el %{_xemacs_sitelispdir}/erlang/*.el +%endif %{__with_emacs} %changelog +* Sun Apr 10 2016 Peter Lemenkov - 18.3.1-2 +- Enable selective building + * Thu Apr 7 2016 Peter Lemenkov - 18.3.1-1 - Ver. 18.3.1 From 2eb1f1c08641335282b2465c6405c9f7b6bea098 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 27 Apr 2016 13:59:42 +0300 Subject: [PATCH 085/340] Ver. 18.3.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index de69c4d..7cd0515 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 18.3.1 -Release: 2%{?dist} +Version: 18.3.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2445,6 +2445,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Apr 27 2016 Peter Lemenkov - 18.3.2-1 +- Ver. 18.3.2 + * Sun Apr 10 2016 Peter Lemenkov - 18.3.1-2 - Enable selective building From 7dd309b317bc4f1f8cd9bbbca3d94b122808f08d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 27 Apr 2016 16:47:46 +0300 Subject: [PATCH 086/340] Upload sources Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2fc3419..1288b54 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.2.4.tar.gz /otp-OTP-18.3.tar.gz /otp-OTP-18.3.1.tar.gz +/otp-OTP-18.3.2.tar.gz diff --git a/sources b/sources index a073951..25a955d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03fd1ccf4e82bc093dd0e514275909df otp-OTP-18.3.1.tar.gz +364da46692634bbf67da585540eda1cb otp-OTP-18.3.2.tar.gz From 99e86faeb679ff6bdc0a2f4366df50dd1a052374 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 11 May 2016 13:12:35 +0300 Subject: [PATCH 087/340] Ver. 18.3.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1288b54..4955ce0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.tar.gz /otp-OTP-18.3.1.tar.gz /otp-OTP-18.3.2.tar.gz +/otp-OTP-18.3.3.tar.gz diff --git a/erlang.spec b/erlang.spec index 7cd0515..a5a987e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 18.3.2 +Version: 18.3.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2445,6 +2445,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed May 11 2016 Peter Lemenkov - 18.3.3-1 +- Ver. 18.3.3 + * Wed Apr 27 2016 Peter Lemenkov - 18.3.2-1 - Ver. 18.3.2 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 00038c5..2af76d2 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -472,10 +472,10 @@ index 1c05d45..88f9f62 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 0a4b625..1b1d83d 100644 +index 7f51676..093f462 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -115,7 +115,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" diff --git a/sources b/sources index 25a955d..068a4eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -364da46692634bbf67da585540eda1cb otp-OTP-18.3.2.tar.gz +34d812a7b27060659e592c33384ad11d otp-OTP-18.3.3.tar.gz From 35d91694b32ea4e1f50dafe5d9e07ec4ea881950 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 13 Jun 2016 15:43:31 +0200 Subject: [PATCH 088/340] Fix regression with GCC 6.x.y Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++- ...-decoding-of-LLONG_MIN-in-erl_decode.patch | 69 +++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch diff --git a/erlang.spec b/erlang.spec index a5a987e..5b5fd1e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 18.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -128,6 +128,9 @@ 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 # end of autogenerated patch tag list BuildRequires: flex @@ -1025,6 +1028,7 @@ Erlang mode for XEmacs (source lisp files). %patch7 -p1 -b .Split_off_webtool_dependency_from_tools %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution %patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications +%patch10 -p1 -b .Fix_decoding_of_LLONG_MIN_in_erl_decode # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2445,6 +2449,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Jun 13 2016 Peter Lemenkov - 18.3.3-2 +- Fix regression with GCC 6.x.y + * Wed May 11 2016 Peter Lemenkov - 18.3.3-1 - Ver. 18.3.3 diff --git a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch b/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch new file mode 100644 index 0000000..d832978 --- /dev/null +++ b/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch @@ -0,0 +1,69 @@ +From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= +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 From a455cfc9726867ddf5a849ada4dd8c3c04fd7f38 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 14 Jun 2016 15:16:31 +0200 Subject: [PATCH 089/340] Ver. 18.3.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5b5fd1e..2924ec0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 18.3.3 -Release: 2%{?dist} +Version: 18.3.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2449,6 +2449,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Jun 14 2016 Peter Lemenkov - 18.3.4-1 +- Ver. 18.3.4 + * Mon Jun 13 2016 Peter Lemenkov - 18.3.3-2 - Fix regression with GCC 6.x.y From 7baa91a7251e17a9c036027784f19d2344e7fd8f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 14 Jun 2016 15:22:10 +0200 Subject: [PATCH 090/340] Forgot to upload tarball. As usual. Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4955ce0..49299e8 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.1.tar.gz /otp-OTP-18.3.2.tar.gz /otp-OTP-18.3.3.tar.gz +/otp-OTP-18.3.4.tar.gz diff --git a/sources b/sources index 068a4eb..780d7be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d812a7b27060659e592c33384ad11d otp-OTP-18.3.3.tar.gz +4debfc36d9392b85006033af38637274 otp-OTP-18.3.4.tar.gz From f866398479f7961914010e2c299b4b4c88afa210 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jul 2016 13:11:40 +0300 Subject: [PATCH 091/340] Ver. 18.3.4.1 - Ver. 18.3.4.1 - Allow node registration via IPv6 (PR erlang/otp#1129) Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 10 +++++- ...dist-switch-while-connection-to-EPMD.patch | 34 +++++++++++++++++++ sources | 2 +- 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch diff --git a/.gitignore b/.gitignore index 49299e8..0d15586 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.2.tar.gz /otp-OTP-18.3.3.tar.gz /otp-OTP-18.3.4.tar.gz +/otp-OTP-18.3.4.1.tar.gz diff --git a/erlang.spec b/erlang.spec index 2924ec0..94917c7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 18.3.4 +Version: 18.3.4.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -131,6 +131,9 @@ 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 # end of autogenerated patch tag list BuildRequires: flex @@ -1029,6 +1032,7 @@ Erlang mode for XEmacs (source lisp files). %patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution %patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications %patch10 -p1 -b .Fix_decoding_of_LLONG_MIN_in_erl_decode +%patch11 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2449,6 +2453,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri Jul 15 2016 Peter Lemenkov - 18.3.4.1-1 +- Ver. 18.3.4.1 +- Allow node registration via IPv6 (PR erlang/otp#1129) + * Tue Jun 14 2016 Peter Lemenkov - 18.3.4-1 - Ver. 18.3.4 diff --git a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch b/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch new file mode 100644 index 0000000..8b8fd0d --- /dev/null +++ b/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch @@ -0,0 +1,34 @@ +From: Peter Lemenkov +Date: Thu, 14 Jul 2016 17:51:16 +0300 +Subject: [PATCH] Respect -proto_dist switch while connection to EPMD + +Signed-off-by: Peter Lemenkov + +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/sources b/sources index 780d7be..bb0797a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4debfc36d9392b85006033af38637274 otp-OTP-18.3.4.tar.gz +d91205fe5b3a64a5105481e05adca005 otp-OTP-18.3.4.1.tar.gz From a3bb2c2410368f07e5396090ee728b4c3062617f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 26 Jul 2016 17:00:07 +0300 Subject: [PATCH 092/340] Ver. 18.3.4.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d15586..17c7274 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.3.tar.gz /otp-OTP-18.3.4.tar.gz /otp-OTP-18.3.4.1.tar.gz +/otp-OTP-18.3.4.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 94917c7..8d5649d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 18.3.4.1 +Version: 18.3.4.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2453,6 +2453,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Jul 26 2016 Peter Lemenkov - 18.3.4.2-1 +- Ver. 18.3.4.2 + * Fri Jul 15 2016 Peter Lemenkov - 18.3.4.1-1 - Ver. 18.3.4.1 - Allow node registration via IPv6 (PR erlang/otp#1129) diff --git a/sources b/sources index bb0797a..1a7d38d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d91205fe5b3a64a5105481e05adca005 otp-OTP-18.3.4.1.tar.gz +fd9934b664769500f3216f688eb57493 otp-OTP-18.3.4.2.tar.gz From 8a7b81063e0a4e3d94ec83a436d7001ea877b2b2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 27 Jul 2016 14:14:07 +0300 Subject: [PATCH 093/340] Ver. 19.0.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 225 ++++------------- ...n-pages-and-do-not-install-miscellan.patch | 6 +- otp-0002-Remove-rpath.patch | 2 +- otp-0003-Do-not-install-C-sources.patch | 46 ++-- otp-0004-Do-not-install-Java-sources.patch | 4 +- ...teventlog-and-related-doc-files-on-n.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 230 ++++++++---------- ...dist-switch-while-connection-to-EPMD.patch | 25 +- ...it-off-webtool-dependency-from-tools.patch | 40 --- ...-to-crash-dump-on-large-distribution.patch | 31 --- ...nd-unasked-for-systemd-notifications.patch | 56 ----- ...-decoding-of-LLONG_MIN-in-erl_decode.patch | 69 ------ sources | 2 +- 14 files changed, 195 insertions(+), 546 deletions(-) rename otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch => otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch (54%) delete mode 100644 otp-0007-Split-off-webtool-dependency-from-tools.patch delete mode 100644 otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch delete mode 100644 otp-0009-Don-t-send-unasked-for-systemd-notifications.patch delete mode 100644 otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch diff --git a/.gitignore b/.gitignore index 17c7274..bdf9fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.4.tar.gz /otp-OTP-18.3.4.1.tar.gz /otp-OTP-18.3.4.2.tar.gz +/otp-OTP-19.0.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 8d5649d..e22de86 100644 --- a/erlang.spec +++ b/erlang.spec @@ -47,8 +47,6 @@ # observer blocks: # # * common_test -# * test_server -# * webtool # # So finally we have to disable the following plugins: # @@ -59,16 +57,14 @@ # megaco # observer # reltool (*) -# test_server # typer -# webtool # wx # %global __with_wxwidgets 1 Name: erlang -Version: 18.3.4.2 +Version: 19.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -120,20 +116,8 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch # Do not install erlang sources Patch6: otp-0006-Do-not-install-erlang-sources.patch # Fedora specific patch -# 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-Respect-proto_dist-switch-while-connection-to-EPMD.patch # end of autogenerated patch tag list BuildRequires: flex @@ -209,7 +193,6 @@ Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} -Requires: %{name}-ose%{?_isa} = %{version}-%{release} Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} Requires: %{name}-percept%{?_isa} = %{version}-%{release} @@ -224,17 +207,11 @@ Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -%if %{__with_wxwidgets} -Requires: %{name}-test_server%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-typer%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} %if %{__with_wxwidgets} -Requires: %{name}-webtool%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} -%if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} @@ -247,29 +224,6 @@ systems from Ericsson. ### BEGIN OF AUTOGENERATED LIST ### -%if %{__with_emacs} -%package -n emacs-erlang -Summary: Compiled elisp files for erlang-mode under GNU Emacs -Group: Applications/Editors -BuildRequires: emacs -BuildRequires: emacs-el -Requires: emacs-common-erlang = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} -BuildArch: noarch - -%description -n emacs-erlang -Erlang mode for GNU Emacs. - -%package -n emacs-erlang-el -Summary: Elisp source files for erlang-mode under GNU Emacs -Group: Applications/Editors -Requires: emacs-erlang = %{version}-%{release} -BuildArch: noarch - -%description -n emacs-erlang-el -Erlang mode for GNU Emacs (source lisp files). -%endif %{__with_emacs} - %package asn1 Summary: Provides support for Abstract Syntax Notation One Group: Development/Languages @@ -296,9 +250,10 @@ Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-test_server%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} +Obsoletes: erlang-test_server %description common_test A portable framework for automatic testing. @@ -530,14 +485,16 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.10 +Provides: erlang(erl_nif_version) = 2.11 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-inviso +Obsoletes: erlang-ose Obsoletes: erlang-pman Obsoletes: erlang-toolbar Obsoletes: erlang-tv +Obsoletes: erlang-webtool %description erts Functionality necessary to run the Erlang System itself. @@ -740,15 +697,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description os_mon A monitor which allows inspection of the underlying operating system. -%package ose -Summary: A module for interacting with Enea OSE -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description ose -A module for interacting with Enea OSE. - %package otp_mibs Summary: SNMP management information base for Erlang/OTP nodes Group: Development/Languages @@ -900,42 +848,31 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. -%if %{__with_wxwidgets} -%package test_server -Summary: The OTP Test Server -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-observer%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-tools%{?_isa} = %{version}-%{release} - -%description test_server -The OTP Test Server. -%endif %{__with_wxwidgets} - %package tools Summary: A set of programming tools including a coverage analyzer etc Group: Development/Languages +%if %{__with_emacs} +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-packages-extra-el +%endif %{__with_emacs} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -# This is a weak dependency triggered by the "cover_web" application. -# Unfortunately Recommends/Suggests tags are supported only in Fedora 21+ and -# RHEL 8+ (eventually) -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -Suggests: %{name}-webtool%{?_isa} = %{version}-%{release} -%endif %if %{__with_emacs} -Provides: emacs-common-erlang = %{version}-%{release} +Requires: emacs-filesystem +Requires: xemacs-filesystem +Obsoletes: emacs-erlang +Obsoletes: emacs-erlang-el +Obsoletes: xemacs-erlang +Obsoletes: xemacs-erlang-el %endif %{__with_emacs} + %description tools A set of programming tools including a coverage analyzer etc. @@ -954,20 +891,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} TYPe annotator for ERlang programs. %endif %{__with_wxwidgets} -%if %{__with_wxwidgets} -%package webtool -Summary: A tool that simplifying the use of web based Erlang tools -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-observer%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description webtool -A tool that simplifying the use of web based Erlang tools. -%endif %{__with_wxwidgets} - %if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang @@ -993,29 +916,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. -%if %{__with_emacs} -%package -n xemacs-erlang -Summary: Compiled elisp files for erlang-mode under XEmacs -Group: Applications/Editors -BuildRequires: xemacs -BuildRequires: xemacs-packages-extra-el -Requires: emacs-common-erlang = %{version}-%{release} -Requires: xemacs(bin) >= %{_xemacs_version} -BuildArch: noarch - -%description -n xemacs-erlang -Erlang mode for XEmacs. - -%package -n xemacs-erlang-el -Summary: Elisp source files for erlang-mode under XEmacs -Group: Applications/Editors -Requires: xemacs-erlang = %{version}-%{release} -BuildArch: noarch - -%description -n xemacs-erlang-el -Erlang mode for XEmacs (source lisp files). -%endif %{__with_emacs} - ### END OF AUTOGENERATED LIST ### %prep @@ -1028,11 +928,7 @@ Erlang mode for XEmacs (source lisp files). %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources -%patch7 -p1 -b .Split_off_webtool_dependency_from_tools -%patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution -%patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications -%patch10 -p1 -b .Fix_decoding_of_LLONG_MIN_in_erl_decode -%patch11 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD +%patch7 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1074,9 +970,7 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- --without-megaco \ --without-observer \ --without-reltool \ - --without-test_server \ --without-typer \ - --without-webtool \ --without-wx %endif %{__with_wxwidgets} @@ -1109,7 +1003,7 @@ cat > xemacs-erlang-init.el << EOF EOF mkdir xemacs-erlang cp lib/tools/emacs/*.el xemacs-erlang/ -rm -f xemacs-erlang/erlang-flymake.el +rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd @@ -1575,11 +1469,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %dir %{_libdir}/erlang/erts-*/bin/ %{_libdir}/erlang/erts-*/bin/beam %{_libdir}/erlang/erts-*/bin/beam.smp -%{_libdir}/erlang/erts-*/bin/child_setup %{_libdir}/erlang/erts-*/bin/dyn_erl %{_libdir}/erlang/erts-*/bin/epmd %{_libdir}/erlang/erts-*/bin/erl %{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erl_child_setup %{_libdir}/erlang/erts-*/bin/erlc %{_libdir}/erlang/erts-*/bin/erlexec %{_libdir}/erlang/erts-*/bin/escript @@ -1606,6 +1500,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/erl_driver.* %{_libdir}/erlang/man/man3/erl_nif.* %{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erl_tracer.* %{_libdir}/erlang/man/man3/erlang.* %{_libdir}/erlang/man/man3/erts_alloc.* %{_libdir}/erlang/man/man3/init.* @@ -1684,7 +1579,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{__with_tcltk} %files gs %dir %{_libdir}/erlang/lib/gs-*/ -%{_libdir}/erlang/lib/gs-*/contribs %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src @@ -1878,15 +1772,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man6/os_mon.* %endif -%files ose -%dir %{_libdir}/erlang/lib/ose-*/ -%{_libdir}/erlang/lib/ose-*/ebin/ -%if %{with doc} -%{_libdir}/erlang/man/man3/ose.* -%{_libdir}/erlang/man/man3/ose_erl_driver.* -%{_libdir}/erlang/man/man6/ose.* -%endif - %files otp_mibs %{_libdir}/erlang/lib/otp_mibs-*/ %if %{with doc} @@ -1912,6 +1797,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} %{_libdir}/erlang/man/man3/public_key.* +%{_libdir}/erlang/man/man6/public_key.* %endif %if %{__with_wxwidgets} @@ -1933,6 +1819,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/dbg.* %{_libdir}/erlang/man/man3/dyntrace.* %{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man3/msacc.* %{_libdir}/erlang/man/man3/system_information.* %{_libdir}/erlang/man/man6/runtime_tools.* %endif @@ -1943,7 +1830,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/sasl-*/src %if %{with doc} %{_libdir}/erlang/man/man3/alarm_handler.* -%{_libdir}/erlang/man/man3/overload.* %{_libdir}/erlang/man/man3/rb.* %{_libdir}/erlang/man/man3/release_handler.* %{_libdir}/erlang/man/man3/systools.* @@ -2080,6 +1966,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/gen_event.* %{_libdir}/erlang/man/man3/gen_fsm.* %{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/gen_statem.* %{_libdir}/erlang/man/man3/io.* %{_libdir}/erlang/man/man3/io_lib.* %{_libdir}/erlang/man/man3/lib.* @@ -2131,22 +2018,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/prettypr.* %endif -%if %{__with_wxwidgets} -%files test_server -%{_libdir}/erlang/lib/test_server-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/test_server.* -%{_libdir}/erlang/man/man3/test_server_ctrl.* -%{_libdir}/erlang/man/man6/test_server.* -%endif -%endif %{__with_wxwidgets} - %files tools %dir %{_libdir}/erlang/lib/tools-*/ %{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin %{_libdir}/erlang/lib/tools-*/emacs -%{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cover.* @@ -2160,6 +2036,19 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/tags.* %{_libdir}/erlang/man/man3/xref.* %endif +%if %{__with_emacs} +%dir %{_emacs_sitelispdir}/erlang +%dir %{_xemacs_sitelispdir}/erlang +%doc %{_emacs_sitelispdir}/erlang/README +%doc %{_xemacs_sitelispdir}/erlang/README +%{_emacs_sitelispdir}/erlang/*.el +%{_emacs_sitelispdir}/erlang/*.elc +%{_emacs_sitestartdir}/erlang-init.el +%{_xemacs_sitelispdir}/erlang/*.el +%{_xemacs_sitelispdir}/erlang/*.elc +%{_xemacs_sitestartdir}/erlang-init.el +%endif %{__with_emacs} + %if %{__with_wxwidgets} %files typer @@ -2170,15 +2059,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/typer-*/ebin/ %endif %{__with_wxwidgets} -%if %{__with_wxwidgets} -%files webtool -%{_libdir}/erlang/lib/webtool-*/ -%if %{with doc} -%{_libdir}/erlang/man/man1/start_webtool.* -%{_libdir}/erlang/man/man3/webtool.* -%endif -%endif %{__with_wxwidgets} - %if %{__with_wxwidgets} %files wx %dir %{_libdir}/erlang/lib/wx-*/ @@ -2431,28 +2311,13 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif -%if %{__with_emacs} -%files -n emacs-erlang -%dir %{_emacs_sitelispdir}/erlang -%doc %{_emacs_sitelispdir}/erlang/README -%{_emacs_sitelispdir}/erlang/*.elc -%{_emacs_sitestartdir}/erlang-init.el - -%files -n emacs-erlang-el -%{_emacs_sitelispdir}/erlang/*.el - -%files -n xemacs-erlang -%dir %{_xemacs_sitelispdir}/erlang -%doc %{_xemacs_sitelispdir}/erlang/README -%{_xemacs_sitelispdir}/erlang/*.elc -%{_xemacs_sitestartdir}/erlang-init.el - -%files -n xemacs-erlang-el -%{_xemacs_sitelispdir}/erlang/*.el -%endif %{__with_emacs} - %changelog +* Wed Jul 27 2016 Peter Lemenkov - 19.0.2-1 +- Ver. 19.0.2 +- The following packages were removed - ose, test_server (merged into common_test), webtool +- Merge (x)emacs subpackages into erlang-typer + * Tue Jul 26 2016 Peter Lemenkov - 18.3.4.2-1 - Ver. 18.3.4.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 2602d40..0415370 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 8e55fa7..9512faa 100644 +index cb053a1..024307b 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -551,10 +551,6 @@ endif +@@ -492,10 +492,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,7 +21,7 @@ index 8e55fa7..9512faa 100644 $(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 e71308e..ae2c9cf 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 . diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 77418af..e1eac8f 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index e66c0ca..574cdf5 100644 +index c62f25b..bb28704 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -90,7 +90,7 @@ endif diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index d4abd19..0f945b7 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,42 +14,41 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 2b72e1a..0522562 100644 +index 1f714df..95835d6 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) +@@ -136,8 +136,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 +index bb28704..165a2e0 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -200,14 +200,10 @@ docs: +@@ -195,13 +195,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" - 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 4f393e9..a9a7f7c 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),) +@@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -73,7 +72,7 @@ index 777d709..57917ae 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index b9f92a0..9612f24 100644 +index c0dad59..9a19028 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in @@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c @@ -90,7 +89,7 @@ index b9f92a0..9612f24 100644 $(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 c37ad4d..09bf1ef 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -271,7 +271,7 @@ release_spec: opt @@ -103,7 +102,7 @@ index 045b6d8..39be02a 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 685eb5d..6c8a432 100644 +index 784e73c..568c5e4 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 +118,7 @@ index 685eb5d..6c8a432 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index e9fc5f4..ac9fb73 100644 +index 27b156a..f11ff30 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,26 +130,11 @@ index e9fc5f4..ac9fb73 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 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 +index cfe9191..735cdaa 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -198,8 +198,6 @@ include ../vsn.mk +@@ -190,8 +190,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index d9ba9c4..694a23f 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov 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 +index 21c38e5..eeba2e4 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: @@ -18,7 +18,7 @@ index d9100cf..6886c71 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index 1c8364e..34b64a8 100644 +index e55cfa6..5e3a0a5 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: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index b0c843e..52bd6f0 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 0c5acd9..5f8f1e3 100644 +index 91c7ae7..dc7bcf3 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) @@ -29,7 +29,7 @@ index 0c5acd9..5f8f1e3 100644 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 3ff6320..29b53a8 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 2af76d2..564546a 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 52034a0..56d91b9 100644 +index 4a447d3..eac5ae5 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -86,8 +86,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -88,8 +88,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -21,7 +21,7 @@ index 52034a0..56d91b9 100644 $(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 38cf2d4..d4bb398 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ release_spec: opt @@ -34,10 +34,10 @@ index 5b34017..d4677d6 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 987345c..f53546a 100644 +index 0f9e044..5039444 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 +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -46,11 +46,27 @@ index 987345c..f53546a 100644 $(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 f015064..57f96d2 100644 +--- a/lib/common_test/test_server/Makefile ++++ b/lib/common_test/test_server/Makefile +@@ -86,9 +86,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 518c89d..1bcd19c 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -62,7 +78,7 @@ index 299b289..36a048b 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index b79f0ec..30d1a1d 100644 +index 29d6223..cb43309 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile @@ -203,7 +203,7 @@ release_spec: opt @@ -75,7 +91,7 @@ index b79f0ec..30d1a1d 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index da8dcf0..88b3993 100644 +index cdaf9e5..6e4e9b8 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile @@ -172,7 +172,7 @@ release_spec: opt @@ -88,7 +104,7 @@ index da8dcf0..88b3993 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index f9107ff..74d337d 100644 +index b396710..2678c2a 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile @@ -180,9 +180,7 @@ release_spec: opt @@ -103,7 +119,7 @@ index f9107ff..74d337d 100644 release_docs_spec: diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index 72b063f..0fdb82e 100644 +index 009c6be..83c2e26 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile @@ -371,8 +371,7 @@ release_spec: opt @@ -117,7 +133,7 @@ index 72b063f..0fdb82e 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index cd559e1..bdf035e 100644 +index 1fdc258..90cf711 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile @@ -180,8 +180,7 @@ release_spec: opt @@ -131,7 +147,7 @@ index cd559e1..bdf035e 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index 7a14db6..4b55398 100644 +index 55d59ba..f22e2c8 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile @@ -199,8 +199,7 @@ release_spec: opt @@ -145,7 +161,7 @@ index 7a14db6..4b55398 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 90e1e51..05826e0 100644 +index 4cc1e48..084f0a7 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile @@ -174,7 +174,7 @@ release_spec: opt @@ -158,7 +174,7 @@ index 90e1e51..05826e0 100644 $(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 456b8be..fcfa8de 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -82,8 +82,6 @@ docs: @@ -171,7 +187,7 @@ index 6e4008e..c2d00fc 100644 $(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 9594a0b..bc33e67 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 +200,10 @@ index f115f49..e7dc360 100644 $(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 256f20f..2920c0f 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -197,7 +213,7 @@ index 770af21..4f8a6d8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index e0bbbdf..10771b2 100644 +index 7f61620..cade771 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ release_spec: opt @@ -228,22 +244,27 @@ index 4e5a418..c0bb0c3 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index cd3c102..b55c513 100644 +index b79a537..d0b231e 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile -@@ -99,10 +99,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +- $(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/asn1" - $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + + release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 7d41506..3f3562f 100644 +index 82d051e..950fdbe 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -256,7 +277,7 @@ index 7d41506..3f3562f 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index 461a52d..1f2e885 100644 +index b6347d8..a695d2c 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -109,7 +109,6 @@ release_spec: opt @@ -280,7 +301,7 @@ index 86a6d88..5732fd8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index ff3080e..60337dd 100644 +index e19ce82..6b7c96e 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -295,7 +316,7 @@ index ff3080e..60337dd 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 0938010..134ed7b 100644 +index 9f50d6b..df92b84 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -308,7 +329,7 @@ index 0938010..134ed7b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index f0af6ac..16b512e 100644 +index d883eec..3119bc4 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -321,7 +342,7 @@ index f0af6ac..16b512e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index a82e28c..f364a53 100644 +index b220bc1..d407327 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -334,10 +355,10 @@ index a82e28c..f364a53 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index f6f6f6b..4369923 100644 +index 88016a7..d8e8fa0 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile -@@ -103,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/llvm @@ -347,7 +368,7 @@ index f6f6f6b..4369923 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index d44be2d..ed81f10 100644 +index 8ef31db..80d2881 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile @@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -360,7 +381,7 @@ index d44be2d..ed81f10 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index be5c9bc..d40b322 100644 +index 72cfff2..e55223a 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -373,7 +394,7 @@ index be5c9bc..d40b322 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 1bf52fe..5049bec 100644 +index b4cdf8b..f9ebcae 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -386,7 +407,7 @@ index 1bf52fe..5049bec 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 4a78ad7..1b1ce05 100644 +index 66e9421..1951742 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ HIPE_MODULES = @@ -407,7 +428,7 @@ index 4a78ad7..1b1ce05 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index a6da81a..60870be 100644 +index 6ad2fbe..258517d 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile @@ -200,7 +200,7 @@ release_spec: opt @@ -420,7 +441,7 @@ index a6da81a..60870be 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile -index f8daa2b..48e5d49 100644 +index 6b99694..530a19e 100644 --- a/lib/inets/src/ftp/Makefile +++ b/lib/inets/src/ftp/Makefile @@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -433,7 +454,7 @@ index f8daa2b..48e5d49 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index cb97b52..cb13dfb 100644 +index a1c1f36..f2eb86f 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile @@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -446,7 +467,7 @@ index cb97b52..cb13dfb 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 4a4eef9..c779c8e 100644 +index 8248e37..1f1b231 100644 --- a/lib/inets/src/http_lib/Makefile +++ b/lib/inets/src/http_lib/Makefile @@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -472,10 +493,10 @@ index 1c05d45..88f9f62 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 7f51676..093f462 100644 +index eb0098d..fff21ff 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -485,7 +506,7 @@ index 7f51676..093f462 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile -index d5d94e1..5583064 100644 +index 4eaa959..198fbf3 100644 --- a/lib/inets/src/tftp/Makefile +++ b/lib/inets/src/tftp/Makefile @@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -498,10 +519,10 @@ index d5d94e1..5583064 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 57daceb..1cebd80 100644 +index 2b72f78..31eed45 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -510,7 +531,7 @@ index 57daceb..1cebd80 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index 8f8e6ec..9e0bc82 100644 +index ab45548..5c7a7f0 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ release_spec: opt @@ -523,7 +544,7 @@ index 8f8e6ec..9e0bc82 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 711fbb7..1db4593 100644 +index b964366..5b5a4cf 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -176,7 +176,7 @@ release_spec: opt @@ -536,7 +557,7 @@ index 711fbb7..1db4593 100644 release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 208942c..d5b7218 100644 +index 869b516..fa7d774 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -549,7 +570,7 @@ index 208942c..d5b7218 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 39be02a..8c6ba31 100644 +index 09bf1ef..b320b2e 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -268,7 +268,6 @@ release_spec: opt @@ -561,7 +582,7 @@ index 39be02a..8c6ba31 100644 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index 0c546a8..78f659a 100644 +index d07db3f..7f421d2 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -574,7 +595,7 @@ index 0c546a8..78f659a 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index f4fc56a..1cc73fd 100644 +index 8e7e82b..2a118d2 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -135,7 +135,7 @@ release_spec: opt @@ -587,7 +608,7 @@ index f4fc56a..1cc73fd 100644 release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 7288c20..aefd9f3 100644 +index 028a63e..9e11e9b 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -600,10 +621,10 @@ index 7288c20..aefd9f3 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index dae0df7..6294ae9 100644 +index 08a00e6..a21ffb3 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -613,10 +634,10 @@ index dae0df7..6294ae9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 2d42510..7579014 100644 +index dd7831f..1d5c505 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -152,7 +152,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -153,7 +153,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -625,7 +646,7 @@ index 2d42510..7579014 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index 51c9ed3..50a4c10 100644 +index 7ca5949..a52ade2 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -638,7 +659,7 @@ index 51c9ed3..50a4c10 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 0eca8dd..18d9627 100644 +index 1086633..553c9cd 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile @@ -145,8 +145,8 @@ release_spec: opt @@ -653,7 +674,7 @@ index 0eca8dd..18d9627 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 30b74c4..9c6708f 100644 +index 7fec29a..a71b9f1 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -253,7 +253,7 @@ release_spec: opt @@ -666,7 +687,7 @@ index 30b74c4..9c6708f 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 1003d24..1b12154 100644 +index 29b53a8..3ae2074 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -677,22 +698,8 @@ index 1003d24..1b12154 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile -index a89e939..224d944 100644 ---- a/lib/ose/src/Makefile -+++ b/lib/ose/src/Makefile -@@ -94,9 +94,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" -- $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 03892cd..c3ad326 100644 +index 4023f50..864a0a5 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -705,7 +712,7 @@ index 03892cd..c3ad326 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index dbecdd2..1d45801 100644 +index dea29be..655aea9 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -718,7 +725,7 @@ index dbecdd2..1d45801 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index 9b963e0..deeb75c 100644 +index b2ec87d..3153e34 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile @@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -730,7 +737,7 @@ index 9b963e0..deeb75c 100644 # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 7474297..a510658 100644 +index a920ea8..7672ef3 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -745,7 +752,7 @@ index 7474297..a510658 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 786f244..0463c67 100644 +index e61390b..6ed6c2c 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -758,7 +765,7 @@ index 786f244..0463c67 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 1fea415..a756470 100644 +index 4bddee4..c714255 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -771,10 +778,10 @@ index 1fea415..a756470 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 99b90f9..25b3ebb 100644 +index 2c90295..d674a8f 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -97,8 +97,6 @@ docs: +@@ -99,8 +99,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -784,7 +791,7 @@ index 99b90f9..25b3ebb 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 7ff6a03..a304900 100644 +index ac7ee51..c53f661 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -796,7 +803,7 @@ index 7ff6a03..a304900 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 89037b3..01de885 100644 +index 2943a4d..8203e62 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -809,7 +816,7 @@ index 89037b3..01de885 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 7972d95..78a9f2b 100644 +index 6f2b8a4..bd062a6 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -822,7 +829,7 @@ index 7972d95..78a9f2b 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 54f2e22..488faa4 100644 +index 4093ffa..18878aa 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -835,7 +842,7 @@ index 54f2e22..488faa4 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 382f83b..db50c26 100644 +index 0cc8749..d203f28 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -848,7 +855,7 @@ index 382f83b..db50c26 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index c71ecf9..d17e699 100644 +index adc2c48..89ce954 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -861,10 +868,10 @@ index c71ecf9..d17e699 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index b44c8ee..8f8b58d 100644 +index 69d5a47..c79ffd1 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -874,10 +881,10 @@ index b44c8ee..8f8b58d 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 7a7a373..419fa9e 100644 +index b625db0..9172486 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -142,7 +142,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -143,7 +143,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -887,10 +894,10 @@ index 7a7a373..419fa9e 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 9f4a446..50ac11e 100644 +index 302834f..53804f8 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -207,7 +207,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -208,7 +208,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -899,7 +906,7 @@ index 9f4a446..50ac11e 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index 2e91adf..0085fca 100644 +index 8325db4..d17fdaa 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -911,23 +918,11 @@ index 2e91adf..0085fca 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile -index 6a26ee2..7336477 100644 ---- a/lib/test_server/src/Makefile -+++ b/lib/test_server/src/Makefile -@@ -124,7 +124,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index 9fcfb79..b30b173 100644 +index 032bd61..efb0309 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile -@@ -107,7 +107,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -937,7 +932,7 @@ index 9fcfb79..b30b173 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 620ca21..9c9390e 100644 +index 6c5d8b0..82f516a 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile @@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -950,21 +945,8 @@ index 620ca21..9c9390e 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index a5a8eaf..be80ba7 100644 ---- a/lib/webtool/src/Makefile -+++ b/lib/webtool/src/Makefile -@@ -88,8 +88,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index b345e34..153a270 100644 +index 21b45af..a7bf34f 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) @@ -980,7 +962,7 @@ index b345e34..153a270 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index f8f0320..099513e 100644 +index 51d9190..1ab65bd 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ release_spec: opt diff --git a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch b/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch similarity index 54% rename from otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch rename to otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch index 8b8fd0d..664f559 100644 --- a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch +++ b/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Respect -proto_dist switch while connection to EPMD Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl -index c6202dd..ec2e330 100644 +index f8ef4a4..79a026a 100644 --- a/lib/kernel/src/erl_epmd.erl +++ b/lib/kernel/src/erl_epmd.erl @@ -103,6 +103,10 @@ names(EpmdAddr) -> @@ -20,15 +20,28 @@ index c6202dd..ec2e330 100644 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 +index f91d7ef..94bde55 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} -> +@@ -74,7 +74,7 @@ gen_listen(Driver, Name) -> 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 + ErlEpmd = net_kernel:epmd_module(), +- case ErlEpmd:register_node(Name, Port) of ++ case ErlEpmd: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 a920f54..08947f2 100644 +--- a/lib/ssl/src/ssl_tls_dist_proxy.erl ++++ b/lib/ssl/src/ssl_tls_dist_proxy.erl +@@ -117,7 +117,7 @@ handle_call({listen, Driver, Name}, _From, State) -> + {ok, WorldTcpAddress} = get_tcp_address(World), + {_,Port} = WorldTcpAddress#net_address.address, + ErlEpmd = net_kernel:epmd_module(), +- case ErlEpmd:register_node(Name, Port) of ++ case ErlEpmd:register_node(Name, Port, Driver) of + {ok, Creation} -> + {reply, {ok, {Socket, TcpAddress, Creation}}, + State#state{listen={Socket, World}}}; diff --git a/otp-0007-Split-off-webtool-dependency-from-tools.patch b/otp-0007-Split-off-webtool-dependency-from-tools.patch deleted file mode 100644 index 9a06884..0000000 --- a/otp-0007-Split-off-webtool-dependency-from-tools.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 8 Nov 2014 22:54:57 +0300 -Subject: [PATCH] Split off webtool dependency from tools - -Signed-off-by: Peter Lemenkov - -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. - - - diff --git a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch deleted file mode 100644 index d148331..0000000 --- a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: John Eckersberg -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); diff --git a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch b/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch deleted file mode 100644 index 1d19ace..0000000 --- a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Alexey Lebedeff -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"); diff --git a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch b/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch deleted file mode 100644 index d832978..0000000 --- a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= -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 diff --git a/sources b/sources index 1a7d38d..036b00a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd9934b664769500f3216f688eb57493 otp-OTP-18.3.4.2.tar.gz +4f3ce6ba4288bda714e58d30ea9c2e69 otp-OTP-19.0.2.tar.gz From 1dbb469f04f2b554ed363dddb1dd89db35cc5400 Mon Sep 17 00:00:00 2001 From: Michal Toman Date: Fri, 12 Aug 2016 15:31:51 +0300 Subject: [PATCH 094/340] Disable doc on MIPS --- erlang.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index e22de86..0b0958f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,7 +2,8 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%ifarch %{arm} +%ifarch %{arm} %{mips} +# MIPS 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 @@ -65,7 +66,7 @@ Name: erlang Version: 19.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2313,6 +2314,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri Aug 12 2016 Michal Toman - 19.0.2-2 +- Disable doc on MIPS + * Wed Jul 27 2016 Peter Lemenkov - 19.0.2-1 - Ver. 19.0.2 - The following packages were removed - ose, test_server (merged into common_test), webtool From c675b92935473afcfca05611f92493ed9ae0f824 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 16 Aug 2016 15:34:33 +0300 Subject: [PATCH 095/340] Ver. 19.0.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0b0958f..63937ec 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.0.2 -Release: 2%{?dist} +Version: 19.0.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2314,6 +2314,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Aug 16 2016 Peter Lemenkov - 19.0.4-1 +- Ver. 19.0.4 + * Fri Aug 12 2016 Michal Toman - 19.0.2-2 - Disable doc on MIPS From 8f2d59ec11bac95a16f9a230a94153338f2dcef7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 16 Aug 2016 15:36:06 +0300 Subject: [PATCH 096/340] Forgot to upload sources as usual Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bdf9fb8..b30e413 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.4.1.tar.gz /otp-OTP-18.3.4.2.tar.gz /otp-OTP-19.0.2.tar.gz +/otp-OTP-19.0.4.tar.gz diff --git a/sources b/sources index 036b00a..675d895 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f3ce6ba4288bda714e58d30ea9c2e69 otp-OTP-19.0.2.tar.gz +8ce215c1b501512038668c9907f64000 otp-OTP-19.0.4.tar.gz From c275ae24448adc3003c86a8245e3cd1502941131 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 23 Aug 2016 15:23:02 +0300 Subject: [PATCH 097/340] Ver. 19.0.5 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b30e413..f3dbf29 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ otp_src_R14A.tar.gz /otp-OTP-18.3.4.2.tar.gz /otp-OTP-19.0.2.tar.gz /otp-OTP-19.0.4.tar.gz +/otp-OTP-19.0.5.tar.gz diff --git a/erlang.spec b/erlang.spec index 63937ec..fdf7962 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.0.4 +Version: 19.0.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2314,6 +2314,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Aug 23 2016 Peter Lemenkov - 19.0.5-1 +- Ver. 19.0.5 + * Tue Aug 16 2016 Peter Lemenkov - 19.0.4-1 - Ver. 19.0.4 diff --git a/sources b/sources index 675d895..082373f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ce215c1b501512038668c9907f64000 otp-OTP-19.0.4.tar.gz +95f3a3c46d0e2879eb6ecb9ca98ad55e otp-OTP-19.0.5.tar.gz From 8547d3fbbca7ffe44415c5b3fd9f7458a9579043 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Sep 2016 13:49:12 +0300 Subject: [PATCH 098/340] Ver. 19.0.6 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f3dbf29..f6061a1 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.0.2.tar.gz /otp-OTP-19.0.4.tar.gz /otp-OTP-19.0.5.tar.gz +/otp-OTP-19.0.6.tar.gz diff --git a/erlang.spec b/erlang.spec index fdf7962..ddd03ee 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.0.5 +Version: 19.0.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2314,6 +2314,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Sep 14 2016 Peter Lemenkov - 19.0.6-1 +- Ver. 19.0.6 + * Tue Aug 23 2016 Peter Lemenkov - 19.0.5-1 - Ver. 19.0.5 diff --git a/sources b/sources index 082373f..c001d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95f3a3c46d0e2879eb6ecb9ca98ad55e otp-OTP-19.0.5.tar.gz +a98b0f01a71d2f7e1ad6ccbee8cf7f5f otp-OTP-19.0.6.tar.gz From ab704de8521e89ed5198b060b7500a50df50435d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Sep 2016 17:22:48 +0300 Subject: [PATCH 099/340] Ver. 19.0.7 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f6061a1..7ad148d 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.0.4.tar.gz /otp-OTP-19.0.5.tar.gz /otp-OTP-19.0.6.tar.gz +/otp-OTP-19.0.7.tar.gz diff --git a/erlang.spec b/erlang.spec index ddd03ee..d5e456a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.0.6 +Version: 19.0.7 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2314,6 +2314,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Sep 14 2016 Peter Lemenkov - 19.0.7-1 +- Ver. 19.0.7 + * Wed Sep 14 2016 Peter Lemenkov - 19.0.6-1 - Ver. 19.0.6 diff --git a/sources b/sources index c001d10..feafc4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a98b0f01a71d2f7e1ad6ccbee8cf7f5f otp-OTP-19.0.6.tar.gz +a167a4e2a845ca1d86be4dcb7284b3f0 otp-OTP-19.0.7.tar.gz From bf974e29d198d9ca2b38586e9928d4e41b62dd93 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 4 Oct 2016 14:58:17 +0200 Subject: [PATCH 100/340] Ver. 19.1.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 9 ++-- otp-0006-Do-not-install-erlang-sources.patch | 6 +-- ...dist-switch-while-connection-to-EPMD.patch | 47 ------------------- sources | 2 +- 5 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch diff --git a/.gitignore b/.gitignore index 7ad148d..bba2587 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.0.5.tar.gz /otp-OTP-19.0.6.tar.gz /otp-OTP-19.0.7.tar.gz +/otp-OTP-19.1.1.tar.gz diff --git a/erlang.spec b/erlang.spec index d5e456a..53dc646 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.0.7 +Version: 19.1.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -116,9 +116,6 @@ 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 -# Respect -proto_dist switch while connection to EPMD -Patch7: otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch # end of autogenerated patch tag list BuildRequires: flex @@ -929,7 +926,6 @@ Provides support for XML 1.0. %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources -%patch7 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2314,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Oct 4 2016 Peter Lemenkov - 19.1.1-1 +- Ver. 19.1.1 + * Wed Sep 14 2016 Peter Lemenkov - 19.0.7-1 - Ver. 19.0.7 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 564546a..ae403a8 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 4a447d3..eac5ae5 100644 +index 2ab9eda..9b8ed35 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -88,8 +88,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -213,7 +213,7 @@ index 256f20f..2920c0f 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 7f61620..cade771 100644 +index 6bf748a..962d7b7 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ release_spec: opt diff --git a/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch b/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch deleted file mode 100644 index 664f559..0000000 --- a/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 14 Jul 2016 17:51:16 +0300 -Subject: [PATCH] Respect -proto_dist switch while connection to EPMD - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl -index f8ef4a4..79a026a 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 f91d7ef..94bde55 100644 ---- a/lib/kernel/src/inet_tcp_dist.erl -+++ b/lib/kernel/src/inet_tcp_dist.erl -@@ -74,7 +74,7 @@ gen_listen(Driver, Name) -> - TcpAddress = get_tcp_address(Driver, Socket), - {_,Port} = TcpAddress#net_address.address, - ErlEpmd = net_kernel:epmd_module(), -- case ErlEpmd:register_node(Name, Port) of -+ case ErlEpmd: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 a920f54..08947f2 100644 ---- a/lib/ssl/src/ssl_tls_dist_proxy.erl -+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl -@@ -117,7 +117,7 @@ handle_call({listen, Driver, Name}, _From, State) -> - {ok, WorldTcpAddress} = get_tcp_address(World), - {_,Port} = WorldTcpAddress#net_address.address, - ErlEpmd = net_kernel:epmd_module(), -- case ErlEpmd:register_node(Name, Port) of -+ case ErlEpmd:register_node(Name, Port, Driver) of - {ok, Creation} -> - {reply, {ok, {Socket, TcpAddress, Creation}}, - State#state{listen={Socket, World}}}; diff --git a/sources b/sources index feafc4c..702791c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a167a4e2a845ca1d86be4dcb7284b3f0 otp-OTP-19.0.7.tar.gz +4c5d86c58e4f667350026b997622dd5f otp-OTP-19.1.1.tar.gz From 4dc5608c1acbaad3881e76f6002501ce62ae5b70 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 4 Oct 2016 16:32:18 +0200 Subject: [PATCH 101/340] Removed outdated README Signed-off-by: Peter Lemenkov --- erlang.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 53dc646..fc1cf94 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1080,7 +1080,6 @@ for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %endif @@ -1171,7 +1170,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %doc %{_docdir}/%{name}-%{version}/COPYRIGHT %doc %{_docdir}/%{name}-%{version}/LICENSE.txt %doc %{_docdir}/%{name}-%{version}/PR.template -%doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/README.md %endif From 0ea9e863ea941801d6d81783c381b8b940dca4e9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 4 Oct 2016 17:12:41 +0200 Subject: [PATCH 102/340] Remove duplicated file Signed-off-by: Peter Lemenkov --- erlang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erlang.spec b/erlang.spec index fc1cf94..0150943 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1081,6 +1081,8 @@ popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/COPYRIGHT $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +# We'll package it by marking it explicitly as doc - see below +rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/README.md %endif # Win32-specific man-pages From dac92bc94fe845a05e1fa6392336d02a809dfcaa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 Oct 2016 14:07:10 +0200 Subject: [PATCH 103/340] Ver. 19.1.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bba2587..97da459 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.0.6.tar.gz /otp-OTP-19.0.7.tar.gz /otp-OTP-19.1.1.tar.gz +/otp-OTP-19.1.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 0150943..d146b92 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.1.1 +Version: 19.1.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2310,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Thu Oct 6 2016 Peter Lemenkov - 19.1.2-1 +- Ver. 19.1.2 + * Tue Oct 4 2016 Peter Lemenkov - 19.1.1-1 - Ver. 19.1.1 diff --git a/sources b/sources index 702791c..4bdb136 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c5d86c58e4f667350026b997622dd5f otp-OTP-19.1.1.tar.gz +da7912dbd1995d5ac955e324c1b3cd5f otp-OTP-19.1.2.tar.gz From de72c4d8e2d072952fe6633c46ce851c8692f638 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 11 Oct 2016 18:55:18 +0300 Subject: [PATCH 104/340] Ver. 19.1.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97da459..17e4424 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.0.7.tar.gz /otp-OTP-19.1.1.tar.gz /otp-OTP-19.1.2.tar.gz +/otp-OTP-19.1.3.tar.gz diff --git a/erlang.spec b/erlang.spec index d146b92..aad276c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.1.2 +Version: 19.1.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2310,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Oct 11 2016 Peter Lemenkov - 19.1.3-1 +- Ver. 19.1.3 + * Thu Oct 6 2016 Peter Lemenkov - 19.1.2-1 - Ver. 19.1.2 diff --git a/sources b/sources index 4bdb136..b79613b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da7912dbd1995d5ac955e324c1b3cd5f otp-OTP-19.1.2.tar.gz +8f75c23d9fba7d4d4922dafef7691859 otp-OTP-19.1.3.tar.gz From 48b2d980bd5f9538b4df10fd606009b0d2c77c97 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 11 Oct 2016 19:55:54 +0300 Subject: [PATCH 105/340] Fix build failure Signed-off-by: Peter Lemenkov --- erlang.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index aad276c..dc251e5 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1059,8 +1059,8 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang -type f -name info -exec rm -f {} \; %if %{__with_examples} # fix 0775 permission on some directories -find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 | xargs chmod 755 -find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 | xargs chmod 755 +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/ -type d -perm 0775 -print -exec chmod 755 {} \; +find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -perm 0775 -print -exec chmod 755 {} \; %else # Remove all examples find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -mindepth 1 -maxdepth 2 -type d -name examples -exec rm -rf {} \; From d02dbcf40ad1422e5d4300a37acd3b6d589b71da Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 14 Oct 2016 14:01:15 +0200 Subject: [PATCH 106/340] Ver. 19.1.4 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 17e4424..039b9cb 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.1.tar.gz /otp-OTP-19.1.2.tar.gz /otp-OTP-19.1.3.tar.gz +/otp-OTP-19.1.4.tar.gz diff --git a/erlang.spec b/erlang.spec index dc251e5..a1866b0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.1.3 +Version: 19.1.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2310,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri Oct 14 2016 Peter Lemenkov - 19.1.4-1 +- Ver. 19.1.4 + * Tue Oct 11 2016 Peter Lemenkov - 19.1.3-1 - Ver. 19.1.3 diff --git a/sources b/sources index b79613b..7022abd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f75c23d9fba7d4d4922dafef7691859 otp-OTP-19.1.3.tar.gz +b52160849cdc64a6d6d75e8bef1173eb otp-OTP-19.1.4.tar.gz From 82d77a4b1fe5080bed3b71f956a3c484ce98abaf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Nov 2016 18:30:52 +0300 Subject: [PATCH 107/340] Ver. 19.1.5 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 039b9cb..5779ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.2.tar.gz /otp-OTP-19.1.3.tar.gz /otp-OTP-19.1.4.tar.gz +/otp-OTP-19.1.5.tar.gz diff --git a/erlang.spec b/erlang.spec index a1866b0..a070b2a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.1.4 +Version: 19.1.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2310,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Nov 7 2016 Peter Lemenkov - 19.1.5-1 +- Ver. 19.1.5 + * Fri Oct 14 2016 Peter Lemenkov - 19.1.4-1 - Ver. 19.1.4 diff --git a/sources b/sources index 7022abd..cee9b2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b52160849cdc64a6d6d75e8bef1173eb otp-OTP-19.1.4.tar.gz +4c89a2175aff7dde0bd5f30e2d2f49b4 otp-OTP-19.1.5.tar.gz From 52fefe46a4250608014f1a712d460e6a2ec148a0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Nov 2016 15:12:54 +0300 Subject: [PATCH 108/340] Ver. 19.1.6 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5779ce6..82ae981 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.3.tar.gz /otp-OTP-19.1.4.tar.gz /otp-OTP-19.1.5.tar.gz +/otp-OTP-19.1.6.tar.gz diff --git a/erlang.spec b/erlang.spec index a070b2a..ec13785 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.1.5 +Version: 19.1.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2310,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Nov 9 2016 Peter Lemenkov - 19.1.6-1 +- Ver. 19.1.6 + * Mon Nov 7 2016 Peter Lemenkov - 19.1.5-1 - Ver. 19.1.5 diff --git a/sources b/sources index cee9b2f..76873ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c89a2175aff7dde0bd5f30e2d2f49b4 otp-OTP-19.1.5.tar.gz +2a69d8aa3b9312cea9b3b0813eead2bf otp-OTP-19.1.6.tar.gz From d8d49b5b3e0aa526f62c5402ecc29dba1d74a4f1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 23 Nov 2016 21:09:08 +0300 Subject: [PATCH 109/340] Disable -fpie - Fix HiPE by disabling -fpie - Fix dialyzer generation Signed-off-by: Peter Lemenkov --- erlang.spec | 14 +++++- ...rrect-link-flags-for-hipe_mkliterals.patch | 45 +++++++++++++++++++ ...erts-Disable-fPIE-for-HiPE-on-x86_64.patch | 33 ++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch create mode 100644 otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch diff --git a/erlang.spec b/erlang.spec index ec13785..7c2cc31 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -116,6 +116,12 @@ 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 +# erts: Fix correct link flags for hipe_mkliterals +Patch7: otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch +# Fedora specific patch +# erts: Disable -fPIE for HiPE on x86_64 +Patch8: otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch # end of autogenerated patch tag list BuildRequires: flex @@ -926,6 +932,8 @@ Provides support for XML 1.0. %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources +%patch7 -p1 -b .erts_Fix_correct_link_flags_for_hipe_mkliterals +%patch8 -p1 -b .erts_Disable_fPIE_for_HiPE_on_x86_64 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2310,6 +2318,10 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Nov 23 2016 Peter Lemenkov - 19.1.6-2 +- Fix HiPE by disabling -fpie +- Fix dialyzer generation + * Wed Nov 9 2016 Peter Lemenkov - 19.1.6-1 - Ver. 19.1.6 diff --git a/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch b/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch new file mode 100644 index 0000000..363777b --- /dev/null +++ b/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch @@ -0,0 +1,45 @@ +From: Sverker Eriksson +Date: Wed, 9 Nov 2016 16:52:23 +0100 +Subject: [PATCH] erts: Fix correct link flags for hipe_mkliterals + +and no need for $(INCLUDED). + +diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in +index e026020..8772bef 100644 +--- a/erts/emulator/Makefile.in ++++ b/erts/emulator/Makefile.in +@@ -49,6 +49,7 @@ CREATE_DIRS= + LDFLAGS=@LDFLAGS@ + ARFLAGS=rc + OMIT_OMIT_FP=no ++TYPE_LIBS= + + DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@ + NEW_PURGE_STRATEGY=@NEW_PURGE_STRATEGY@ +@@ -90,7 +91,7 @@ PURIFY = + TYPEMARKER = .gcov + TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE= + ifneq ($(findstring solaris,$(TARGET)),solaris) +-LIBS += -lgcov ++TYPE_LIBS = -lgcov + endif + ENABLE_ALLOC_TYPE_VARS += debug + else +@@ -146,6 +147,8 @@ endif + endif + endif + ++LIBS += $(TYPE_LIBS) ++ + comma:=, + space:= + space+= +@@ -931,7 +934,7 @@ $(OBJDIR)/%.o: hipe/%.c + $(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@ + + $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o +- $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $< ++ $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS) + + $(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ + $(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED diff --git a/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch b/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch new file mode 100644 index 0000000..8f007ff --- /dev/null +++ b/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch @@ -0,0 +1,33 @@ +From: Sverker Eriksson +Date: Tue, 8 Nov 2016 16:52:32 +0100 +Subject: [PATCH] erts: Disable -fPIE for HiPE on x86_64 + + +diff --git a/erts/configure.in b/erts/configure.in +index 7455516..7489f8a 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -2778,6 +2778,23 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then + fi + fi + ++dnl Check to disable -fPIE and friends for HiPE on amd64 ++if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then ++ AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__) ++ #error -fPIE is enabled by default ++ #endif], ++ [AC_MSG_NOTICE([No -fPIE enabled by default])], ++ [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE]) ++ STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS" ++ saved_LDFLAGS=$LDFLAGS ++ LDFLAGS="-no-pie $LDFLAGS" ++ AC_TRY_LINK(,, [], ++ [AC_MSG_WARN([Linked does not accept option -no-pie]) ++ LDFLAGS=$saved_LDFLAGS])]) ++ ++fi ++ ++ + if test X${enable_fp_exceptions} = Xauto ; then + case $host_os in + *linux*) From 8bed1fa73a2201f82aa37540c021594ce8758b46 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 11 Jan 2017 19:39:49 +0300 Subject: [PATCH 110/340] Ver. 19.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 20 ++++----- otp-0006-Do-not-install-erlang-sources.patch | 14 +++--- ...rrect-link-flags-for-hipe_mkliterals.patch | 45 ------------------- ...erts-Disable-fPIE-for-HiPE-on-x86_64.patch | 33 -------------- sources | 2 +- 6 files changed, 17 insertions(+), 98 deletions(-) delete mode 100644 otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch delete mode 100644 otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch diff --git a/.gitignore b/.gitignore index 82ae981..2bc234d 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.4.tar.gz /otp-OTP-19.1.5.tar.gz /otp-OTP-19.1.6.tar.gz +/otp-OTP-19.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 7c2cc31..dbabbba 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.1.6 -Release: 2%{?dist} +Version: 19.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -116,12 +116,6 @@ 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 -# erts: Fix correct link flags for hipe_mkliterals -Patch7: otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch -# Fedora specific patch -# erts: Disable -fPIE for HiPE on x86_64 -Patch8: otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch # end of autogenerated patch tag list BuildRequires: flex @@ -363,7 +357,7 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -BuildRequires: openssl-devel +BuildRequires: pkgconfig(openssl) < 1.1.0 Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -932,8 +926,6 @@ Provides support for XML 1.0. %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources -%patch7 -p1 -b .erts_Fix_correct_link_flags_for_hipe_mkliterals -%patch8 -p1 -b .erts_Disable_fPIE_for_HiPE_on_x86_64 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1008,7 +1000,7 @@ cat > xemacs-erlang-init.el << EOF EOF mkdir xemacs-erlang cp lib/tools/emacs/*.el xemacs-erlang/ -rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el +rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el xemacs-erlang/erldoc.el xemacs-erlang/erlang-edoc.el pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd @@ -2129,6 +2121,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/wxDirDialog.* %{_libdir}/erlang/man/man3/wxDirPickerCtrl.* %{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* +%{_libdir}/erlang/man/man3/wxDropFilesEvent.* %{_libdir}/erlang/man/man3/wxEraseEvent.* %{_libdir}/erlang/man/man3/wxEvent.* %{_libdir}/erlang/man/man3/wxEvtHandler.* @@ -2318,6 +2311,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Jan 11 2017 Peter Lemenkov - 19.2-1 +- Ver. 19.2 + * Wed Nov 23 2016 Peter Lemenkov - 19.1.6-2 - Fix HiPE by disabling -fpie - Fix dialyzer generation diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index ae403a8..c3c4699 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -34,10 +34,10 @@ index 38cf2d4..d4bb398 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 0f9e044..5039444 100644 +index 9d75199..b96a112 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -634,10 +634,10 @@ index 08a00e6..a21ffb3 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index dd7831f..1d5c505 100644 +index ff2bcbd..4973158 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -153,7 +153,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -868,7 +868,7 @@ index adc2c48..89ce954 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 69d5a47..c79ffd1 100644 +index 7ab6f22..b57da4a 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -881,10 +881,10 @@ index 69d5a47..c79ffd1 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index b625db0..9172486 100644 +index 3dda1a3..a1e3c7c 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -143,7 +143,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -146,7 +146,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch b/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch deleted file mode 100644 index 363777b..0000000 --- a/otp-0007-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Sverker Eriksson -Date: Wed, 9 Nov 2016 16:52:23 +0100 -Subject: [PATCH] erts: Fix correct link flags for hipe_mkliterals - -and no need for $(INCLUDED). - -diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in -index e026020..8772bef 100644 ---- a/erts/emulator/Makefile.in -+++ b/erts/emulator/Makefile.in -@@ -49,6 +49,7 @@ CREATE_DIRS= - LDFLAGS=@LDFLAGS@ - ARFLAGS=rc - OMIT_OMIT_FP=no -+TYPE_LIBS= - - DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@ - NEW_PURGE_STRATEGY=@NEW_PURGE_STRATEGY@ -@@ -90,7 +91,7 @@ PURIFY = - TYPEMARKER = .gcov - TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE= - ifneq ($(findstring solaris,$(TARGET)),solaris) --LIBS += -lgcov -+TYPE_LIBS = -lgcov - endif - ENABLE_ALLOC_TYPE_VARS += debug - else -@@ -146,6 +147,8 @@ endif - endif - endif - -+LIBS += $(TYPE_LIBS) -+ - comma:=, - space:= - space+= -@@ -931,7 +934,7 @@ $(OBJDIR)/%.o: hipe/%.c - $(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@ - - $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o -- $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $< -+ $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS) - - $(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ - $(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED diff --git a/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch b/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch deleted file mode 100644 index 8f007ff..0000000 --- a/otp-0008-erts-Disable-fPIE-for-HiPE-on-x86_64.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 8 Nov 2016 16:52:32 +0100 -Subject: [PATCH] erts: Disable -fPIE for HiPE on x86_64 - - -diff --git a/erts/configure.in b/erts/configure.in -index 7455516..7489f8a 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -2778,6 +2778,23 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then - fi - fi - -+dnl Check to disable -fPIE and friends for HiPE on amd64 -+if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then -+ AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__) -+ #error -fPIE is enabled by default -+ #endif], -+ [AC_MSG_NOTICE([No -fPIE enabled by default])], -+ [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE]) -+ STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS" -+ saved_LDFLAGS=$LDFLAGS -+ LDFLAGS="-no-pie $LDFLAGS" -+ AC_TRY_LINK(,, [], -+ [AC_MSG_WARN([Linked does not accept option -no-pie]) -+ LDFLAGS=$saved_LDFLAGS])]) -+ -+fi -+ -+ - if test X${enable_fp_exceptions} = Xauto ; then - case $host_os in - *linux*) diff --git a/sources b/sources index 76873ad..d5b5ab6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a69d8aa3b9312cea9b3b0813eead2bf otp-OTP-19.1.6.tar.gz +SHA512 (otp-OTP-19.2.tar.gz) = 8ad0fb2958bb35620e666522e09290f4fa4302c57e0bca7fc97abc77f8ec7401b73d8d346eef076e30a218683b182b275f8ecc3601a1048faa0e37aa544f3db9 From c2d1b1caed87430dda59c1cba122b55a06dd1c13 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 18 Jan 2017 14:51:14 +0300 Subject: [PATCH 111/340] Ver. 19.2.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2bc234d..763a893 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.5.tar.gz /otp-OTP-19.1.6.tar.gz /otp-OTP-19.2.tar.gz +/otp-OTP-19.2.1.tar.gz diff --git a/erlang.spec b/erlang.spec index dbabbba..d025e53 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.2 +Version: 19.2.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2311,6 +2311,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Jan 18 2017 Peter Lemenkov - 19.2.1-1 +- Ver. 19.2.1 + * Wed Jan 11 2017 Peter Lemenkov - 19.2-1 - Ver. 19.2 diff --git a/sources b/sources index d5b5ab6..3ed0da5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.2.tar.gz) = 8ad0fb2958bb35620e666522e09290f4fa4302c57e0bca7fc97abc77f8ec7401b73d8d346eef076e30a218683b182b275f8ecc3601a1048faa0e37aa544f3db9 +SHA512 (otp-OTP-19.2.1.tar.gz) = 60b5889f16ae52418eb8a8c53ed7195096ea2e29bca85b62d4d6ddb70a028f6e1dd091ed1482983f5ca56b326748bb822fa7bcf0c869f66edf7bb8dfc5d6398d From 95da270c187a3a034740e1cd556fa399186ab926 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 1 Feb 2017 15:16:30 +0300 Subject: [PATCH 112/340] Ver. 19.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index d025e53..31e3d59 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.2.1 +Version: 19.2.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2311,6 +2311,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Feb 1 2017 Peter Lemenkov - 19.2.2-1 +- Ver. 19.2.2 + * Wed Jan 18 2017 Peter Lemenkov - 19.2.1-1 - Ver. 19.2.1 From 702793bfad858b4aa8d3941329f968d174fd57a7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 1 Feb 2017 15:22:39 +0300 Subject: [PATCH 113/340] Forgot to upload new sources. Again. Signed-off-by: Peter Lemenkov --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 763a893..cf513ad 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.1.6.tar.gz /otp-OTP-19.2.tar.gz /otp-OTP-19.2.1.tar.gz +/otp-OTP-19.2.2.tar.gz diff --git a/sources b/sources index 3ed0da5..4329f35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.2.1.tar.gz) = 60b5889f16ae52418eb8a8c53ed7195096ea2e29bca85b62d4d6ddb70a028f6e1dd091ed1482983f5ca56b326748bb822fa7bcf0c869f66edf7bb8dfc5d6398d +SHA512 (otp-OTP-19.2.2.tar.gz) = 4432cb00bbd4a35264fb3960c9dd5a8d0974cb31dc181e9d9ba3d55ebc91e55d8e91fe8e39afbe1822148c2666903bbf6ee16ac095f07f559a1a945a884b6d1c From 4a572cf7ca2b9a807a9b2e727d485dbc6617e718 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 8 Feb 2017 16:15:08 +0300 Subject: [PATCH 114/340] Ver. 19.2.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf513ad..1b056ad 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.2.tar.gz /otp-OTP-19.2.1.tar.gz /otp-OTP-19.2.2.tar.gz +/otp-OTP-19.2.3.tar.gz diff --git a/erlang.spec b/erlang.spec index 31e3d59..6fc4a44 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.2.2 +Version: 19.2.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2311,6 +2311,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Feb 8 2017 Peter Lemenkov - 19.2.3-1 +- Ver. 19.2.3 + * Wed Feb 1 2017 Peter Lemenkov - 19.2.2-1 - Ver. 19.2.2 diff --git a/sources b/sources index 4329f35..167a36d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.2.2.tar.gz) = 4432cb00bbd4a35264fb3960c9dd5a8d0974cb31dc181e9d9ba3d55ebc91e55d8e91fe8e39afbe1822148c2666903bbf6ee16ac095f07f559a1a945a884b6d1c +SHA512 (otp-OTP-19.2.3.tar.gz) = 3ec4f5f805eac14327ea370993afc2f0bb18c104b69e01e219cdc3bf5241ac0e1ac665d4aba00b2b544976fa475023254a744858e893efcf121cf357d7bd2d1c From dd211a4ec21143e91b95b0dfa3b7fbe9e8e89043 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 15 Mar 2017 16:12:54 +0300 Subject: [PATCH 115/340] Ver. 19.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1b056ad..0741f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.2.1.tar.gz /otp-OTP-19.2.2.tar.gz /otp-OTP-19.2.3.tar.gz +/otp-OTP-19.3.tar.gz diff --git a/erlang.spec b/erlang.spec index 6fc4a44..370e51e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.2.3 +Version: 19.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2311,6 +2311,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Wed Mar 15 2017 Peter Lemenkov - 19.3-1 +- Ver. 19.3 + * Wed Feb 8 2017 Peter Lemenkov - 19.2.3-1 - Ver. 19.2.3 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index c3c4699..d2b6af7 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -881,10 +881,10 @@ index 7ab6f22..b57da4a 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 3dda1a3..a1e3c7c 100644 +index 2e7df97..0cd43d3 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -146,7 +146,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/sources b/sources index 167a36d..8f91301 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.2.3.tar.gz) = 3ec4f5f805eac14327ea370993afc2f0bb18c104b69e01e219cdc3bf5241ac0e1ac665d4aba00b2b544976fa475023254a744858e893efcf121cf357d7bd2d1c +SHA512 (otp-OTP-19.3.tar.gz) = 871daa5904ea93feedf9163ab0a6a8f14bb66c99d0057f929dd06130b7fa322607ecc62cf6c61c9b6464b4e9581a513bfc1aea004b00fd02c0c3a19bc38f5be7 From 97871d0d23d42cdcb63e13e3881bce4659e48269 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 15 Mar 2017 16:55:01 +0300 Subject: [PATCH 116/340] Missing man-page Signed-off-by: Peter Lemenkov --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index 370e51e..4dd0e41 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1205,6 +1205,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/ct_snmp.* %{_libdir}/erlang/man/man3/ct_ssh.* %{_libdir}/erlang/man/man3/ct_telnet.* +%{_libdir}/erlang/man/man3/ct_testspec.* %{_libdir}/erlang/man/man3/unix_telnet.* %{_libdir}/erlang/man/man6/common_test.* %endif From 776ede1a0c2fb5cc963fb489c4afd9ee34945384 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 21 Mar 2017 19:26:52 +0300 Subject: [PATCH 117/340] CVE-2016-10253 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +- otp-0007-Fix-CVE-2016-10253.patch | 318 ++++++++++++++++++++++++++++++ 2 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 otp-0007-Fix-CVE-2016-10253.patch diff --git a/erlang.spec b/erlang.spec index 4dd0e41..5d66ef8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -116,6 +116,9 @@ 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 +# Fix CVE-2016-10253 +Patch7: otp-0007-Fix-CVE-2016-10253.patch # end of autogenerated patch tag list BuildRequires: flex @@ -926,6 +929,7 @@ Provides support for XML 1.0. %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources +%patch7 -p1 -b .Fix_CVE_2016_10253 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2312,6 +2316,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Mar 21 2017 Peter Lemenkov - 19.3-2 +- Fix for CVE-2016-10253 + * Wed Mar 15 2017 Peter Lemenkov - 19.3-1 - Ver. 19.3 diff --git a/otp-0007-Fix-CVE-2016-10253.patch b/otp-0007-Fix-CVE-2016-10253.patch new file mode 100644 index 0000000..bee9afb --- /dev/null +++ b/otp-0007-Fix-CVE-2016-10253.patch @@ -0,0 +1,318 @@ +From: Zephyr Pellerin +Date: Mon, 20 Mar 2017 15:36:41 -0700 +Subject: [PATCH] Fix CVE-2016-10253 + + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index d48126a..15a81fa 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -2335,34 +2335,36 @@ for (;;) + } + } + +- +- + /************************************************* +-* Scan compiled branch for non-emptiness * +-*************************************************/ ++ * Scan compiled branch for non-emptiness * ++ *************************************************/ + + /* This function scans through a branch of a compiled pattern to see whether it +-can match the empty string or not. It is called from could_be_empty() +-below and from compile_branch() when checking for an unlimited repeat of a +-group that can match nothing. Note that first_significant_code() skips over +-backward and negative forward assertions when its final argument is TRUE. If we +-hit an unclosed bracket, we return "empty" - this means we've struck an inner +-bracket whose current branch will already have been scanned. +- +-Arguments: +- code points to start of search +- endcode points to where to stop +- utf TRUE if in UTF-8 / UTF-16 / UTF-32 mode +- cd contains pointers to tables etc. +- +-Returns: TRUE if what is matched could be empty ++ can match the empty string or not. It is called from could_be_empty() ++ below and from compile_branch() when checking for an unlimited repeat of a ++ group that can match nothing. Note that first_significant_code() skips over ++ backward and negative forward assertions when its final argument is TRUE. If we ++ hit an unclosed bracket, we return "empty" - this means we've struck an inner ++ bracket whose current branch will already have been scanned. ++ ++ Arguments: ++ code points to start of search ++ endcode points to where to stop ++ utf TRUE if in UTF-8 / UTF-16 / UTF-32 mode ++ cd contains pointers to tables etc. ++ recurses chain of recurse_check to catch mutual recursion ++ ++ Returns: TRUE if what is matched could be empty + */ + ++ + static BOOL + could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode, +- BOOL utf, compile_data *cd) ++ BOOL utf, compile_data *cd, recurse_check *recurses) + { + register pcre_uchar c; ++recurse_check this_recurse; ++ + for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + code < endcode; + code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE)) +@@ -2390,25 +2392,47 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + + if (c == OP_RECURSE) + { +- const pcre_uchar *scode; ++ const pcre_uchar *scode = cd->start_code + GET(code, 1); ++ const pcre_uchar *endgroup = scode; + BOOL empty_branch; + +- /* Test for forward reference */ ++ /* Test for forward reference or uncompleted reference. This is disabled ++ when called to scan a completed pattern by setting cd->start_workspace to ++ NULL. */ + +- for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE) +- if ((int)GET(scode, 0) == (int)(code + 1 - cd->start_code)) return TRUE; ++ if (cd->start_workspace != NULL) ++ { ++ const pcre_uchar *tcode; ++ for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE) ++ if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE; ++ if (GET(scode, 1) == 0) return TRUE; /* Unclosed */ ++ } + +- /* Not a forward reference, test for completed backward reference */ ++ /* If the reference is to a completed group, we need to detect whether this ++ is a recursive call, as otherwise there will be an infinite loop. If it is ++ a recursion, just skip over it. Simple recursions are easily detected. For ++ mutual recursions we keep a chain on the stack. */ + +- empty_branch = FALSE; +- scode = cd->start_code + GET(code, 1); +- if (GET(scode, 1) == 0) return TRUE; /* Unclosed */ ++ do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT); ++ if (code >= scode && code <= endgroup) continue; /* Simple recursion */ ++ else ++ { ++ recurse_check *r = recurses; ++ for (r = recurses; r != NULL; r = r->prev) ++ if (r->group == scode) break; ++ if (r != NULL) continue; /* Mutual recursion */ ++ } ++ ++ /* Completed reference; scan the referenced group, remembering it on the ++ stack chain to detect mutual recursions. */ + +- /* Completed backwards reference */ ++ empty_branch = FALSE; ++ this_recurse.prev = recurses; ++ this_recurse.group = scode; + + do + { +- if (could_be_empty_branch(scode, endcode, utf, cd)) ++ if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse)) + { + empty_branch = TRUE; + break; +@@ -2448,7 +2472,7 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + if (c == OP_BRA || c == OP_BRAPOS || + c == OP_CBRA || c == OP_CBRAPOS || + c == OP_ONCE || c == OP_ONCE_NC || +- c == OP_COND) ++ c == OP_COND || c == OP_SCOND) + { + BOOL empty_branch; + if (GET(code, 1) == 0) return TRUE; /* Hit unclosed bracket */ +@@ -2464,8 +2488,8 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + empty_branch = FALSE; + do + { +- if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd)) +- empty_branch = TRUE; ++ if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd, ++ recurses)) empty_branch = TRUE; + code += GET(code, 1); + } + while (*code == OP_ALT); +@@ -2522,34 +2546,57 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + + /* Opcodes that must match a character */ + ++ case OP_ANY: ++ case OP_ALLANY: ++ case OP_ANYBYTE: ++ + case OP_PROP: + case OP_NOTPROP: ++ case OP_ANYNL: ++ ++ case OP_NOT_HSPACE: ++ case OP_HSPACE: ++ case OP_NOT_VSPACE: ++ case OP_VSPACE: + case OP_EXTUNI: ++ + case OP_NOT_DIGIT: + case OP_DIGIT: + case OP_NOT_WHITESPACE: + case OP_WHITESPACE: + case OP_NOT_WORDCHAR: + case OP_WORDCHAR: +- case OP_ANY: +- case OP_ALLANY: +- case OP_ANYBYTE: ++ + case OP_CHAR: + case OP_CHARI: + case OP_NOT: + case OP_NOTI: ++ + case OP_PLUS: ++ case OP_PLUSI: + case OP_MINPLUS: +- case OP_POSPLUS: +- case OP_EXACT: ++ case OP_MINPLUSI: ++ + case OP_NOTPLUS: ++ case OP_NOTPLUSI: + case OP_NOTMINPLUS: ++ case OP_NOTMINPLUSI: ++ ++ case OP_POSPLUS: ++ case OP_POSPLUSI: + case OP_NOTPOSPLUS: ++ case OP_NOTPOSPLUSI: ++ ++ case OP_EXACT: ++ case OP_EXACTI: + case OP_NOTEXACT: ++ case OP_NOTEXACTI: ++ + case OP_TYPEPLUS: + case OP_TYPEMINPLUS: + case OP_TYPEPOSPLUS: + case OP_TYPEEXACT: ++ + return FALSE; + + /* These are going to continue, as they may be empty, but we have to +@@ -2583,30 +2630,58 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); + return TRUE; + + /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO, +- MINUPTO, and POSUPTO may be followed by a multibyte character */ ++ MINUPTO, and POSUPTO and their caseless and negative versions may be ++ followed by a multibyte character. */ + + #if defined SUPPORT_UTF && !defined COMPILE_PCRE32 + case OP_STAR: + case OP_STARI: ++ case OP_NOTSTAR: ++ case OP_NOTSTARI: ++ + case OP_MINSTAR: + case OP_MINSTARI: ++ case OP_NOTMINSTAR: ++ case OP_NOTMINSTARI: ++ + case OP_POSSTAR: + case OP_POSSTARI: ++ case OP_NOTPOSSTAR: ++ case OP_NOTPOSSTARI: ++ + case OP_QUERY: + case OP_QUERYI: ++ case OP_NOTQUERY: ++ case OP_NOTQUERYI: ++ + case OP_MINQUERY: + case OP_MINQUERYI: ++ case OP_NOTMINQUERY: ++ case OP_NOTMINQUERYI: ++ + case OP_POSQUERY: + case OP_POSQUERYI: ++ case OP_NOTPOSQUERY: ++ case OP_NOTPOSQUERYI: ++ + if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]); + break; + + case OP_UPTO: + case OP_UPTOI: ++ case OP_NOTUPTO: ++ case OP_NOTUPTOI: ++ + case OP_MINUPTO: + case OP_MINUPTOI: ++ case OP_NOTMINUPTO: ++ case OP_NOTMINUPTOI: ++ + case OP_POSUPTO: + case OP_POSUPTOI: ++ case OP_NOTPOSUPTO: ++ case OP_NOTPOSUPTOI: ++ + if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]); + break; + #endif +@@ -2632,7 +2707,6 @@ return TRUE; + } + + +- + /************************************************* + * Scan compiled regex for non-emptiness * + *************************************************/ +@@ -2660,7 +2734,7 @@ could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode, + { + while (bcptr != NULL && bcptr->current_branch >= code) + { +- if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd)) ++ if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL)) + return FALSE; + bcptr = bcptr->outer; + } +@@ -2668,7 +2742,6 @@ return TRUE; + } + + +- + /************************************************* + * Check for POSIX class syntax * + *************************************************/ +@@ -5392,7 +5465,7 @@ for (;; ptr++) + pcre_uchar *scode = bracode; + do + { +- if (could_be_empty_branch(scode, ketcode, utf, cd)) ++ if (could_be_empty_branch(scode, ketcode, utf, cd, NULL)) + { + *bracode += OP_SBRA - OP_BRA; + break; +diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h +index af436bd..eb0db89 100644 +--- a/erts/emulator/pcre/pcre_internal.h ++++ b/erts/emulator/pcre/pcre_internal.h +@@ -2455,6 +2455,13 @@ typedef struct branch_chain { + pcre_uchar *current_branch; + } branch_chain; + ++/* Structure for mutual recursion detection. */ ++ ++typedef struct recurse_check { ++ struct recurse_check *prev; ++ const pcre_uchar *group; ++} recurse_check; ++ + /* Structure for items in a linked list that represents an explicit recursive + call within the pattern; used by pcre_exec(). */ + From e1916531546622c13fe3db3cc803f9994ec4e4b9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 4 Apr 2017 17:34:06 +0300 Subject: [PATCH 118/340] Ver. 19.3.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0741f0b..db0ede8 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.2.2.tar.gz /otp-OTP-19.2.3.tar.gz /otp-OTP-19.3.tar.gz +/otp-OTP-19.3.1.tar.gz diff --git a/erlang.spec b/erlang.spec index 5d66ef8..37c787e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.3 -Release: 2%{?dist} +Version: 19.3.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2316,6 +2316,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue Apr 4 2017 Peter Lemenkov - 19.3.1-1 +- Ver. 19.3.1 + * Tue Mar 21 2017 Peter Lemenkov - 19.3-2 - Fix for CVE-2016-10253 diff --git a/sources b/sources index 8f91301..e8c5b3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.tar.gz) = 871daa5904ea93feedf9163ab0a6a8f14bb66c99d0057f929dd06130b7fa322607ecc62cf6c61c9b6464b4e9581a513bfc1aea004b00fd02c0c3a19bc38f5be7 +SHA512 (otp-OTP-19.3.1.tar.gz) = d0db7654ee699b5ff23db9b563960a26338d209629115e2534fdbd3c08f42a9f0a59ebeb83f76c36e0944e24e429ec56a1b9e9430779193b0734648a94be88df From 7ab86b5985989c76f87efb635090ff3cc5c34340 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 24 Apr 2017 13:04:10 +0300 Subject: [PATCH 119/340] Ver. 19.3.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db0ede8..c90d412 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.2.3.tar.gz /otp-OTP-19.3.tar.gz /otp-OTP-19.3.1.tar.gz +/otp-OTP-19.3.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 37c787e..ab7e755 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.1 +Version: 19.3.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2316,6 +2316,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Mon Apr 24 2017 Peter Lemenkov - 19.3.2-1 +- Ver. 19.3.2 + * Tue Apr 4 2017 Peter Lemenkov - 19.3.1-1 - Ver. 19.3.1 diff --git a/sources b/sources index e8c5b3e..0c37bb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.1.tar.gz) = d0db7654ee699b5ff23db9b563960a26338d209629115e2534fdbd3c08f42a9f0a59ebeb83f76c36e0944e24e429ec56a1b9e9430779193b0734648a94be88df +SHA512 (otp-OTP-19.3.2.tar.gz) = d895aa647fd5ad45a8733c9db846bc70d09cc03900fb9d09d6aa2e2448f92d5a13190c0d14d1e09ca46fb9088198175a0ea69e533ee9d8d8472250d66eab0c9a From 57b0bc8600396bb0af9605d90f34abdf5e8bd0c7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 2 May 2017 11:47:40 +0300 Subject: [PATCH 120/340] Ver. 19.3.3 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 5 +- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 16 +- otp-0004-Do-not-install-Java-sources.patch | 4 +- ...teventlog-and-related-doc-files-on-n.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 144 +++++++++--------- otp-0007-Fix-CVE-2016-10253.patch | 4 +- sources | 2 +- 10 files changed, 96 insertions(+), 92 deletions(-) diff --git a/.gitignore b/.gitignore index c90d412..efb0f9d 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.tar.gz /otp-OTP-19.3.1.tar.gz /otp-OTP-19.3.2.tar.gz +/otp-OTP-19.3.3.tar.gz diff --git a/erlang.spec b/erlang.spec index ab7e755..2dbc064 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.2 +Version: 19.3.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2316,6 +2316,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Tue May 2 2017 Peter Lemenkov - 19.3.3-1 +- Ver. 19.3.2 + * Mon Apr 24 2017 Peter Lemenkov - 19.3.2-1 - Ver. 19.3.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 0415370..fe09948 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index cb053a1..024307b 100644 +index cb053a1b7c..024307b9c9 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -492,10 +492,6 @@ endif @@ -21,7 +21,7 @@ index cb053a1..024307b 100644 $(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 e71308e..ae2c9cf 100644 +index e71308edbe..ae2c9cf251 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 . diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index e1eac8f..5d39eb0 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c62f25b..bb28704 100644 +index c62f25b3ee..bb28704c1e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -90,7 +90,7 @@ endif @@ -18,7 +18,7 @@ index c62f25b..bb28704 100644 EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB else diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile -index ff9d3e1..d3aba77 100644 +index ff9d3e1dc9..d3aba77808 100644 --- a/lib/crypto/priv/Makefile +++ b/lib/crypto/priv/Makefile @@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 0f945b7..5d169b0 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 1f714df..95835d6 100644 +index 1f714df357..95835d6ed2 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile @@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -27,7 +27,7 @@ index 1f714df..95835d6 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index bb28704..165a2e0 100644 +index bb28704c1e..165a2e0cd5 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -195,13 +195,9 @@ docs: @@ -45,7 +45,7 @@ index bb28704..165a2e0 100644 endif diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 4f393e9..a9a7f7c 100644 +index 4f393e952c..a9a7f7cc79 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) @@ -72,7 +72,7 @@ index 4f393e9..a9a7f7c 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index c0dad59..9a19028 100644 +index c0dad59557..9a19028ff3 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in @@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c @@ -89,7 +89,7 @@ index c0dad59..9a19028 100644 $(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 c37ad4d..09bf1ef 100644 +index c37ad4d702..09bf1efe95 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -271,7 +271,7 @@ release_spec: opt @@ -102,7 +102,7 @@ index c37ad4d..09bf1ef 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 784e73c..568c5e4 100644 +index 784e73c47e..568c5e4c3e 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 @@ -118,7 +118,7 @@ index 784e73c..568c5e4 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index 27b156a..f11ff30 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,7 +131,7 @@ index 27b156a..f11ff30 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index cfe9191..735cdaa 100644 +index cfe91917f8..735cdaaaef 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -190,8 +190,6 @@ include ../vsn.mk diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 694a23f..9e3861e 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -index 21c38e5..eeba2e4 100644 +index 21c38e54b5..eeba2e4eae 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: @@ -18,7 +18,7 @@ index 21c38e5..eeba2e4 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index e55cfa6..5e3a0a5 100644 +index e55cfa62ea..5e3a0a5274 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: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 52bd6f0..bf1febc 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 91c7ae7..dc7bcf3 100644 +index 91c7ae7bc3..dc7bcf3686 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) @@ -29,7 +29,7 @@ index 91c7ae7..dc7bcf3 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 3ff6320..29b53a8 100644 +index 3ff63204c6..29b53a8188 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index d2b6af7..ba3c5fd 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 2ab9eda..9b8ed35 100644 +index 2ab9edaf5e..9b8ed35d1a 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -21,7 +21,7 @@ index 2ab9eda..9b8ed35 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 38cf2d4..d4bb398 100644 +index 38cf2d496a..d4bb3982d2 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ release_spec: opt @@ -34,7 +34,7 @@ index 38cf2d4..d4bb398 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 9d75199..b96a112 100644 +index 9d751996ad..b96a11225c 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -47,7 +47,7 @@ index 9d75199..b96a112 100644 $(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 f015064..57f96d2 100644 +index f015064b39..57f96d2929 100644 --- a/lib/common_test/test_server/Makefile +++ b/lib/common_test/test_server/Makefile @@ -86,9 +86,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -63,7 +63,7 @@ index f015064..57f96d2 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 518c89d..1bcd19c 100644 +index 518c89d044..1bcd19cff7 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -78,7 +78,7 @@ index 518c89d..1bcd19c 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index 29d6223..cb43309 100644 +index 29d6223005..cb433090d2 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile @@ -203,7 +203,7 @@ release_spec: opt @@ -91,7 +91,7 @@ index 29d6223..cb43309 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index cdaf9e5..6e4e9b8 100644 +index cdaf9e5f1f..6e4e9b8c52 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile @@ -172,7 +172,7 @@ release_spec: opt @@ -104,7 +104,7 @@ index cdaf9e5..6e4e9b8 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index b396710..2678c2a 100644 +index b3967101e9..2678c2a642 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile @@ -180,9 +180,7 @@ release_spec: opt @@ -119,7 +119,7 @@ index b396710..2678c2a 100644 release_docs_spec: diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index 009c6be..83c2e26 100644 +index 009c6be4a5..83c2e26057 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile @@ -371,8 +371,7 @@ release_spec: opt @@ -133,7 +133,7 @@ index 009c6be..83c2e26 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index 1fdc258..90cf711 100644 +index 1fdc258a6d..90cf7116b7 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile @@ -180,8 +180,7 @@ release_spec: opt @@ -147,7 +147,7 @@ index 1fdc258..90cf711 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index 55d59ba..f22e2c8 100644 +index 55d59baea3..f22e2c81db 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile @@ -199,8 +199,7 @@ release_spec: opt @@ -161,7 +161,7 @@ index 55d59ba..f22e2c8 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 4cc1e48..084f0a7 100644 +index 4cc1e487c2..084f0a7230 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile @@ -174,7 +174,7 @@ release_spec: opt @@ -174,7 +174,7 @@ index 4cc1e48..084f0a7 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 456b8be..fcfa8de 100644 +index 456b8be64d..fcfa8def89 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -82,8 +82,6 @@ docs: @@ -187,7 +187,7 @@ index 456b8be..fcfa8de 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 9594a0b..bc33e67 100644 +index 9594a0bfe3..bc33e67e88 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -200,7 +200,7 @@ index 9594a0b..bc33e67 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 256f20f..2920c0f 100644 +index 256f20f549..2920c0f198 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -213,7 +213,7 @@ index 256f20f..2920c0f 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 6bf748a..962d7b7 100644 +index 6bf748a727..962d7b75d6 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ release_spec: opt @@ -231,7 +231,7 @@ index 6bf748a..962d7b7 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index 4e5a418..c0bb0c3 100644 +index 4e5a4182da..c0bb0c32ec 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -88,7 +88,7 @@ release_spec: opt @@ -244,7 +244,7 @@ index 4e5a418..c0bb0c3 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index b79a537..d0b231e 100644 +index b79a537424..d0b231e5fc 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile @@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -264,7 +264,7 @@ index b79a537..d0b231e 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 82d051e..950fdbe 100644 +index 82d051e9bb..950fdbe177 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -277,7 +277,7 @@ index 82d051e..950fdbe 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index b6347d8..a695d2c 100644 +index b6347d8b6d..a695d2cc2d 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -109,7 +109,6 @@ release_spec: opt @@ -289,7 +289,7 @@ index b6347d8..a695d2c 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 86a6d88..5732fd8 100644 +index 86a6d8831e..5732fd85f3 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -120,7 +120,6 @@ release_spec: opt @@ -301,7 +301,7 @@ index 86a6d88..5732fd8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index e19ce82..6b7c96e 100644 +index e19ce822b9..6b7c96ea68 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -316,7 +316,7 @@ index e19ce82..6b7c96e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 9f50d6b..df92b84 100644 +index 9f50d6bf91..df92b84c0d 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -329,7 +329,7 @@ index 9f50d6b..df92b84 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index d883eec..3119bc4 100644 +index d883eecf36..3119bc4638 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -342,7 +342,7 @@ index d883eec..3119bc4 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index b220bc1..d407327 100644 +index b220bc16a0..d4073277be 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -355,7 +355,7 @@ index b220bc1..d407327 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 88016a7..d8e8fa0 100644 +index 88016a7d8b..d8e8fa0546 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -368,7 +368,7 @@ index 88016a7..d8e8fa0 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index 8ef31db..80d2881 100644 +index 8ef31dbb46..80d28819f2 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile @@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -381,7 +381,7 @@ index 8ef31db..80d2881 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index 72cfff2..e55223a 100644 +index 72cfff21a8..e55223a57d 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -394,7 +394,7 @@ index 72cfff2..e55223a 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index b4cdf8b..f9ebcae 100644 +index b4cdf8b1f2..f9ebcaec30 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -407,7 +407,7 @@ index b4cdf8b..f9ebcae 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 66e9421..1951742 100644 +index 66e9421c25..19517427e6 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ HIPE_MODULES = @@ -428,7 +428,7 @@ index 66e9421..1951742 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index 6ad2fbe..258517d 100644 +index 6ad2fbeeb7..258517da6f 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile @@ -200,7 +200,7 @@ release_spec: opt @@ -441,7 +441,7 @@ index 6ad2fbe..258517d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile -index 6b99694..530a19e 100644 +index 6b99694ea7..530a19ecea 100644 --- a/lib/inets/src/ftp/Makefile +++ b/lib/inets/src/ftp/Makefile @@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -454,7 +454,7 @@ index 6b99694..530a19e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index a1c1f36..f2eb86f 100644 +index a1c1f36b70..f2eb86f7ac 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile @@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -467,7 +467,7 @@ index a1c1f36..f2eb86f 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 8248e37..1f1b231 100644 +index 8248e37c44..1f1b23184b 100644 --- a/lib/inets/src/http_lib/Makefile +++ b/lib/inets/src/http_lib/Makefile @@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -480,7 +480,7 @@ index 8248e37..1f1b231 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 1c05d45..88f9f62 100644 +index 1c05d454a5..88f9f62d3b 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -493,7 +493,7 @@ index 1c05d45..88f9f62 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index eb0098d..fff21ff 100644 +index eb0098dbee..fff21ff740 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -506,7 +506,7 @@ index eb0098d..fff21ff 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile -index 4eaa959..198fbf3 100644 +index 4eaa959cce..198fbf3106 100644 --- a/lib/inets/src/tftp/Makefile +++ b/lib/inets/src/tftp/Makefile @@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -519,7 +519,7 @@ index 4eaa959..198fbf3 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 2b72f78..31eed45 100644 +index 2b72f78dcf..31eed456ff 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile @@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -531,7 +531,7 @@ index 2b72f78..31eed45 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index ab45548..5c7a7f0 100644 +index ab45548099..5c7a7f0be9 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ release_spec: opt @@ -544,7 +544,7 @@ index ab45548..5c7a7f0 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index b964366..5b5a4cf 100644 +index b9643669f6..5b5a4cf482 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -176,7 +176,7 @@ release_spec: opt @@ -557,7 +557,7 @@ index b964366..5b5a4cf 100644 release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 869b516..fa7d774 100644 +index 869b516b05..fa7d774d84 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -570,7 +570,7 @@ index 869b516..fa7d774 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 09bf1ef..b320b2e 100644 +index 09bf1efe95..b320b2e96f 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -268,7 +268,6 @@ release_spec: opt @@ -582,7 +582,7 @@ index 09bf1ef..b320b2e 100644 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index d07db3f..7f421d2 100644 +index d07db3fa4b..7f421d24cc 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -595,7 +595,7 @@ index d07db3f..7f421d2 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index 8e7e82b..2a118d2 100644 +index 8e7e82b276..2a118d24e3 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -135,7 +135,7 @@ release_spec: opt @@ -608,7 +608,7 @@ index 8e7e82b..2a118d2 100644 release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 028a63e..9e11e9b 100644 +index 028a63e98e..9e11e9bfb2 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -621,7 +621,7 @@ index 028a63e..9e11e9b 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 08a00e6..a21ffb3 100644 +index 08a00e6aba..a21ffb3801 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -634,7 +634,7 @@ index 08a00e6..a21ffb3 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index ff2bcbd..4973158 100644 +index ff2bcbdb99..4973158705 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile @@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -646,7 +646,7 @@ index ff2bcbd..4973158 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index 7ca5949..a52ade2 100644 +index 7ca59495ed..a52ade2fe3 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -659,7 +659,7 @@ index 7ca5949..a52ade2 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 1086633..553c9cd 100644 +index 108663396c..553c9cdd01 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile @@ -145,8 +145,8 @@ release_spec: opt @@ -674,7 +674,7 @@ index 1086633..553c9cd 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 7fec29a..a71b9f1 100644 +index 7fec29a000..a71b9f1227 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -253,7 +253,7 @@ release_spec: opt @@ -687,7 +687,7 @@ index 7fec29a..a71b9f1 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 29b53a8..3ae2074 100644 +index 29b53a8188..3ae2074f8c 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -699,7 +699,7 @@ index 29b53a8..3ae2074 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 4023f50..864a0a5 100644 +index 4023f50d48..864a0a53d8 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -712,7 +712,7 @@ index 4023f50..864a0a5 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index dea29be..655aea9 100644 +index dea29bee4c..655aea91ca 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -725,7 +725,7 @@ index dea29be..655aea9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index b2ec87d..3153e34 100644 +index b2ec87d08c..3153e34f7a 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile @@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -737,7 +737,7 @@ index b2ec87d..3153e34 100644 # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index a920ea8..7672ef3 100644 +index a920ea87ea..7672ef3470 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -752,7 +752,7 @@ index a920ea8..7672ef3 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index e61390b..6ed6c2c 100644 +index e61390bce3..6ed6c2cf9f 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -765,7 +765,7 @@ index e61390b..6ed6c2c 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 4bddee4..c714255 100644 +index 4bddee4664..c714255548 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -778,7 +778,7 @@ index 4bddee4..c714255 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 2c90295..d674a8f 100644 +index 2c902952a1..d674a8fe13 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile @@ -99,8 +99,6 @@ docs: @@ -791,7 +791,7 @@ index 2c90295..d674a8f 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index ac7ee51..c53f661 100644 +index ac7ee51100..c53f661675 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -803,7 +803,7 @@ index ac7ee51..c53f661 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 2943a4d..8203e62 100644 +index 2943a4d550..8203e62361 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -816,7 +816,7 @@ index 2943a4d..8203e62 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 6f2b8a4..bd062a6 100644 +index 6f2b8a4077..bd062a6473 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -829,7 +829,7 @@ index 6f2b8a4..bd062a6 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 4093ffa..18878aa 100644 +index 4093ffa9ca..18878aa5db 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -842,7 +842,7 @@ index 4093ffa..18878aa 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 0cc8749..d203f28 100644 +index 0cc87492f1..d203f2846a 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -855,7 +855,7 @@ index 0cc8749..d203f28 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index adc2c48..89ce954 100644 +index adc2c4858f..89ce954e99 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -868,7 +868,7 @@ index adc2c48..89ce954 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 7ab6f22..b57da4a 100644 +index 7ab6f22424..b57da4ad67 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -881,7 +881,7 @@ index 7ab6f22..b57da4a 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 2e7df97..0cd43d3 100644 +index 2e7df9792e..0cd43d3805 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -894,7 +894,7 @@ index 2e7df97..0cd43d3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 302834f..53804f8 100644 +index 302834f9d0..53804f81ff 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile @@ -208,7 +208,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -906,7 +906,7 @@ index 302834f..53804f8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index 8325db4..d17fdaa 100644 +index 8325db45a8..d17fdaa0ec 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -919,7 +919,7 @@ index 8325db4..d17fdaa 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index 032bd61..efb0309 100644 +index 032bd612db..efb0309eb8 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile @@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -932,7 +932,7 @@ index 032bd61..efb0309 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 6c5d8b0..82f516a 100644 +index 6c5d8b0726..82f516a0e5 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile @@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -946,7 +946,7 @@ index 6c5d8b0..82f516a 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 21b45af..a7bf34f 100644 +index 21b45af2c4..a7bf34f4f4 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) @@ -962,7 +962,7 @@ index 21b45af..a7bf34f 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 51d9190..1ab65bd 100644 +index 51d9190797..1ab65bd2ed 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ release_spec: opt diff --git a/otp-0007-Fix-CVE-2016-10253.patch b/otp-0007-Fix-CVE-2016-10253.patch index bee9afb..ca5ab5d 100644 --- a/otp-0007-Fix-CVE-2016-10253.patch +++ b/otp-0007-Fix-CVE-2016-10253.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Fix CVE-2016-10253 diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index d48126a..15a81fa 100644 +index d48126a55d..15a81fae56 100644 --- a/erts/emulator/pcre/pcre_compile.c +++ b/erts/emulator/pcre/pcre_compile.c @@ -2335,34 +2335,36 @@ for (;;) @@ -299,7 +299,7 @@ index d48126a..15a81fa 100644 *bracode += OP_SBRA - OP_BRA; break; diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h -index af436bd..eb0db89 100644 +index af436bd99b..eb0db89619 100644 --- a/erts/emulator/pcre/pcre_internal.h +++ b/erts/emulator/pcre/pcre_internal.h @@ -2455,6 +2455,13 @@ typedef struct branch_chain { diff --git a/sources b/sources index 0c37bb0..5d92ca5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.2.tar.gz) = d895aa647fd5ad45a8733c9db846bc70d09cc03900fb9d09d6aa2e2448f92d5a13190c0d14d1e09ca46fb9088198175a0ea69e533ee9d8d8472250d66eab0c9a +SHA512 (otp-OTP-19.3.3.tar.gz) = b720b3c4f7c80a59a2cdca8ea36246a8cb879542977497d13113a3128e21bd91355a44bc467b4e2bfb988be74e1b434d49237d08d76878f32e3fc9f1d5ec049c From ae3c1bb728985290fdbc978a14e49302ab3212ea Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 12 May 2017 17:18:56 +0300 Subject: [PATCH 121/340] Erlang ver. 19.3.4 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 25 ++++++++++++++++--------- sources | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index efb0f9d..fd40fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.1.tar.gz /otp-OTP-19.3.2.tar.gz /otp-OTP-19.3.3.tar.gz +/otp-OTP-19.3.4.tar.gz diff --git a/erlang.spec b/erlang.spec index 2dbc064..e5677ff 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,13 +65,13 @@ Name: erlang -Version: 19.3.3 +Version: 19.3.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ASL 2.0 -URL: http://www.erlang.org +URL: https://www.erlang.org %if 0%{?el7}%{?fedora} VCS: scm:git:https://github.com/erlang/otp %endif @@ -574,6 +574,7 @@ Summary: IDL compiler Group: Development/Languages %if %{__with_java} BuildRequires: java-devel +Requires: javapackages-tools %endif %{__with_java} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -600,6 +601,7 @@ A set of services such as a Web server and a ftp client etc. Summary: A library for accessing Java from Erlang Group: Development/Languages BuildRequires: java-devel +Requires: javapackages-tools Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description jinterface @@ -1165,7 +1167,7 @@ done %pre erts getent group epmd >/dev/null || groupadd -r epmd getent passwd epmd >/dev/null || \ -useradd -r -g epmd -d /tmp -s /sbin/nologin \ +useradd -r -g epmd -d /dev/null -s /sbin/nologin \ -c "Erlang Port Mapper Daemon" epmd 2>/dev/null || : @@ -1598,9 +1600,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/ic-*/include %{_libdir}/erlang/lib/ic-*/priv %{_libdir}/erlang/lib/ic-*/src -# FIXME see erlang-jinterface also -#%dir %{_javadir}/%{name}/ %if %{__with_java} +# FIXME see also erlang-jinterface +%dir %{_javadir}/%{name}/ %{_javadir}/%{name}/ic.jar %endif %{__with_java} %if %{with doc} @@ -1633,8 +1635,8 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{__with_java} %files jinterface -# FIXME see erlang-ic also -#%dir %{_javadir}/%{name}/ +# FIXME see also erlang-ic +%dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ %endif %{__with_java} @@ -2316,8 +2318,13 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %changelog +* Fri May 12 2017 Peter Lemenkov - 19.3.4-1 +- Ver. 19.3.4 +- Require javapackages-tools (/use/share/java) +- Use /dev/null as a homedir for EPMD (its shell is /sbin/nologin anyway) + * Tue May 2 2017 Peter Lemenkov - 19.3.3-1 -- Ver. 19.3.2 +- Ver. 19.3.3 * Mon Apr 24 2017 Peter Lemenkov - 19.3.2-1 - Ver. 19.3.2 @@ -2802,7 +2809,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ - new release R12B-0 * Wed Dec 05 2007 Release Engineering - R11B-6 - - Rebuild for deps +- Rebuild for deps * Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 - fix some permissions diff --git a/sources b/sources index 5d92ca5..d2b6a26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.3.tar.gz) = b720b3c4f7c80a59a2cdca8ea36246a8cb879542977497d13113a3128e21bd91355a44bc467b4e2bfb988be74e1b434d49237d08d76878f32e3fc9f1d5ec049c +SHA512 (otp-OTP-19.3.4.tar.gz) = c370964b01caf65005c8168d379567e867d09e1584b69ffc28d7405467967cc3e9a76b8421ab16ba0ff853d921d82f8a1e082c3f7661e6f64342ec0d3fed1853 From 56767782dce01a7ca6af71ebf528d3bc808afa4a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 7 Jun 2017 18:56:58 +0300 Subject: [PATCH 122/340] Ver. 19.3.5 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fd40fd7..64cae11 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.2.tar.gz /otp-OTP-19.3.3.tar.gz /otp-OTP-19.3.4.tar.gz +/otp-OTP-19.3.5.tar.gz diff --git a/erlang.spec b/erlang.spec index e5677ff..58fda60 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.4 +Version: 19.3.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1160,8 +1160,11 @@ done %check -# FIXME run tests somehow -# make tests || exit 0 +TARGET="$(make target_configured)" +ERL_TOP="$(pwd)" +# FIXME we'll keep "exit 0" for a while to check if everything ok on secondary +# arches. +ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests || exit 0 %pre erts @@ -2318,6 +2321,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jun 7 2017 Peter Lemenkov - 19.3.5-1 +- Ver. 19.3.5 +- Enabled tests + * Fri May 12 2017 Peter Lemenkov - 19.3.4-1 - Ver. 19.3.4 - Require javapackages-tools (/use/share/java) diff --git a/sources b/sources index d2b6a26..b332493 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.4.tar.gz) = c370964b01caf65005c8168d379567e867d09e1584b69ffc28d7405467967cc3e9a76b8421ab16ba0ff853d921d82f8a1e082c3f7661e6f64342ec0d3fed1853 +SHA512 (otp-OTP-19.3.5.tar.gz) = d3ea25114195abd66989ede948075a6afbd4a02e4fd94a5227be52d397182df0274951ac9a061f62779d040d3d156bc05a0b1189419ce41a84a727f5c2e5d99c From 3484e6a9b9cf8d88ce530fc8ea6c1bfbee851c7e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 13 Jun 2017 16:18:20 +0300 Subject: [PATCH 123/340] Ver. 19.3.6 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 64cae11..61129c6 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.3.tar.gz /otp-OTP-19.3.4.tar.gz /otp-OTP-19.3.5.tar.gz +/otp-OTP-19.3.6.tar.gz diff --git a/erlang.spec b/erlang.spec index 58fda60..320334c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.5 +Version: 19.3.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1162,9 +1162,10 @@ done %check TARGET="$(make target_configured)" ERL_TOP="$(pwd)" -# FIXME we'll keep "exit 0" for a while to check if everything ok on secondary -# arches. -ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests || exit 0 +ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests +# Unfortunately running the tests will take several hours. So we build the +# package w/o tests for now. See this: +# https://github.com/erlang/otp/wiki/Running-tests %pre erts @@ -2321,6 +2322,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jun 13 2017 Peter Lemenkov - 19.3.6-1 +- Ver. 19.3.6 + * Wed Jun 7 2017 Peter Lemenkov - 19.3.5-1 - Ver. 19.3.5 - Enabled tests diff --git a/sources b/sources index b332493..08471d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.5.tar.gz) = d3ea25114195abd66989ede948075a6afbd4a02e4fd94a5227be52d397182df0274951ac9a061f62779d040d3d156bc05a0b1189419ce41a84a727f5c2e5d99c +SHA512 (otp-OTP-19.3.6.tar.gz) = 18369e7736d0d697f84bc7ba537741bd601440372493024b5d9ee0de713c00941b41045b3e93d43f575e0e30a8b0eb741725c14f9704430e187e1116a548a394 From fc59c2ce6ea83028cafb2af0f34917ed038a123e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 16 Jun 2017 17:44:33 +0300 Subject: [PATCH 124/340] Fix EPMD port assignment in IPv6 environment See this PR for the details: * https://github.com/erlang/otp/pull/erlang/otp/pull/1487 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++- ...erl_epmd-port_please-when-using-IPv6.patch | 26 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch diff --git a/erlang.spec b/erlang.spec index 320334c..32b5638 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -119,6 +119,9 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch # Fedora specific patch # Fix CVE-2016-10253 Patch7: otp-0007-Fix-CVE-2016-10253.patch +# Fedora specific patch +# Fix erl_epmd:port_please when using IPv6 +Patch8: otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch # end of autogenerated patch tag list BuildRequires: flex @@ -932,6 +935,7 @@ Provides support for XML 1.0. %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Fix_CVE_2016_10253 +%patch8 -p1 -b .Fix_erl_epmd_port_please_when_using_IPv6 # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -2322,6 +2326,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jun 16 2017 Peter Lemenkov - 19.3.6-2 +- Fix EPMD port assignment in IPv6 env. (GH#1487) + * Tue Jun 13 2017 Peter Lemenkov - 19.3.6-1 - Ver. 19.3.6 diff --git a/otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch b/otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch new file mode 100644 index 0000000..866d325 --- /dev/null +++ b/otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch @@ -0,0 +1,26 @@ +From: John Eckersberg +Date: Wed, 14 Jun 2017 12:32:17 -0400 +Subject: [PATCH] Fix erl_epmd:port_please when using IPv6 + +This mirrors the behavior of inet:gethostbyname when no family or +timeout is supplied. + +diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl +index 7bc9e2ede3..f96bc88913 100644 +--- a/lib/kernel/src/erl_epmd.erl ++++ b/lib/kernel/src/erl_epmd.erl +@@ -79,7 +79,13 @@ port_please(Node, EpmdAddr, Timeout) -> + + + port_please1(Node,HostName, Timeout) -> +- case inet:gethostbyname(HostName, inet, Timeout) of ++ Family = case inet_db:res_option(inet6) of ++ true -> ++ inet6; ++ false -> ++ inet ++ end, ++ case inet:gethostbyname(HostName, Family, Timeout) of + {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} -> + get_port(Node, EpmdAddr, Timeout); + Else -> From dcf7a2f92c67e1eff4ddb705a5e3265b0922d661 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 30 Jun 2017 15:40:15 +0300 Subject: [PATCH 125/340] Ver. 19.3.6.1 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61129c6..97218e0 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.4.tar.gz /otp-OTP-19.3.5.tar.gz /otp-OTP-19.3.6.tar.gz +/otp-OTP-19.3.6.1.tar.gz diff --git a/erlang.spec b/erlang.spec index 32b5638..f644508 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.3.6 -Release: 2%{?dist} +Version: 19.3.6.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2326,6 +2326,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jun 30 2017 Peter Lemenkov - 19.3.6.1-1 +- Ver. 19.3.6.1 + * Fri Jun 16 2017 Peter Lemenkov - 19.3.6-2 - Fix EPMD port assignment in IPv6 env. (GH#1487) diff --git a/sources b/sources index 08471d6..cffeee2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.tar.gz) = 18369e7736d0d697f84bc7ba537741bd601440372493024b5d9ee0de713c00941b41045b3e93d43f575e0e30a8b0eb741725c14f9704430e187e1116a548a394 +SHA512 (otp-OTP-19.3.6.1.tar.gz) = dfcaba4e9ec3ca1beb7ee3d86bcce9c414b19b41b08d7ff4054a1ffb6b41a5b695e4f299703d78d7b25931d6961c16edf113090ca2bb4bfab801e97b337e3c6b From e5db7d37d5cf7d9f4d951e906a2cb3f800fba668 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 07:33:38 +0000 Subject: [PATCH 126/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index f644508..c35e76f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2326,6 +2326,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 19.3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 30 2017 Peter Lemenkov - 19.3.6.1-1 - Ver. 19.3.6.1 From 54498e8c8864ca42e57e688c909cb2896a57e0e8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 31 Jul 2017 17:32:29 +0300 Subject: [PATCH 127/340] Ver. 19.3.6.2 Signed-off-by: Peter Lemenkov --- .gitignore | 1 + erlang.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 97218e0..8a6ffa5 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ otp_src_R14A.tar.gz /otp-OTP-19.3.5.tar.gz /otp-OTP-19.3.6.tar.gz /otp-OTP-19.3.6.1.tar.gz +/otp-OTP-19.3.6.2.tar.gz diff --git a/erlang.spec b/erlang.spec index c35e76f..0168b40 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.3.6.1 -Release: 2%{?dist} +Version: 19.3.6.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2326,6 +2326,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 31 2017 Peter Lemenkov - 19.3.6.2-1 +- Ver. 19.3.6.2 + * Wed Jul 26 2017 Fedora Release Engineering - 19.3.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index cffeee2..5255c77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.1.tar.gz) = dfcaba4e9ec3ca1beb7ee3d86bcce9c414b19b41b08d7ff4054a1ffb6b41a5b695e4f299703d78d7b25931d6961c16edf113090ca2bb4bfab801e97b337e3c6b +SHA512 (otp-OTP-19.3.6.2.tar.gz) = 195cff90ef13761b03c311eadd238907dbc4b9c3ddff19c0356ead33f55113d535b15f250d06b32cbcdff6e34dfc8c3677f9e7d021b355defae74ae49f672ed0 From 20535944dde0f2448bdb62bd5f3ea825a38a99d0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 2 Aug 2017 16:14:59 +0300 Subject: [PATCH 128/340] Search /usr/share/erlang/lib for libraries as well Signed-off-by: Peter Lemenkov --- erlang.spec | 15 +++++++++++- otp-0009-Add-extra-search-directory.patch | 30 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 otp-0009-Add-extra-search-directory.patch diff --git a/erlang.spec b/erlang.spec index 0168b40..efe2026 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -122,6 +122,9 @@ Patch7: otp-0007-Fix-CVE-2016-10253.patch # Fedora specific patch # Fix erl_epmd:port_please when using IPv6 Patch8: otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch +# Fedora specific patch +# Add extra search directory +Patch9: otp-0009-Add-extra-search-directory.patch # end of autogenerated patch tag list BuildRequires: flex @@ -936,6 +939,7 @@ Provides support for XML 1.0. %patch6 -p1 -b .Do_not_install_erlang_sources %patch7 -p1 -b .Fix_CVE_2016_10253 %patch8 -p1 -b .Fix_erl_epmd_port_please_when_using_IPv6 +%patch9 -p1 -b .Add_extra_search_directory # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1162,6 +1166,10 @@ do done %endif %{__with_wxwidgets} +# Provide a place for noarch libs to live. +install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/ +install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/lib + %check TARGET="$(make target_configured)" @@ -1445,6 +1453,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ # TODO # In order to have a parallel-installable Erlang packages these directories # should be packaged separately +%dir %{_datadir}/erlang/ +%dir %{_datadir}/erlang/lib/ %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ @@ -2326,6 +2336,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Aug 1 2017 Randy Barlow - 19.3.6.2-2 +- Search /usr/share/erlang/lib for libraries as well + * Mon Jul 31 2017 Peter Lemenkov - 19.3.6.2-1 - Ver. 19.3.6.2 diff --git a/otp-0009-Add-extra-search-directory.patch b/otp-0009-Add-extra-search-directory.patch new file mode 100644 index 0000000..baa993f --- /dev/null +++ b/otp-0009-Add-extra-search-directory.patch @@ -0,0 +1,30 @@ +From: Peter Lemenkov +Date: Wed, 2 Aug 2017 16:12:19 +0300 +Subject: [PATCH] Add extra search directory + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl +index 59b26176bf..5f3d68db2a 100644 +--- a/lib/kernel/src/code_server.erl ++++ b/lib/kernel/src/code_server.erl +@@ -79,11 +79,15 @@ 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"), ++ {ok,D} = erl_prim_loader:list_dir(LD), ++ make_path(LD, D) ++ end, ++ Paths = F(Root), ++ SharedPaths = F("/usr/share/erlang"), + UserLibPaths = get_user_lib_dirs(), +- ["."] ++ UserLibPaths ++ Paths; ++ ["."] ++ UserLibPaths ++ Paths ++ SharedPaths; + _ -> + [] + end, From c76a7576fa1bfe2de60eadfbc4d89b2a0b38ec0a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Aug 2017 10:17:03 +0300 Subject: [PATCH 129/340] Fix patch Signed-off-by: Peter Lemenkov --- otp-0009-Add-extra-search-directory.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/otp-0009-Add-extra-search-directory.patch b/otp-0009-Add-extra-search-directory.patch index baa993f..961fa32 100644 --- a/otp-0009-Add-extra-search-directory.patch +++ b/otp-0009-Add-extra-search-directory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 59b26176bf..5f3d68db2a 100644 +index 59b26176bf..89297718fe 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl -@@ -79,11 +79,15 @@ init(Ref, Parent, [Root,Mode]) -> +@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> IPath = case Mode of interactive -> @@ -17,8 +17,10 @@ index 59b26176bf..5f3d68db2a 100644 - Paths = make_path(LibDir, Dirs), + F = fun(R) -> + LD = filename:append(R, "lib"), -+ {ok,D} = erl_prim_loader:list_dir(LD), -+ make_path(LD, D) ++ 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"), From 2ee53c8aaefbd52999c29dfb8ca1d67c8a676180 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Oct 2017 16:42:55 +0300 Subject: [PATCH 130/340] Erlang ver. 19.3.6.3 Signed-off-by: Peter Lemenkov --- .gitignore | 98 ++++------------------------------------------ erlang.spec | 36 ++--------------- otp-get-patches.sh | 29 +------------- sources | 2 +- 4 files changed, 12 insertions(+), 153 deletions(-) diff --git a/.gitignore b/.gitignore index 8a6ffa5..36e05df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,91 +1,7 @@ -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 -/otp-OTP-17.2.1.tar.gz -/otp-OTP-17.2.2.tar.gz -/otp-OTP-17.3.3.tar.gz -/otp-OTP-17.3.4.tar.gz -/otp-OTP-17.4.tar.gz -/otp-OTP-18.2.2.tar.gz -/otp-OTP-18.2.3.tar.gz -/otp-OTP-18.2.4.tar.gz -/otp-OTP-18.3.tar.gz -/otp-OTP-18.3.1.tar.gz -/otp-OTP-18.3.2.tar.gz -/otp-OTP-18.3.3.tar.gz -/otp-OTP-18.3.4.tar.gz -/otp-OTP-18.3.4.1.tar.gz -/otp-OTP-18.3.4.2.tar.gz -/otp-OTP-19.0.2.tar.gz -/otp-OTP-19.0.4.tar.gz -/otp-OTP-19.0.5.tar.gz -/otp-OTP-19.0.6.tar.gz -/otp-OTP-19.0.7.tar.gz -/otp-OTP-19.1.1.tar.gz -/otp-OTP-19.1.2.tar.gz -/otp-OTP-19.1.3.tar.gz -/otp-OTP-19.1.4.tar.gz -/otp-OTP-19.1.5.tar.gz -/otp-OTP-19.1.6.tar.gz -/otp-OTP-19.2.tar.gz -/otp-OTP-19.2.1.tar.gz -/otp-OTP-19.2.2.tar.gz -/otp-OTP-19.2.3.tar.gz -/otp-OTP-19.3.tar.gz -/otp-OTP-19.3.1.tar.gz -/otp-OTP-19.3.2.tar.gz -/otp-OTP-19.3.3.tar.gz -/otp-OTP-19.3.4.tar.gz -/otp-OTP-19.3.5.tar.gz -/otp-OTP-19.3.6.tar.gz -/otp-OTP-19.3.6.1.tar.gz -/otp-OTP-19.3.6.2.tar.gz +/*.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 diff --git a/erlang.spec b/erlang.spec index efe2026..27fbd72 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 19.3.6.2 -Release: 2%{?dist} +Version: 19.3.6.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -98,32 +98,14 @@ Source999: otp-get-patches.sh # 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 -# Fix CVE-2016-10253 Patch7: otp-0007-Fix-CVE-2016-10253.patch -# Fedora specific patch -# Fix erl_epmd:port_please when using IPv6 Patch8: otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch -# Fedora specific patch -# Add extra search directory Patch9: otp-0009-Add-extra-search-directory.patch # end of autogenerated patch tag list @@ -928,19 +910,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%setup -q -n otp-OTP-%{version} - -# start of autogenerated prep patch list -%patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan -%patch2 -p1 -b .Remove_rpath -%patch3 -p1 -b .Do_not_install_C_sources -%patch4 -p1 -b .Do_not_install_Java_sources -%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n -%patch6 -p1 -b .Do_not_install_erlang_sources -%patch7 -p1 -b .Fix_CVE_2016_10253 -%patch8 -p1 -b .Fix_erl_epmd_port_please_when_using_IPv6 -%patch9 -p1 -b .Add_extra_search_directory -# end of autogenerated prep patch list +%autosetup -n otp-OTP-%{version} # FIXME we should come up with a better solution # remove shipped zlib sources diff --git a/otp-get-patches.sh b/otp-get-patches.sh index 033db0e..75d4a54 100755 --- a/otp-get-patches.sh +++ b/otp-get-patches.sh @@ -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 @@ 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 "$newspec2" "$specfile" +mv -f "$newspec1" "$specfile" git add "$specfile" rm -rf "$tmpdir" diff --git a/sources b/sources index 5255c77..5b53573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.2.tar.gz) = 195cff90ef13761b03c311eadd238907dbc4b9c3ddff19c0356ead33f55113d535b15f250d06b32cbcdff6e34dfc8c3677f9e7d021b355defae74ae49f672ed0 +SHA512 (otp-OTP-19.3.6.3.tar.gz) = 9260dbc2dfff82c80697ec2a00452cb33411d895c66a8e6993fdf5a10cabbb8d52e5dc1755220584186c419ea179fd6380a13b89bbedcbdbdf766c2ac41d55f2 From b685bf295f55132318dfb880dd5f13623ea50985 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Oct 2017 17:06:27 +0300 Subject: [PATCH 131/340] Typo fix Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 27fbd72..27e4b00 100644 --- a/erlang.spec +++ b/erlang.spec @@ -910,7 +910,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -n otp-OTP-%{version} +%autosetup -p1 -n otp-OTP-%{version} # FIXME we should come up with a better solution # remove shipped zlib sources From f87281924c06b6ff5c8be4dc2335c9bf25379505 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 27 Nov 2017 15:16:23 +0300 Subject: [PATCH 132/340] Ver. 19.3.6.4 - Ver. 19.3.6.4 - ssl: Countermeasurements for Bleichenbacher attack Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 27e4b00..aa7a44c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.6.3 +Version: 19.3.6.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2306,6 +2306,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Nov 27 2017 Peter Lemenkov - 19.3.6.4 +- Ver. 19.3.6.4 +- ssl: Countermeasurements for Bleichenbacher attack + * Tue Aug 1 2017 Randy Barlow - 19.3.6.2-2 - Search /usr/share/erlang/lib for libraries as well diff --git a/sources b/sources index 5b53573..33101cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.3.tar.gz) = 9260dbc2dfff82c80697ec2a00452cb33411d895c66a8e6993fdf5a10cabbb8d52e5dc1755220584186c419ea179fd6380a13b89bbedcbdbdf766c2ac41d55f2 +SHA512 (otp-OTP-19.3.6.4.tar.gz) = 9cab3262cadc88fdace481995069ecdd821fff43511b38b849fb92e3fce621b83ba002626543113ea001ce899b3b8c675419c7331a7c8c965c254058bc0a10ac From 14e348c526b96aec6a3dc3f17407d1c40f5ebe92 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 19 Dec 2017 13:11:18 +0300 Subject: [PATCH 133/340] Ver. 19.3.6.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index aa7a44c..efc339b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 19.3.6.4 +Version: 19.3.6.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2306,6 +2306,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Dec 19 2017 Peter Lemenkov - 19.3.6.5 +- Ver. 19.3.6.5 + * Mon Nov 27 2017 Peter Lemenkov - 19.3.6.4 - Ver. 19.3.6.4 - ssl: Countermeasurements for Bleichenbacher attack diff --git a/sources b/sources index 33101cb..0b72665 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.4.tar.gz) = 9cab3262cadc88fdace481995069ecdd821fff43511b38b849fb92e3fce621b83ba002626543113ea001ce899b3b8c675419c7331a7c8c965c254058bc0a10ac +SHA512 (otp-OTP-19.3.6.5.tar.gz) = 7ed91bb3b2a5baa9674b811281746aae82b8d06dc1f7dfccf1a00e0d6be34e249d5fe1300fb6bd3d3a2a81409e326b32f82340461da58bba042e6900fdb5ed71 From 0b84386fb5bbaf0c577287209d80a6e2b754b8be Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 15 Jan 2018 16:57:22 +0100 Subject: [PATCH 134/340] fix if conditions Signed-off-by: Igor Gnatenko --- erlang.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/erlang.spec b/erlang.spec index efc339b..b47e56f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -72,7 +72,7 @@ Summary: General-purpose programming language and runtime environment Group: Development/Languages License: ASL 2.0 URL: https://www.erlang.org -%if 0%{?el7}%{?fedora} +%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 @@ -118,13 +118,11 @@ BuildRequires: erlang %endif %endif -%if 0%{?el7}%{?fedora} +%if ! (0%{?rhel} && 0%{?rhel} <= 6) # for BuildRequires: systemd-devel BuildRequires: systemd -Requires(post): systemd -Requires(preun):systemd -Requires(postun):systemd +%{?systemd_requires} Requires: systemd %endif BuildRequires: autoconf @@ -1116,7 +1114,7 @@ ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{na %endif %{__with_java} # systemd-related stuff -%if 0%{?el7}%{?fedora} +%if ! (0%{?rhel} && 0%{?rhel} <= 6) install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.service @@ -1500,7 +1498,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%if 0%{?el7}%{?fedora} +%if ! (0%{?rhel} && 0%{?rhel} <= 6) %{_unitdir}/epmd.service %{_unitdir}/epmd.socket %{_unitdir}/epmd@.service From d54e49b2905f2c5f1d095fd46736861ab0d8f396 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 08:37:16 +0000 Subject: [PATCH 135/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index b47e56f..1a74d5d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 19.3.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2304,6 +2304,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 19.3.6.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Dec 19 2017 Peter Lemenkov - 19.3.6.5 - Ver. 19.3.6.5 From e5d275e4123199c41e18256da3cb141799737c6a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 20 Feb 2018 16:26:06 +0300 Subject: [PATCH 136/340] Ver. 20.2.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 125 ++----- ...n-pages-and-do-not-install-miscellan.patch | 6 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 8 +- otp-0004-Do-not-install-Java-sources.patch | 2 +- ...teventlog-and-related-doc-files-on-n.patch | 6 +- otp-0006-Do-not-install-erlang-sources.patch | 105 ++---- otp-0007-Fix-CVE-2016-10253.patch | 318 ------------------ ...erl_epmd-port_please-when-using-IPv6.patch | 0 ... otp-0008-Add-extra-search-directory.patch | 2 +- sources | 2 +- 11 files changed, 68 insertions(+), 510 deletions(-) delete mode 100644 otp-0007-Fix-CVE-2016-10253.patch rename otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch => otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch (100%) rename otp-0009-Add-extra-search-directory.patch => otp-0008-Add-extra-search-directory.patch (96%) diff --git a/erlang.spec b/erlang.spec index 1a74d5d..661ae3c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -22,7 +22,6 @@ %global __with_emacs 1 %global __with_examples 1 %global __with_java 1 -%global __with_tcltk 1 # # wxWidgets plugin blocks the following ones: # @@ -37,10 +36,6 @@ # * common_test # * megaco # -# dialyzer blocks: -# -# * typer -# # et blocks: # # * megaco @@ -58,15 +53,14 @@ # megaco # observer # reltool (*) -# typer # wx # %global __with_wxwidgets 1 Name: erlang -Version: 19.3.6.5 -Release: 2%{?dist} +Version: 20.2.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -104,9 +98,8 @@ Patch3: otp-0003-Do-not-install-C-sources.patch Patch4: otp-0004-Do-not-install-Java-sources.patch Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Patch6: otp-0006-Do-not-install-erlang-sources.patch -Patch7: otp-0007-Fix-CVE-2016-10253.patch -Patch8: otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch -Patch9: otp-0009-Add-extra-search-directory.patch +Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch +Patch8: otp-0008-Add-extra-search-directory.patch # end of autogenerated patch tag list BuildRequires: flex @@ -158,9 +151,6 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-eunit%{?_isa} = %{version}-%{release} -%if %{__with_tcltk} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -%endif %{__with_tcltk} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-ic%{?_isa} = %{version}-%{release} @@ -182,7 +172,6 @@ Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} -Requires: %{name}-percept%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-reltool%{?_isa} = %{version}-%{release} @@ -196,9 +185,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} -Requires: %{name}-typer%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} -%if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} @@ -380,6 +366,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} Requires: graphviz +Obsoletes: erlang-typer %description dialyzer A DIscrepancy AnaLYZer for ERlang programs. @@ -472,12 +459,14 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.11 +Provides: erlang(erl_nif_version) = 2.13 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder +Obsoletes: erlang-gs Obsoletes: erlang-inviso Obsoletes: erlang-ose +Obsoletes: erlang-percept Obsoletes: erlang-pman Obsoletes: erlang-toolbar Obsoletes: erlang-tv @@ -515,9 +504,6 @@ Support for unit testing. Summary: Examples for some Erlang modules Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} -%if %{__with_tcltk} -Requires: %{name}-gs%{?_isa} = %{version}-%{release} -%endif %{__with_tcltk} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} @@ -528,21 +514,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Examples for some Erlang modules. %endif %{__with_examples} -%if %{__with_tcltk} -%package gs -Summary: A library for Tcl/Tk support in Erlang -Group: Development/Languages -BuildRequires: tcl-devel -BuildRequires: tk-devel -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: tk - -%description gs -A Graphics System used to write platform independent user interfaces. -%endif %{__with_tcltk} - %package hipe Summary: High Performance Erlang Group: Development/Languages @@ -708,18 +679,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description parsetools A set of parsing and lexical analysis tools. -%package percept -Summary: A concurrency profiler tool -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description percept -A concurrency profiler tool. - %package public_key Summary: API to public key infrastructure Group: Development/Languages @@ -865,21 +824,6 @@ Obsoletes: xemacs-erlang-el %description tools A set of programming tools including a coverage analyzer etc. -%if %{__with_wxwidgets} -%package typer -Summary: TYPe annotator for ERlang programs -Group: Development/Languages -Requires: %{name}-compiler%{?_isa} = %{version}-%{release} -Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description typer -TYPe annotator for ERlang programs. -%endif %{__with_wxwidgets} - %if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang @@ -934,11 +878,6 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- %else --without-jinterface \ %endif %{__with_java} -%if %{__with_tcltk} - \ -%else - --without-gs \ -%endif %{__with_tcltk} %if %{__with_wxwidgets} --with-wx-config=/usr/bin/wx-config-3.0 %else @@ -949,7 +888,6 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- --without-megaco \ --without-observer \ --without-reltool \ - --without-typer \ --without-wx %endif %{__with_wxwidgets} @@ -1126,6 +1064,7 @@ install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket echo "No need to fix additional scripts" %else # FIXME workaround for broken Erlang install procedure +echo "Removing scripts which won't work w/o wxWidgets anyway" for exe in ct_run dialyzer typer do rm -f $RPM_BUILD_ROOT/%{_bindir}/${exe} @@ -1172,7 +1111,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/asn1-*/src %if %{with doc} %{_libdir}/erlang/man/man3/asn1ct.* -%{_libdir}/erlang/man/man3/asn1rt.* %endif %if %{__with_wxwidgets} @@ -1345,11 +1283,16 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{__with_wxwidgets} %files dialyzer %{_bindir}/dialyzer +# FIXME FIXME FIXME this must be installed properly!!!!!! +#%%{_bindir}/typer %{_libdir}/erlang/bin/dialyzer +%{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/dialyzer +%{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/dialyzer-*/ %if %{with doc} %{_libdir}/erlang/man/man3/dialyzer.* +%{_libdir}/erlang/man/man3/typer.* %endif %endif %{__with_wxwidgets} @@ -1457,7 +1400,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/bin/to_erl %dir %{_libdir}/erlang/erts-*/ %dir %{_libdir}/erlang/erts-*/bin/ -%{_libdir}/erlang/erts-*/bin/beam %{_libdir}/erlang/erts-*/bin/beam.smp %{_libdir}/erlang/erts-*/bin/dyn_erl %{_libdir}/erlang/erts-*/bin/epmd @@ -1537,9 +1479,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/et-*/examples/ %endif %{__with_wxwidgets} %{_libdir}/erlang/lib/eunit-*/examples/ -%if %{__with_tcltk} -%{_libdir}/erlang/lib/gs-*/examples/ -%endif %{__with_tcltk} %if %{__with_java} %{_libdir}/erlang/lib/ic-*/examples/ %endif %{__with_java} @@ -1566,17 +1505,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %{__with_wxwidgets} %endif %{__with_examples} -%if %{__with_tcltk} -%files gs -%dir %{_libdir}/erlang/lib/gs-*/ -%{_libdir}/erlang/lib/gs-*/ebin -%{_libdir}/erlang/lib/gs-*/priv -%{_libdir}/erlang/lib/gs-*/src -%if %{with doc} -%{_libdir}/erlang/man/man3/gs.* -%endif -%endif %{__with_tcltk} - %files hipe %{_libdir}/erlang/lib/hipe-*/ @@ -1775,14 +1703,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/man/man3/yecc.* %endif -%files percept -%{_libdir}/erlang/lib/percept-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/egd.* -%{_libdir}/erlang/man/man3/percept.* -%{_libdir}/erlang/man/man3/percept_profile.* -%endif - %files public_key %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} @@ -2039,16 +1959,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_xemacs_sitestartdir}/erlang-init.el %endif %{__with_emacs} - -%if %{__with_wxwidgets} -%files typer -%{_bindir}/typer -%{_libdir}/erlang/bin/typer -%{_libdir}/erlang/erts-*/bin/typer -%dir %{_libdir}/erlang/lib/typer-*/ -%{_libdir}/erlang/lib/typer-*/ebin/ -%endif %{__with_wxwidgets} - %if %{__with_wxwidgets} %files wx %dir %{_libdir}/erlang/lib/wx-*/ @@ -2304,6 +2214,12 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 20 2018 Peter Lemenkov - 20.2.3-1 +- Ver. 20.2.3 +- Removed gs (also removed tcl/tk dependency), percept +- Application typer was merged into dialyzer +- NIF version bumped up to 2.13 + * Wed Feb 07 2018 Fedora Release Engineering - 19.3.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -2340,6 +2256,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ - Ver. 19.3.4 - Require javapackages-tools (/use/share/java) - Use /dev/null as a homedir for EPMD (its shell is /sbin/nologin anyway) +- Removed beam appilciation (non-SMP VM). * Tue May 2 2017 Peter Lemenkov - 19.3.3-1 - Ver. 19.3.3 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index fe09948..be12bd8 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index cb053a1b7c..024307b9c9 100644 +index 5b1b9119ce..02535a78bc 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -492,10 +492,6 @@ endif +@@ -495,10 +495,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,7 +21,7 @@ index cb053a1b7c..024307b9c9 100644 $(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 e71308edbe..ae2c9cf251 100644 +index e4b842877c..382561821f 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 . diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 5d39eb0..b05f9ce 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c62f25b3ee..bb28704c1e 100644 +index 31124ba477..a4a6c158cc 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif +@@ -96,7 +96,7 @@ endif DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 5d169b0..51e7b8b 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index bb28704c1e..165a2e0cd5 100644 +index a4a6c158cc..2a7532a399 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -195,13 +195,9 @@ docs: +@@ -216,13 +216,9 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -43,9 +43,9 @@ index bb28704c1e..165a2e0cd5 100644 - $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj" $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib" endif - + $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 4f393e952c..a9a7f7cc79 100644 +index 69b5b6003d..ba9a0e74b8 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 9e3861e..8948d81 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -18,7 +18,7 @@ index 21c38e54b5..eeba2e4eae 100644 $(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv" diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index e55cfa62ea..5e3a0a5274 100644 +index 001acfdd2e..35b2eb3446 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: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index bf1febc..50af2de 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 91c7ae7bc3..dc7bcf3686 100644 +index 4aa8879a91..46dfde42f1 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) @@ -26,10 +26,10 @@ index 91c7ae7bc3..dc7bcf3686 100644 - 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 3ff63204c6..29b53a8188 100644 +index fc2eb22393..e2f4d5a090 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index ba3c5fd..1bd9697 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 2ab9edaf5e..9b8ed35d1a 100644 +index edb9f35258..6ee4ac2251 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -21,10 +21,10 @@ index 2ab9edaf5e..9b8ed35d1a 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 38cf2d496a..d4bb3982d2 100644 +index ba459f6cd3..5565126214 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -155,7 +155,7 @@ release_spec: opt +@@ -154,7 +154,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,7 +63,7 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 518c89d044..1bcd19cff7 100644 +index ef6db66ff6..4c9be713aa 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -174,10 +174,10 @@ index 4cc1e487c2..084f0a7230 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 456b8be64d..fcfa8def89 100644 +index edad0e6b61..00a30c010f 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 @@ -187,7 +187,7 @@ index 456b8be64d..fcfa8def89 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 9594a0bfe3..bc33e67e88 100644 +index 118cb6b758..86722d8767 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -200,10 +200,10 @@ index 9594a0bfe3..bc33e67e88 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 256f20f549..2920c0f198 100644 +index fc08e7ca2f..2464a15c3f 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -158,7 +158,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -213,7 +213,7 @@ index 256f20f549..2920c0f198 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 6bf748a727..962d7b75d6 100644 +index 3af856f63e..9630a89ba6 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ release_spec: opt @@ -231,10 +231,10 @@ index 6bf748a727..962d7b75d6 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index 4e5a4182da..c0bb0c32ec 100644 +index ea2f45dc4c..84af08eb67 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile -@@ -88,7 +88,7 @@ release_spec: opt +@@ -87,7 +87,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -289,7 +289,7 @@ index b6347d8b6d..a695d2cc2d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 86a6d8831e..5732fd85f3 100644 +index 3510d3cc93..9179e9b4c2 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -120,7 +120,6 @@ release_spec: opt @@ -300,21 +300,6 @@ index 86a6d8831e..5732fd85f3 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index e19ce822b9..6b7c96ea68 100644 ---- a/lib/gs/src/Makefile -+++ b/lib/gs/src/Makefile -@@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \ -- $(GSTK_GENERIC) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \ -+ "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile index 9f50d6bf91..df92b84c0d 100644 --- a/lib/hipe/cerl/Makefile @@ -355,10 +340,10 @@ index b220bc16a0..d4073277be 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 88016a7d8b..d8e8fa0546 100644 +index 817ff67dcd..e50ba5e207 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/llvm @@ -381,7 +366,7 @@ index 8ef31dbb46..80d28819f2 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index 72cfff21a8..e55223a57d 100644 +index e5033e444b..74a444b386 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -394,7 +379,7 @@ index 72cfff21a8..e55223a57d 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index b4cdf8b1f2..f9ebcaec30 100644 +index 5abc9ec049..664df3b0c6 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -407,12 +392,12 @@ index b4cdf8b1f2..f9ebcaec30 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 66e9421c25..19517427e6 100644 +index 20b1c3bf50..40c642a441 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ HIPE_MODULES = endif - MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES) + MODULES = hipe_timing hipe_dot hipe_digraph hipe_dsets $(HIPE_MODULES) -HRL_FILES= ERL_FILES= $(MODULES:%=%.erl) @@ -519,10 +504,10 @@ index 4eaa959cce..198fbf3106 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 2b72f78dcf..31eed456ff 100644 +index 5946620f0f..b8944e0a26 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -204,7 +204,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -621,10 +606,10 @@ index 028a63e98e..9e11e9bfb2 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 08a00e6aba..a21ffb3801 100644 +index 7d316df263..60fdefb5d0 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -687,7 +672,7 @@ index 7fec29a000..a71b9f1227 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 29b53a8188..3ae2074f8c 100644 +index e2f4d5a090..57f21a145b 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -699,7 +684,7 @@ index 29b53a8188..3ae2074f8c 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 4023f50d48..864a0a53d8 100644 +index 5c7af39c3f..a85368b4f4 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -712,7 +697,7 @@ index 4023f50d48..864a0a53d8 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index dea29bee4c..655aea91ca 100644 +index ba206904ec..281cc8657c 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -724,18 +709,6 @@ index dea29bee4c..655aea91ca 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index b2ec87d08c..3153e34f7a 100644 ---- a/lib/percept/src/Makefile -+++ b/lib/percept/src/Makefile -@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" - # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index a920ea87ea..7672ef3470 100644 --- a/lib/public_key/asn1/Makefile @@ -778,10 +751,10 @@ index 4bddee4664..c714255548 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 2c902952a1..d674a8fe13 100644 +index 5a99c6e240..bdd77fb4f4 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -99,8 +99,6 @@ docs: +@@ -98,8 +98,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -868,10 +841,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 7ab6f22424..b57da4ad67 100644 +index 9e8d80c71f..6ce3dc96ef 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -894,10 +867,10 @@ index 2e7df9792e..0cd43d3805 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 302834f9d0..53804f81ff 100644 +index bf836203ec..e86fb6a6d1 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -208,7 +208,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -212,7 +212,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -931,20 +904,6 @@ index 032bd612db..efb0309eb8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" -diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 6c5d8b0726..82f516a0e5 100644 ---- a/lib/typer/src/Makefile -+++ b/lib/typer/src/Makefile -@@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \ -- "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile index 21b45af2c4..a7bf34f4f4 100644 --- a/lib/wx/src/Makefile diff --git a/otp-0007-Fix-CVE-2016-10253.patch b/otp-0007-Fix-CVE-2016-10253.patch deleted file mode 100644 index ca5ab5d..0000000 --- a/otp-0007-Fix-CVE-2016-10253.patch +++ /dev/null @@ -1,318 +0,0 @@ -From: Zephyr Pellerin -Date: Mon, 20 Mar 2017 15:36:41 -0700 -Subject: [PATCH] Fix CVE-2016-10253 - - -diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c -index d48126a55d..15a81fae56 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -2335,34 +2335,36 @@ for (;;) - } - } - -- -- - /************************************************* --* Scan compiled branch for non-emptiness * --*************************************************/ -+ * Scan compiled branch for non-emptiness * -+ *************************************************/ - - /* This function scans through a branch of a compiled pattern to see whether it --can match the empty string or not. It is called from could_be_empty() --below and from compile_branch() when checking for an unlimited repeat of a --group that can match nothing. Note that first_significant_code() skips over --backward and negative forward assertions when its final argument is TRUE. If we --hit an unclosed bracket, we return "empty" - this means we've struck an inner --bracket whose current branch will already have been scanned. -- --Arguments: -- code points to start of search -- endcode points to where to stop -- utf TRUE if in UTF-8 / UTF-16 / UTF-32 mode -- cd contains pointers to tables etc. -- --Returns: TRUE if what is matched could be empty -+ can match the empty string or not. It is called from could_be_empty() -+ below and from compile_branch() when checking for an unlimited repeat of a -+ group that can match nothing. Note that first_significant_code() skips over -+ backward and negative forward assertions when its final argument is TRUE. If we -+ hit an unclosed bracket, we return "empty" - this means we've struck an inner -+ bracket whose current branch will already have been scanned. -+ -+ Arguments: -+ code points to start of search -+ endcode points to where to stop -+ utf TRUE if in UTF-8 / UTF-16 / UTF-32 mode -+ cd contains pointers to tables etc. -+ recurses chain of recurse_check to catch mutual recursion -+ -+ Returns: TRUE if what is matched could be empty - */ - -+ - static BOOL - could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode, -- BOOL utf, compile_data *cd) -+ BOOL utf, compile_data *cd, recurse_check *recurses) - { - register pcre_uchar c; -+recurse_check this_recurse; -+ - for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - code < endcode; - code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE)) -@@ -2390,25 +2392,47 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - - if (c == OP_RECURSE) - { -- const pcre_uchar *scode; -+ const pcre_uchar *scode = cd->start_code + GET(code, 1); -+ const pcre_uchar *endgroup = scode; - BOOL empty_branch; - -- /* Test for forward reference */ -+ /* Test for forward reference or uncompleted reference. This is disabled -+ when called to scan a completed pattern by setting cd->start_workspace to -+ NULL. */ - -- for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE) -- if ((int)GET(scode, 0) == (int)(code + 1 - cd->start_code)) return TRUE; -+ if (cd->start_workspace != NULL) -+ { -+ const pcre_uchar *tcode; -+ for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE) -+ if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE; -+ if (GET(scode, 1) == 0) return TRUE; /* Unclosed */ -+ } - -- /* Not a forward reference, test for completed backward reference */ -+ /* If the reference is to a completed group, we need to detect whether this -+ is a recursive call, as otherwise there will be an infinite loop. If it is -+ a recursion, just skip over it. Simple recursions are easily detected. For -+ mutual recursions we keep a chain on the stack. */ - -- empty_branch = FALSE; -- scode = cd->start_code + GET(code, 1); -- if (GET(scode, 1) == 0) return TRUE; /* Unclosed */ -+ do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT); -+ if (code >= scode && code <= endgroup) continue; /* Simple recursion */ -+ else -+ { -+ recurse_check *r = recurses; -+ for (r = recurses; r != NULL; r = r->prev) -+ if (r->group == scode) break; -+ if (r != NULL) continue; /* Mutual recursion */ -+ } -+ -+ /* Completed reference; scan the referenced group, remembering it on the -+ stack chain to detect mutual recursions. */ - -- /* Completed backwards reference */ -+ empty_branch = FALSE; -+ this_recurse.prev = recurses; -+ this_recurse.group = scode; - - do - { -- if (could_be_empty_branch(scode, endcode, utf, cd)) -+ if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse)) - { - empty_branch = TRUE; - break; -@@ -2448,7 +2472,7 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - if (c == OP_BRA || c == OP_BRAPOS || - c == OP_CBRA || c == OP_CBRAPOS || - c == OP_ONCE || c == OP_ONCE_NC || -- c == OP_COND) -+ c == OP_COND || c == OP_SCOND) - { - BOOL empty_branch; - if (GET(code, 1) == 0) return TRUE; /* Hit unclosed bracket */ -@@ -2464,8 +2488,8 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - empty_branch = FALSE; - do - { -- if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd)) -- empty_branch = TRUE; -+ if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd, -+ recurses)) empty_branch = TRUE; - code += GET(code, 1); - } - while (*code == OP_ALT); -@@ -2522,34 +2546,57 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - - /* Opcodes that must match a character */ - -+ case OP_ANY: -+ case OP_ALLANY: -+ case OP_ANYBYTE: -+ - case OP_PROP: - case OP_NOTPROP: -+ case OP_ANYNL: -+ -+ case OP_NOT_HSPACE: -+ case OP_HSPACE: -+ case OP_NOT_VSPACE: -+ case OP_VSPACE: - case OP_EXTUNI: -+ - case OP_NOT_DIGIT: - case OP_DIGIT: - case OP_NOT_WHITESPACE: - case OP_WHITESPACE: - case OP_NOT_WORDCHAR: - case OP_WORDCHAR: -- case OP_ANY: -- case OP_ALLANY: -- case OP_ANYBYTE: -+ - case OP_CHAR: - case OP_CHARI: - case OP_NOT: - case OP_NOTI: -+ - case OP_PLUS: -+ case OP_PLUSI: - case OP_MINPLUS: -- case OP_POSPLUS: -- case OP_EXACT: -+ case OP_MINPLUSI: -+ - case OP_NOTPLUS: -+ case OP_NOTPLUSI: - case OP_NOTMINPLUS: -+ case OP_NOTMINPLUSI: -+ -+ case OP_POSPLUS: -+ case OP_POSPLUSI: - case OP_NOTPOSPLUS: -+ case OP_NOTPOSPLUSI: -+ -+ case OP_EXACT: -+ case OP_EXACTI: - case OP_NOTEXACT: -+ case OP_NOTEXACTI: -+ - case OP_TYPEPLUS: - case OP_TYPEMINPLUS: - case OP_TYPEPOSPLUS: - case OP_TYPEEXACT: -+ - return FALSE; - - /* These are going to continue, as they may be empty, but we have to -@@ -2583,30 +2630,58 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); - return TRUE; - - /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO, -- MINUPTO, and POSUPTO may be followed by a multibyte character */ -+ MINUPTO, and POSUPTO and their caseless and negative versions may be -+ followed by a multibyte character. */ - - #if defined SUPPORT_UTF && !defined COMPILE_PCRE32 - case OP_STAR: - case OP_STARI: -+ case OP_NOTSTAR: -+ case OP_NOTSTARI: -+ - case OP_MINSTAR: - case OP_MINSTARI: -+ case OP_NOTMINSTAR: -+ case OP_NOTMINSTARI: -+ - case OP_POSSTAR: - case OP_POSSTARI: -+ case OP_NOTPOSSTAR: -+ case OP_NOTPOSSTARI: -+ - case OP_QUERY: - case OP_QUERYI: -+ case OP_NOTQUERY: -+ case OP_NOTQUERYI: -+ - case OP_MINQUERY: - case OP_MINQUERYI: -+ case OP_NOTMINQUERY: -+ case OP_NOTMINQUERYI: -+ - case OP_POSQUERY: - case OP_POSQUERYI: -+ case OP_NOTPOSQUERY: -+ case OP_NOTPOSQUERYI: -+ - if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]); - break; - - case OP_UPTO: - case OP_UPTOI: -+ case OP_NOTUPTO: -+ case OP_NOTUPTOI: -+ - case OP_MINUPTO: - case OP_MINUPTOI: -+ case OP_NOTMINUPTO: -+ case OP_NOTMINUPTOI: -+ - case OP_POSUPTO: - case OP_POSUPTOI: -+ case OP_NOTPOSUPTO: -+ case OP_NOTPOSUPTOI: -+ - if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]); - break; - #endif -@@ -2632,7 +2707,6 @@ return TRUE; - } - - -- - /************************************************* - * Scan compiled regex for non-emptiness * - *************************************************/ -@@ -2660,7 +2734,7 @@ could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode, - { - while (bcptr != NULL && bcptr->current_branch >= code) - { -- if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd)) -+ if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL)) - return FALSE; - bcptr = bcptr->outer; - } -@@ -2668,7 +2742,6 @@ return TRUE; - } - - -- - /************************************************* - * Check for POSIX class syntax * - *************************************************/ -@@ -5392,7 +5465,7 @@ for (;; ptr++) - pcre_uchar *scode = bracode; - do - { -- if (could_be_empty_branch(scode, ketcode, utf, cd)) -+ if (could_be_empty_branch(scode, ketcode, utf, cd, NULL)) - { - *bracode += OP_SBRA - OP_BRA; - break; -diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h -index af436bd99b..eb0db89619 100644 ---- a/erts/emulator/pcre/pcre_internal.h -+++ b/erts/emulator/pcre/pcre_internal.h -@@ -2455,6 +2455,13 @@ typedef struct branch_chain { - pcre_uchar *current_branch; - } branch_chain; - -+/* Structure for mutual recursion detection. */ -+ -+typedef struct recurse_check { -+ struct recurse_check *prev; -+ const pcre_uchar *group; -+} recurse_check; -+ - /* Structure for items in a linked list that represents an explicit recursive - call within the pattern; used by pcre_exec(). */ - diff --git a/otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch b/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch similarity index 100% rename from otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch rename to otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch diff --git a/otp-0009-Add-extra-search-directory.patch b/otp-0008-Add-extra-search-directory.patch similarity index 96% rename from otp-0009-Add-extra-search-directory.patch rename to otp-0008-Add-extra-search-directory.patch index 961fa32..5b9acff 100644 --- a/otp-0009-Add-extra-search-directory.patch +++ b/otp-0008-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 59b26176bf..89297718fe 100644 +index 418b0c50e1..d24b73a9aa 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/sources b/sources index 0b72665..045735e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-19.3.6.5.tar.gz) = 7ed91bb3b2a5baa9674b811281746aae82b8d06dc1f7dfccf1a00e0d6be34e249d5fe1300fb6bd3d3a2a81409e326b32f82340461da58bba042e6900fdb5ed71 +SHA512 (otp-OTP-20.2.3.tar.gz) = 54dd81041635d14c8c4c05e31a70017ae5c501c91e5071875711cad460c4f21572f586eb3faeeb6e400b888f32a56859e066ea049877356f02f8cab43d3e6207 From b71caeb7327487567258add0859cb69ec41fd65a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 22 Feb 2018 15:30:22 +0300 Subject: [PATCH 137/340] Ver. 20.2.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 661ae3c..3764954 100644 --- a/erlang.spec +++ b/erlang.spec @@ -59,7 +59,7 @@ Name: erlang -Version: 20.2.3 +Version: 20.2.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Feb 22 2018 Peter Lemenkov - 20.2.4-1 +- Ver. 20.2.4 + * Tue Feb 20 2018 Peter Lemenkov - 20.2.3-1 - Ver. 20.2.3 - Removed gs (also removed tcl/tk dependency), percept diff --git a/sources b/sources index 045735e..29b77fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.2.3.tar.gz) = 54dd81041635d14c8c4c05e31a70017ae5c501c91e5071875711cad460c4f21572f586eb3faeeb6e400b888f32a56859e066ea049877356f02f8cab43d3e6207 +SHA512 (otp-OTP-20.2.4.tar.gz) = 0d4d95bed9c2aa315a0a51df158b15dbb3d1871606b4b23e27ed68b9e836a93aba271818c445a79bc065bc401b6c5023c8b9a2420a456427729d927899986975 From e42544de855ba6f48e95871bc89db88ffcb25d5b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Mar 2018 18:03:18 +0300 Subject: [PATCH 138/340] Ver. 20.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0008-Add-extra-search-directory.patch | 2 +- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3764954..dd91d1f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -59,7 +59,7 @@ Name: erlang -Version: 20.2.4 +Version: 20.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Mar 14 2018 Peter Lemenkov - 20.3 +- Ver. 20.3 + * Thu Feb 22 2018 Peter Lemenkov - 20.2.4-1 - Ver. 20.2.4 diff --git a/otp-0008-Add-extra-search-directory.patch b/otp-0008-Add-extra-search-directory.patch index 5b9acff..806418b 100644 --- a/otp-0008-Add-extra-search-directory.patch +++ b/otp-0008-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 418b0c50e1..d24b73a9aa 100644 +index f5a890cb95..f2bb1a1290 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/sources b/sources index 29b77fd..a764f1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.2.4.tar.gz) = 0d4d95bed9c2aa315a0a51df158b15dbb3d1871606b4b23e27ed68b9e836a93aba271818c445a79bc065bc401b6c5023c8b9a2420a456427729d927899986975 +SHA512 (otp-OTP-20.3.tar.gz) = 1efb9b4e13a5dbabebc9db85bdeb34f0e8bcd72db56fed033e5063c64ba58c23af76e6fdecd00f2efddbce8a3db81c97f705c5247e54405d825fe5c7e8b02cf0 From 258e8217c0920f245a0036df4d3d7c512da39375 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 Mar 2018 23:08:44 +0000 Subject: [PATCH 139/340] Disable fop on riscv64. --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index dd91d1f..6be4ff1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,7 +2,7 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%ifarch %{arm} %{mips} +%ifarch %{arm} %{mips} riscv64 # MIPS does not have all dependencies for fop yet # For some reason, fop hangs on arm, so for now don't generate docs by # default @@ -60,7 +60,7 @@ Name: erlang Version: 20.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 20 2018 Richard W.M. Jones - 20.3-2 +- Disable fop on riscv64. + * Wed Mar 14 2018 Peter Lemenkov - 20.3 - Ver. 20.3 From b70db0a02db51b2cfcc114eef3b3fd36cbbd6354 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 23 Mar 2018 14:07:00 +0300 Subject: [PATCH 140/340] Erlang ver. 20.3.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6be4ff1..6dae01a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -59,8 +59,8 @@ Name: erlang -Version: 20.3 -Release: 2%{?dist} +Version: 20.3.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Mar 23 2018 Peter Lemenkov - 20.3.2 +- Ver. 20.3.2 + * Tue Mar 20 2018 Richard W.M. Jones - 20.3-2 - Disable fop on riscv64. diff --git a/sources b/sources index a764f1b..2a36d01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.tar.gz) = 1efb9b4e13a5dbabebc9db85bdeb34f0e8bcd72db56fed033e5063c64ba58c23af76e6fdecd00f2efddbce8a3db81c97f705c5247e54405d825fe5c7e8b02cf0 +SHA512 (otp-OTP-20.3.2.tar.gz) = 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b From 9da5a6558cdf93f9a4aafaa8fa6fb844ee320cde Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Apr 2018 17:45:33 +0300 Subject: [PATCH 141/340] Allow building against OpenSSL 1.1.0+ Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6dae01a..4a205ba 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang Version: 20.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -332,7 +332,7 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support Group: Development/Languages -BuildRequires: pkgconfig(openssl) < 1.1.0 +BuildRequires: pkgconfig(openssl) Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -2214,7 +2214,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog -* Fri Mar 23 2018 Peter Lemenkov - 20.3.2 +* Fri Apr 06 2018 Peter Lemenkov - 20.3.2-2 +- Allow building against OpenSSL 1.1.0+ + +* Fri Mar 23 2018 Peter Lemenkov - 20.3.2-1 - Ver. 20.3.2 * Tue Mar 20 2018 Richard W.M. Jones - 20.3-2 From 5cf52673235be71a000e9418a6a7fa91b971d6c8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 15 May 2018 18:18:35 +0300 Subject: [PATCH 142/340] Ver. 20.3.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 4a205ba..93ec2db 100644 --- a/erlang.spec +++ b/erlang.spec @@ -59,8 +59,8 @@ Name: erlang -Version: 20.3.2 -Release: 2%{?dist} +Version: 20.3.6 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2214,6 +2214,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue May 15 2018 Peter Lemenkov - 20.3.6-1 +- Ver. 20.3.6 + * Fri Apr 06 2018 Peter Lemenkov - 20.3.2-2 - Allow building against OpenSSL 1.1.0+ diff --git a/sources b/sources index 2a36d01..003a280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.2.tar.gz) = 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b +SHA512 (otp-OTP-20.3.6.tar.gz) = 8bde6929f2185e3ffb63355c23ad3e0955f55376ebdf46096fdf51ec1fca0d1c0fe58492b7fc10c9970f75a73f0fa46976bc8d398933ed9a30a94d53b4991416 From 151b470e839bbf98ab62c42f371526ed8ab0c3ae Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 18 May 2018 09:21:52 -0700 Subject: [PATCH 143/340] Make xemacs an optional component --- erlang.spec | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/erlang.spec b/erlang.spec index 93ec2db..b63ab92 100644 --- a/erlang.spec +++ b/erlang.spec @@ -20,6 +20,7 @@ ## %global __with_emacs 1 +%global __with_xemacs 1 %global __with_examples 1 %global __with_java 1 # @@ -60,7 +61,7 @@ Name: erlang Version: 20.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -802,9 +803,11 @@ Group: Development/Languages %if %{__with_emacs} BuildRequires: emacs BuildRequires: emacs-el +%endif %{__with_emacs} +%if %{__with_xemacs} BuildRequires: xemacs BuildRequires: xemacs-packages-extra-el -%endif %{__with_emacs} +%endif %{__with_xemacs} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -813,12 +816,14 @@ Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %if %{__with_emacs} Requires: emacs-filesystem -Requires: xemacs-filesystem Obsoletes: emacs-erlang Obsoletes: emacs-erlang-el +%endif %{__with_emacs} +%if %{__with_xemacs} +Requires: xemacs-filesystem Obsoletes: xemacs-erlang Obsoletes: xemacs-erlang-el -%endif %{__with_emacs} +%endif %{__with_xemacs} %description tools @@ -910,7 +915,8 @@ cp lib/tools/emacs/*.el emacs-erlang/ pushd emacs-erlang %{_emacs_bytecompile} *.el popd - +%endif %{__with_emacs} +%if %{__with_xemacs} # XEmacs related stuff cat > xemacs-erlang-init.el << EOF (setq load-path (cons "%{_xemacs_sitelispdir}/erlang" load-path)) @@ -924,7 +930,7 @@ rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el xemacs-erlang pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd -%endif %{__with_emacs} +%endif %{__with_xemacs} make @@ -954,7 +960,8 @@ for f in lib/tools/emacs/{README,*.el}; do "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" done install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" - +%endif %{__with_emacs} +%if %{__with_xemacs} # XEmacs related stuff install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}" install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang" @@ -966,7 +973,7 @@ for f in lib/tools/emacs/{README,*.el}; do done rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el" install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" -%endif %{__with_emacs} +%endif %{__with_xemacs} make DESTDIR=$RPM_BUILD_ROOT install @@ -1948,16 +1955,18 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %if %{__with_emacs} %dir %{_emacs_sitelispdir}/erlang -%dir %{_xemacs_sitelispdir}/erlang %doc %{_emacs_sitelispdir}/erlang/README -%doc %{_xemacs_sitelispdir}/erlang/README %{_emacs_sitelispdir}/erlang/*.el %{_emacs_sitelispdir}/erlang/*.elc %{_emacs_sitestartdir}/erlang-init.el +%endif %{__with_emacs} +%if %{__with_xemacs} +%dir %{_xemacs_sitelispdir}/erlang +%doc %{_xemacs_sitelispdir}/erlang/README %{_xemacs_sitelispdir}/erlang/*.el %{_xemacs_sitelispdir}/erlang/*.elc %{_xemacs_sitestartdir}/erlang-init.el -%endif %{__with_emacs} +%endif %{__with_xemacs} %if %{__with_wxwidgets} %files wx @@ -2214,6 +2223,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri May 18 2018 Troy Dawson - 20.3.6-2 +- Make xemacs an optional component + * Tue May 15 2018 Peter Lemenkov - 20.3.6-1 - Ver. 20.3.6 From c5fcf94973b575721b3e6bfe72009378ef8c9e52 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 14 Jun 2018 17:04:04 +0300 Subject: [PATCH 144/340] Ver. 20.3.8 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index b63ab92..733adac 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.6 -Release: 2%{?dist} +Version: 20.3.8 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2223,6 +2223,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jun 14 2018 Peter Lemenkov - 20.3.8-1 +- Ver. 20.3.8 + * Fri May 18 2018 Troy Dawson - 20.3.6-2 - Make xemacs an optional component diff --git a/sources b/sources index 003a280..a1ffec3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.6.tar.gz) = 8bde6929f2185e3ffb63355c23ad3e0955f55376ebdf46096fdf51ec1fca0d1c0fe58492b7fc10c9970f75a73f0fa46976bc8d398933ed9a30a94d53b4991416 +SHA512 (otp-OTP-20.3.8.tar.gz) = 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c From a87a57f23234efcedf91f906f6635eb4f1154482 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 27 Jun 2018 15:39:10 +0300 Subject: [PATCH 145/340] Erlang ver. 20.3.8.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 733adac..75e0478 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8 +Version: 20.3.8.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2223,6 +2223,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jun 27 2018 Peter Lemenkov - 20.3.8.1-1 +- Ver. 20.3.8.1 + * Thu Jun 14 2018 Peter Lemenkov - 20.3.8-1 - Ver. 20.3.8 diff --git a/sources b/sources index a1ffec3..3c53f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.tar.gz) = 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c +SHA512 (otp-OTP-20.3.8.1.tar.gz) = c4abdaaad9dc6f310bf8e89fcb21e87871ad640e05aab929ed8a06876f291e56d9344402b0e9f33e06c7665a40fa60d74c205802a62f58eff7f5228d28dea9da From d4d3684689adfac7be3ce24f6a8fd3cf576543f8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:44 +0200 Subject: [PATCH 146/340] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index 75e0478..fe44b6d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -103,6 +103,7 @@ Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch Patch8: otp-0008-Add-extra-search-directory.patch # end of autogenerated patch tag list +BuildRequires: gcc BuildRequires: flex %if %{with doc} From d0ac35585fdc5356f213966841f52c72def44b16 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 10 Jul 2018 15:30:27 +0300 Subject: [PATCH 147/340] Erlang ver. 20.3.8.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index fe44b6d..fd497bf 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.1 +Version: 20.3.8.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2224,6 +2224,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jul 10 2018 Peter Lemenkov - 20.3.8.2-1 +- Ver. 20.3.8.2 + * Wed Jun 27 2018 Peter Lemenkov - 20.3.8.1-1 - Ver. 20.3.8.1 diff --git a/sources b/sources index 3c53f50..075a29e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.1.tar.gz) = c4abdaaad9dc6f310bf8e89fcb21e87871ad640e05aab929ed8a06876f291e56d9344402b0e9f33e06c7665a40fa60d74c205802a62f58eff7f5228d28dea9da +SHA512 (otp-OTP-20.3.8.2.tar.gz) = 821d67868fe49111ee80b342f56d60b56c5df1e27df9778c53903a249145e1425f5f8d9e41313c39dd0b76c223bbce2c6e2e9416ae00c7e67561f52ccbb46abe From 21795187219b60c2924068943efe5efdf58c1eb2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 10 Jul 2018 18:08:26 +0300 Subject: [PATCH 148/340] Fix FTBFS on F-29 and higher Signed-off-by: Peter Lemenkov --- erlang.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index fd497bf..25a8145 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -103,7 +103,8 @@ Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch Patch8: otp-0008-Add-extra-search-directory.patch # end of autogenerated patch tag list -BuildRequires: gcc +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: flex %if %{with doc} @@ -2224,6 +2225,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jul 10 2018 Peter Lemenkov - 20.3.8.2-2 +- Fix FTBFS on F-29 and higher + * Tue Jul 10 2018 Peter Lemenkov - 20.3.8.2-1 - Ver. 20.3.8.2 From caa9bee5bb046fefe21cb9ecd93677fa9ffa00b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 23:57:11 +0000 Subject: [PATCH 149/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 25a8145..44d0cc9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2225,6 +2225,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 20.3.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Peter Lemenkov - 20.3.8.2-2 - Fix FTBFS on F-29 and higher From bd508a23e0a9985b1d87b18cfbc54a338adbd0fc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 30 Jul 2018 13:01:35 +0300 Subject: [PATCH 150/340] Erlang ver. 20.3.8.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 8 +++-- ...09-Avoid-forking-sed-to-get-basename.patch | 31 +++++++++++++++++++ sources | 2 +- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 otp-0009-Avoid-forking-sed-to-get-basename.patch diff --git a/erlang.spec b/erlang.spec index 44d0cc9..217fdfb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.8.2 -Release: 3%{?dist} +Version: 20.3.8.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -101,6 +101,7 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Patch6: otp-0006-Do-not-install-erlang-sources.patch Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch Patch8: otp-0008-Add-extra-search-directory.patch +Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -2225,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 30 2018 Peter Lemenkov - 20.3.8.3-1 +- Ver. 20.3.8.3 + * Thu Jul 12 2018 Fedora Release Engineering - 20.3.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/otp-0009-Avoid-forking-sed-to-get-basename.patch b/otp-0009-Avoid-forking-sed-to-get-basename.patch new file mode 100644 index 0000000..f98699a --- /dev/null +++ b/otp-0009-Avoid-forking-sed-to-get-basename.patch @@ -0,0 +1,31 @@ +From: Jan Pazdziora +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 959c099e8f..861b8bcbf1 100644 +--- a/erts/etc/unix/erl.src.src ++++ b/erts/etc/unix/erl.src.src +@@ -21,7 +21,7 @@ + ROOTDIR="%FINAL_ROOTDIR%" + BINDIR=$ROOTDIR/erts-%VSN%/bin + EMU=%EMULATOR%%EMULATOR_NUMBER% +-PROGNAME=`echo $0 | sed 's/.*\///'` ++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 diff --git a/sources b/sources index 075a29e..dc29ceb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.2.tar.gz) = 821d67868fe49111ee80b342f56d60b56c5df1e27df9778c53903a249145e1425f5f8d9e41313c39dd0b76c223bbce2c6e2e9416ae00c7e67561f52ccbb46abe +SHA512 (otp-OTP-20.3.8.3.tar.gz) = 78d9d2e9d63021badea9b3da7f12cb78f85c0d673d6a5fb0e457596691f820b5b9601c3aabceff29de0f8d558a01b0a24519f4456a6c614249ffa08c7dacfdd0 From 3bbc20375c949c8cb040651c2cdad61a05961736 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 11:22:32 +0200 Subject: [PATCH 151/340] Rebuild with fixed binutils --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 217fdfb..10acaf8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jul 31 2018 Florian Weimer - 20.3.8.3-2 +- Rebuild with fixed binutils + * Mon Jul 30 2018 Peter Lemenkov - 20.3.8.3-1 - Ver. 20.3.8.3 From 7efc25653e4d1f35e0ad6ca29df953800a05c6c3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 3 Aug 2018 16:35:30 +0300 Subject: [PATCH 152/340] Erlang ver. 20.3.8.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 10acaf8..a8901e5 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.8.3 -Release: 2%{?dist} +Version: 20.3.8.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Aug 03 2018 Peter Lemenkov - 20.3.8.4-1 +- Ver. 20.3.8.4 + * Tue Jul 31 2018 Florian Weimer - 20.3.8.3-2 - Rebuild with fixed binutils diff --git a/sources b/sources index dc29ceb..bfaa8c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.3.tar.gz) = 78d9d2e9d63021badea9b3da7f12cb78f85c0d673d6a5fb0e457596691f820b5b9601c3aabceff29de0f8d558a01b0a24519f4456a6c614249ffa08c7dacfdd0 +SHA512 (otp-OTP-20.3.8.4.tar.gz) = e8b089f8622724b3616fcc3e762d1944a3640b504b3c5fd25b42b433acfbe802c0174c4f9b79d3d38d98831f8a46a74d78eea8bbfe9335d174ef05b55ffea9f7 From c2727fe326fe456fb268034a0d65a3f7ff6e70e6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 10 Aug 2018 15:26:41 +0300 Subject: [PATCH 153/340] Erlang ver. 20.3.8.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a8901e5..abb1593 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.4 +Version: 20.3.8.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Aug 10 2018 Peter Lemenkov - 20.3.8.5-1 +- Ver. 20.3.8.5 + * Fri Aug 03 2018 Peter Lemenkov - 20.3.8.4-1 - Ver. 20.3.8.4 diff --git a/sources b/sources index bfaa8c0..06b80f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.4.tar.gz) = e8b089f8622724b3616fcc3e762d1944a3640b504b3c5fd25b42b433acfbe802c0174c4f9b79d3d38d98831f8a46a74d78eea8bbfe9335d174ef05b55ffea9f7 +SHA512 (otp-OTP-20.3.8.5.tar.gz) = abee28c0bc56b921b58b194672da96a916be854e0a6f07f0f311b3432964fe954d17a6c99fbd87824a4d404cd30f5455fcf45eaaa631a6df0db44563dfbf57a0 From e2dfe6894f6901741484151ac2e81a8d2effc02a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 15 Aug 2018 13:10:46 +0300 Subject: [PATCH 154/340] Erlang ver. 20.3.8.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index abb1593..6e68404 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.5 +Version: 20.3.8.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Aug 15 2018 Peter Lemenkov - 20.3.8.6-1 +- Ver. 20.3.8.6 + * Fri Aug 10 2018 Peter Lemenkov - 20.3.8.5-1 - Ver. 20.3.8.5 diff --git a/sources b/sources index 06b80f6..d9bd88f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.5.tar.gz) = abee28c0bc56b921b58b194672da96a916be854e0a6f07f0f311b3432964fe954d17a6c99fbd87824a4d404cd30f5455fcf45eaaa631a6df0db44563dfbf57a0 +SHA512 (otp-OTP-20.3.8.6.tar.gz) = 79b37fb7987b2c1e42c6fb71aecc1ca995ff6e658908781d5a25c50e10b88c6b9ccc4e8ff0ee29b02adfa8dbccbc07ef85af4c706253b7e3743fbd582715a467 From 7c17e3e6f8624b34673696c61d18ea7771b82ac2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 29 Aug 2018 16:05:16 +0300 Subject: [PATCH 155/340] Erlang ver. 20.3.8.8 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0003-Do-not-install-C-sources.patch | 9 ++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6e68404..7e50fc6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.6 +Version: 20.3.8.8 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Aug 29 2018 Peter Lemenkov - 20.3.8.8-1 +- Ver. 20.3.8.8 + * Wed Aug 15 2018 Peter Lemenkov - 20.3.8.6-1 - Ver. 20.3.8.6 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 51e7b8b..18c53c6 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index a4a6c158cc..2a7532a399 100644 +index a4a6c158cc..13658302f5 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -216,13 +216,9 @@ docs: +@@ -216,16 +216,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -43,7 +43,10 @@ index a4a6c158cc..2a7532a399 100644 - $(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj" $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib" endif - $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" +- $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" + $(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib" + + release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index 69b5b6003d..ba9a0e74b8 100644 --- a/lib/erl_interface/src/Makefile.in diff --git a/sources b/sources index d9bd88f..68d545f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.6.tar.gz) = 79b37fb7987b2c1e42c6fb71aecc1ca995ff6e658908781d5a25c50e10b88c6b9ccc4e8ff0ee29b02adfa8dbccbc07ef85af4c706253b7e3743fbd582715a467 +SHA512 (otp-OTP-20.3.8.8.tar.gz) = b56237a53e5bb9450929c71d5357bc1102bc8687fd1e5635e5b548cf1d3f0adb546bd5b1551802b6d2d0c76c9fd2fb7f712073b58cb9269242761f11717e0ff1 From c5952775a9c99231d97794a18ff2974f7260780f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 18 Sep 2018 21:04:03 +0300 Subject: [PATCH 156/340] Erlang ver. 20.3.8.9 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 7e50fc6..c6f14af 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.8 +Version: 20.3.8.9 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2226,6 +2226,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Sep 18 2018 Peter Lemenkov - 20.3.8.9-1 +- Ver. 20.3.8.9 + * Wed Aug 29 2018 Peter Lemenkov - 20.3.8.8-1 - Ver. 20.3.8.8 diff --git a/sources b/sources index 68d545f..4e9ec01 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (otp-OTP-20.3.8.8.tar.gz) = b56237a53e5bb9450929c71d5357bc1102bc8687fd1e5635e5b548cf1d3f0adb546bd5b1551802b6d2d0c76c9fd2fb7f712073b58cb9269242761f11717e0ff1 +SHA512 (otp-OTP-20.3.8.9.tar.gz) = 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7 From c259dd998685970b81ebda0a7b63651b1100ca02 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 20 Sep 2018 15:05:13 +0300 Subject: [PATCH 157/340] Install man-pages into system-wide directories Signed-off-by: Peter Lemenkov --- erlang.spec | 1307 +++++++++-------- ...man-pages-from-system-wide-directory.patch | 25 + sources | 1 - 3 files changed, 682 insertions(+), 651 deletions(-) create mode 100644 otp-0010-Load-man-pages-from-system-wide-directory.patch diff --git a/erlang.spec b/erlang.spec index c6f14af..c9be29c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -102,6 +102,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch Patch8: otp-0008-Add-extra-search-directory.patch Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch +Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1023,6 +1024,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/win32reg.* # remove empty directory rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man +%if %{with doc} +# Move man-pages to a system-wide directory - in the same way as Debian did +# Erlang files from man 3 have too generic names +for m in $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/* +do + mv ${manpage} ${manpage}erl +done +mkdir -p $RPM_BUILD_ROOT%{_mandir}/ +mv $RPM_BUILD_ROOT%{_libdir}/erlang/man/* $RPM_BUILD_ROOT%{_mandir}/ +%endif + # remove outdated script rm -f $RPM_BUILD_ROOT%{_libdir}/erlang/Install @@ -1120,7 +1132,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/asn1-*/priv %{_libdir}/erlang/lib/asn1-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/asn1ct.* +%{_mandir}/man3/asn1ct.* %endif %if %{__with_wxwidgets} @@ -1130,52 +1142,52 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/ct_run %{_libdir}/erlang/lib/common_test-*/ %if %{with doc} -%{_libdir}/erlang/man/man1/ct_run.* -%{_libdir}/erlang/man/man3/ct.* -%{_libdir}/erlang/man/man3/ct_cover.* -%{_libdir}/erlang/man/man3/ct_ftp.* -%{_libdir}/erlang/man/man3/ct_hooks.* -%{_libdir}/erlang/man/man3/ct_master.* -%{_libdir}/erlang/man/man3/ct_netconfc.* -%{_libdir}/erlang/man/man3/ct_property_test.* -%{_libdir}/erlang/man/man3/ct_rpc.* -%{_libdir}/erlang/man/man3/ct_slave.* -%{_libdir}/erlang/man/man3/ct_snmp.* -%{_libdir}/erlang/man/man3/ct_ssh.* -%{_libdir}/erlang/man/man3/ct_telnet.* -%{_libdir}/erlang/man/man3/ct_testspec.* -%{_libdir}/erlang/man/man3/unix_telnet.* -%{_libdir}/erlang/man/man6/common_test.* +%{_mandir}/man1/ct_run.* +%{_mandir}/man3/ct.* +%{_mandir}/man3/ct_cover.* +%{_mandir}/man3/ct_ftp.* +%{_mandir}/man3/ct_hooks.* +%{_mandir}/man3/ct_master.* +%{_mandir}/man3/ct_netconfc.* +%{_mandir}/man3/ct_property_test.* +%{_mandir}/man3/ct_rpc.* +%{_mandir}/man3/ct_slave.* +%{_mandir}/man3/ct_snmp.* +%{_mandir}/man3/ct_ssh.* +%{_mandir}/man3/ct_telnet.* +%{_mandir}/man3/ct_testspec.* +%{_mandir}/man3/unix_telnet.* +%{_mandir}/man6/common_test.* %endif %endif %{__with_wxwidgets} %files compiler %{_libdir}/erlang/lib/compiler-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/compile.* +%{_mandir}/man3/compile.* %endif %files cosEvent %{_libdir}/erlang/lib/cosEvent-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/cosEventApp.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ConsumerAdmin.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_EventChannel.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_ProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosEventChannelAdmin_SupplierAdmin.* +%{_mandir}/man3/cosEventApp.* +%{_mandir}/man3/CosEventChannelAdmin.* +%{_mandir}/man3/CosEventChannelAdmin_ConsumerAdmin.* +%{_mandir}/man3/CosEventChannelAdmin_EventChannel.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPullConsumer.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPullSupplier.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPushConsumer.* +%{_mandir}/man3/CosEventChannelAdmin_ProxyPushSupplier.* +%{_mandir}/man3/CosEventChannelAdmin_SupplierAdmin.* %endif %files cosEventDomain %{_libdir}/erlang/lib/cosEventDomain-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/CosEventDomainAdmin.* -%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomain.* -%{_libdir}/erlang/man/man3/CosEventDomainAdmin_EventDomainFactory.* -%{_libdir}/erlang/man/man3/cosEventDomainApp.* +%{_mandir}/man3/CosEventDomainAdmin.* +%{_mandir}/man3/CosEventDomainAdmin_EventDomain.* +%{_mandir}/man3/CosEventDomainAdmin_EventDomainFactory.* +%{_mandir}/man3/cosEventDomainApp.* %endif %files cosFileTransfer @@ -1184,12 +1196,12 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/cosFileTransfer-*/include %{_libdir}/erlang/lib/cosFileTransfer-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/cosFileTransferApp.* -%{_libdir}/erlang/man/man3/CosFileTransfer_Directory.* -%{_libdir}/erlang/man/man3/CosFileTransfer_File.* -%{_libdir}/erlang/man/man3/CosFileTransfer_FileIterator.* -%{_libdir}/erlang/man/man3/CosFileTransfer_FileTransferSession.* -%{_libdir}/erlang/man/man3/CosFileTransfer_VirtualFileSystem.* +%{_mandir}/man3/cosFileTransferApp.* +%{_mandir}/man3/CosFileTransfer_Directory.* +%{_mandir}/man3/CosFileTransfer_File.* +%{_mandir}/man3/CosFileTransfer_FileIterator.* +%{_mandir}/man3/CosFileTransfer_FileTransferSession.* +%{_mandir}/man3/CosFileTransfer_VirtualFileSystem.* %endif %files cosNotification @@ -1198,34 +1210,34 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/cosNotification-*/include %{_libdir}/erlang/lib/cosNotification-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/CosNotification.* -%{_libdir}/erlang/man/man3/CosNotification_AdminPropertiesAdmin.* -%{_libdir}/erlang/man/man3/cosNotificationApp.* -%{_libdir}/erlang/man/man3/CosNotification_QoSAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ConsumerAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannel.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_EventChannelFactory.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_ProxySupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* -%{_libdir}/erlang/man/man3/CosNotifyChannelAdmin_SupplierAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyComm_NotifyPublish.* -%{_libdir}/erlang/man/man3/CosNotifyComm_NotifySubscribe.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_Filter.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterAdmin.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_FilterFactory.* -%{_libdir}/erlang/man/man3/CosNotifyFilter_MappingFilter.* +%{_mandir}/man3/CosNotification.* +%{_mandir}/man3/CosNotification_AdminPropertiesAdmin.* +%{_mandir}/man3/cosNotificationApp.* +%{_mandir}/man3/CosNotification_QoSAdmin.* +%{_mandir}/man3/CosNotifyChannelAdmin_ConsumerAdmin.* +%{_mandir}/man3/CosNotifyChannelAdmin_EventChannel.* +%{_mandir}/man3/CosNotifyChannelAdmin_EventChannelFactory.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_ProxySupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* +%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* +%{_mandir}/man3/CosNotifyChannelAdmin_SupplierAdmin.* +%{_mandir}/man3/CosNotifyComm_NotifyPublish.* +%{_mandir}/man3/CosNotifyComm_NotifySubscribe.* +%{_mandir}/man3/CosNotifyFilter_Filter.* +%{_mandir}/man3/CosNotifyFilter_FilterAdmin.* +%{_mandir}/man3/CosNotifyFilter_FilterFactory.* +%{_mandir}/man3/CosNotifyFilter_MappingFilter.* %endif %files cosProperty @@ -1234,13 +1246,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/cosProperty-*/include %{_libdir}/erlang/lib/cosProperty-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/cosProperty.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertiesIterator.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertyNamesIterator.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySet.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDef.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetDefFactory.* -%{_libdir}/erlang/man/man3/CosPropertyService_PropertySetFactory.* +%{_mandir}/man3/cosProperty.* +%{_mandir}/man3/CosPropertyService_PropertiesIterator.* +%{_mandir}/man3/CosPropertyService_PropertyNamesIterator.* +%{_mandir}/man3/CosPropertyService_PropertySet.* +%{_mandir}/man3/CosPropertyService_PropertySetDef.* +%{_mandir}/man3/CosPropertyService_PropertySetDefFactory.* +%{_mandir}/man3/CosPropertyService_PropertySetFactory.* %endif %files cosTime @@ -1249,12 +1261,12 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/cosTime-*/include %{_libdir}/erlang/lib/cosTime-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/cosTime.* -%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventHandler.* -%{_libdir}/erlang/man/man3/CosTimerEvent_TimerEventService.* -%{_libdir}/erlang/man/man3/CosTime_TimeService.* -%{_libdir}/erlang/man/man3/CosTime_TIO.* -%{_libdir}/erlang/man/man3/CosTime_UTO.* +%{_mandir}/man3/cosTime.* +%{_mandir}/man3/CosTimerEvent_TimerEventHandler.* +%{_mandir}/man3/CosTimerEvent_TimerEventService.* +%{_mandir}/man3/CosTime_TimeService.* +%{_mandir}/man3/CosTime_TIO.* +%{_mandir}/man3/CosTime_UTO.* %endif %files cosTransactions @@ -1263,30 +1275,30 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/cosTransactions-*/include %{_libdir}/erlang/lib/cosTransactions-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/cosTransactions.* -%{_libdir}/erlang/man/man3/CosTransactions_Control.* -%{_libdir}/erlang/man/man3/CosTransactions_Coordinator.* -%{_libdir}/erlang/man/man3/CosTransactions_RecoveryCoordinator.* -%{_libdir}/erlang/man/man3/CosTransactions_Resource.* -%{_libdir}/erlang/man/man3/CosTransactions_SubtransactionAwareResource.* -%{_libdir}/erlang/man/man3/CosTransactions_Terminator.* -%{_libdir}/erlang/man/man3/CosTransactions_TransactionFactory.* +%{_mandir}/man3/cosTransactions.* +%{_mandir}/man3/CosTransactions_Control.* +%{_mandir}/man3/CosTransactions_Coordinator.* +%{_mandir}/man3/CosTransactions_RecoveryCoordinator.* +%{_mandir}/man3/CosTransactions_Resource.* +%{_mandir}/man3/CosTransactions_SubtransactionAwareResource.* +%{_mandir}/man3/CosTransactions_Terminator.* +%{_mandir}/man3/CosTransactions_TransactionFactory.* %endif %files crypto %{_libdir}/erlang/lib/crypto-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/crypto.* -%{_libdir}/erlang/man/man6/crypto.* +%{_mandir}/man3/crypto.* +%{_mandir}/man6/crypto.* %endif %if %{__with_wxwidgets} %files debugger %{_libdir}/erlang/lib/debugger-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/debugger.* -%{_libdir}/erlang/man/man3/i.* -%{_libdir}/erlang/man/man3/int.* +%{_mandir}/man3/debugger.* +%{_mandir}/man3/i.* +%{_mandir}/man3/int.* %endif %endif %{__with_wxwidgets} @@ -1301,8 +1313,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/dialyzer-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/dialyzer.* -%{_libdir}/erlang/man/man3/typer.* +%{_mandir}/man3/dialyzer.* +%{_mandir}/man3/typer.* %endif %endif %{__with_wxwidgets} @@ -1313,15 +1325,15 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/diameter-*/include %{_libdir}/erlang/lib/diameter-*/src %if %{with doc} -%{_libdir}/erlang/man/man1/diameterc.* -%{_libdir}/erlang/man/man3/diameter.* -%{_libdir}/erlang/man/man3/diameter_app.* -%{_libdir}/erlang/man/man3/diameter_codec.* -%{_libdir}/erlang/man/man3/diameter_make.* -%{_libdir}/erlang/man/man3/diameter_sctp.* -%{_libdir}/erlang/man/man3/diameter_tcp.* -%{_libdir}/erlang/man/man3/diameter_transport.* -%{_libdir}/erlang/man/man4/diameter_dict.* +%{_mandir}/man1/diameterc.* +%{_mandir}/man3/diameter.* +%{_mandir}/man3/diameter_app.* +%{_mandir}/man3/diameter_codec.* +%{_mandir}/man3/diameter_make.* +%{_mandir}/man3/diameter_sctp.* +%{_mandir}/man3/diameter_tcp.* +%{_mandir}/man3/diameter_transport.* +%{_mandir}/man4/diameter_dict.* %endif %if %{with doc} @@ -1334,40 +1346,40 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files edoc %{_libdir}/erlang/lib/edoc-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/edoc.* -%{_libdir}/erlang/man/man3/edoc_doclet.* -%{_libdir}/erlang/man/man3/edoc_extract.* -%{_libdir}/erlang/man/man3/edoc_layout.* -%{_libdir}/erlang/man/man3/edoc_lib.* -%{_libdir}/erlang/man/man3/edoc_run.* +%{_mandir}/man3/edoc.* +%{_mandir}/man3/edoc_doclet.* +%{_mandir}/man3/edoc_extract.* +%{_mandir}/man3/edoc_layout.* +%{_mandir}/man3/edoc_lib.* +%{_mandir}/man3/edoc_run.* %endif %files eldap %{_libdir}/erlang/lib/eldap-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/eldap.* +%{_mandir}/man3/eldap.* %endif %files erl_docgen %{_libdir}/erlang/lib/erl_docgen-*/ %if %{with doc} -%{_libdir}/erlang/man/man6/erl_docgen.* +%{_mandir}/man6/erl_docgen.* %endif %files erl_interface %{_libdir}/erlang/lib/erl_interface-*/ %if %{with doc} -%{_libdir}/erlang/man/man1/erl_call.* -%{_libdir}/erlang/man/man3/ei.* -%{_libdir}/erlang/man/man3/ei_connect.* -%{_libdir}/erlang/man/man3/erl_connect.* -%{_libdir}/erlang/man/man3/erl_error.* -%{_libdir}/erlang/man/man3/erl_eterm.* -%{_libdir}/erlang/man/man3/erl_format.* -%{_libdir}/erlang/man/man3/erl_global.* -%{_libdir}/erlang/man/man3/erl_malloc.* -%{_libdir}/erlang/man/man3/erl_marshal.* -%{_libdir}/erlang/man/man3/registry.* +%{_mandir}/man1/erl_call.* +%{_mandir}/man3/ei.* +%{_mandir}/man3/ei_connect.* +%{_mandir}/man3/erl_connect.* +%{_mandir}/man3/erl_error.* +%{_mandir}/man3/erl_eterm.* +%{_mandir}/man3/erl_format.* +%{_mandir}/man3/erl_global.* +%{_mandir}/man3/erl_malloc.* +%{_mandir}/man3/erl_marshal.* +%{_mandir}/man3/registry.* %endif %files erts @@ -1379,14 +1391,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %dir %{_libdir}/erlang/ %dir %{_libdir}/erlang/bin/ %dir %{_libdir}/erlang/lib/ -%if %{with doc} -%dir %{_libdir}/erlang/man/ -%dir %{_libdir}/erlang/man/man1/ -%dir %{_libdir}/erlang/man/man3/ -%dir %{_libdir}/erlang/man/man4/ -%dir %{_libdir}/erlang/man/man6/ -%dir %{_libdir}/erlang/man/man7/ -%endif %dir %{_libdir}/erlang/releases/ %{_bindir}/epmd @@ -1431,22 +1435,22 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/erts-*/src/ %{_libdir}/erlang/lib/erts-*/ %if %{with doc} -%{_libdir}/erlang/man/man1/epmd.* -%{_libdir}/erlang/man/man1/erl.* -%{_libdir}/erlang/man/man1/erlc.* -%{_libdir}/erlang/man/man1/escript.* -%{_libdir}/erlang/man/man1/run_erl.* -%{_libdir}/erlang/man/man1/start.* -%{_libdir}/erlang/man/man1/start_erl.* -%{_libdir}/erlang/man/man3/driver_entry.* -%{_libdir}/erlang/man/man3/erl_driver.* -%{_libdir}/erlang/man/man3/erl_nif.* -%{_libdir}/erlang/man/man3/erl_prim_loader.* -%{_libdir}/erlang/man/man3/erl_tracer.* -%{_libdir}/erlang/man/man3/erlang.* -%{_libdir}/erlang/man/man3/erts_alloc.* -%{_libdir}/erlang/man/man3/init.* -%{_libdir}/erlang/man/man3/zlib.* +%{_mandir}/man1/epmd.* +%{_mandir}/man1/erl.* +%{_mandir}/man1/erlc.* +%{_mandir}/man1/escript.* +%{_mandir}/man1/run_erl.* +%{_mandir}/man1/start.* +%{_mandir}/man1/start_erl.* +%{_mandir}/man3/driver_entry.* +%{_mandir}/man3/erl_driver.* +%{_mandir}/man3/erl_nif.* +%{_mandir}/man3/erl_prim_loader.* +%{_mandir}/man3/erl_tracer.* +%{_mandir}/man3/erlang.* +%{_mandir}/man3/erts_alloc.* +%{_mandir}/man3/init.* +%{_mandir}/man3/zlib.* %endif %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ @@ -1464,10 +1468,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/et-*/include %{_libdir}/erlang/lib/et-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/et.* -%{_libdir}/erlang/man/man3/et_collector.* -%{_libdir}/erlang/man/man3/et_selector.* -%{_libdir}/erlang/man/man3/et_viewer.* +%{_mandir}/man3/et.* +%{_mandir}/man3/et_collector.* +%{_mandir}/man3/et_selector.* +%{_mandir}/man3/et_viewer.* %endif %endif %{__with_wxwidgets} @@ -1477,8 +1481,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/eunit-*/include %{_libdir}/erlang/lib/eunit-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/eunit.* -%{_libdir}/erlang/man/man3/eunit_surefire.* +%{_mandir}/man3/eunit.* +%{_mandir}/man3/eunit_surefire.* %endif %if %{__with_examples} @@ -1530,9 +1534,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_javadir}/%{name}/ic.jar %endif %{__with_java} %if %{with doc} -%{_libdir}/erlang/man/man3/ic.* -%{_libdir}/erlang/man/man3/ic_clib.* -%{_libdir}/erlang/man/man3/ic_c_protocol.* +%{_mandir}/man3/ic.* +%{_mandir}/man3/ic_clib.* +%{_mandir}/man3/ic_c_protocol.* %endif %files inets @@ -1542,19 +1546,19 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/inets-*/priv %{_libdir}/erlang/lib/inets-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/ftp.* -%{_libdir}/erlang/man/man3/http_uri.* -%{_libdir}/erlang/man/man3/httpc.* -%{_libdir}/erlang/man/man3/httpd.* -%{_libdir}/erlang/man/man3/httpd_custom_api.* -%{_libdir}/erlang/man/man3/httpd_socket.* -%{_libdir}/erlang/man/man3/httpd_util.* -%{_libdir}/erlang/man/man3/inets.* -%{_libdir}/erlang/man/man3/mod_alias.* -%{_libdir}/erlang/man/man3/mod_auth.* -%{_libdir}/erlang/man/man3/mod_esi.* -%{_libdir}/erlang/man/man3/mod_security.* -%{_libdir}/erlang/man/man3/tftp.* +%{_mandir}/man3/ftp.* +%{_mandir}/man3/http_uri.* +%{_mandir}/man3/httpc.* +%{_mandir}/man3/httpd.* +%{_mandir}/man3/httpd_custom_api.* +%{_mandir}/man3/httpd_socket.* +%{_mandir}/man3/httpd_util.* +%{_mandir}/man3/inets.* +%{_mandir}/man3/mod_alias.* +%{_mandir}/man3/mod_auth.* +%{_mandir}/man3/mod_esi.* +%{_mandir}/man3/mod_security.* +%{_mandir}/man3/tftp.* %endif %if %{__with_java} @@ -1571,38 +1575,38 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/kernel-*/include %{_libdir}/erlang/lib/kernel-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/application.* -%{_libdir}/erlang/man/man3/auth.* -%{_libdir}/erlang/man/man3/code.* -%{_libdir}/erlang/man/man3/disk_log.* -%{_libdir}/erlang/man/man3/erl_boot_server.* -%{_libdir}/erlang/man/man3/erl_ddll.* -%{_libdir}/erlang/man/man3/erl_prim_loader_stub.* -%{_libdir}/erlang/man/man3/erlang_stub.* -%{_libdir}/erlang/man/man3/error_handler.* -%{_libdir}/erlang/man/man3/error_logger.* -%{_libdir}/erlang/man/man3/file.* -%{_libdir}/erlang/man/man3/gen_sctp.* -%{_libdir}/erlang/man/man3/gen_tcp.* -%{_libdir}/erlang/man/man3/gen_udp.* -%{_libdir}/erlang/man/man3/global.* -%{_libdir}/erlang/man/man3/global_group.* -%{_libdir}/erlang/man/man3/heart.* -%{_libdir}/erlang/man/man3/inet.* -%{_libdir}/erlang/man/man3/inet_res.* -%{_libdir}/erlang/man/man3/init_stub.* -%{_libdir}/erlang/man/man3/net_adm.* -%{_libdir}/erlang/man/man3/net_kernel.* -%{_libdir}/erlang/man/man3/os.* -%{_libdir}/erlang/man/man3/pg2.* -%{_libdir}/erlang/man/man3/rpc.* -%{_libdir}/erlang/man/man3/seq_trace.* -%{_libdir}/erlang/man/man3/user.* -%{_libdir}/erlang/man/man3/wrap_log_reader.* -%{_libdir}/erlang/man/man3/zlib_stub.* -%{_libdir}/erlang/man/man4/app.* -%{_libdir}/erlang/man/man4/config.* -%{_libdir}/erlang/man/man6/kernel.* +%{_mandir}/man3/application.* +%{_mandir}/man3/auth.* +%{_mandir}/man3/code.* +%{_mandir}/man3/disk_log.* +%{_mandir}/man3/erl_boot_server.* +%{_mandir}/man3/erl_ddll.* +%{_mandir}/man3/erl_prim_loader_stub.* +%{_mandir}/man3/erlang_stub.* +%{_mandir}/man3/error_handler.* +%{_mandir}/man3/error_logger.* +%{_mandir}/man3/file.* +%{_mandir}/man3/gen_sctp.* +%{_mandir}/man3/gen_tcp.* +%{_mandir}/man3/gen_udp.* +%{_mandir}/man3/global.* +%{_mandir}/man3/global_group.* +%{_mandir}/man3/heart.* +%{_mandir}/man3/inet.* +%{_mandir}/man3/inet_res.* +%{_mandir}/man3/init_stub.* +%{_mandir}/man3/net_adm.* +%{_mandir}/man3/net_kernel.* +%{_mandir}/man3/os.* +%{_mandir}/man3/pg2.* +%{_mandir}/man3/rpc.* +%{_mandir}/man3/seq_trace.* +%{_mandir}/man3/user.* +%{_mandir}/man3/wrap_log_reader.* +%{_mandir}/man3/zlib_stub.* +%{_mandir}/man4/app.* +%{_mandir}/man4/config.* +%{_mandir}/man6/kernel.* %endif %if %{__with_wxwidgets} @@ -1613,18 +1617,18 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/megaco-*/priv %{_libdir}/erlang/lib/megaco-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/megaco.* -%{_libdir}/erlang/man/man3/megaco_codec_meas.* -%{_libdir}/erlang/man/man3/megaco_codec_mstone1.* -%{_libdir}/erlang/man/man3/megaco_codec_mstone2.* -%{_libdir}/erlang/man/man3/megaco_codec_transform.* -%{_libdir}/erlang/man/man3/megaco_edist_compress.* -%{_libdir}/erlang/man/man3/megaco_encoder.* -%{_libdir}/erlang/man/man3/megaco_flex_scanner.* -%{_libdir}/erlang/man/man3/megaco_tcp.* -%{_libdir}/erlang/man/man3/megaco_transport.* -%{_libdir}/erlang/man/man3/megaco_udp.* -%{_libdir}/erlang/man/man3/megaco_user.* +%{_mandir}/man3/megaco.* +%{_mandir}/man3/megaco_codec_meas.* +%{_mandir}/man3/megaco_codec_mstone1.* +%{_mandir}/man3/megaco_codec_mstone2.* +%{_mandir}/man3/megaco_codec_transform.* +%{_mandir}/man3/megaco_edist_compress.* +%{_mandir}/man3/megaco_encoder.* +%{_mandir}/man3/megaco_flex_scanner.* +%{_mandir}/man3/megaco_tcp.* +%{_mandir}/man3/megaco_transport.* +%{_mandir}/man3/megaco_udp.* +%{_mandir}/man3/megaco_user.* %endif %endif %{__with_wxwidgets} @@ -1633,9 +1637,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/mnesia-*/ebin %{_libdir}/erlang/lib/mnesia-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/mnesia.* -%{_libdir}/erlang/man/man3/mnesia_frag_hash.* -%{_libdir}/erlang/man/man3/mnesia_registry.* +%{_mandir}/man3/mnesia.* +%{_mandir}/man3/mnesia_frag_hash.* +%{_mandir}/man3/mnesia_registry.* %endif %if %{__with_wxwidgets} @@ -1646,19 +1650,19 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/observer-*/priv/ %{_libdir}/erlang/lib/observer-*/src/ %if %{with doc} -%{_libdir}/erlang/man/man1/cdv.* -%{_libdir}/erlang/man/man3/crashdump.* -%{_libdir}/erlang/man/man3/etop.* -%{_libdir}/erlang/man/man3/observer.* -%{_libdir}/erlang/man/man3/ttb.* -%{_libdir}/erlang/man/man6/observer.* +%{_mandir}/man1/cdv.* +%{_mandir}/man3/crashdump.* +%{_mandir}/man3/etop.* +%{_mandir}/man3/observer.* +%{_mandir}/man3/ttb.* +%{_mandir}/man6/observer.* %endif %endif %{__with_wxwidgets} %files odbc %{_libdir}/erlang/lib/odbc-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/odbc.* +%{_mandir}/man3/odbc.* %endif %files orber @@ -1670,54 +1674,54 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/orber-*/priv %{_libdir}/erlang/lib/orber-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/CosNaming.* -%{_libdir}/erlang/man/man3/CosNaming_BindingIterator.* -%{_libdir}/erlang/man/man3/CosNaming_NamingContext.* -%{_libdir}/erlang/man/man3/CosNaming_NamingContextExt.* -%{_libdir}/erlang/man/man3/Module_Interface.* -%{_libdir}/erlang/man/man3/any.* -%{_libdir}/erlang/man/man3/corba.* -%{_libdir}/erlang/man/man3/corba_object.* -%{_libdir}/erlang/man/man3/fixed.* -%{_libdir}/erlang/man/man3/interceptors.* -%{_libdir}/erlang/man/man3/lname.* -%{_libdir}/erlang/man/man3/lname_component.* -%{_libdir}/erlang/man/man3/orber.* -%{_libdir}/erlang/man/man3/orber_acl.* -%{_libdir}/erlang/man/man3/orber_diagnostics.* -%{_libdir}/erlang/man/man3/orber_ifr.* -%{_libdir}/erlang/man/man3/orber_tc.* +%{_mandir}/man3/CosNaming.* +%{_mandir}/man3/CosNaming_BindingIterator.* +%{_mandir}/man3/CosNaming_NamingContext.* +%{_mandir}/man3/CosNaming_NamingContextExt.* +%{_mandir}/man3/Module_Interface.* +%{_mandir}/man3/any.* +%{_mandir}/man3/corba.* +%{_mandir}/man3/corba_object.* +%{_mandir}/man3/fixed.* +%{_mandir}/man3/interceptors.* +%{_mandir}/man3/lname.* +%{_mandir}/man3/lname_component.* +%{_mandir}/man3/orber.* +%{_mandir}/man3/orber_acl.* +%{_mandir}/man3/orber_diagnostics.* +%{_mandir}/man3/orber_ifr.* +%{_mandir}/man3/orber_tc.* %endif %files os_mon %{_libdir}/erlang/lib/os_mon-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/cpu_sup.* -%{_libdir}/erlang/man/man3/disksup.* -%{_libdir}/erlang/man/man3/memsup.* -%{_libdir}/erlang/man/man3/os_mon_mib.* -%{_libdir}/erlang/man/man3/os_sup.* -%{_libdir}/erlang/man/man6/os_mon.* +%{_mandir}/man3/cpu_sup.* +%{_mandir}/man3/disksup.* +%{_mandir}/man3/memsup.* +%{_mandir}/man3/os_mon_mib.* +%{_mandir}/man3/os_sup.* +%{_mandir}/man6/os_mon.* %endif %files otp_mibs %{_libdir}/erlang/lib/otp_mibs-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/otp_mib.* +%{_mandir}/man3/otp_mib.* %endif %files parsetools %{_libdir}/erlang/lib/parsetools-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/leex.* -%{_libdir}/erlang/man/man3/yecc.* +%{_mandir}/man3/leex.* +%{_mandir}/man3/yecc.* %endif %files public_key %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/public_key.* -%{_libdir}/erlang/man/man6/public_key.* +%{_mandir}/man3/public_key.* +%{_mandir}/man6/public_key.* %endif %if %{__with_wxwidgets} @@ -1726,7 +1730,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/reltool-*/ebin %{_libdir}/erlang/lib/reltool-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/reltool.* +%{_mandir}/man3/reltool.* %endif %endif %{__with_wxwidgets} @@ -1736,12 +1740,12 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/runtime_tools-*/include/ %{_libdir}/erlang/lib/runtime_tools-*/priv/ %if %{with doc} -%{_libdir}/erlang/man/man3/dbg.* -%{_libdir}/erlang/man/man3/dyntrace.* -%{_libdir}/erlang/man/man3/erts_alloc_config.* -%{_libdir}/erlang/man/man3/msacc.* -%{_libdir}/erlang/man/man3/system_information.* -%{_libdir}/erlang/man/man6/runtime_tools.* +%{_mandir}/man3/dbg.* +%{_mandir}/man3/dyntrace.* +%{_mandir}/man3/erts_alloc_config.* +%{_mandir}/man3/msacc.* +%{_mandir}/man3/system_information.* +%{_mandir}/man6/runtime_tools.* %endif %files sasl @@ -1749,15 +1753,15 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/sasl-*/ebin %{_libdir}/erlang/lib/sasl-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/alarm_handler.* -%{_libdir}/erlang/man/man3/rb.* -%{_libdir}/erlang/man/man3/release_handler.* -%{_libdir}/erlang/man/man3/systools.* -%{_libdir}/erlang/man/man4/appup.* -%{_libdir}/erlang/man/man4/rel.* -%{_libdir}/erlang/man/man4/relup.* -%{_libdir}/erlang/man/man4/script.* -%{_libdir}/erlang/man/man6/sasl.* +%{_mandir}/man3/alarm_handler.* +%{_mandir}/man3/rb.* +%{_mandir}/man3/release_handler.* +%{_mandir}/man3/systools.* +%{_mandir}/man4/appup.* +%{_mandir}/man4/rel.* +%{_mandir}/man4/relup.* +%{_mandir}/man4/script.* +%{_mandir}/man6/sasl.* %endif %files snmp @@ -1769,57 +1773,57 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/snmp-*/priv %{_libdir}/erlang/lib/snmp-*/src %if %{with doc} -%{_libdir}/erlang/man/man1/snmpc.* -%{_libdir}/erlang/man/man3/snmp.* -%{_libdir}/erlang/man/man3/snmpa.* -%{_libdir}/erlang/man/man3/snmpa_conf.* -%{_libdir}/erlang/man/man3/snmpa_discovery_handler.* -%{_libdir}/erlang/man/man3/snmpa_error.* -%{_libdir}/erlang/man/man3/snmpa_error_io.* -%{_libdir}/erlang/man/man3/snmpa_error_logger.* -%{_libdir}/erlang/man/man3/snmpa_error_report.* -%{_libdir}/erlang/man/man3/snmpa_local_db.* -%{_libdir}/erlang/man/man3/snmpa_mib_data.* -%{_libdir}/erlang/man/man3/snmpa_mib_storage.* -%{_libdir}/erlang/man/man3/snmpa_mpd.* -%{_libdir}/erlang/man/man3/snmpa_network_interface.* -%{_libdir}/erlang/man/man3/snmpa_network_interface_filter.* -%{_libdir}/erlang/man/man3/snmpa_notification_delivery_info_receiver.* -%{_libdir}/erlang/man/man3/snmpa_notification_filter.* -%{_libdir}/erlang/man/man3/snmpa_supervisor.* -%{_libdir}/erlang/man/man3/snmpc.* -%{_libdir}/erlang/man/man3/snmp_community_mib.* -%{_libdir}/erlang/man/man3/snmp_framework_mib.* -%{_libdir}/erlang/man/man3/snmp_generic.* -%{_libdir}/erlang/man/man3/snmp_index.* -%{_libdir}/erlang/man/man3/snmpm.* -%{_libdir}/erlang/man/man3/snmpm_conf.* -%{_libdir}/erlang/man/man3/snmpm_mpd.* -%{_libdir}/erlang/man/man3/snmpm_network_interface.* -%{_libdir}/erlang/man/man3/snmpm_network_interface_filter.* -%{_libdir}/erlang/man/man3/snmpm_user.* -%{_libdir}/erlang/man/man3/snmp_notification_mib.* -%{_libdir}/erlang/man/man3/snmp_pdus.* -%{_libdir}/erlang/man/man3/snmp_standard_mib.* -%{_libdir}/erlang/man/man3/snmp_target_mib.* -%{_libdir}/erlang/man/man3/snmp_user_based_sm_mib.* -%{_libdir}/erlang/man/man3/snmp_view_based_acm_mib.* -%{_libdir}/erlang/man/man6/snmp.* -%{_libdir}/erlang/man/man7/INET-ADDRESS-MIB.* -%{_libdir}/erlang/man/man7/OTP-SNMPEA-MIB.* -%{_libdir}/erlang/man/man7/RFC1213-MIB.* -%{_libdir}/erlang/man/man7/SNMP-COMMUNITY-MIB.* -%{_libdir}/erlang/man/man7/SNMP-FRAMEWORK-MIB.* -%{_libdir}/erlang/man/man7/SNMP-MPD-MIB.* -%{_libdir}/erlang/man/man7/SNMP-NOTIFICATION-MIB.* -%{_libdir}/erlang/man/man7/SNMP-TARGET-MIB.* -%{_libdir}/erlang/man/man7/SNMP-USER-BASED-SM-MIB.* -%{_libdir}/erlang/man/man7/SNMP-USM-AES-MIB.* -%{_libdir}/erlang/man/man7/SNMPv2-MIB.* -%{_libdir}/erlang/man/man7/SNMPv2-TM.* -%{_libdir}/erlang/man/man7/SNMP-VIEW-BASED-ACM-MIB.* -%{_libdir}/erlang/man/man7/STANDARD-MIB.* -%{_libdir}/erlang/man/man7/TRANSPORT-ADDRESS-MIB.* +%{_mandir}/man1/snmpc.* +%{_mandir}/man3/snmp.* +%{_mandir}/man3/snmpa.* +%{_mandir}/man3/snmpa_conf.* +%{_mandir}/man3/snmpa_discovery_handler.* +%{_mandir}/man3/snmpa_error.* +%{_mandir}/man3/snmpa_error_io.* +%{_mandir}/man3/snmpa_error_logger.* +%{_mandir}/man3/snmpa_error_report.* +%{_mandir}/man3/snmpa_local_db.* +%{_mandir}/man3/snmpa_mib_data.* +%{_mandir}/man3/snmpa_mib_storage.* +%{_mandir}/man3/snmpa_mpd.* +%{_mandir}/man3/snmpa_network_interface.* +%{_mandir}/man3/snmpa_network_interface_filter.* +%{_mandir}/man3/snmpa_notification_delivery_info_receiver.* +%{_mandir}/man3/snmpa_notification_filter.* +%{_mandir}/man3/snmpa_supervisor.* +%{_mandir}/man3/snmpc.* +%{_mandir}/man3/snmp_community_mib.* +%{_mandir}/man3/snmp_framework_mib.* +%{_mandir}/man3/snmp_generic.* +%{_mandir}/man3/snmp_index.* +%{_mandir}/man3/snmpm.* +%{_mandir}/man3/snmpm_conf.* +%{_mandir}/man3/snmpm_mpd.* +%{_mandir}/man3/snmpm_network_interface.* +%{_mandir}/man3/snmpm_network_interface_filter.* +%{_mandir}/man3/snmpm_user.* +%{_mandir}/man3/snmp_notification_mib.* +%{_mandir}/man3/snmp_pdus.* +%{_mandir}/man3/snmp_standard_mib.* +%{_mandir}/man3/snmp_target_mib.* +%{_mandir}/man3/snmp_user_based_sm_mib.* +%{_mandir}/man3/snmp_view_based_acm_mib.* +%{_mandir}/man6/snmp.* +%{_mandir}/man7/INET-ADDRESS-MIB.* +%{_mandir}/man7/OTP-SNMPEA-MIB.* +%{_mandir}/man7/RFC1213-MIB.* +%{_mandir}/man7/SNMP-COMMUNITY-MIB.* +%{_mandir}/man7/SNMP-FRAMEWORK-MIB.* +%{_mandir}/man7/SNMP-MPD-MIB.* +%{_mandir}/man7/SNMP-NOTIFICATION-MIB.* +%{_mandir}/man7/SNMP-TARGET-MIB.* +%{_mandir}/man7/SNMP-USER-BASED-SM-MIB.* +%{_mandir}/man7/SNMP-USM-AES-MIB.* +%{_mandir}/man7/SNMPv2-MIB.* +%{_mandir}/man7/SNMPv2-TM.* +%{_mandir}/man7/SNMP-VIEW-BASED-ACM-MIB.* +%{_mandir}/man7/STANDARD-MIB.* +%{_mandir}/man7/TRANSPORT-ADDRESS-MIB.* %endif %files ssh @@ -1828,14 +1832,14 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/ssh-*/include %{_libdir}/erlang/lib/ssh-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/ssh.* -%{_libdir}/erlang/man/man3/ssh_channel.* -%{_libdir}/erlang/man/man3/ssh_client_key_api.* -%{_libdir}/erlang/man/man3/ssh_connection.* -%{_libdir}/erlang/man/man3/ssh_server_key_api.* -%{_libdir}/erlang/man/man3/ssh_sftp.* -%{_libdir}/erlang/man/man3/ssh_sftpd.* -%{_libdir}/erlang/man/man6/ssh.* +%{_mandir}/man3/ssh.* +%{_mandir}/man3/ssh_channel.* +%{_mandir}/man3/ssh_client_key_api.* +%{_mandir}/man3/ssh_connection.* +%{_mandir}/man3/ssh_server_key_api.* +%{_mandir}/man3/ssh_sftp.* +%{_mandir}/man3/ssh_sftpd.* +%{_mandir}/man6/ssh.* %endif %files ssl @@ -1843,11 +1847,11 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/ssl-*/ebin %{_libdir}/erlang/lib/ssl-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/ssl.* -%{_libdir}/erlang/man/man3/ssl_crl_cache.* -%{_libdir}/erlang/man/man3/ssl_crl_cache_api.* -%{_libdir}/erlang/man/man3/ssl_session_cache_api.* -%{_libdir}/erlang/man/man6/ssl.* +%{_mandir}/man3/ssl.* +%{_mandir}/man3/ssl_crl_cache.* +%{_mandir}/man3/ssl_crl_cache_api.* +%{_mandir}/man3/ssl_session_cache_api.* +%{_mandir}/man6/ssl.* %endif %files stdlib @@ -1856,68 +1860,68 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/array.* -%{_libdir}/erlang/man/man3/base64.* -%{_libdir}/erlang/man/man3/beam_lib.* -%{_libdir}/erlang/man/man3/binary.* -%{_libdir}/erlang/man/man3/c.* -%{_libdir}/erlang/man/man3/calendar.* -%{_libdir}/erlang/man/man3/dets.* -%{_libdir}/erlang/man/man3/dict.* -%{_libdir}/erlang/man/man3/digraph.* -%{_libdir}/erlang/man/man3/digraph_utils.* -%{_libdir}/erlang/man/man3/epp.* -%{_libdir}/erlang/man/man3/erl_anno.* -%{_libdir}/erlang/man/man3/erl_eval.* -%{_libdir}/erlang/man/man3/erl_expand_records.* -%{_libdir}/erlang/man/man3/erl_id_trans.* -%{_libdir}/erlang/man/man3/erl_internal.* -%{_libdir}/erlang/man/man3/erl_lint.* -%{_libdir}/erlang/man/man3/erl_parse.* -%{_libdir}/erlang/man/man3/erl_pp.* -%{_libdir}/erlang/man/man3/erl_scan.* -%{_libdir}/erlang/man/man3/erl_tar.* -%{_libdir}/erlang/man/man3/ets.* -%{_libdir}/erlang/man/man3/file_sorter.* -%{_libdir}/erlang/man/man3/filelib.* -%{_libdir}/erlang/man/man3/filename.* -%{_libdir}/erlang/man/man3/gb_sets.* -%{_libdir}/erlang/man/man3/gb_trees.* -%{_libdir}/erlang/man/man3/gen_event.* -%{_libdir}/erlang/man/man3/gen_fsm.* -%{_libdir}/erlang/man/man3/gen_server.* -%{_libdir}/erlang/man/man3/gen_statem.* -%{_libdir}/erlang/man/man3/io.* -%{_libdir}/erlang/man/man3/io_lib.* -%{_libdir}/erlang/man/man3/lib.* -%{_libdir}/erlang/man/man3/lists.* -%{_libdir}/erlang/man/man3/log_mf_h.* -%{_libdir}/erlang/man/man3/maps.* -%{_libdir}/erlang/man/man3/math.* -%{_libdir}/erlang/man/man3/ms_transform.* -%{_libdir}/erlang/man/man3/orddict.* -%{_libdir}/erlang/man/man3/ordsets.* -%{_libdir}/erlang/man/man3/pool.* -%{_libdir}/erlang/man/man3/proc_lib.* -%{_libdir}/erlang/man/man3/proplists.* -%{_libdir}/erlang/man/man3/qlc.* -%{_libdir}/erlang/man/man3/queue.* -%{_libdir}/erlang/man/man3/rand.* -%{_libdir}/erlang/man/man3/random.* -%{_libdir}/erlang/man/man3/re.* -%{_libdir}/erlang/man/man3/sets.* -%{_libdir}/erlang/man/man3/shell.* -%{_libdir}/erlang/man/man3/shell_default.* -%{_libdir}/erlang/man/man3/slave.* -%{_libdir}/erlang/man/man3/sofs.* -%{_libdir}/erlang/man/man3/string.* -%{_libdir}/erlang/man/man3/supervisor.* -%{_libdir}/erlang/man/man3/supervisor_bridge.* -%{_libdir}/erlang/man/man3/sys.* -%{_libdir}/erlang/man/man3/timer.* -%{_libdir}/erlang/man/man3/unicode.* -%{_libdir}/erlang/man/man3/zip.* -%{_libdir}/erlang/man/man6/stdlib.* +%{_mandir}/man3/array.* +%{_mandir}/man3/base64.* +%{_mandir}/man3/beam_lib.* +%{_mandir}/man3/binary.* +%{_mandir}/man3/c.* +%{_mandir}/man3/calendar.* +%{_mandir}/man3/dets.* +%{_mandir}/man3/dict.* +%{_mandir}/man3/digraph.* +%{_mandir}/man3/digraph_utils.* +%{_mandir}/man3/epp.* +%{_mandir}/man3/erl_anno.* +%{_mandir}/man3/erl_eval.* +%{_mandir}/man3/erl_expand_records.* +%{_mandir}/man3/erl_id_trans.* +%{_mandir}/man3/erl_internal.* +%{_mandir}/man3/erl_lint.* +%{_mandir}/man3/erl_parse.* +%{_mandir}/man3/erl_pp.* +%{_mandir}/man3/erl_scan.* +%{_mandir}/man3/erl_tar.* +%{_mandir}/man3/ets.* +%{_mandir}/man3/file_sorter.* +%{_mandir}/man3/filelib.* +%{_mandir}/man3/filename.* +%{_mandir}/man3/gb_sets.* +%{_mandir}/man3/gb_trees.* +%{_mandir}/man3/gen_event.* +%{_mandir}/man3/gen_fsm.* +%{_mandir}/man3/gen_server.* +%{_mandir}/man3/gen_statem.* +%{_mandir}/man3/io.* +%{_mandir}/man3/io_lib.* +%{_mandir}/man3/lib.* +%{_mandir}/man3/lists.* +%{_mandir}/man3/log_mf_h.* +%{_mandir}/man3/maps.* +%{_mandir}/man3/math.* +%{_mandir}/man3/ms_transform.* +%{_mandir}/man3/orddict.* +%{_mandir}/man3/ordsets.* +%{_mandir}/man3/pool.* +%{_mandir}/man3/proc_lib.* +%{_mandir}/man3/proplists.* +%{_mandir}/man3/qlc.* +%{_mandir}/man3/queue.* +%{_mandir}/man3/rand.* +%{_mandir}/man3/random.* +%{_mandir}/man3/re.* +%{_mandir}/man3/sets.* +%{_mandir}/man3/shell.* +%{_mandir}/man3/shell_default.* +%{_mandir}/man3/slave.* +%{_mandir}/man3/sofs.* +%{_mandir}/man3/string.* +%{_mandir}/man3/supervisor.* +%{_mandir}/man3/supervisor_bridge.* +%{_mandir}/man3/sys.* +%{_mandir}/man3/timer.* +%{_mandir}/man3/unicode.* +%{_mandir}/man3/zip.* +%{_mandir}/man6/stdlib.* %endif %files syntax_tools @@ -1925,17 +1929,17 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/syntax_tools-*/ebin %{_libdir}/erlang/lib/syntax_tools-*/include %if %{with doc} -%{_libdir}/erlang/man/man3/epp_dodger.* -%{_libdir}/erlang/man/man3/erl_comment_scan.* -%{_libdir}/erlang/man/man3/erl_prettypr.* -%{_libdir}/erlang/man/man3/erl_recomment.* -%{_libdir}/erlang/man/man3/erl_syntax.* -%{_libdir}/erlang/man/man3/erl_syntax_lib.* -%{_libdir}/erlang/man/man3/erl_tidy.* -%{_libdir}/erlang/man/man3/igor.* -%{_libdir}/erlang/man/man3/merl.* -%{_libdir}/erlang/man/man3/merl_transform.* -%{_libdir}/erlang/man/man3/prettypr.* +%{_mandir}/man3/epp_dodger.* +%{_mandir}/man3/erl_comment_scan.* +%{_mandir}/man3/erl_prettypr.* +%{_mandir}/man3/erl_recomment.* +%{_mandir}/man3/erl_syntax.* +%{_mandir}/man3/erl_syntax_lib.* +%{_mandir}/man3/erl_tidy.* +%{_mandir}/man3/igor.* +%{_mandir}/man3/merl.* +%{_mandir}/man3/merl_transform.* +%{_mandir}/man3/prettypr.* %endif %files tools @@ -1945,16 +1949,16 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/cover.* -%{_libdir}/erlang/man/man3/cprof.* -%{_libdir}/erlang/man/man3/eprof.* -%{_libdir}/erlang/man/man3/erlang_mode.* -%{_libdir}/erlang/man/man3/fprof.* -%{_libdir}/erlang/man/man3/instrument.* -%{_libdir}/erlang/man/man3/lcnt.* -%{_libdir}/erlang/man/man3/make.* -%{_libdir}/erlang/man/man3/tags.* -%{_libdir}/erlang/man/man3/xref.* +%{_mandir}/man3/cover.* +%{_mandir}/man3/cprof.* +%{_mandir}/man3/eprof.* +%{_mandir}/man3/erlang_mode.* +%{_mandir}/man3/fprof.* +%{_mandir}/man3/instrument.* +%{_mandir}/man3/lcnt.* +%{_mandir}/man3/make.* +%{_mandir}/man3/tags.* +%{_mandir}/man3/xref.* %endif %if %{__with_emacs} %dir %{_emacs_sitelispdir}/erlang @@ -1979,253 +1983,256 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/wx-*/priv %{_libdir}/erlang/lib/wx-*/src %if %{with doc} -%{_libdir}/erlang/man/man3/gl.* -%{_libdir}/erlang/man/man3/glu.* -%{_libdir}/erlang/man/man3/wx.* -%{_libdir}/erlang/man/man3/wx_misc.* -%{_libdir}/erlang/man/man3/wx_object.* -%{_libdir}/erlang/man/man3/wxAcceleratorEntry.* -%{_libdir}/erlang/man/man3/wxAcceleratorTable.* -%{_libdir}/erlang/man/man3/wxActivateEvent.* -%{_libdir}/erlang/man/man3/wxArtProvider.* -%{_libdir}/erlang/man/man3/wxAuiDockArt.* -%{_libdir}/erlang/man/man3/wxAuiManager.* -%{_libdir}/erlang/man/man3/wxAuiManagerEvent.* -%{_libdir}/erlang/man/man3/wxAuiNotebook.* -%{_libdir}/erlang/man/man3/wxAuiNotebookEvent.* -%{_libdir}/erlang/man/man3/wxAuiPaneInfo.* -%{_libdir}/erlang/man/man3/wxAuiSimpleTabArt.* -%{_libdir}/erlang/man/man3/wxAuiTabArt.* -%{_libdir}/erlang/man/man3/wxBitmap.* -%{_libdir}/erlang/man/man3/wxBitmapButton.* -%{_libdir}/erlang/man/man3/wxBitmapDataObject.* -%{_libdir}/erlang/man/man3/wxBoxSizer.* -%{_libdir}/erlang/man/man3/wxBrush.* -%{_libdir}/erlang/man/man3/wxBufferedDC.* -%{_libdir}/erlang/man/man3/wxBufferedPaintDC.* -%{_libdir}/erlang/man/man3/wxButton.* -%{_libdir}/erlang/man/man3/wxCalendarCtrl.* -%{_libdir}/erlang/man/man3/wxCalendarDateAttr.* -%{_libdir}/erlang/man/man3/wxCalendarEvent.* -%{_libdir}/erlang/man/man3/wxCaret.* -%{_libdir}/erlang/man/man3/wxCheckBox.* -%{_libdir}/erlang/man/man3/wxCheckListBox.* -%{_libdir}/erlang/man/man3/wxChildFocusEvent.* -%{_libdir}/erlang/man/man3/wxChoice.* -%{_libdir}/erlang/man/man3/wxChoicebook.* -%{_libdir}/erlang/man/man3/wxClientDC.* -%{_libdir}/erlang/man/man3/wxClipboard.* -%{_libdir}/erlang/man/man3/wxClipboardTextEvent.* -%{_libdir}/erlang/man/man3/wxCloseEvent.* -%{_libdir}/erlang/man/man3/wxColourData.* -%{_libdir}/erlang/man/man3/wxColourDialog.* -%{_libdir}/erlang/man/man3/wxColourPickerCtrl.* -%{_libdir}/erlang/man/man3/wxColourPickerEvent.* -%{_libdir}/erlang/man/man3/wxComboBox.* -%{_libdir}/erlang/man/man3/wxCommandEvent.* -%{_libdir}/erlang/man/man3/wxContextMenuEvent.* -%{_libdir}/erlang/man/man3/wxControl.* -%{_libdir}/erlang/man/man3/wxControlWithItems.* -%{_libdir}/erlang/man/man3/wxCursor.* -%{_libdir}/erlang/man/man3/wxDataObject.* -%{_libdir}/erlang/man/man3/wxDateEvent.* -%{_libdir}/erlang/man/man3/wxDatePickerCtrl.* -%{_libdir}/erlang/man/man3/wxDC.* -%{_libdir}/erlang/man/man3/wxDCOverlay.* -%{_libdir}/erlang/man/man3/wxDialog.* -%{_libdir}/erlang/man/man3/wxDirDialog.* -%{_libdir}/erlang/man/man3/wxDirPickerCtrl.* -%{_libdir}/erlang/man/man3/wxDisplayChangedEvent.* -%{_libdir}/erlang/man/man3/wxDropFilesEvent.* -%{_libdir}/erlang/man/man3/wxEraseEvent.* -%{_libdir}/erlang/man/man3/wxEvent.* -%{_libdir}/erlang/man/man3/wxEvtHandler.* -%{_libdir}/erlang/man/man3/wxFileDataObject.* -%{_libdir}/erlang/man/man3/wxFileDialog.* -%{_libdir}/erlang/man/man3/wxFileDirPickerEvent.* -%{_libdir}/erlang/man/man3/wxFilePickerCtrl.* -%{_libdir}/erlang/man/man3/wxFindReplaceData.* -%{_libdir}/erlang/man/man3/wxFindReplaceDialog.* -%{_libdir}/erlang/man/man3/wxFlexGridSizer.* -%{_libdir}/erlang/man/man3/wxFocusEvent.* -%{_libdir}/erlang/man/man3/wxFont.* -%{_libdir}/erlang/man/man3/wxFontData.* -%{_libdir}/erlang/man/man3/wxFontDialog.* -%{_libdir}/erlang/man/man3/wxFontPickerCtrl.* -%{_libdir}/erlang/man/man3/wxFontPickerEvent.* -%{_libdir}/erlang/man/man3/wxFrame.* -%{_libdir}/erlang/man/man3/wxGauge.* -%{_libdir}/erlang/man/man3/wxGBSizerItem.* -%{_libdir}/erlang/man/man3/wxGenericDirCtrl.* -%{_libdir}/erlang/man/man3/wxGLCanvas.* -%{_libdir}/erlang/man/man3/wxGraphicsBrush.* -%{_libdir}/erlang/man/man3/wxGraphicsContext.* -%{_libdir}/erlang/man/man3/wxGraphicsFont.* -%{_libdir}/erlang/man/man3/wxGraphicsMatrix.* -%{_libdir}/erlang/man/man3/wxGraphicsObject.* -%{_libdir}/erlang/man/man3/wxGraphicsPath.* -%{_libdir}/erlang/man/man3/wxGraphicsPen.* -%{_libdir}/erlang/man/man3/wxGraphicsRenderer.* -%{_libdir}/erlang/man/man3/wxGrid.* -%{_libdir}/erlang/man/man3/wxGridBagSizer.* -%{_libdir}/erlang/man/man3/wxGridCellAttr.* -%{_libdir}/erlang/man/man3/wxGridCellBoolEditor.* -%{_libdir}/erlang/man/man3/wxGridCellBoolRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellChoiceEditor.* -%{_libdir}/erlang/man/man3/wxGridCellEditor.* -%{_libdir}/erlang/man/man3/wxGridCellFloatEditor.* -%{_libdir}/erlang/man/man3/wxGridCellFloatRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellNumberEditor.* -%{_libdir}/erlang/man/man3/wxGridCellNumberRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellStringRenderer.* -%{_libdir}/erlang/man/man3/wxGridCellTextEditor.* -%{_libdir}/erlang/man/man3/wxGridEvent.* -%{_libdir}/erlang/man/man3/wxGridSizer.* -%{_libdir}/erlang/man/man3/wxHelpEvent.* -%{_libdir}/erlang/man/man3/wxHtmlEasyPrinting.* -%{_libdir}/erlang/man/man3/wxHtmlLinkEvent.* -%{_libdir}/erlang/man/man3/wxHtmlWindow.* -%{_libdir}/erlang/man/man3/wxIcon.* -%{_libdir}/erlang/man/man3/wxIconBundle.* -%{_libdir}/erlang/man/man3/wxIconizeEvent.* -%{_libdir}/erlang/man/man3/wxIdleEvent.* -%{_libdir}/erlang/man/man3/wxImage.* -%{_libdir}/erlang/man/man3/wxImageList.* -%{_libdir}/erlang/man/man3/wxInitDialogEvent.* -%{_libdir}/erlang/man/man3/wxJoystickEvent.* -%{_libdir}/erlang/man/man3/wxKeyEvent.* -%{_libdir}/erlang/man/man3/wxLayoutAlgorithm.* -%{_libdir}/erlang/man/man3/wxListbook.* -%{_libdir}/erlang/man/man3/wxListBox.* -%{_libdir}/erlang/man/man3/wxListCtrl.* -%{_libdir}/erlang/man/man3/wxListEvent.* -%{_libdir}/erlang/man/man3/wxListItem.* -%{_libdir}/erlang/man/man3/wxListItemAttr.* -%{_libdir}/erlang/man/man3/wxListView.* -%{_libdir}/erlang/man/man3/wxLocale.* -%{_libdir}/erlang/man/man3/wxLogNull.* -%{_libdir}/erlang/man/man3/wxMask.* -%{_libdir}/erlang/man/man3/wxMaximizeEvent.* -%{_libdir}/erlang/man/man3/wxMDIChildFrame.* -%{_libdir}/erlang/man/man3/wxMDIClientWindow.* -%{_libdir}/erlang/man/man3/wxMDIParentFrame.* -%{_libdir}/erlang/man/man3/wxMemoryDC.* -%{_libdir}/erlang/man/man3/wxMenu.* -%{_libdir}/erlang/man/man3/wxMenuBar.* -%{_libdir}/erlang/man/man3/wxMenuEvent.* -%{_libdir}/erlang/man/man3/wxMenuItem.* -%{_libdir}/erlang/man/man3/wxMessageDialog.* -%{_libdir}/erlang/man/man3/wxMiniFrame.* -%{_libdir}/erlang/man/man3/wxMirrorDC.* -%{_libdir}/erlang/man/man3/wxMouseCaptureChangedEvent.* -%{_libdir}/erlang/man/man3/wxMouseCaptureLostEvent.* -%{_libdir}/erlang/man/man3/wxMouseEvent.* -%{_libdir}/erlang/man/man3/wxMoveEvent.* -%{_libdir}/erlang/man/man3/wxMultiChoiceDialog.* -%{_libdir}/erlang/man/man3/wxNavigationKeyEvent.* -%{_libdir}/erlang/man/man3/wxNotebook.* -%{_libdir}/erlang/man/man3/wxNotebookEvent.* -%{_libdir}/erlang/man/man3/wxNotifyEvent.* -%{_libdir}/erlang/man/man3/wxOverlay.* -%{_libdir}/erlang/man/man3/wxPageSetupDialog.* -%{_libdir}/erlang/man/man3/wxPageSetupDialogData.* -%{_libdir}/erlang/man/man3/wxPaintDC.* -%{_libdir}/erlang/man/man3/wxPaintEvent.* -%{_libdir}/erlang/man/man3/wxPalette.* -%{_libdir}/erlang/man/man3/wxPaletteChangedEvent.* -%{_libdir}/erlang/man/man3/wxPanel.* -%{_libdir}/erlang/man/man3/wxPasswordEntryDialog.* -%{_libdir}/erlang/man/man3/wxPen.* -%{_libdir}/erlang/man/man3/wxPickerBase.* -%{_libdir}/erlang/man/man3/wxPopupTransientWindow.* -%{_libdir}/erlang/man/man3/wxPopupWindow.* -%{_libdir}/erlang/man/man3/wxPostScriptDC.* -%{_libdir}/erlang/man/man3/wxPreviewCanvas.* -%{_libdir}/erlang/man/man3/wxPreviewControlBar.* -%{_libdir}/erlang/man/man3/wxPreviewFrame.* -%{_libdir}/erlang/man/man3/wxPrintData.* -%{_libdir}/erlang/man/man3/wxPrintDialog.* -%{_libdir}/erlang/man/man3/wxPrintDialogData.* -%{_libdir}/erlang/man/man3/wxPrinter.* -%{_libdir}/erlang/man/man3/wxPrintout.* -%{_libdir}/erlang/man/man3/wxPrintPreview.* -%{_libdir}/erlang/man/man3/wxProgressDialog.* -%{_libdir}/erlang/man/man3/wxQueryNewPaletteEvent.* -%{_libdir}/erlang/man/man3/wxRadioBox.* -%{_libdir}/erlang/man/man3/wxRadioButton.* -%{_libdir}/erlang/man/man3/wxRegion.* -%{_libdir}/erlang/man/man3/wxSashEvent.* -%{_libdir}/erlang/man/man3/wxSashLayoutWindow.* -%{_libdir}/erlang/man/man3/wxSashWindow.* -%{_libdir}/erlang/man/man3/wxScreenDC.* -%{_libdir}/erlang/man/man3/wxScrollBar.* -%{_libdir}/erlang/man/man3/wxScrolledWindow.* -%{_libdir}/erlang/man/man3/wxScrollEvent.* -%{_libdir}/erlang/man/man3/wxScrollWinEvent.* -%{_libdir}/erlang/man/man3/wxSetCursorEvent.* -%{_libdir}/erlang/man/man3/wxShowEvent.* -%{_libdir}/erlang/man/man3/wxSingleChoiceDialog.* -%{_libdir}/erlang/man/man3/wxSizeEvent.* -%{_libdir}/erlang/man/man3/wxSizer.* -%{_libdir}/erlang/man/man3/wxSizerFlags.* -%{_libdir}/erlang/man/man3/wxSizerItem.* -%{_libdir}/erlang/man/man3/wxSlider.* -%{_libdir}/erlang/man/man3/wxSpinButton.* -%{_libdir}/erlang/man/man3/wxSpinCtrl.* -%{_libdir}/erlang/man/man3/wxSpinEvent.* -%{_libdir}/erlang/man/man3/wxSplashScreen.* -%{_libdir}/erlang/man/man3/wxSplitterEvent.* -%{_libdir}/erlang/man/man3/wxSplitterWindow.* -%{_libdir}/erlang/man/man3/wxStaticBitmap.* -%{_libdir}/erlang/man/man3/wxStaticBox.* -%{_libdir}/erlang/man/man3/wxStaticBoxSizer.* -%{_libdir}/erlang/man/man3/wxStaticLine.* -%{_libdir}/erlang/man/man3/wxStaticText.* -%{_libdir}/erlang/man/man3/wxStatusBar.* -%{_libdir}/erlang/man/man3/wxStdDialogButtonSizer.* -%{_libdir}/erlang/man/man3/wxStyledTextCtrl.* -%{_libdir}/erlang/man/man3/wxStyledTextEvent.* -%{_libdir}/erlang/man/man3/wxSysColourChangedEvent.* -%{_libdir}/erlang/man/man3/wxSystemOptions.* -%{_libdir}/erlang/man/man3/wxSystemSettings.* -%{_libdir}/erlang/man/man3/wxTaskBarIcon.* -%{_libdir}/erlang/man/man3/wxTaskBarIconEvent.* -%{_libdir}/erlang/man/man3/wxTextAttr.* -%{_libdir}/erlang/man/man3/wxTextCtrl.* -%{_libdir}/erlang/man/man3/wxTextDataObject.* -%{_libdir}/erlang/man/man3/wxTextEntryDialog.* -%{_libdir}/erlang/man/man3/wxToggleButton.* -%{_libdir}/erlang/man/man3/wxToolBar.* -%{_libdir}/erlang/man/man3/wxToolbook.* -%{_libdir}/erlang/man/man3/wxToolTip.* -%{_libdir}/erlang/man/man3/wxTopLevelWindow.* -%{_libdir}/erlang/man/man3/wxTreebook.* -%{_libdir}/erlang/man/man3/wxTreeCtrl.* -%{_libdir}/erlang/man/man3/wxTreeEvent.* -%{_libdir}/erlang/man/man3/wxUpdateUIEvent.* -%{_libdir}/erlang/man/man3/wxWindow.* -%{_libdir}/erlang/man/man3/wxWindowCreateEvent.* -%{_libdir}/erlang/man/man3/wxWindowDC.* -%{_libdir}/erlang/man/man3/wxWindowDestroyEvent.* -%{_libdir}/erlang/man/man3/wxXmlResource.* +%{_mandir}/man3/gl.* +%{_mandir}/man3/glu.* +%{_mandir}/man3/wx.* +%{_mandir}/man3/wx_misc.* +%{_mandir}/man3/wx_object.* +%{_mandir}/man3/wxAcceleratorEntry.* +%{_mandir}/man3/wxAcceleratorTable.* +%{_mandir}/man3/wxActivateEvent.* +%{_mandir}/man3/wxArtProvider.* +%{_mandir}/man3/wxAuiDockArt.* +%{_mandir}/man3/wxAuiManager.* +%{_mandir}/man3/wxAuiManagerEvent.* +%{_mandir}/man3/wxAuiNotebook.* +%{_mandir}/man3/wxAuiNotebookEvent.* +%{_mandir}/man3/wxAuiPaneInfo.* +%{_mandir}/man3/wxAuiSimpleTabArt.* +%{_mandir}/man3/wxAuiTabArt.* +%{_mandir}/man3/wxBitmap.* +%{_mandir}/man3/wxBitmapButton.* +%{_mandir}/man3/wxBitmapDataObject.* +%{_mandir}/man3/wxBoxSizer.* +%{_mandir}/man3/wxBrush.* +%{_mandir}/man3/wxBufferedDC.* +%{_mandir}/man3/wxBufferedPaintDC.* +%{_mandir}/man3/wxButton.* +%{_mandir}/man3/wxCalendarCtrl.* +%{_mandir}/man3/wxCalendarDateAttr.* +%{_mandir}/man3/wxCalendarEvent.* +%{_mandir}/man3/wxCaret.* +%{_mandir}/man3/wxCheckBox.* +%{_mandir}/man3/wxCheckListBox.* +%{_mandir}/man3/wxChildFocusEvent.* +%{_mandir}/man3/wxChoice.* +%{_mandir}/man3/wxChoicebook.* +%{_mandir}/man3/wxClientDC.* +%{_mandir}/man3/wxClipboard.* +%{_mandir}/man3/wxClipboardTextEvent.* +%{_mandir}/man3/wxCloseEvent.* +%{_mandir}/man3/wxColourData.* +%{_mandir}/man3/wxColourDialog.* +%{_mandir}/man3/wxColourPickerCtrl.* +%{_mandir}/man3/wxColourPickerEvent.* +%{_mandir}/man3/wxComboBox.* +%{_mandir}/man3/wxCommandEvent.* +%{_mandir}/man3/wxContextMenuEvent.* +%{_mandir}/man3/wxControl.* +%{_mandir}/man3/wxControlWithItems.* +%{_mandir}/man3/wxCursor.* +%{_mandir}/man3/wxDataObject.* +%{_mandir}/man3/wxDateEvent.* +%{_mandir}/man3/wxDatePickerCtrl.* +%{_mandir}/man3/wxDC.* +%{_mandir}/man3/wxDCOverlay.* +%{_mandir}/man3/wxDialog.* +%{_mandir}/man3/wxDirDialog.* +%{_mandir}/man3/wxDirPickerCtrl.* +%{_mandir}/man3/wxDisplayChangedEvent.* +%{_mandir}/man3/wxDropFilesEvent.* +%{_mandir}/man3/wxEraseEvent.* +%{_mandir}/man3/wxEvent.* +%{_mandir}/man3/wxEvtHandler.* +%{_mandir}/man3/wxFileDataObject.* +%{_mandir}/man3/wxFileDialog.* +%{_mandir}/man3/wxFileDirPickerEvent.* +%{_mandir}/man3/wxFilePickerCtrl.* +%{_mandir}/man3/wxFindReplaceData.* +%{_mandir}/man3/wxFindReplaceDialog.* +%{_mandir}/man3/wxFlexGridSizer.* +%{_mandir}/man3/wxFocusEvent.* +%{_mandir}/man3/wxFont.* +%{_mandir}/man3/wxFontData.* +%{_mandir}/man3/wxFontDialog.* +%{_mandir}/man3/wxFontPickerCtrl.* +%{_mandir}/man3/wxFontPickerEvent.* +%{_mandir}/man3/wxFrame.* +%{_mandir}/man3/wxGauge.* +%{_mandir}/man3/wxGBSizerItem.* +%{_mandir}/man3/wxGenericDirCtrl.* +%{_mandir}/man3/wxGLCanvas.* +%{_mandir}/man3/wxGraphicsBrush.* +%{_mandir}/man3/wxGraphicsContext.* +%{_mandir}/man3/wxGraphicsFont.* +%{_mandir}/man3/wxGraphicsMatrix.* +%{_mandir}/man3/wxGraphicsObject.* +%{_mandir}/man3/wxGraphicsPath.* +%{_mandir}/man3/wxGraphicsPen.* +%{_mandir}/man3/wxGraphicsRenderer.* +%{_mandir}/man3/wxGrid.* +%{_mandir}/man3/wxGridBagSizer.* +%{_mandir}/man3/wxGridCellAttr.* +%{_mandir}/man3/wxGridCellBoolEditor.* +%{_mandir}/man3/wxGridCellBoolRenderer.* +%{_mandir}/man3/wxGridCellChoiceEditor.* +%{_mandir}/man3/wxGridCellEditor.* +%{_mandir}/man3/wxGridCellFloatEditor.* +%{_mandir}/man3/wxGridCellFloatRenderer.* +%{_mandir}/man3/wxGridCellNumberEditor.* +%{_mandir}/man3/wxGridCellNumberRenderer.* +%{_mandir}/man3/wxGridCellRenderer.* +%{_mandir}/man3/wxGridCellStringRenderer.* +%{_mandir}/man3/wxGridCellTextEditor.* +%{_mandir}/man3/wxGridEvent.* +%{_mandir}/man3/wxGridSizer.* +%{_mandir}/man3/wxHelpEvent.* +%{_mandir}/man3/wxHtmlEasyPrinting.* +%{_mandir}/man3/wxHtmlLinkEvent.* +%{_mandir}/man3/wxHtmlWindow.* +%{_mandir}/man3/wxIcon.* +%{_mandir}/man3/wxIconBundle.* +%{_mandir}/man3/wxIconizeEvent.* +%{_mandir}/man3/wxIdleEvent.* +%{_mandir}/man3/wxImage.* +%{_mandir}/man3/wxImageList.* +%{_mandir}/man3/wxInitDialogEvent.* +%{_mandir}/man3/wxJoystickEvent.* +%{_mandir}/man3/wxKeyEvent.* +%{_mandir}/man3/wxLayoutAlgorithm.* +%{_mandir}/man3/wxListbook.* +%{_mandir}/man3/wxListBox.* +%{_mandir}/man3/wxListCtrl.* +%{_mandir}/man3/wxListEvent.* +%{_mandir}/man3/wxListItem.* +%{_mandir}/man3/wxListItemAttr.* +%{_mandir}/man3/wxListView.* +%{_mandir}/man3/wxLocale.* +%{_mandir}/man3/wxLogNull.* +%{_mandir}/man3/wxMask.* +%{_mandir}/man3/wxMaximizeEvent.* +%{_mandir}/man3/wxMDIChildFrame.* +%{_mandir}/man3/wxMDIClientWindow.* +%{_mandir}/man3/wxMDIParentFrame.* +%{_mandir}/man3/wxMemoryDC.* +%{_mandir}/man3/wxMenu.* +%{_mandir}/man3/wxMenuBar.* +%{_mandir}/man3/wxMenuEvent.* +%{_mandir}/man3/wxMenuItem.* +%{_mandir}/man3/wxMessageDialog.* +%{_mandir}/man3/wxMiniFrame.* +%{_mandir}/man3/wxMirrorDC.* +%{_mandir}/man3/wxMouseCaptureChangedEvent.* +%{_mandir}/man3/wxMouseCaptureLostEvent.* +%{_mandir}/man3/wxMouseEvent.* +%{_mandir}/man3/wxMoveEvent.* +%{_mandir}/man3/wxMultiChoiceDialog.* +%{_mandir}/man3/wxNavigationKeyEvent.* +%{_mandir}/man3/wxNotebook.* +%{_mandir}/man3/wxNotebookEvent.* +%{_mandir}/man3/wxNotifyEvent.* +%{_mandir}/man3/wxOverlay.* +%{_mandir}/man3/wxPageSetupDialog.* +%{_mandir}/man3/wxPageSetupDialogData.* +%{_mandir}/man3/wxPaintDC.* +%{_mandir}/man3/wxPaintEvent.* +%{_mandir}/man3/wxPalette.* +%{_mandir}/man3/wxPaletteChangedEvent.* +%{_mandir}/man3/wxPanel.* +%{_mandir}/man3/wxPasswordEntryDialog.* +%{_mandir}/man3/wxPen.* +%{_mandir}/man3/wxPickerBase.* +%{_mandir}/man3/wxPopupTransientWindow.* +%{_mandir}/man3/wxPopupWindow.* +%{_mandir}/man3/wxPostScriptDC.* +%{_mandir}/man3/wxPreviewCanvas.* +%{_mandir}/man3/wxPreviewControlBar.* +%{_mandir}/man3/wxPreviewFrame.* +%{_mandir}/man3/wxPrintData.* +%{_mandir}/man3/wxPrintDialog.* +%{_mandir}/man3/wxPrintDialogData.* +%{_mandir}/man3/wxPrinter.* +%{_mandir}/man3/wxPrintout.* +%{_mandir}/man3/wxPrintPreview.* +%{_mandir}/man3/wxProgressDialog.* +%{_mandir}/man3/wxQueryNewPaletteEvent.* +%{_mandir}/man3/wxRadioBox.* +%{_mandir}/man3/wxRadioButton.* +%{_mandir}/man3/wxRegion.* +%{_mandir}/man3/wxSashEvent.* +%{_mandir}/man3/wxSashLayoutWindow.* +%{_mandir}/man3/wxSashWindow.* +%{_mandir}/man3/wxScreenDC.* +%{_mandir}/man3/wxScrollBar.* +%{_mandir}/man3/wxScrolledWindow.* +%{_mandir}/man3/wxScrollEvent.* +%{_mandir}/man3/wxScrollWinEvent.* +%{_mandir}/man3/wxSetCursorEvent.* +%{_mandir}/man3/wxShowEvent.* +%{_mandir}/man3/wxSingleChoiceDialog.* +%{_mandir}/man3/wxSizeEvent.* +%{_mandir}/man3/wxSizer.* +%{_mandir}/man3/wxSizerFlags.* +%{_mandir}/man3/wxSizerItem.* +%{_mandir}/man3/wxSlider.* +%{_mandir}/man3/wxSpinButton.* +%{_mandir}/man3/wxSpinCtrl.* +%{_mandir}/man3/wxSpinEvent.* +%{_mandir}/man3/wxSplashScreen.* +%{_mandir}/man3/wxSplitterEvent.* +%{_mandir}/man3/wxSplitterWindow.* +%{_mandir}/man3/wxStaticBitmap.* +%{_mandir}/man3/wxStaticBox.* +%{_mandir}/man3/wxStaticBoxSizer.* +%{_mandir}/man3/wxStaticLine.* +%{_mandir}/man3/wxStaticText.* +%{_mandir}/man3/wxStatusBar.* +%{_mandir}/man3/wxStdDialogButtonSizer.* +%{_mandir}/man3/wxStyledTextCtrl.* +%{_mandir}/man3/wxStyledTextEvent.* +%{_mandir}/man3/wxSysColourChangedEvent.* +%{_mandir}/man3/wxSystemOptions.* +%{_mandir}/man3/wxSystemSettings.* +%{_mandir}/man3/wxTaskBarIcon.* +%{_mandir}/man3/wxTaskBarIconEvent.* +%{_mandir}/man3/wxTextAttr.* +%{_mandir}/man3/wxTextCtrl.* +%{_mandir}/man3/wxTextDataObject.* +%{_mandir}/man3/wxTextEntryDialog.* +%{_mandir}/man3/wxToggleButton.* +%{_mandir}/man3/wxToolBar.* +%{_mandir}/man3/wxToolbook.* +%{_mandir}/man3/wxToolTip.* +%{_mandir}/man3/wxTopLevelWindow.* +%{_mandir}/man3/wxTreebook.* +%{_mandir}/man3/wxTreeCtrl.* +%{_mandir}/man3/wxTreeEvent.* +%{_mandir}/man3/wxUpdateUIEvent.* +%{_mandir}/man3/wxWindow.* +%{_mandir}/man3/wxWindowCreateEvent.* +%{_mandir}/man3/wxWindowDC.* +%{_mandir}/man3/wxWindowDestroyEvent.* +%{_mandir}/man3/wxXmlResource.* %endif %endif %{__with_wxwidgets} %files xmerl %{_libdir}/erlang/lib/xmerl-*/ %if %{with doc} -%{_libdir}/erlang/man/man3/xmerl.* -%{_libdir}/erlang/man/man3/xmerl_eventp.* -%{_libdir}/erlang/man/man3/xmerl_sax_parser.* -%{_libdir}/erlang/man/man3/xmerl_scan.* -%{_libdir}/erlang/man/man3/xmerl_xpath.* -%{_libdir}/erlang/man/man3/xmerl_xs.* -%{_libdir}/erlang/man/man3/xmerl_xsd.* +%{_mandir}/man3/xmerl.* +%{_mandir}/man3/xmerl_eventp.* +%{_mandir}/man3/xmerl_sax_parser.* +%{_mandir}/man3/xmerl_scan.* +%{_mandir}/man3/xmerl_xpath.* +%{_mandir}/man3/xmerl_xs.* +%{_mandir}/man3/xmerl_xsd.* %endif %changelog +* Thu Sep 20 2018 Peter Lemenkov - 20.3.8.9-2 +- Install man-pages into system-wide directories (as Debian already did). + * Tue Sep 18 2018 Peter Lemenkov - 20.3.8.9-1 - Ver. 20.3.8.9 diff --git a/otp-0010-Load-man-pages-from-system-wide-directory.patch b/otp-0010-Load-man-pages-from-system-wide-directory.patch new file mode 100644 index 0000000..a5eab25 --- /dev/null +++ b/otp-0010-Load-man-pages-from-system-wide-directory.patch @@ -0,0 +1,25 @@ +From: Francois-Denis Gonthier +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 793cb532b3..2368a2c97b 100644 +--- a/erts/etc/common/erlexec.c ++++ b/erts/etc/common/erlexec.c +@@ -712,8 +712,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 diff --git a/sources b/sources index 4e9ec01..e05f309 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (otp-OTP-20.3.8.8.tar.gz) = b56237a53e5bb9450929c71d5357bc1102bc8687fd1e5635e5b548cf1d3f0adb546bd5b1551802b6d2d0c76c9fd2fb7f712073b58cb9269242761f11717e0ff1 SHA512 (otp-OTP-20.3.8.9.tar.gz) = 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7 From 5cae8cdcfe9dac14cdca4eda483a06dc4ef0b65f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 20 Sep 2018 17:10:23 +0300 Subject: [PATCH 158/340] Typo Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index c9be29c..12cd624 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1027,7 +1027,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/erlang/erts-*/man %if %{with doc} # Move man-pages to a system-wide directory - in the same way as Debian did # Erlang files from man 3 have too generic names -for m in $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/* +for manpage in $RPM_BUILD_ROOT%{_libdir}/erlang/man/man3/* do mv ${manpage} ${manpage}erl done From 381702ce0525ab8d320d65acba580e6719588fb4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 16 Nov 2018 12:49:48 +0300 Subject: [PATCH 159/340] Erlang ver. 20.3.8.14 Signed-off-by: Peter Lemenkov --- epmd.socket | 2 +- epmd@.socket | 2 +- erlang.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmd.socket b/epmd.socket index 8eee066..34817e0 100644 --- a/epmd.socket +++ b/epmd.socket @@ -2,7 +2,7 @@ Description=Erlang Port Mapper Daemon Activation Socket [Socket] -ListenStream=127.0.0.1:4369 +ListenStream=4369 Accept=false [Install] diff --git a/epmd@.socket b/epmd@.socket index 5dda63d..f3e5338 100644 --- a/epmd@.socket +++ b/epmd@.socket @@ -2,7 +2,7 @@ Description=Erlang Port Mapper Daemon Activation Socket [Socket] -ListenStream=%i:4369 +ListenStream=%I Accept=false [Install] diff --git a/erlang.spec b/erlang.spec index 12cd624..0be014a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.8.9 -Release: 2%{?dist} +Version: 20.3.8.14 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2230,6 +2230,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Nov 16 2018 Peter Lemenkov - 20.3.8.14 +- Ver. 20.3.8.14 +- Fix epmd systemd files + * Thu Sep 20 2018 Peter Lemenkov - 20.3.8.9-2 - Install man-pages into system-wide directories (as Debian already did). diff --git a/sources b/sources index e05f309..ba19d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.9.tar.gz) = 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7 +SHA512 (otp-OTP-20.3.8.14.tar.gz) = 27c1b3bc33e72788129899539d9c4ae7f656c279f7a2cdf1416b2f13953bef5b75d5476d2332d92092a0e4a1609aced85e9714fc3abd4f5ffff7540a8bcfa54a From e156e77857c41b1fafb49df05a22ec2bce689847 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 10 Dec 2018 14:57:13 +0300 Subject: [PATCH 160/340] Erlang ver. 20.3.8.15 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0be014a..b4e1a12 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.14 +Version: 20.3.8.15 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2230,6 +2230,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Dec 10 2018 Peter Lemenkov - 20.3.8.15 +- Ver. 20.3.8.15 + * Fri Nov 16 2018 Peter Lemenkov - 20.3.8.14 - Ver. 20.3.8.14 - Fix epmd systemd files diff --git a/sources b/sources index ba19d83..86a6bbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.14.tar.gz) = 27c1b3bc33e72788129899539d9c4ae7f656c279f7a2cdf1416b2f13953bef5b75d5476d2332d92092a0e4a1609aced85e9714fc3abd4f5ffff7540a8bcfa54a +SHA512 (otp-OTP-20.3.8.15.tar.gz) = 6dc442c908dbfaf3cc32e11b650137481cf8e7f768406aeba3c045c9e5e2bc20253e8022caf1ccdccd85e063f53c475aadf37cbf0b81569e14d6b146bce98318 From f24f488f0e48786b432430c2f897bc3f7a7a2356 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Jan 2019 12:20:10 +0300 Subject: [PATCH 161/340] Erlang ver. 20.3.8.16 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index b4e1a12..aee4b4f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.15 +Version: 20.3.8.16 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2230,10 +2230,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog -* Mon Dec 10 2018 Peter Lemenkov - 20.3.8.15 +* Tue Jan 08 2019 Peter Lemenkov - 20.3.8.16-1 +- Ver. 20.3.8.16 + +* Mon Dec 10 2018 Peter Lemenkov - 20.3.8.15-1 - Ver. 20.3.8.15 -* Fri Nov 16 2018 Peter Lemenkov - 20.3.8.14 +* Fri Nov 16 2018 Peter Lemenkov - 20.3.8.14-1 - Ver. 20.3.8.14 - Fix epmd systemd files diff --git a/sources b/sources index 86a6bbf..4f05812 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.15.tar.gz) = 6dc442c908dbfaf3cc32e11b650137481cf8e7f768406aeba3c045c9e5e2bc20253e8022caf1ccdccd85e063f53c475aadf37cbf0b81569e14d6b146bce98318 +SHA512 (otp-OTP-20.3.8.16.tar.gz) = a83511d8dce08cbd494535e037cd63d1892589af6a55c14cb00cf8c54af80a3d3ff723b2d3bf2d040bea2522586585aa672cdbf9cf4b651c80bf4cf484081ce2 From 42988d5d18907143ee3116665afe413e9894619c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 10 Jan 2019 12:34:06 +0300 Subject: [PATCH 162/340] Erlang ver. 20.3.8.17 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index aee4b4f..caa9942 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 20.3.8.16 +Version: 20.3.8.17 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -2230,6 +2230,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 10 2019 Peter Lemenkov - 20.3.8.17-1 +- Ver. 20.3.8.17 + * Tue Jan 08 2019 Peter Lemenkov - 20.3.8.16-1 - Ver. 20.3.8.16 diff --git a/sources b/sources index 4f05812..8d99f6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.16.tar.gz) = a83511d8dce08cbd494535e037cd63d1892589af6a55c14cb00cf8c54af80a3d3ff723b2d3bf2d040bea2522586585aa672cdbf9cf4b651c80bf4cf484081ce2 +SHA512 (otp-OTP-20.3.8.17.tar.gz) = 85f278b89873927bdeba495bbbf732227f2d38e4160c4b7ba104fc787e011142e59d0169832653c6405725ae3e943fd8c1f7d954b79db44f1822ff00a2901ddf From 54bf40d43a841552912cded8ef9ce2bc814a6930 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 15 Jan 2019 18:38:56 +0300 Subject: [PATCH 163/340] Fix issue with nodes info querying Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +- otp-0011-Improve-nodes-querying.patch | 134 ++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 otp-0011-Improve-nodes-querying.patch diff --git a/erlang.spec b/erlang.spec index caa9942..cf60398 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -103,6 +103,7 @@ Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch Patch8: otp-0008-Add-extra-search-directory.patch Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch +Patch11: otp-0011-Improve-nodes-querying.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -880,7 +881,7 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif -CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd \ +CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \ %{?__with_hipe:--enable-hipe} \ %if %{__with_java} \ @@ -2230,6 +2231,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jan 15 2019 Peter Lemenkov - 20.3.8.17-2 +- Fix issue with nodes info querying +- Enable verbose build logs + * Thu Jan 10 2019 Peter Lemenkov - 20.3.8.17-1 - Ver. 20.3.8.17 diff --git a/otp-0011-Improve-nodes-querying.patch b/otp-0011-Improve-nodes-querying.patch new file mode 100644 index 0000000..3fe0dea --- /dev/null +++ b/otp-0011-Improve-nodes-querying.patch @@ -0,0 +1,134 @@ +From: Peter Lemenkov +Date: Wed, 24 Oct 2018 14:58:41 +0200 +Subject: [PATCH] Improve nodes querying + +We've got a few similar stacktraces once. See the following one for +example: + +** Reason for termination == +** {badarg, + [{ets,next,[sys_dist,'rabbitmq-cli-42@host.example.com'],[]}, + {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1025}]}, + {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1019}]}, + {net_kernel,get_nodes_info,0,[{file,"net_kernel.erl"},{line,1439}]}, + {rabbit_mgmt_external_stats,cluster_links,0, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,252}]}, + {rabbit_mgmt_external_stats,emit_node_node_stats,1, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,366}]}, + {rabbit_mgmt_external_stats,handle_info,2, + [{file,"src/rabbit_mgmt_external_stats.erl"},{line,347}]}, + {gen_server,try_dispatch,4,[{file,"gen_server.erl"},{line,615}]}]} + +The problem is that when we're trying to query a list of connected +nodes, we're doing it in the following way: + + Call for the first record in ETS + While not EOF: + Call for the next record in ETS + +What happens, when some Node disconnects during the "not EOF" loop? +We'll get an exception. + +Let's do it differently - query a list of nodes in one shot, and then +get info from each of the nodes in list (w/o extra calls to ets). These +individual calls care of disconnected nodes so everything will be fine +even if a node disconnects. + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl +index 7da89dd7cb..f57324b67f 100644 +--- a/lib/kernel/src/net_kernel.erl ++++ b/lib/kernel/src/net_kernel.erl +@@ -609,24 +609,16 @@ code_change(_OldVsn, State, _Extra) -> + + terminate(no_network, State) -> + lists:foreach( +- fun({Node, Type}) -> +- case Type of +- normal -> ?nodedown(Node, State); +- _ -> ok +- end +- end, get_up_nodes() ++ [{node(), normal}]); ++ fun(Node) -> ?nodedown(Node, State) ++ end, get_nodes_up_normal() ++ [node()]); + terminate(_Reason, State) -> + lists:foreach( + fun(#listen {listen = Listen,module = Mod}) -> + Mod:close(Listen) + end, State#state.listen), + lists:foreach( +- fun({Node, Type}) -> +- case Type of +- normal -> ?nodedown(Node, State); +- _ -> ok +- end +- end, get_up_nodes() ++ [{node(), normal}]). ++ fun(Node) -> ?nodedown(Node, State) ++ end, get_nodes_up_normal() ++ [node()]). + + + %% ------------------------------------------------------------ +@@ -1045,35 +1037,10 @@ disconnect_pid(Pid, State) -> + %% + %% + %% +-get_nodes(Which) -> +- get_nodes(ets:first(sys_dist), Which). + +-get_nodes('$end_of_table', _) -> +- []; +-get_nodes(Key, Which) -> +- case ets:lookup(sys_dist, Key) of +- [Conn = #connection{state = up}] -> +- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), +- Which)]; +- [Conn = #connection{}] when Which =:= all -> +- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), +- Which)]; +- _ -> +- get_nodes(ets:next(sys_dist, Key), Which) +- end. +- +-%% Return a list of all nodes that are 'up'. +-get_up_nodes() -> +- get_up_nodes(ets:first(sys_dist)). +- +-get_up_nodes('$end_of_table') -> []; +-get_up_nodes(Key) -> +- case ets:lookup(sys_dist, Key) of +- [#connection{state=up,node=Node,type=Type}] -> +- [{Node,Type}|get_up_nodes(ets:next(sys_dist, Key))]; +- _ -> +- get_up_nodes(ets:next(sys_dist, Key)) +- end. ++%% Return a list of all nodes that are 'up' and not hidden. ++get_nodes_up_normal() -> ++ ets:select(sys_dist, [{#connection{node = '$1', state = up, type = normal, _ = '_'}, [], ['$1']}]). + + ticker(Kernel, Tick) when is_integer(Tick) -> + process_flag(priority, max), +@@ -1525,15 +1492,14 @@ get_node_info(Node, Key) -> + end. + + get_nodes_info() -> +- get_nodes_info(get_nodes(all), []). +- +-get_nodes_info([Node|Nodes], InfoList) -> +- case get_node_info(Node) of +- {ok, Info} -> get_nodes_info(Nodes, [{Node, Info}|InfoList]); +- _ -> get_nodes_info(Nodes, InfoList) +- end; +-get_nodes_info([], InfoList) -> +- {ok, InfoList}. ++ Nodes = ets:select(sys_dist, [{#connection{node = '$1', _ = '_'}, [], ['$1']}]), ++ {ok, lists:filtermap( ++ fun(Node) -> ++ case get_node_info(Node) of ++ {ok, Info} -> {true, {Node, Info}}; ++ _ -> false ++ end ++ end, Nodes)}. + + %% ------------------------------------------------------------ + %% Misc. functions From 6225c31c982e20de7083430ca48cfdb579491135 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Jan 2019 17:21:00 +0300 Subject: [PATCH 164/340] Erlang ver. 20.3.8.18 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index cf60398..c839044 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.8.17 -Release: 2%{?dist} +Version: 20.3.8.18 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -2231,6 +2231,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jan 22 2019 Peter Lemenkov - 20.3.8.18-1 +- Ver. 20.3.8.18 + * Tue Jan 15 2019 Peter Lemenkov - 20.3.8.17-2 - Fix issue with nodes info querying - Enable verbose build logs diff --git a/sources b/sources index 8d99f6d..8808637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.17.tar.gz) = 85f278b89873927bdeba495bbbf732227f2d38e4160c4b7ba104fc787e011142e59d0169832653c6405725ae3e943fd8c1f7d954b79db44f1822ff00a2901ddf +SHA512 (otp-OTP-20.3.8.18.tar.gz) = 877649835dcf79db7f8940cfbd5db882b10bb5a2652386680b1cecfa2d60fcd2939a9e2cc3710cda49194286e598f752d81e6e6119f40f4e43aef7efbbe5cbd8 From c1298c308537c976b3d9ae7e7ff576b1fa871901 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:43 +0100 Subject: [PATCH 165/340] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- erlang.spec | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/erlang.spec b/erlang.spec index c839044..155adc0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,6 @@ Version: 20.3.8.18 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment -Group: Development/Languages License: ASL 2.0 URL: https://www.erlang.org %if ! (0%{?rhel} && 0%{?rhel} <= 6) @@ -205,7 +204,6 @@ systems from Ericsson. %package asn1 Summary: Provides support for Abstract Syntax Notation One -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -216,7 +214,6 @@ Provides support for Abstract Syntax Notation One. %if %{__with_wxwidgets} %package common_test Summary: A portable framework for automatic testing -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} @@ -240,7 +237,6 @@ A portable framework for automatic testing. %package compiler Summary: A byte code compiler for Erlang which produces highly compact code -Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} @@ -252,7 +248,6 @@ A byte code compiler for Erlang which produces highly compact code. %package cosEvent Summary: Orber OMG Event Service -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} @@ -263,7 +258,6 @@ Orber OMG Event Service. %package cosEventDomain Summary: Orber OMG Event Domain Service -Group: Development/Languages Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -275,7 +269,6 @@ Orber OMG Event Domain Service. %package cosFileTransfer Summary: Orber OMG File Transfer Service -Group: Development/Languages Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -289,7 +282,6 @@ Orber OMG File Transfer Service. %package cosNotification Summary: Orber OMG Notification Service -Group: Development/Languages Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} Requires: %{name}-cosTime%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -302,7 +294,6 @@ Orber OMG Notification Service. %package cosProperty Summary: Orber OMG Property Service -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -314,7 +305,6 @@ Orber OMG Property Service. %package cosTime Summary: Orber OMG Timer and TimerEvent Service -Group: Development/Languages Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -326,7 +316,6 @@ Orber OMG Timer and TimerEvent Service. %package cosTransactions Summary: Orber OMG Transaction Service -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} @@ -337,7 +326,6 @@ Orber OMG Transaction Service. %package crypto Summary: Cryptographical support -Group: Development/Languages BuildRequires: pkgconfig(openssl) Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -349,7 +337,6 @@ Cryptographical support. %if %{__with_wxwidgets} %package debugger Summary: A debugger for debugging and testing of Erlang programs -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -363,7 +350,6 @@ A debugger for debugging and testing of Erlang programs. %if %{__with_wxwidgets} %package dialyzer Summary: A DIscrepancy AnaLYZer for ERlang programs -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} @@ -380,7 +366,6 @@ A DIscrepancy AnaLYZer for ERlang programs. %package diameter Summary: Diameter (RFC 3588) library -Group: Development/Languages BuildRequires: ed Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -395,7 +380,6 @@ Diameter (RFC 3588) library %if %{with doc} %package doc Summary: Erlang documentation -Group: Development/Languages BuildRequires: fop BuildRequires: libxslt BuildArch: noarch @@ -406,7 +390,6 @@ Documentation for Erlang. %package edoc Summary: A utility used to generate documentation out of tags in source files -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -419,7 +402,6 @@ A utility used to generate documentation out of tags in source files. %package eldap Summary: Erlang LDAP library -Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -431,7 +413,6 @@ Erlang LDAP library. %package erl_docgen Summary: A utility used to generate erlang HTML documentation -Group: Development/Languages Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -442,7 +423,6 @@ A utility used to generate erlang HTML documentation. %package erl_interface Summary: Low level interface to C -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description erl_interface @@ -450,7 +430,6 @@ Low level interface to C. %package erts Summary: Functionality necessary to run the Erlang System itself -Group: Development/Languages BuildRequires: lksctp-tools-devel BuildRequires: m4 BuildRequires: ncurses-devel @@ -484,7 +463,6 @@ Functionality necessary to run the Erlang System itself. %if %{__with_wxwidgets} %package et Summary: An event tracer for Erlang programs -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} @@ -497,7 +475,6 @@ An event tracer for Erlang programs. %package eunit Summary: Support for unit testing -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -508,7 +485,6 @@ Support for unit testing. %if %{__with_examples} %package examples Summary: Examples for some Erlang modules -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} @@ -522,7 +498,6 @@ Examples for some Erlang modules. %package hipe Summary: High Performance Erlang -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -534,7 +509,6 @@ High Performance Erlang. %package ic Summary: IDL compiler -Group: Development/Languages %if %{__with_java} BuildRequires: java-devel Requires: javapackages-tools @@ -548,7 +522,6 @@ IDL compiler. %package inets Summary: A set of services such as a Web server and a ftp client etc -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -562,7 +535,6 @@ A set of services such as a Web server and a ftp client etc. %if %{__with_java} %package jinterface Summary: A library for accessing Java from Erlang -Group: Development/Languages BuildRequires: java-devel Requires: javapackages-tools Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -573,7 +545,6 @@ Low level interface to Java. %package kernel Summary: Main erlang library -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -583,7 +554,6 @@ Main erlang library. %if %{__with_wxwidgets} %package megaco Summary: Megaco/H.248 support library -Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -600,7 +570,6 @@ from media conversion. %package mnesia Summary: A heavy duty real-time distributed database -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -611,7 +580,6 @@ A heavy duty real-time distributed database. %if %{__with_wxwidgets} %package observer Summary: A set of tools for tracing and investigation of distributed systems -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -626,7 +594,6 @@ A set of tools for tracing and investigation of distributed systems. %package odbc Summary: A library for unixODBC support in Erlang -Group: Development/Languages BuildRequires: unixODBC-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -638,7 +605,6 @@ Connectivity). %package orber Summary: A CORBA Object Request Broker -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -651,7 +617,6 @@ A CORBA Object Request Broker. %package os_mon Summary: A monitor which allows inspection of the underlying operating system -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -665,7 +630,6 @@ A monitor which allows inspection of the underlying operating system. %package otp_mibs Summary: SNMP management information base for Erlang/OTP nodes -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -677,7 +641,6 @@ SNMP management information base for Erlang/OTP nodes. %package parsetools Summary: A set of parsing and lexical analysis tools -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -687,7 +650,6 @@ A set of parsing and lexical analysis tools. %package public_key Summary: API to public key infrastructure -Group: Development/Languages Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -700,7 +662,6 @@ API to public key infrastructure. %if %{__with_wxwidgets} %package reltool Summary: A release management tool -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} @@ -719,7 +680,6 @@ for generation of customized target systems. %package runtime_tools Summary: A set of tools to include in a production system -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -730,7 +690,6 @@ A set of tools to include in a production system. %package sasl Summary: The System Architecture Support Libraries -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -742,7 +701,6 @@ release upgrades and alarm handling etc. %package snmp Summary: Simple Network Management Protocol (SNMP) support -Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -756,7 +714,6 @@ MIB compiler and tools for creating SNMP agents. %package ssh Summary: Secure Shell application with sftp and ssh support -Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -768,7 +725,6 @@ Secure Shell application with sftp and ssh support. %package ssl Summary: Secure Socket Layer support -Group: Development/Languages Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -781,7 +737,6 @@ Secure Socket Layer support. %package stdlib Summary: The Erlang standard libraries -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -792,7 +747,6 @@ The Erlang standard libraries. %package syntax_tools Summary: A set of tools for dealing with erlang sources -Group: Development/Languages Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -804,7 +758,6 @@ reading source files differently, pretty-printing syntax trees. %package tools Summary: A set of programming tools including a coverage analyzer etc -Group: Development/Languages %if %{__with_emacs} BuildRequires: emacs BuildRequires: emacs-el @@ -837,7 +790,6 @@ A set of programming tools including a coverage analyzer etc. %if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang -Group: Development/Languages BuildRequires: wxGTK3-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} @@ -851,7 +803,6 @@ A Graphics System used to write platform independent user interfaces. %package xmerl Summary: Provides support for XML 1.0 -Group: Development/Languages Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} From e86010329a849523974388dcb5b65f50b8a6f589 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 18:46:02 +0000 Subject: [PATCH 166/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 155adc0..e5ad726 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 20.3.8.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -2182,6 +2182,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 20.3.8.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 22 2019 Peter Lemenkov - 20.3.8.18-1 - Ver. 20.3.8.18 From 0cc610b48f4bf8df7f1c7504f4ee5c215672e24c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 31 Jan 2019 12:56:33 +0300 Subject: [PATCH 167/340] Erlang ver. 21.2.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 373 ++++-------------- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 19 +- otp-0004-Do-not-install-Java-sources.patch | 15 +- ...teventlog-and-related-doc-files-on-n.patch | 2 +- otp-0006-Do-not-install-erlang-sources.patch | 232 ++--------- ... otp-0007-Add-extra-search-directory.patch | 2 +- ...erl_epmd-port_please-when-using-IPv6.patch | 26 -- ...08-Avoid-forking-sed-to-get-basename.patch | 0 ...man-pages-from-system-wide-directory.patch | 4 +- ...h => otp-0010-Improve-nodes-querying.patch | 8 +- sources | 2 +- 12 files changed, 125 insertions(+), 562 deletions(-) rename otp-0008-Add-extra-search-directory.patch => otp-0007-Add-extra-search-directory.patch (96%) delete mode 100644 otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch rename otp-0009-Avoid-forking-sed-to-get-basename.patch => otp-0008-Avoid-forking-sed-to-get-basename.patch (100%) rename otp-0010-Load-man-pages-from-system-wide-directory.patch => otp-0009-Load-man-pages-from-system-wide-directory.patch (89%) rename otp-0011-Improve-nodes-querying.patch => otp-0010-Improve-nodes-querying.patch (95%) diff --git a/erlang.spec b/erlang.spec index e5ad726..ca182a3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -20,7 +20,7 @@ ## %global __with_emacs 1 -%global __with_xemacs 1 +%global __with_xemacs 0 %global __with_examples 1 %global __with_java 1 # @@ -60,8 +60,8 @@ Name: erlang -Version: 20.3.8.18 -Release: 2%{?dist} +Version: 21.2.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -98,11 +98,10 @@ Patch3: otp-0003-Do-not-install-C-sources.patch Patch4: otp-0004-Do-not-install-Java-sources.patch Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Patch6: otp-0006-Do-not-install-erlang-sources.patch -Patch7: otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch -Patch8: otp-0008-Add-extra-search-directory.patch -Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch -Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch -Patch11: otp-0011-Improve-nodes-querying.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 +Patch10: otp-0010-Improve-nodes-querying.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -132,13 +131,6 @@ Requires: %{name}-asn1%{?_isa} = %{version}-%{release} Requires: %{name}-common_test%{?_isa} = %{version}-%{release} %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} @@ -156,10 +148,8 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-eunit%{?_isa} = %{version}-%{release} +Requires: %{name}-ftp%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} -%if %{__with_java} -Requires: %{name}-ic%{?_isa} = %{version}-%{release} -%endif %{__with_java} Requires: %{name}-inets%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} @@ -173,7 +163,6 @@ Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} @@ -188,6 +177,7 @@ Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} +Requires: %{name}-tftp%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} @@ -246,84 +236,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description compiler A byte code compiler for Erlang which produces highly compact code. -%package cosEvent -Summary: Orber OMG Event Service -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosEvent -Orber OMG Event Service. - -%package cosEventDomain -Summary: Orber OMG Event Domain Service -Requires: %{name}-cosNotification%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosEventDomain -Orber OMG Event Domain Service. - -%package cosFileTransfer -Summary: Orber OMG File Transfer Service -Requires: %{name}-cosProperty%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-ssl%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosFileTransfer -Orber OMG File Transfer Service. - -%package cosNotification -Summary: Orber OMG Notification Service -Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} -Requires: %{name}-cosTime%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosNotification -Orber OMG Notification Service. - -%package cosProperty -Summary: Orber OMG Property Service -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosProperty -Orber OMG Property Service. - -%package cosTime -Summary: Orber OMG Timer and TimerEvent Service -Requires: %{name}-cosEvent%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosTime -Orber OMG Timer and TimerEvent Service. - -%package cosTransactions -Summary: Orber OMG Transaction Service -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-orber%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description cosTransactions -Orber OMG Transaction Service. - %package crypto Summary: Cryptographical support BuildRequires: pkgconfig(openssl) @@ -444,14 +356,15 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.13 +Provides: erlang(erl_nif_version) = 2.14 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs Obsoletes: erlang-inviso Obsoletes: erlang-ose -Obsoletes: erlang-percept +# Moved to https://github.com/erlang/percept +Obsoletes: erlang-percept < 20.2.3 Obsoletes: erlang-pman Obsoletes: erlang-toolbar Obsoletes: erlang-tv @@ -496,6 +409,15 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Examples for some Erlang modules. %endif %{__with_examples} +%package ftp +Summary: FTP client +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description ftp +FTP client. + %package hipe Summary: High Performance Erlang Requires: %{name}-compiler%{?_isa} = %{version}-%{release} @@ -507,21 +429,8 @@ Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} %description hipe High Performance Erlang. -%package ic -Summary: IDL compiler -%if %{__with_java} -BuildRequires: java-devel -Requires: javapackages-tools -%endif %{__with_java} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description ic -IDL compiler. - %package inets -Summary: A set of services such as a Web server and a ftp client etc +Summary: A set of services such as a Web server and a HTTP client etc Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} @@ -530,7 +439,7 @@ Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description inets -A set of services such as a Web server and a ftp client etc. +A set of services such as a Web server and a HTTP client etc. %if %{__with_java} %package jinterface @@ -603,18 +512,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} An interface to relational SQL-databases built on ODBC (Open Database Connectivity). -%package orber -Summary: A CORBA Object Request Broker -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-ssl%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description orber -A CORBA Object Request Broker. - %package os_mon Summary: A monitor which allows inspection of the underlying operating system Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -756,6 +653,15 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. +%package tftp +Summary: TFTP client +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} + +%description tftp +TFTP client. + %package tools Summary: A set of programming tools including a coverage analyzer etc %if %{__with_emacs} @@ -1014,11 +920,6 @@ done # symlink *.jar files to appropriate places for subpackages install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" -# erlang-ic -ic_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ic-*/ | sed "s,^$RPM_BUILD_ROOT,,")" -test -d "$RPM_BUILD_ROOT$ic_lib_dir" -ln -s "${ic_lib_dir}priv/ic.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" - # erlang-jinterface jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" @@ -1119,124 +1020,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/compile.* %endif -%files cosEvent -%{_libdir}/erlang/lib/cosEvent-*/ -%if %{with doc} -%{_mandir}/man3/cosEventApp.* -%{_mandir}/man3/CosEventChannelAdmin.* -%{_mandir}/man3/CosEventChannelAdmin_ConsumerAdmin.* -%{_mandir}/man3/CosEventChannelAdmin_EventChannel.* -%{_mandir}/man3/CosEventChannelAdmin_ProxyPullConsumer.* -%{_mandir}/man3/CosEventChannelAdmin_ProxyPullSupplier.* -%{_mandir}/man3/CosEventChannelAdmin_ProxyPushConsumer.* -%{_mandir}/man3/CosEventChannelAdmin_ProxyPushSupplier.* -%{_mandir}/man3/CosEventChannelAdmin_SupplierAdmin.* -%endif - -%files cosEventDomain -%{_libdir}/erlang/lib/cosEventDomain-*/ -%if %{with doc} -%{_mandir}/man3/CosEventDomainAdmin.* -%{_mandir}/man3/CosEventDomainAdmin_EventDomain.* -%{_mandir}/man3/CosEventDomainAdmin_EventDomainFactory.* -%{_mandir}/man3/cosEventDomainApp.* -%endif - -%files cosFileTransfer -%dir %{_libdir}/erlang/lib/cosFileTransfer-*/ -%{_libdir}/erlang/lib/cosFileTransfer-*/ebin -%{_libdir}/erlang/lib/cosFileTransfer-*/include -%{_libdir}/erlang/lib/cosFileTransfer-*/src -%if %{with doc} -%{_mandir}/man3/cosFileTransferApp.* -%{_mandir}/man3/CosFileTransfer_Directory.* -%{_mandir}/man3/CosFileTransfer_File.* -%{_mandir}/man3/CosFileTransfer_FileIterator.* -%{_mandir}/man3/CosFileTransfer_FileTransferSession.* -%{_mandir}/man3/CosFileTransfer_VirtualFileSystem.* -%endif - -%files cosNotification -%dir %{_libdir}/erlang/lib/cosNotification-*/ -%{_libdir}/erlang/lib/cosNotification-*/ebin -%{_libdir}/erlang/lib/cosNotification-*/include -%{_libdir}/erlang/lib/cosNotification-*/src -%if %{with doc} -%{_mandir}/man3/CosNotification.* -%{_mandir}/man3/CosNotification_AdminPropertiesAdmin.* -%{_mandir}/man3/cosNotificationApp.* -%{_mandir}/man3/CosNotification_QoSAdmin.* -%{_mandir}/man3/CosNotifyChannelAdmin_ConsumerAdmin.* -%{_mandir}/man3/CosNotifyChannelAdmin_EventChannel.* -%{_mandir}/man3/CosNotifyChannelAdmin_EventChannelFactory.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxyConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPullSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxyPushSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_ProxySupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPullSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_SequenceProxyPushSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPullSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushConsumer.* -%{_mandir}/man3/CosNotifyChannelAdmin_StructuredProxyPushSupplier.* -%{_mandir}/man3/CosNotifyChannelAdmin_SupplierAdmin.* -%{_mandir}/man3/CosNotifyComm_NotifyPublish.* -%{_mandir}/man3/CosNotifyComm_NotifySubscribe.* -%{_mandir}/man3/CosNotifyFilter_Filter.* -%{_mandir}/man3/CosNotifyFilter_FilterAdmin.* -%{_mandir}/man3/CosNotifyFilter_FilterFactory.* -%{_mandir}/man3/CosNotifyFilter_MappingFilter.* -%endif - -%files cosProperty -%dir %{_libdir}/erlang/lib/cosProperty-*/ -%{_libdir}/erlang/lib/cosProperty-*/ebin -%{_libdir}/erlang/lib/cosProperty-*/include -%{_libdir}/erlang/lib/cosProperty-*/src -%if %{with doc} -%{_mandir}/man3/cosProperty.* -%{_mandir}/man3/CosPropertyService_PropertiesIterator.* -%{_mandir}/man3/CosPropertyService_PropertyNamesIterator.* -%{_mandir}/man3/CosPropertyService_PropertySet.* -%{_mandir}/man3/CosPropertyService_PropertySetDef.* -%{_mandir}/man3/CosPropertyService_PropertySetDefFactory.* -%{_mandir}/man3/CosPropertyService_PropertySetFactory.* -%endif - -%files cosTime -%dir %{_libdir}/erlang/lib/cosTime-*/ -%{_libdir}/erlang/lib/cosTime-*/ebin -%{_libdir}/erlang/lib/cosTime-*/include -%{_libdir}/erlang/lib/cosTime-*/src -%if %{with doc} -%{_mandir}/man3/cosTime.* -%{_mandir}/man3/CosTimerEvent_TimerEventHandler.* -%{_mandir}/man3/CosTimerEvent_TimerEventService.* -%{_mandir}/man3/CosTime_TimeService.* -%{_mandir}/man3/CosTime_TIO.* -%{_mandir}/man3/CosTime_UTO.* -%endif - -%files cosTransactions -%dir %{_libdir}/erlang/lib/cosTransactions-*/ -%{_libdir}/erlang/lib/cosTransactions-*/ebin -%{_libdir}/erlang/lib/cosTransactions-*/include -%{_libdir}/erlang/lib/cosTransactions-*/src -%if %{with doc} -%{_mandir}/man3/cosTransactions.* -%{_mandir}/man3/CosTransactions_Control.* -%{_mandir}/man3/CosTransactions_Coordinator.* -%{_mandir}/man3/CosTransactions_RecoveryCoordinator.* -%{_mandir}/man3/CosTransactions_Resource.* -%{_mandir}/man3/CosTransactions_SubtransactionAwareResource.* -%{_mandir}/man3/CosTransactions_Terminator.* -%{_mandir}/man3/CosTransactions_TransactionFactory.* -%endif - %files crypto %{_libdir}/erlang/lib/crypto-*/ %if %{with doc} @@ -1258,7 +1041,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files dialyzer %{_bindir}/dialyzer # FIXME FIXME FIXME this must be installed properly!!!!!! -#%%{_bindir}/typer +%{_bindir}/typer %{_libdir}/erlang/bin/dialyzer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/dialyzer @@ -1394,6 +1177,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man1/run_erl.* %{_mandir}/man1/start.* %{_mandir}/man1/start_erl.* +%{_mandir}/man3/atomics.* +%{_mandir}/man3/counters.* %{_mandir}/man3/driver_entry.* %{_mandir}/man3/erl_driver.* %{_mandir}/man3/erl_nif.* @@ -1402,6 +1187,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erlang.* %{_mandir}/man3/erts_alloc.* %{_mandir}/man3/init.* +%{_mandir}/man3/persistent_term.* +%{_mandir}/man3/scheduler.* %{_mandir}/man3/zlib.* %endif %{_libdir}/erlang/releases/* @@ -1445,9 +1232,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/et-*/examples/ %endif %{__with_wxwidgets} %{_libdir}/erlang/lib/eunit-*/examples/ -%if %{__with_java} -%{_libdir}/erlang/lib/ic-*/examples/ -%endif %{__with_java} %{_libdir}/erlang/lib/inets-*/examples/ %{_libdir}/erlang/lib/kernel-*/examples/ %{_libdir}/erlang/lib/megaco-*/examples/ @@ -1455,7 +1239,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/observer-*/examples/ %endif %{__with_wxwidgets} -%{_libdir}/erlang/lib/orber-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/reltool-*/examples/ %endif %{__with_wxwidgets} @@ -1471,26 +1254,17 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %{__with_wxwidgets} %endif %{__with_examples} +%files ftp +%dir %{_libdir}/erlang/lib/ftp-*/ +%{_libdir}/erlang/lib/ftp-*/ebin +%{_libdir}/erlang/lib/ftp-*/src +%if %{with doc} +%{_mandir}/man3/ftp.* +%endif + %files hipe %{_libdir}/erlang/lib/hipe-*/ -%files ic -%dir %{_libdir}/erlang/lib/ic-*/ -%{_libdir}/erlang/lib/ic-*/ebin -%{_libdir}/erlang/lib/ic-*/include -%{_libdir}/erlang/lib/ic-*/priv -%{_libdir}/erlang/lib/ic-*/src -%if %{__with_java} -# FIXME see also erlang-jinterface -%dir %{_javadir}/%{name}/ -%{_javadir}/%{name}/ic.jar -%endif %{__with_java} -%if %{with doc} -%{_mandir}/man3/ic.* -%{_mandir}/man3/ic_clib.* -%{_mandir}/man3/ic_c_protocol.* -%endif - %files inets %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin @@ -1515,7 +1289,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{__with_java} %files jinterface -# FIXME see also erlang-ic %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ @@ -1533,6 +1306,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/disk_log.* %{_mandir}/man3/erl_boot_server.* %{_mandir}/man3/erl_ddll.* +%{_mandir}/man3/erl_epmd.* %{_mandir}/man3/erl_prim_loader_stub.* %{_mandir}/man3/erlang_stub.* %{_mandir}/man3/error_handler.* @@ -1547,6 +1321,11 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/inet.* %{_mandir}/man3/inet_res.* %{_mandir}/man3/init_stub.* +%{_mandir}/man3/logger.* +%{_mandir}/man3/logger_disk_log_h.* +%{_mandir}/man3/logger_filters.* +%{_mandir}/man3/logger_formatter.* +%{_mandir}/man3/logger_std_h.* %{_mandir}/man3/net_adm.* %{_mandir}/man3/net_kernel.* %{_mandir}/man3/os.* @@ -1617,34 +1396,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/odbc.* %endif -%files orber -%dir %{_libdir}/erlang/lib/orber-*/ -%{_libdir}/erlang/lib/orber-*/COSS -%{_libdir}/erlang/lib/orber-*/ebin -%{_libdir}/erlang/lib/orber-*/include -%{_libdir}/erlang/lib/orber-*/java_src -%{_libdir}/erlang/lib/orber-*/priv -%{_libdir}/erlang/lib/orber-*/src -%if %{with doc} -%{_mandir}/man3/CosNaming.* -%{_mandir}/man3/CosNaming_BindingIterator.* -%{_mandir}/man3/CosNaming_NamingContext.* -%{_mandir}/man3/CosNaming_NamingContextExt.* -%{_mandir}/man3/Module_Interface.* -%{_mandir}/man3/any.* -%{_mandir}/man3/corba.* -%{_mandir}/man3/corba_object.* -%{_mandir}/man3/fixed.* -%{_mandir}/man3/interceptors.* -%{_mandir}/man3/lname.* -%{_mandir}/man3/lname_component.* -%{_mandir}/man3/orber.* -%{_mandir}/man3/orber_acl.* -%{_mandir}/man3/orber_diagnostics.* -%{_mandir}/man3/orber_ifr.* -%{_mandir}/man3/orber_tc.* -%endif - %files os_mon %{_libdir}/erlang/lib/os_mon-*/ %if %{with doc} @@ -1785,9 +1536,11 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/ssh-*/src %if %{with doc} %{_mandir}/man3/ssh.* -%{_mandir}/man3/ssh_channel.* +%{_mandir}/man3/ssh_client_channel.* %{_mandir}/man3/ssh_client_key_api.* %{_mandir}/man3/ssh_connection.* +%{_mandir}/man3/ssh_file.* +%{_mandir}/man3/ssh_server_channel.* %{_mandir}/man3/ssh_server_key_api.* %{_mandir}/man3/ssh_sftp.* %{_mandir}/man3/ssh_sftpd.* @@ -1845,7 +1598,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/gen_statem.* %{_mandir}/man3/io.* %{_mandir}/man3/io_lib.* -%{_mandir}/man3/lib.* %{_mandir}/man3/lists.* %{_mandir}/man3/log_mf_h.* %{_mandir}/man3/maps.* @@ -1872,6 +1624,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/sys.* %{_mandir}/man3/timer.* %{_mandir}/man3/unicode.* +%{_mandir}/man3/uri_string.* %{_mandir}/man3/zip.* %{_mandir}/man6/stdlib.* %endif @@ -1894,12 +1647,21 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/prettypr.* %endif +%files tftp +%dir %{_libdir}/erlang/lib/tftp-*/ +%{_libdir}/erlang/lib/tftp-*/ebin +%{_libdir}/erlang/lib/tftp-*/src +%if %{with doc} +%{_mandir}/man3/tftp.* +%endif + %files tools %dir %{_libdir}/erlang/lib/tools-*/ %{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/src +%{_libdir}/erlang/lib/tools-*/priv %if %{with doc} %{_mandir}/man3/cover.* %{_mandir}/man3/cprof.* @@ -2182,6 +1944,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 31 2019 Peter Lemenkov - 21.2.4-1 +- Ver. 21.2.4 +- Removed cosEvent, cosEventDomain, cosFileTransfer, cosNotification, + cosProperty, cosTime, cosTransactions, ic, orber applications +- Added ftp, tftp applications +- Disabled XEmacs support (fails to build) + * Thu Jan 31 2019 Fedora Release Engineering - 20.3.8.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index be12bd8..5f2f83f 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 5b1b9119ce..02535a78bc 100644 +index 1f35cef669..f603eb2946 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -495,10 +495,6 @@ endif +@@ -496,10 +496,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 18c53c6..e5c04fd 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -48,7 +48,7 @@ index a4a6c158cc..13658302f5 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 69b5b6003d..ba9a0e74b8 100644 +index 614e7325a9..993167175b 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) @@ -74,23 +74,6 @@ index 69b5b6003d..ba9a0e74b8 100644 release_docs: -diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index c0dad59557..9a19028ff3 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 c37ad4d702..09bf1efe95 100644 --- a/lib/megaco/src/flex/Makefile.in diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 8948d81..7b8bbd4 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -4,21 +4,8 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov -diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -index 21c38e54b5..eeba2e4eae 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 001acfdd2e..35b2eb3446 100644 +index ee616f3d7e..fdd28e79b3 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: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 50af2de..7a1ca77 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 4aa8879a91..46dfde42f1 100644 +index 354f8ed26b..12adcfbcf2 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) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 1bd9697..9aecad5 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index edb9f35258..6ee4ac2251 100644 +index e1bd5bc295..a4833521d1 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -94,8 +94,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -34,7 +34,7 @@ index ba459f6cd3..5565126214 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 9d751996ad..b96a11225c 100644 +index 80eaed70bd..cde0c6823d 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -63,10 +63,10 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index ef6db66ff6..4c9be713aa 100644 +index 2408c76b48..700e236964 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -173,8 +173,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -77,104 +77,8 @@ index ef6db66ff6..4c9be713aa 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index 29d6223005..cb433090d2 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 cdaf9e5f1f..6e4e9b8c52 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 b3967101e9..2678c2a642 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 009c6be4a5..83c2e26057 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 1fdc258a6d..90cf7116b7 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 55d59baea3..f22e2c81db 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 4cc1e487c2..084f0a7230 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 edad0e6b61..00a30c010f 100644 +index 1753ba4f36..2cd09475e8 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -81,8 +81,6 @@ docs: @@ -213,10 +117,10 @@ index fc08e7ca2f..2464a15c3f 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 3af856f63e..9630a89ba6 100644 +index 98636ed6e2..171846f1e4 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -251,11 +251,8 @@ release_spec: opt +@@ -250,11 +250,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -301,7 +205,7 @@ index 3510d3cc93..9179e9b4c2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 9f50d6bf91..df92b84c0d 100644 +index f653dce36f..7cc5c06528 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -379,7 +283,7 @@ index e5033e444b..74a444b386 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 5abc9ec049..664df3b0c6 100644 +index becdd0b7d8..da8f66343f 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -412,32 +316,6 @@ index 20b1c3bf50..40c642a441 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index 6ad2fbeeb7..258517da6f 100644 ---- a/lib/ic/src/Makefile -+++ b/lib/ic/src/Makefile -@@ -200,7 +200,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" - $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" - $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" -diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile -index 6b99694ea7..530a19ecea 100644 ---- a/lib/inets/src/ftp/Makefile -+++ b/lib/inets/src/ftp/Makefile -@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/ftp" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile index a1c1f36b70..f2eb86f7ac 100644 --- a/lib/inets/src/http_client/Makefile @@ -478,10 +356,10 @@ index 1c05d454a5..88f9f62d3b 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index eb0098dbee..fff21ff740 100644 +index ec1ae70305..88c084ef58 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -490,24 +368,11 @@ index eb0098dbee..fff21ff740 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile -index 4eaa959cce..198fbf3106 100644 ---- a/lib/inets/src/tftp/Makefile -+++ b/lib/inets/src/tftp/Makefile -@@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/tftp" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 5946620f0f..b8944e0a26 100644 +index 57f17defc8..3c8a0a09e7 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -204,7 +204,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -225,7 +225,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -619,10 +484,10 @@ index 7d316df263..60fdefb5d0 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index ff2bcbdb99..4973158705 100644 +index f9f239db37..dd061f29f4 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -149,7 +149,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -150,7 +150,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -643,34 +508,6 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile -index 108663396c..553c9cdd01 100644 ---- a/lib/orber/COSS/CosNaming/Makefile -+++ b/lib/orber/COSS/CosNaming/Makefile -@@ -145,8 +145,8 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" -- $(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming" -+ $(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming" -+ $(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming" - - - release_docs_spec: -diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 7fec29a000..a71b9f1227 100644 ---- a/lib/orber/src/Makefile -+++ b/lib/orber/src/Makefile -@@ -253,7 +253,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) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" - diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile index e2f4d5a090..57f21a145b 100644 --- a/lib/os_mon/src/Makefile @@ -751,10 +588,10 @@ index 4bddee4664..c714255548 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 5a99c6e240..bdd77fb4f4 100644 +index 76286c5499..d921f9f294 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -98,8 +98,6 @@ docs: +@@ -99,8 +99,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -764,7 +601,7 @@ index 5a99c6e240..bdd77fb4f4 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index ac7ee51100..c53f661675 100644 +index 7338bdf016..a280225dad 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -841,10 +678,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 9e8d80c71f..6ce3dc96ef 100644 +index 6d64a45112..5b1249ca5b 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -854,10 +691,10 @@ index 9e8d80c71f..6ce3dc96ef 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 2e7df9792e..0cd43d3805 100644 +index 8d1341f594..72ab265200 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -867,10 +704,10 @@ index 2e7df9792e..0cd43d3805 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index bf836203ec..e86fb6a6d1 100644 +index c95f7637f7..0f601aefb5 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -212,7 +212,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -214,7 +214,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -879,7 +716,7 @@ index bf836203ec..e86fb6a6d1 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index 8325db45a8..d17fdaa0ec 100644 +index c21d2f49c8..03dbc74ef7 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -891,11 +728,24 @@ index 8325db45a8..d17fdaa0ec 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" +diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile +index 602ae845a4..a1f2f09a00 100644 +--- a/lib/tftp/src/Makefile ++++ b/lib/tftp/src/Makefile +@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index 032bd612db..efb0309eb8 100644 +index cc5bee9a8f..7dfa55cb41 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile -@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0008-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch similarity index 96% rename from otp-0008-Add-extra-search-directory.patch rename to otp-0007-Add-extra-search-directory.patch index 806418b..5551bb0 100644 --- a/otp-0008-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index f5a890cb95..f2bb1a1290 100644 +index 1b4a67ecb7..3602b9e098 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch b/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch deleted file mode 100644 index 866d325..0000000 --- a/otp-0007-Fix-erl_epmd-port_please-when-using-IPv6.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: John Eckersberg -Date: Wed, 14 Jun 2017 12:32:17 -0400 -Subject: [PATCH] Fix erl_epmd:port_please when using IPv6 - -This mirrors the behavior of inet:gethostbyname when no family or -timeout is supplied. - -diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl -index 7bc9e2ede3..f96bc88913 100644 ---- a/lib/kernel/src/erl_epmd.erl -+++ b/lib/kernel/src/erl_epmd.erl -@@ -79,7 +79,13 @@ port_please(Node, EpmdAddr, Timeout) -> - - - port_please1(Node,HostName, Timeout) -> -- case inet:gethostbyname(HostName, inet, Timeout) of -+ Family = case inet_db:res_option(inet6) of -+ true -> -+ inet6; -+ false -> -+ inet -+ end, -+ case inet:gethostbyname(HostName, Family, Timeout) of - {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} -> - get_port(Node, EpmdAddr, Timeout); - Else -> diff --git a/otp-0009-Avoid-forking-sed-to-get-basename.patch b/otp-0008-Avoid-forking-sed-to-get-basename.patch similarity index 100% rename from otp-0009-Avoid-forking-sed-to-get-basename.patch rename to otp-0008-Avoid-forking-sed-to-get-basename.patch diff --git a/otp-0010-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch similarity index 89% rename from otp-0010-Load-man-pages-from-system-wide-directory.patch rename to otp-0009-Load-man-pages-from-system-wide-directory.patch index a5eab25..9cc8256 100644 --- a/otp-0010-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 793cb532b3..2368a2c97b 100644 +index 0cb01fd4ef..f4ab21aab4 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -712,8 +712,10 @@ int main(int argc, char **argv) +@@ -721,8 +721,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0011-Improve-nodes-querying.patch b/otp-0010-Improve-nodes-querying.patch similarity index 95% rename from otp-0011-Improve-nodes-querying.patch rename to otp-0010-Improve-nodes-querying.patch index 3fe0dea..af00198 100644 --- a/otp-0011-Improve-nodes-querying.patch +++ b/otp-0010-Improve-nodes-querying.patch @@ -37,10 +37,10 @@ even if a node disconnects. Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl -index 7da89dd7cb..f57324b67f 100644 +index a9dc77837e..04025cf35b 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl -@@ -609,24 +609,16 @@ code_change(_OldVsn, State, _Extra) -> +@@ -670,24 +670,16 @@ code_change(_OldVsn, State, _Extra) -> terminate(no_network, State) -> lists:foreach( @@ -69,7 +69,7 @@ index 7da89dd7cb..f57324b67f 100644 %% ------------------------------------------------------------ -@@ -1045,35 +1037,10 @@ disconnect_pid(Pid, State) -> +@@ -1139,35 +1131,10 @@ disconnect_pid(Pid, State) -> %% %% %% @@ -108,7 +108,7 @@ index 7da89dd7cb..f57324b67f 100644 ticker(Kernel, Tick) when is_integer(Tick) -> process_flag(priority, max), -@@ -1525,15 +1492,14 @@ get_node_info(Node, Key) -> +@@ -1632,15 +1599,14 @@ get_node_info(Node, Key) -> end. get_nodes_info() -> diff --git a/sources b/sources index 8808637..8d8a804 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-20.3.8.18.tar.gz) = 877649835dcf79db7f8940cfbd5db882b10bb5a2652386680b1cecfa2d60fcd2939a9e2cc3710cda49194286e598f752d81e6e6119f40f4e43aef7efbbe5cbd8 +SHA512 (otp-OTP-21.2.4.tar.gz) = 15b5f96a8159be56016124567ce72c72c7e3b727aabcb408dcc054ae4523c15eec79f33e3df2b283e06dc3f6df09da4d154dbf7a278c6e544ef7d2216662b90d From 4fcc82fa8fd16ff436a5c61004b26478410e8a1c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Feb 2019 13:21:00 +0300 Subject: [PATCH 168/340] Erlang: fix EC detection Signed-off-by: Peter Lemenkov --- erlang.spec | 6 ++++- ...e-EC_GROUP_new_curve_GF2m-function-i.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch diff --git a/erlang.spec b/erlang.spec index ca182a3..1467e61 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 21.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -102,6 +102,7 @@ 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 Patch10: otp-0010-Improve-nodes-querying.patch +Patch11: otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1944,6 +1945,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Feb 04 2019 Peter Lemenkov - 21.2.4-2 +- Fix EC detection + * Thu Jan 31 2019 Peter Lemenkov - 21.2.4-1 - Ver. 21.2.4 - Removed cosEvent, cosEventDomain, cosFileTransfer, cosNotification, diff --git a/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch b/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch new file mode 100644 index 0000000..ee96c42 --- /dev/null +++ b/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch @@ -0,0 +1,22 @@ +From: "Matwey V. Kornilov" +Date: Sat, 21 Dec 2013 00:13:35 +0400 +Subject: [PATCH] In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped + by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, + and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not + HAVE_EC. + + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index df607732bf..a1fe05dd41 100644 +--- a/lib/crypto/c_src/crypto.c ++++ b/lib/crypto/c_src/crypto.c +@@ -168,7 +168,8 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ +- && !defined(OPENSSL_NO_ECDSA) ++ && !defined(OPENSSL_NO_ECDSA) \ ++ && !defined(OPENSSL_NO_EC2M) + # define HAVE_EC + #endif + From 8bdfb92429b6a8b8d09da05065e2d55ed186a633 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 5 Feb 2019 17:51:10 +0300 Subject: [PATCH 169/340] Erlang ver. 21.2.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++-- ...l-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch | 21 +++++++++++++++++++ sources | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch diff --git a/erlang.spec b/erlang.spec index 1467e61..be61d53 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 21.2.4 -Release: 2%{?dist} +Version: 21.2.5 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -103,6 +103,7 @@ Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch Patch10: otp-0010-Improve-nodes-querying.patch Patch11: otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch +Patch12: otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1945,6 +1946,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 05 2019 Peter Lemenkov - 21.2.5-1 +- Ver. 21.2.5 +- Revert: Fix EC detection + * Mon Feb 04 2019 Peter Lemenkov - 21.2.4-2 - Fix EC detection diff --git a/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch b/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch new file mode 100644 index 0000000..63e8092 --- /dev/null +++ b/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch @@ -0,0 +1,21 @@ +From: Peter Lemenkov +Date: Tue, 5 Feb 2019 17:43:18 +0300 +Subject: [PATCH] Revert "In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is + wrapped by #ifndef OPENSSL_NO_EC2M." + +This reverts commit 01593ce68f154686cba0815c8121db5912a5e02a. + +diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c +index a1fe05dd41..df607732bf 100644 +--- a/lib/crypto/c_src/crypto.c ++++ b/lib/crypto/c_src/crypto.c +@@ -168,8 +168,7 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ +- && !defined(OPENSSL_NO_ECDSA) \ +- && !defined(OPENSSL_NO_EC2M) ++ && !defined(OPENSSL_NO_ECDSA) + # define HAVE_EC + #endif + diff --git a/sources b/sources index 8d8a804..65ca37f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.2.4.tar.gz) = 15b5f96a8159be56016124567ce72c72c7e3b727aabcb408dcc054ae4523c15eec79f33e3df2b283e06dc3f6df09da4d154dbf7a278c6e544ef7d2216662b90d +SHA512 (otp-OTP-21.2.5.tar.gz) = f6f68ec6d87d557cd94ca3308f34fd656e770e9446299495a92b7f647e01512110f2941cdbb69b3939ba5ad65ff2c3bb1fd1e63196d14c4c1df69f546a8df73b From 549ec45528fe7a6de4455ad3de37d3ee216f6256 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 19 Feb 2019 12:44:29 +0300 Subject: [PATCH 170/340] Erlang ver. 21.2.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index be61d53..233c79d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 21.2.5 +Version: 21.2.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1946,6 +1946,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 19 2019 Peter Lemenkov - 21.2.6-1 +- Ver. 21.2.6 + * Tue Feb 05 2019 Peter Lemenkov - 21.2.5-1 - Ver. 21.2.5 - Revert: Fix EC detection diff --git a/sources b/sources index 65ca37f..c40bed2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.2.5.tar.gz) = f6f68ec6d87d557cd94ca3308f34fd656e770e9446299495a92b7f647e01512110f2941cdbb69b3939ba5ad65ff2c3bb1fd1e63196d14c4c1df69f546a8df73b +SHA512 (otp-OTP-21.2.6.tar.gz) = 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9 From 4e211dfa6e173fc150f8fbbbb7c0978d16550420 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 19 Feb 2019 16:36:26 +0100 Subject: [PATCH 171/340] Rebuilt against fixed atk (#1626575) --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 233c79d..91d9f0d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 21.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1946,6 +1946,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 19 2019 Kalev Lember - 21.2.6-2 +- Rebuilt against fixed atk (#1626575) + * Tue Feb 19 2019 Peter Lemenkov - 21.2.6-1 - Ver. 21.2.6 From a1e5da3f623a804165ab0f65345a28c2ef58c189 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 Mar 2019 14:14:14 +0300 Subject: [PATCH 172/340] Erlang ver. 21.2.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++---- ...e-EC_GROUP_new_curve_GF2m-function-i.patch | 22 ------------------- ...l-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch | 21 ------------------ sources | 2 +- 4 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch delete mode 100644 otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch diff --git a/erlang.spec b/erlang.spec index 91d9f0d..2abaa3d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,8 +60,8 @@ Name: erlang -Version: 21.2.6 -Release: 2%{?dist} +Version: 21.2.7 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -102,8 +102,6 @@ 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 Patch10: otp-0010-Improve-nodes-querying.patch -Patch11: otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch -Patch12: otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1946,6 +1944,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Mar 07 2019 Peter Lemenkov - 21.2.7-1 +- Ver. 21.2.7 + * Tue Feb 19 2019 Kalev Lember - 21.2.6-2 - Rebuilt against fixed atk (#1626575) diff --git a/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch b/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch deleted file mode 100644 index ee96c42..0000000 --- a/otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: "Matwey V. Kornilov" -Date: Sat, 21 Dec 2013 00:13:35 +0400 -Subject: [PATCH] In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped - by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set, - and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not - HAVE_EC. - - -diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c -index df607732bf..a1fe05dd41 100644 ---- a/lib/crypto/c_src/crypto.c -+++ b/lib/crypto/c_src/crypto.c -@@ -168,7 +168,8 @@ - #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ - && !defined(OPENSSL_NO_EC) \ - && !defined(OPENSSL_NO_ECDH) \ -- && !defined(OPENSSL_NO_ECDSA) -+ && !defined(OPENSSL_NO_ECDSA) \ -+ && !defined(OPENSSL_NO_EC2M) - # define HAVE_EC - #endif - diff --git a/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch b/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch deleted file mode 100644 index 63e8092..0000000 --- a/otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 5 Feb 2019 17:43:18 +0300 -Subject: [PATCH] Revert "In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is - wrapped by #ifndef OPENSSL_NO_EC2M." - -This reverts commit 01593ce68f154686cba0815c8121db5912a5e02a. - -diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c -index a1fe05dd41..df607732bf 100644 ---- a/lib/crypto/c_src/crypto.c -+++ b/lib/crypto/c_src/crypto.c -@@ -168,8 +168,7 @@ - #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ - && !defined(OPENSSL_NO_EC) \ - && !defined(OPENSSL_NO_ECDH) \ -- && !defined(OPENSSL_NO_ECDSA) \ -- && !defined(OPENSSL_NO_EC2M) -+ && !defined(OPENSSL_NO_ECDSA) - # define HAVE_EC - #endif - diff --git a/sources b/sources index c40bed2..176b491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.2.6.tar.gz) = 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9 +SHA512 (otp-OTP-21.2.7.tar.gz) = 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7 From 5f853134dfe68dd0faaf8c9eb5d11d56cf328f09 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 19:53:56 +0300 Subject: [PATCH 173/340] Erlang ver. 21.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0003-Do-not-install-C-sources.patch | 6 +++--- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- otp-0007-Add-extra-search-directory.patch | 2 +- otp-0009-Load-man-pages-from-system-wide-directory.patch | 4 ++-- sources | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2abaa3d..cd1b508 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 21.2.7 +Version: 21.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1944,6 +1944,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 12 2019 Peter Lemenkov - 21.3-1 +- Ver. 21.3 + * Thu Mar 07 2019 Peter Lemenkov - 21.2.7-1 - Ver. 21.2.7 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index e5c04fd..487e573 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -48,7 +48,7 @@ index a4a6c158cc..13658302f5 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 614e7325a9..993167175b 100644 +index b0bb9bfadf..eeff0338c3 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) @@ -117,10 +117,10 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index cfe91917f8..735cdaaaef 100644 +index 289322b6fa..9e2b9b7e7c 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -190,8 +190,6 @@ include ../vsn.mk +@@ -189,8 +189,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 9aecad5..696035c 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 57f17defc8..3c8a0a09e7 100644 +index 3d1506ea08..728fa64869 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -225,7 +225,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -227,7 +227,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index 5551bb0..a8b3649 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 1b4a67ecb7..3602b9e098 100644 +index 68e1205301..0f534ff814 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 9cc8256..a934881 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 0cb01fd4ef..f4ab21aab4 100644 +index 23bbb86333..741b492668 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -721,8 +721,10 @@ int main(int argc, char **argv) +@@ -722,8 +722,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index 176b491..0a6c3d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.2.7.tar.gz) = 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7 +SHA512 (otp-OTP-21.3.tar.gz) = 7001b6a37597e8d78b9b071d517e7be449592d7d7f9f8bf6f555dd3ed58caec429644adf52d9c5669c2e06dafc61149544a730f3dae138a8c25da0f61d06ba83 From 5aa2bc6732806e2fef555ea15c32a37bc543a61a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 20:41:24 +0300 Subject: [PATCH 174/340] Added new man-pages Signed-off-by: Peter Lemenkov --- erlang.spec | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/erlang.spec b/erlang.spec index cd1b508..4deb9fd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1700,8 +1700,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/gl.* %{_mandir}/man3/glu.* %{_mandir}/man3/wx.* -%{_mandir}/man3/wx_misc.* -%{_mandir}/man3/wx_object.* %{_mandir}/man3/wxAcceleratorEntry.* %{_mandir}/man3/wxAcceleratorTable.* %{_mandir}/man3/wxActivateEvent.* @@ -1745,14 +1743,15 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxControl.* %{_mandir}/man3/wxControlWithItems.* %{_mandir}/man3/wxCursor.* +%{_mandir}/man3/wxDC.* +%{_mandir}/man3/wxDCOverlay.* %{_mandir}/man3/wxDataObject.* %{_mandir}/man3/wxDateEvent.* %{_mandir}/man3/wxDatePickerCtrl.* -%{_mandir}/man3/wxDC.* -%{_mandir}/man3/wxDCOverlay.* %{_mandir}/man3/wxDialog.* %{_mandir}/man3/wxDirDialog.* %{_mandir}/man3/wxDirPickerCtrl.* +%{_mandir}/man3/wxDisplay.* %{_mandir}/man3/wxDisplayChangedEvent.* %{_mandir}/man3/wxDropFilesEvent.* %{_mandir}/man3/wxEraseEvent.* @@ -1772,10 +1771,11 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxFontPickerCtrl.* %{_mandir}/man3/wxFontPickerEvent.* %{_mandir}/man3/wxFrame.* -%{_mandir}/man3/wxGauge.* %{_mandir}/man3/wxGBSizerItem.* -%{_mandir}/man3/wxGenericDirCtrl.* +%{_mandir}/man3/wxGCDC.* %{_mandir}/man3/wxGLCanvas.* +%{_mandir}/man3/wxGauge.* +%{_mandir}/man3/wxGenericDirCtrl.* %{_mandir}/man3/wxGraphicsBrush.* %{_mandir}/man3/wxGraphicsContext.* %{_mandir}/man3/wxGraphicsFont.* @@ -1814,20 +1814,20 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxJoystickEvent.* %{_mandir}/man3/wxKeyEvent.* %{_mandir}/man3/wxLayoutAlgorithm.* -%{_mandir}/man3/wxListbook.* %{_mandir}/man3/wxListBox.* %{_mandir}/man3/wxListCtrl.* %{_mandir}/man3/wxListEvent.* %{_mandir}/man3/wxListItem.* %{_mandir}/man3/wxListItemAttr.* %{_mandir}/man3/wxListView.* +%{_mandir}/man3/wxListbook.* %{_mandir}/man3/wxLocale.* %{_mandir}/man3/wxLogNull.* -%{_mandir}/man3/wxMask.* -%{_mandir}/man3/wxMaximizeEvent.* %{_mandir}/man3/wxMDIChildFrame.* %{_mandir}/man3/wxMDIClientWindow.* %{_mandir}/man3/wxMDIParentFrame.* +%{_mandir}/man3/wxMask.* +%{_mandir}/man3/wxMaximizeEvent.* %{_mandir}/man3/wxMemoryDC.* %{_mandir}/man3/wxMenu.* %{_mandir}/man3/wxMenuBar.* @@ -1865,9 +1865,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxPrintData.* %{_mandir}/man3/wxPrintDialog.* %{_mandir}/man3/wxPrintDialogData.* +%{_mandir}/man3/wxPrintPreview.* %{_mandir}/man3/wxPrinter.* %{_mandir}/man3/wxPrintout.* -%{_mandir}/man3/wxPrintPreview.* %{_mandir}/man3/wxProgressDialog.* %{_mandir}/man3/wxQueryNewPaletteEvent.* %{_mandir}/man3/wxRadioBox.* @@ -1878,9 +1878,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxSashWindow.* %{_mandir}/man3/wxScreenDC.* %{_mandir}/man3/wxScrollBar.* -%{_mandir}/man3/wxScrolledWindow.* %{_mandir}/man3/wxScrollEvent.* %{_mandir}/man3/wxScrollWinEvent.* +%{_mandir}/man3/wxScrolledWindow.* %{_mandir}/man3/wxSetCursorEvent.* %{_mandir}/man3/wxShowEvent.* %{_mandir}/man3/wxSingleChoiceDialog.* @@ -1915,18 +1915,20 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxTextEntryDialog.* %{_mandir}/man3/wxToggleButton.* %{_mandir}/man3/wxToolBar.* -%{_mandir}/man3/wxToolbook.* %{_mandir}/man3/wxToolTip.* +%{_mandir}/man3/wxToolbook.* %{_mandir}/man3/wxTopLevelWindow.* -%{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxTreeCtrl.* %{_mandir}/man3/wxTreeEvent.* +%{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxUpdateUIEvent.* %{_mandir}/man3/wxWindow.* %{_mandir}/man3/wxWindowCreateEvent.* %{_mandir}/man3/wxWindowDC.* %{_mandir}/man3/wxWindowDestroyEvent.* %{_mandir}/man3/wxXmlResource.* +%{_mandir}/man3/wx_misc.* +%{_mandir}/man3/wx_object.* %endif %endif %{__with_wxwidgets} From 66281633d2f29a3a1dc3f41d5497913fd741b80f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 19 Mar 2019 16:52:27 +0300 Subject: [PATCH 175/340] Erlang ver. 21.3.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 10 +++++++++- sources | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 4deb9fd..99fd7bb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -8,8 +8,13 @@ # default %bcond_with doc %else +# RHEL8 doesn't have fop +%if 0%{?rhel} > 7 +%bcond_with doc +%else %bcond_without doc %endif +%endif %ifarch %{arm} %{ix86} x86_64 ppc %{power64} %global __with_hipe 1 @@ -60,7 +65,7 @@ Name: erlang -Version: 21.3 +Version: 21.3.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1946,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 19 2019 Peter Lemenkov - 21.3.1-1 +- Ver. 21.3.1 + * Tue Mar 12 2019 Peter Lemenkov - 21.3-1 - Ver. 21.3 diff --git a/sources b/sources index 0a6c3d5..7ba01cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.tar.gz) = 7001b6a37597e8d78b9b071d517e7be449592d7d7f9f8bf6f555dd3ed58caec429644adf52d9c5669c2e06dafc61149544a730f3dae138a8c25da0f61d06ba83 +SHA512 (otp-OTP-21.3.1.tar.gz) = 96092aefad3817b54a0f073420df28294a1c5f2f2ba234069bd2595956b6a6dd6eddaef3bd14cf072f269b947a4464554073f94c497efaabca4841f4de882d2a From 53062af746599391d3e6cdb9e2dd1c34fc81ce3c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 22 Mar 2019 12:05:26 +0300 Subject: [PATCH 176/340] Erlang ver. 21.3.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 99fd7bb..8556111 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.1 +Version: 21.3.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Mar 22 2019 Peter Lemenkov - 21.3.2-1 +- Ver. 21.3.2 + * Tue Mar 19 2019 Peter Lemenkov - 21.3.1-1 - Ver. 21.3.1 diff --git a/sources b/sources index 7ba01cb..f0618d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.1.tar.gz) = 96092aefad3817b54a0f073420df28294a1c5f2f2ba234069bd2595956b6a6dd6eddaef3bd14cf072f269b947a4464554073f94c497efaabca4841f4de882d2a +SHA512 (otp-OTP-21.3.2.tar.gz) = 4c9b880ac6f7ff715a90a978bbd0fb1c12e9fb23a083a94df52e5bc97e77973f081cd664ba36432157961811784b7323a67cbca2511ba3628d0eda130770a581 From 94edb3f05827a4e6c95df589e23888713e11598f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 2 Apr 2019 13:26:56 +0300 Subject: [PATCH 177/340] Erlang ver. 21.3.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 8556111..21fdfa9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.2 +Version: 21.3.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Apr 02 2019 Peter Lemenkov - 21.3.3-1 +- Ver. 21.3.3 + * Fri Mar 22 2019 Peter Lemenkov - 21.3.2-1 - Ver. 21.3.2 diff --git a/sources b/sources index f0618d5..85b280f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.2.tar.gz) = 4c9b880ac6f7ff715a90a978bbd0fb1c12e9fb23a083a94df52e5bc97e77973f081cd664ba36432157961811784b7323a67cbca2511ba3628d0eda130770a581 +SHA512 (otp-OTP-21.3.3.tar.gz) = d67083f7f3b490874ef341aba54fdfb977b5a0e3f2ae6465d8a9a6e36735de3b8d9fda8c46d12458f4f483d2e3c4ab6066ec698571257c8c06c49f796fc94f79 From 8a086ef1d2f99ee08f8ab34a713b786ea1173f5e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 13 Apr 2019 11:03:27 +0300 Subject: [PATCH 178/340] Erlang ver. 21.3.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0003-Do-not-install-C-sources.patch | 4 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index 21fdfa9..ba68ae6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.3 +Version: 21.3.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Apr 13 2019 Peter Lemenkov - 21.3.4-1 +- Ver. 21.3.4 + * Tue Apr 02 2019 Peter Lemenkov - 21.3.3-1 - Ver. 21.3.3 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 487e573..4528177 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -48,10 +48,10 @@ index a4a6c158cc..13658302f5 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index b0bb9bfadf..eeff0338c3 100644 +index 2c1a8252ae..48973052c8 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) +@@ -844,14 +844,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" diff --git a/sources b/sources index 85b280f..c822c06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.3.tar.gz) = d67083f7f3b490874ef341aba54fdfb977b5a0e3f2ae6465d8a9a6e36735de3b8d9fda8c46d12458f4f483d2e3c4ab6066ec698571257c8c06c49f796fc94f79 +SHA512 (otp-OTP-21.3.4.tar.gz) = 40f17df2b30d6116ee7374292d48c9ce436ad012f0134b81dc454b981393aa9243b3b66f35eb892c4bfe58aa9ced135e18b66c218bdf55182ada905059170697 From 1eb1a50db471286ea4104eee954f934f4b852476 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 15 Apr 2019 13:17:31 +0300 Subject: [PATCH 179/340] Erlang ver. 21.3.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index ba68ae6..8ada567 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.4 +Version: 21.3.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Apr 15 2019 Peter Lemenkov - 21.3.5-1 +- Ver. 21.3.5 + * Sat Apr 13 2019 Peter Lemenkov - 21.3.4-1 - Ver. 21.3.4 diff --git a/sources b/sources index c822c06..ffd61d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.4.tar.gz) = 40f17df2b30d6116ee7374292d48c9ce436ad012f0134b81dc454b981393aa9243b3b66f35eb892c4bfe58aa9ced135e18b66c218bdf55182ada905059170697 +SHA512 (otp-OTP-21.3.5.tar.gz) = 46e8c0c96cccd35ff53b90fa335f2c579c75b9aa385a2146a5aab65483ec0047d0d0c33fa065d98a442bacc6d8564493e3ad6e79298143a40c6c33b5d4ce8ae7 From a4a164bd12a68a596cd592fb08e9377177f749e8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 18 Apr 2019 15:45:25 +0300 Subject: [PATCH 180/340] Erlang ver. 21.3.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 8ada567..1119bf6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.5 +Version: 21.3.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Apr 18 2019 Peter Lemenkov - 21.3.6-1 +- Ver. 21.3.6 + * Mon Apr 15 2019 Peter Lemenkov - 21.3.5-1 - Ver. 21.3.5 diff --git a/sources b/sources index ffd61d9..477c91e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.5.tar.gz) = 46e8c0c96cccd35ff53b90fa335f2c579c75b9aa385a2146a5aab65483ec0047d0d0c33fa065d98a442bacc6d8564493e3ad6e79298143a40c6c33b5d4ce8ae7 +SHA512 (otp-OTP-21.3.6.tar.gz) = 4ba430ccacde9366233c085f641712b2745360315ce32447e19eb25ee2c734e4be88fe2ccb68a9bda9c6ee7f257330adcad9fc421a8038ab14dba426c9466227 From 4cf015c32ff26951ef78caa560ac9ebdca25fda5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 1 May 2019 14:12:02 +0300 Subject: [PATCH 181/340] Erlang ver. 21.3.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1119bf6..884f3f5 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.6 +Version: 21.3.7 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 01 2019 Peter Lemenkov - 21.3.7-1 +- Ver. 21.3.7 + * Thu Apr 18 2019 Peter Lemenkov - 21.3.6-1 - Ver. 21.3.6 diff --git a/sources b/sources index 477c91e..b8ec892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.6.tar.gz) = 4ba430ccacde9366233c085f641712b2745360315ce32447e19eb25ee2c734e4be88fe2ccb68a9bda9c6ee7f257330adcad9fc421a8038ab14dba426c9466227 +SHA512 (otp-OTP-21.3.7.tar.gz) = f029929bda3826ed84d16a77612c793d0559a81b0806ed93a3ff365f6d31773dab6068c777f4b3c7106c683851d8dd61ccd5b1dcf8151de9b917baea90c487b8 From d634bcb64c0aac4cd70d36ba159b2201f6ec477d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 17 May 2019 14:45:54 +0300 Subject: [PATCH 182/340] Erlang ver. 21.3.8.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 884f3f5..6fb66c6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.7 +Version: 21.3.8.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri May 17 2019 Peter Lemenkov - 21.3.8.1-1 +- Ver. 21.3.8.1 + * Wed May 01 2019 Peter Lemenkov - 21.3.7-1 - Ver. 21.3.7 diff --git a/sources b/sources index b8ec892..7ee4fa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.7.tar.gz) = f029929bda3826ed84d16a77612c793d0559a81b0806ed93a3ff365f6d31773dab6068c777f4b3c7106c683851d8dd61ccd5b1dcf8151de9b917baea90c487b8 +SHA512 (otp-OTP-21.3.8.1.tar.gz) = 06dcac272823cb1a6fb1fdb2df8a584436f8babc83c40197685eb5a12265de6317098cf5faeb8f0bc803022c02ef421d5cc0d39da661ebbe71907535735e382b From b95f7e56afe16f558f184c0db8fd80ad0b476f23 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 20 May 2019 14:45:15 +0300 Subject: [PATCH 183/340] Erlang ver. 21.3.8.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6fb66c6..7a98cbb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.8.1 +Version: 21.3.8.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon May 20 2019 Peter Lemenkov - 21.3.8.2-1 +- Ver. 21.3.8.2 + * Fri May 17 2019 Peter Lemenkov - 21.3.8.1-1 - Ver. 21.3.8.1 diff --git a/sources b/sources index 7ee4fa7..438dcf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.1.tar.gz) = 06dcac272823cb1a6fb1fdb2df8a584436f8babc83c40197685eb5a12265de6317098cf5faeb8f0bc803022c02ef421d5cc0d39da661ebbe71907535735e382b +SHA512 (otp-OTP-21.3.8.2.tar.gz) = 02aa2b5ea1aa153c03c6b0da77d530f43136576ed00820b60767d200c9f9cb0f8d7b7ad0d776fd51b6d954cf5b2b3082e0654c203320599924e67198d538298b From 175c299460b7d3d472d9c2d6b7ebe4e7ecfc22a6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 4 Jun 2019 13:09:06 +0300 Subject: [PATCH 184/340] Erlang ver. 21.3.8.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 7a98cbb..a298fb4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.8.2 +Version: 21.3.8.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jun 04 2019 Peter Lemenkov - 21.3.8.3-1 +- Ver. 21.3.8.3 + * Mon May 20 2019 Peter Lemenkov - 21.3.8.2-1 - Ver. 21.3.8.2 diff --git a/sources b/sources index 438dcf5..3b13b6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.2.tar.gz) = 02aa2b5ea1aa153c03c6b0da77d530f43136576ed00820b60767d200c9f9cb0f8d7b7ad0d776fd51b6d954cf5b2b3082e0654c203320599924e67198d538298b +SHA512 (otp-OTP-21.3.8.3.tar.gz) = 6a745006679fa8ae8158ecd0f670e15f253754fb7e69f9a95e8e280635d74b2153d7b8c8aecc6cfbc09bb88e649e500d2ca8a859928c8134c940d730c40cb47d From 3294272b14b07e3f5def055f30942015cd6fffd2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 19 Jun 2019 14:08:45 +0200 Subject: [PATCH 185/340] Erlang ver. 21.3.8.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a298fb4..d725096 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.8.3 +Version: 21.3.8.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1951,6 +1951,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jun 19 2019 Peter Lemenkov - 21.3.8.4-1 +- Ver. 21.3.8.4 + * Tue Jun 04 2019 Peter Lemenkov - 21.3.8.3-1 - Ver. 21.3.8.3 diff --git a/sources b/sources index 3b13b6a..d25dc7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.3.tar.gz) = 6a745006679fa8ae8158ecd0f670e15f253754fb7e69f9a95e8e280635d74b2153d7b8c8aecc6cfbc09bb88e649e500d2ca8a859928c8134c940d730c40cb47d +SHA512 (otp-OTP-21.3.8.4.tar.gz) = 9173966a5c3594b2102e75e42eac72a395b74fb74d40898011deecc58379b5c27cc1d19d460ea6a21e15f3e964cc32f59b56c43df0f889e16210817d102fbcd2 From 13563f0c64899ed3ad1b2e7692c0cb51fac29c16 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Jun 2019 12:57:37 +0200 Subject: [PATCH 186/340] Megaco examples depends on wxWidgets Signed-off-by: Peter Lemenkov --- erlang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erlang.spec b/erlang.spec index d725096..ceb17e2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1239,7 +1239,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/eunit-*/examples/ %{_libdir}/erlang/lib/inets-*/examples/ %{_libdir}/erlang/lib/kernel-*/examples/ +%if %{__with_wxwidgets} %{_libdir}/erlang/lib/megaco-*/examples/ +%endif %{__with_wxwidgets} %{_libdir}/erlang/lib/mnesia-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/observer-*/examples/ From 537d953900436b949f029e9a28d4f8fc93c2a566 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 8 Jul 2019 14:50:06 +0200 Subject: [PATCH 187/340] Erlang ver. 21.3.8.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0006-Do-not-install-erlang-sources.patch | 2 +- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index ceb17e2..5ffa677 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.8.4 +Version: 21.3.8.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1953,6 +1953,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 8 2019 Peter Lemenkov - 21.3.8.5-1 +- Ver. 21.3.8.5 + * Wed Jun 19 2019 Peter Lemenkov - 21.3.8.4-1 - Ver. 21.3.8.4 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 696035c..8af1e9a 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -547,7 +547,7 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index a920ea87ea..7672ef3470 100644 +index 10952106c6..dc07102803 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt diff --git a/sources b/sources index d25dc7b..34421d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.4.tar.gz) = 9173966a5c3594b2102e75e42eac72a395b74fb74d40898011deecc58379b5c27cc1d19d460ea6a21e15f3e964cc32f59b56c43df0f889e16210817d102fbcd2 +SHA512 (otp-OTP-21.3.8.5.tar.gz) = 7510ad504105c59ad0f3eb921de522cf670e35bfd0a056f646a5b7fb9cefc2bc7740790814c0b69cc4a5b01aa4718567c64c4fab9075e05facfaae59e7bfc234 From 0eb78c92803fc5c740b4a44269dd0807fd2c5eb6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 15 Jul 2019 15:26:16 +0200 Subject: [PATCH 188/340] Erlang ver. 21.3.8.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5ffa677..80ace18 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 21.3.8.5 +Version: 21.3.8.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1953,6 +1953,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 15 2019 Peter Lemenkov - 21.3.8.6-1 +- Ver. 21.3.8.6 + * Mon Jul 8 2019 Peter Lemenkov - 21.3.8.5-1 - Ver. 21.3.8.5 diff --git a/sources b/sources index 34421d0..fab476f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.5.tar.gz) = 7510ad504105c59ad0f3eb921de522cf670e35bfd0a056f646a5b7fb9cefc2bc7740790814c0b69cc4a5b01aa4718567c64c4fab9075e05facfaae59e7bfc234 +SHA512 (otp-OTP-21.3.8.6.tar.gz) = 66b8e30624f4e41f73a0f1e6ff4813a7f0dd84f45c4b1b2eb803bdf53d2a14ec871094e20825606ea8888453eaa1755de7036b20edd01b309629573dd1d8b4eb From 4ed5ede65ec8e6423ba2fe023d5a4d4f51ac3a0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 23:36:29 +0000 Subject: [PATCH 189/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 80ace18..1eddddd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 21.3.8.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1953,6 +1953,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 21.3.8.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 15 2019 Peter Lemenkov - 21.3.8.6-1 - Ver. 21.3.8.6 From 4c0d16ab65c923c41f6948f1b80f9b01d7b12d0f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 16 Jul 2019 15:16:12 +0200 Subject: [PATCH 190/340] Erlang ver. 22.0.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 103 ++++++++---------- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 14 +-- ...teventlog-and-related-doc-files-on-n.patch | 15 ++- otp-0006-Do-not-install-erlang-sources.patch | 63 +++++------ ...man-pages-from-system-wide-directory.patch | 4 +- otp-0010-Improve-nodes-querying.patch | 6 +- 7 files changed, 91 insertions(+), 118 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1eddddd..45680e7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 21.3.8.6 -Release: 2%{?dist} +Version: 22.0.7 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -134,15 +134,15 @@ BuildRequires: automake 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}-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} +%endif # __with_wxwidgets Requires: %{name}-diameter%{?_isa} = %{version}-%{release} Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-eldap%{?_isa} = %{version}-%{release} @@ -151,30 +151,29 @@ Requires: %{name}-erl_interface%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-et%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets Requires: %{name}-eunit%{?_isa} = %{version}-%{release} Requires: %{name}-ftp%{?_isa} = %{version}-%{release} Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} -%endif %{__with_java} +%endif # __with_java Requires: %{name}-kernel%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-megaco%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-observer%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets Requires: %{name}-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} -Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} Requires: %{name}-public_key%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-reltool%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} @@ -186,7 +185,7 @@ Requires: %{name}-tftp%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} %description @@ -228,7 +227,7 @@ Obsoletes: erlang-test_server %description common_test A portable framework for automatic testing. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package compiler Summary: A byte code compiler for Erlang which produces highly compact code @@ -262,7 +261,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description debugger A debugger for debugging and testing of Erlang programs. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %if %{__with_wxwidgets} %package dialyzer @@ -279,7 +278,7 @@ Obsoletes: erlang-typer %description dialyzer A DIscrepancy AnaLYZer for ERlang programs. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package diameter Summary: Diameter (RFC 3588) library @@ -368,6 +367,7 @@ Obsoletes: erlang-docbuilder Obsoletes: erlang-gs Obsoletes: erlang-inviso Obsoletes: erlang-ose +Obsoletes: erlang-otp_mibs # Moved to https://github.com/erlang/percept Obsoletes: erlang-percept < 20.2.3 Obsoletes: erlang-pman @@ -389,7 +389,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description et An event tracer for Erlang programs. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package eunit Summary: Support for unit testing @@ -455,7 +455,7 @@ Requires: %{name}-erts%{?_isa} = %{version}-%{release} %description jinterface Low level interface to Java. -%endif %{__with_java} +%endif # __with_java %package kernel Summary: Main erlang library @@ -480,7 +480,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Megaco/H.248 is a protocol for control of elements in a physically decomposed multimedia gateway, enabling separation of call control from media conversion. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package mnesia Summary: A heavy duty real-time distributed database @@ -504,7 +504,7 @@ Requires: %{name}-wx%{?_isa} = %{version}-%{release} %description observer A set of tools for tracing and investigation of distributed systems. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package odbc Summary: A library for unixODBC support in Erlang @@ -522,7 +522,6 @@ Summary: A monitor which allows inspection of the underlying operating system Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -530,17 +529,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description os_mon A monitor which allows inspection of the underlying operating system. -%package otp_mibs -Summary: SNMP management information base for Erlang/OTP nodes -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} -Requires: %{name}-snmp%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description otp_mibs -SNMP management information base for Erlang/OTP nodes. - %package parsetools Summary: A set of parsing and lexical analysis tools Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -578,7 +566,7 @@ between applications. The graphical frontend depicts the dependencies and enables interactive customization of a target system. The backend provides a batch interface for generation of customized target systems. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package runtime_tools Summary: A set of tools to include in a production system @@ -710,7 +698,7 @@ Requires: mesa-libGLU %description wx A Graphics System used to write platform independent user interfaces. -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %package xmerl Summary: Provides support for XML 1.0 @@ -749,7 +737,7 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- \ %else --without-jinterface \ -%endif %{__with_java} +%endif # __with_java %if %{__with_wxwidgets} --with-wx-config=/usr/bin/wx-config-3.0 %else @@ -761,7 +749,7 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- --without-observer \ --without-reltool \ --without-wx -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets # Remove pre-built BEAM files make clean @@ -929,7 +917,7 @@ install -m 0755 -d "$RPM_BUILD_ROOT%{_javadir}/%{name}" jinterface_lib_dir="$(ls -d1 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/jinterface-*/ | sed "s,^$RPM_BUILD_ROOT,,")" test -d "$RPM_BUILD_ROOT$jinterface_lib_dir" ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{name}/" -%endif %{__with_java} +%endif # __with_java # systemd-related stuff %if ! (0%{?rhel} && 0%{?rhel} <= 6) @@ -951,7 +939,7 @@ do rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/bin/${exe} rm -f $RPM_BUILD_ROOT/%{_libdir}/erlang/erts-*/bin/${exe} done -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets # Provide a place for noarch libs to live. install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/ @@ -1017,7 +1005,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/unix_telnet.* %{_mandir}/man6/common_test.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files compiler %{_libdir}/erlang/lib/compiler-*/ @@ -1040,7 +1028,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/i.* %{_mandir}/man3/int.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %if %{__with_wxwidgets} %files dialyzer @@ -1056,7 +1044,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/dialyzer.* %{_mandir}/man3/typer.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files diameter %dir %{_libdir}/erlang/lib/diameter-*/ @@ -1192,8 +1180,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erlang.* %{_mandir}/man3/erts_alloc.* %{_mandir}/man3/init.* +%{_mandir}/man3/net.* %{_mandir}/man3/persistent_term.* %{_mandir}/man3/scheduler.* +%{_mandir}/man3/socket.* %{_mandir}/man3/zlib.* %endif %{_libdir}/erlang/releases/* @@ -1217,7 +1207,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/et_selector.* %{_mandir}/man3/et_viewer.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files eunit %dir %{_libdir}/erlang/lib/eunit-*/ @@ -1235,20 +1225,20 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/diameter-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/et-*/examples/ -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %{_libdir}/erlang/lib/eunit-*/examples/ %{_libdir}/erlang/lib/inets-*/examples/ %{_libdir}/erlang/lib/kernel-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/megaco-*/examples/ -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %{_libdir}/erlang/lib/mnesia-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/observer-*/examples/ -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %if %{__with_wxwidgets} %{_libdir}/erlang/lib/reltool-*/examples/ -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %{_libdir}/erlang/lib/runtime_tools-*/examples/ %{_libdir}/erlang/lib/sasl-*/examples/ %{_libdir}/erlang/lib/snmp-*/examples/ @@ -1258,7 +1248,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/tools-*/examples/ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/wx-*/examples/ -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %endif %{__with_examples} %files ftp @@ -1299,7 +1289,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ -%endif %{__with_java} +%endif # __with_java %files kernel %dir %{_libdir}/erlang/lib/kernel-*/ @@ -1368,7 +1358,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/megaco_udp.* %{_mandir}/man3/megaco_user.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files mnesia %dir %{_libdir}/erlang/lib/mnesia-*/ @@ -1395,7 +1385,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ttb.* %{_mandir}/man6/observer.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files odbc %{_libdir}/erlang/lib/odbc-*/ @@ -1409,17 +1399,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/cpu_sup.* %{_mandir}/man3/disksup.* %{_mandir}/man3/memsup.* -%{_mandir}/man3/os_mon_mib.* %{_mandir}/man3/os_sup.* %{_mandir}/man6/os_mon.* %endif -%files otp_mibs -%{_libdir}/erlang/lib/otp_mibs-*/ -%if %{with doc} -%{_mandir}/man3/otp_mib.* -%endif - %files parsetools %{_libdir}/erlang/lib/parsetools-*/ %if %{with doc} @@ -1442,7 +1425,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{with doc} %{_mandir}/man3/reltool.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files runtime_tools %dir %{_libdir}/erlang/lib/runtime_tools-*/ @@ -1937,7 +1920,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wx_misc.* %{_mandir}/man3/wx_object.* %endif -%endif %{__with_wxwidgets} +%endif # __with_wxwidgets %files xmerl %{_libdir}/erlang/lib/xmerl-*/ @@ -1953,6 +1936,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jul 30 2019 Peter Lemenkov - 22.0.7-1 +- Ver. 22.0.7 +- Removed otp_mibs application + * Wed Jul 24 2019 Fedora Release Engineering - 21.3.8.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index b05f9ce..dd08460 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 31124ba477..a4a6c158cc 100644 +index b6a65d7488..cd60549711 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -96,7 +96,7 @@ endif +@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 4528177..f70afb1 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index a4a6c158cc..13658302f5 100644 +index cd60549711..5be70391d2 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -216,16 +216,11 @@ docs: +@@ -223,16 +223,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -48,10 +48,10 @@ index a4a6c158cc..13658302f5 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 2c1a8252ae..48973052c8 100644 +index 6e0d3476c7..55499fd9d4 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -844,14 +844,14 @@ ifneq ($(EXE_TARGETS),) +@@ -848,14 +848,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -75,10 +75,10 @@ index 2c1a8252ae..48973052c8 100644 release_docs: diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index c37ad4d702..09bf1efe95 100644 +index 26d2ddd44c..753925ed77 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) @@ -88,7 +88,7 @@ index c37ad4d702..09bf1efe95 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 784e73c47e..568c5e4c3e 100644 +index 294d832797..173f660f26 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 diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 7a1ca77..cfd78de 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/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 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 354f8ed26b..12adcfbcf2 100644 +index 8e9a4c333c..33b32b09b9 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) +@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml @@ -21,7 +21,6 @@ index 354f8ed26b..12adcfbcf2 100644 XML_REF3_FILES = cpu_sup.xml \ disksup.xml \ memsup.xml \ - os_mon_mib.xml \ os_sup.xml \ - nteventlog.xml + $(NTEVENTLOG_DOCFILE) @@ -29,25 +28,25 @@ index 354f8ed26b..12adcfbcf2 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index fc2eb22393..e2f4d5a090 100644 +index 923a31f290..5963351b0f 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_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_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 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 8af1e9a..595a92d 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index e1bd5bc295..a4833521d1 100644 +index 27d450c873..d3ea19286e 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -94,8 +94,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -112,8 +112,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -63,10 +63,10 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 2408c76b48..700e236964 100644 +index 87b0d345f2..db0ea47135 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -173,8 +173,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -179,8 +179,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -104,10 +104,10 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index fc08e7ca2f..2464a15c3f 100644 +index bddd761705..f0c2e7c35b 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -158,7 +158,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -160,7 +160,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -205,10 +205,10 @@ index 3510d3cc93..9179e9b4c2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index f653dce36f..7cc5c06528 100644 +index 5c367b5b77..b7a85ba115 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/cerl" @@ -244,10 +244,10 @@ index b220bc16a0..d4073277be 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 817ff67dcd..e50ba5e207 100644 +index 9f7a2def6d..def1b4be52 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/llvm @@ -283,10 +283,10 @@ index e5033e444b..74a444b386 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index becdd0b7d8..da8f66343f 100644 +index 0c0f6e24f5..fcffc1f8b5 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile -@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/rtl" @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 3d1506ea08..728fa64869 100644 +index fcb599859b..14f82f9ea4 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -227,7 +227,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -420,10 +420,10 @@ index 869b516b05..fa7d774d84 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 09bf1efe95..b320b2e96f 100644 +index 753925ed77..c6b68e225f 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in -@@ -268,7 +268,6 @@ release_spec: opt +@@ -248,7 +248,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_DIR) "$(RELSYSDIR)/include" @@ -509,7 +509,7 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index e2f4d5a090..57f21a145b 100644 +index 5963351b0f..22c41137d0 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -520,19 +520,6 @@ index e2f4d5a090..57f21a145b 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile -index 5c7af39c3f..a85368b4f4 100644 ---- a/lib/otp_mibs/src/Makefile -+++ b/lib/otp_mibs/src/Makefile -@@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" - diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile index ba206904ec..281cc8657c 100644 --- a/lib/parsetools/src/Makefile @@ -547,7 +534,7 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 10952106c6..dc07102803 100644 +index a920ea87ea..7672ef3470 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -601,10 +588,10 @@ index 76286c5499..d921f9f294 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 7338bdf016..a280225dad 100644 +index fd62588f5c..07373bfa78 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -691,10 +678,10 @@ index 6d64a45112..5b1249ca5b 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 8d1341f594..72ab265200 100644 +index 8dc76f2638..3c2f73f5be 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -183,7 +183,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -704,10 +691,10 @@ index 8d1341f594..72ab265200 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index c95f7637f7..0f601aefb5 100644 +index 86003c953d..69bfbefeb9 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -214,7 +214,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -216,7 +216,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -755,7 +742,7 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 21b45af2c4..a7bf34f4f4 100644 +index 52f4008e0a..dc297f1d55 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index a934881..4cd87ce 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 23bbb86333..741b492668 100644 +index 8203c46a39..631b93a92e 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -722,8 +722,10 @@ int main(int argc, char **argv) +@@ -706,8 +706,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-Improve-nodes-querying.patch b/otp-0010-Improve-nodes-querying.patch index af00198..fbf61b1 100644 --- a/otp-0010-Improve-nodes-querying.patch +++ b/otp-0010-Improve-nodes-querying.patch @@ -37,7 +37,7 @@ even if a node disconnects. Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl -index a9dc77837e..04025cf35b 100644 +index 83d3b4b5e1..bebefc2e08 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -670,24 +670,16 @@ code_change(_OldVsn, State, _Extra) -> @@ -69,7 +69,7 @@ index a9dc77837e..04025cf35b 100644 %% ------------------------------------------------------------ -@@ -1139,35 +1131,10 @@ disconnect_pid(Pid, State) -> +@@ -1147,35 +1139,10 @@ disconnect_pid(Pid, State) -> %% %% %% @@ -108,7 +108,7 @@ index a9dc77837e..04025cf35b 100644 ticker(Kernel, Tick) when is_integer(Tick) -> process_flag(priority, max), -@@ -1632,15 +1599,14 @@ get_node_info(Node, Key) -> +@@ -1640,15 +1607,14 @@ get_node_info(Node, Key) -> end. get_nodes_info() -> From 8d92b7bfefec32f5a84ea1712baf965d20e8f72b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 28 Aug 2019 20:56:06 +0200 Subject: [PATCH 191/340] Again forgot the sources Signed-off-by: Peter Lemenkov --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index fab476f..2313247 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-21.3.8.6.tar.gz) = 66b8e30624f4e41f73a0f1e6ff4813a7f0dd84f45c4b1b2eb803bdf53d2a14ec871094e20825606ea8888453eaa1755de7036b20edd01b309629573dd1d8b4eb +SHA512 (otp-OTP-22.0.7.tar.gz) = cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 From 6d1b9b2ecad9542784ada2918476f9fae2018bd8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 11 Sep 2019 15:07:36 +0200 Subject: [PATCH 192/340] Disable arches with a broken builders Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 45680e7..948638e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 22.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -82,6 +82,7 @@ Source8: epmd@.socket # These files are intended for Fedora package maintainers only. Source998: otp-make-subpackages.py Source999: otp-get-patches.sh +ExcludeArch: s390 s390x # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp @@ -360,7 +361,7 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.14 +Provides: erlang(erl_nif_version) = 2.15 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder @@ -1936,6 +1937,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Sep 11 2019 Peter Lemenkov - 22.0.7-2 +- Disable arches with a broken builders +- Expose a correct NIF API version + * Tue Jul 30 2019 Peter Lemenkov - 22.0.7-1 - Ver. 22.0.7 - Removed otp_mibs application From 3968351848d14e576a7a65b9276d927375e49c65 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 16 Sep 2019 12:07:03 +0200 Subject: [PATCH 193/340] Enable arches disabled in a previous build Signed-off-by: Peter Lemenkov --- erlang.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 948638e..9fcf1b6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 22.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -82,7 +82,6 @@ Source8: epmd@.socket # These files are intended for Fedora package maintainers only. Source998: otp-make-subpackages.py Source999: otp-get-patches.sh -ExcludeArch: s390 s390x # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp @@ -1937,6 +1936,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Sep 16 2019 Peter Lemenkov - 22.0.7-3 +- Enable arches disabled in a previous build + * Wed Sep 11 2019 Peter Lemenkov - 22.0.7-2 - Disable arches with a broken builders - Expose a correct NIF API version From 3d000ece2e50f3a6c001007ad07883884f57c044 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 16 Sep 2019 12:17:06 +0200 Subject: [PATCH 194/340] Since we've added s390(x) back we need to rebootstrap it Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 9fcf1b6..ac9196c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,4 +1,4 @@ -%global need_bootstrap_set 0 +%global need_bootstrap_set 1 %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} From dd8ae304396bf8c71e7a6905fc02c4a9d98d30f3 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 5 Nov 2019 12:50:41 -0500 Subject: [PATCH 195/340] Erlang ver. 22.1.5 --- erlang.spec | 9 +- otp-0010-Improve-nodes-querying.patch | 134 ------------------ ...etup-reduce-number-of-calls-to-close.patch | 64 +++++++++ sources | 2 +- 4 files changed, 71 insertions(+), 138 deletions(-) delete mode 100644 otp-0010-Improve-nodes-querying.patch create mode 100644 otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch diff --git a/erlang.spec b/erlang.spec index ac9196c..bc2d166 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 22.0.7 -Release: 3%{?dist} +Version: 22.1.5 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -106,7 +106,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-Improve-nodes-querying.patch +Patch10: otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1936,6 +1936,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Nov 5 2019 John Eckersberg - 22.1.5-1 +- Ver. 22.1.5 + * Mon Sep 16 2019 Peter Lemenkov - 22.0.7-3 - Enable arches disabled in a previous build diff --git a/otp-0010-Improve-nodes-querying.patch b/otp-0010-Improve-nodes-querying.patch deleted file mode 100644 index fbf61b1..0000000 --- a/otp-0010-Improve-nodes-querying.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Peter Lemenkov -Date: Wed, 24 Oct 2018 14:58:41 +0200 -Subject: [PATCH] Improve nodes querying - -We've got a few similar stacktraces once. See the following one for -example: - -** Reason for termination == -** {badarg, - [{ets,next,[sys_dist,'rabbitmq-cli-42@host.example.com'],[]}, - {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1025}]}, - {net_kernel,get_nodes,2,[{file,"net_kernel.erl"},{line,1019}]}, - {net_kernel,get_nodes_info,0,[{file,"net_kernel.erl"},{line,1439}]}, - {rabbit_mgmt_external_stats,cluster_links,0, - [{file,"src/rabbit_mgmt_external_stats.erl"},{line,252}]}, - {rabbit_mgmt_external_stats,emit_node_node_stats,1, - [{file,"src/rabbit_mgmt_external_stats.erl"},{line,366}]}, - {rabbit_mgmt_external_stats,handle_info,2, - [{file,"src/rabbit_mgmt_external_stats.erl"},{line,347}]}, - {gen_server,try_dispatch,4,[{file,"gen_server.erl"},{line,615}]}]} - -The problem is that when we're trying to query a list of connected -nodes, we're doing it in the following way: - - Call for the first record in ETS - While not EOF: - Call for the next record in ETS - -What happens, when some Node disconnects during the "not EOF" loop? -We'll get an exception. - -Let's do it differently - query a list of nodes in one shot, and then -get info from each of the nodes in list (w/o extra calls to ets). These -individual calls care of disconnected nodes so everything will be fine -even if a node disconnects. - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl -index 83d3b4b5e1..bebefc2e08 100644 ---- a/lib/kernel/src/net_kernel.erl -+++ b/lib/kernel/src/net_kernel.erl -@@ -670,24 +670,16 @@ code_change(_OldVsn, State, _Extra) -> - - terminate(no_network, State) -> - lists:foreach( -- fun({Node, Type}) -> -- case Type of -- normal -> ?nodedown(Node, State); -- _ -> ok -- end -- end, get_up_nodes() ++ [{node(), normal}]); -+ fun(Node) -> ?nodedown(Node, State) -+ end, get_nodes_up_normal() ++ [node()]); - terminate(_Reason, State) -> - lists:foreach( - fun(#listen {listen = Listen,module = Mod}) -> - Mod:close(Listen) - end, State#state.listen), - lists:foreach( -- fun({Node, Type}) -> -- case Type of -- normal -> ?nodedown(Node, State); -- _ -> ok -- end -- end, get_up_nodes() ++ [{node(), normal}]). -+ fun(Node) -> ?nodedown(Node, State) -+ end, get_nodes_up_normal() ++ [node()]). - - - %% ------------------------------------------------------------ -@@ -1147,35 +1139,10 @@ disconnect_pid(Pid, State) -> - %% - %% - %% --get_nodes(Which) -> -- get_nodes(ets:first(sys_dist), Which). - --get_nodes('$end_of_table', _) -> -- []; --get_nodes(Key, Which) -> -- case ets:lookup(sys_dist, Key) of -- [Conn = #connection{state = up}] -> -- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), -- Which)]; -- [Conn = #connection{}] when Which =:= all -> -- [Conn#connection.node | get_nodes(ets:next(sys_dist, Key), -- Which)]; -- _ -> -- get_nodes(ets:next(sys_dist, Key), Which) -- end. -- --%% Return a list of all nodes that are 'up'. --get_up_nodes() -> -- get_up_nodes(ets:first(sys_dist)). -- --get_up_nodes('$end_of_table') -> []; --get_up_nodes(Key) -> -- case ets:lookup(sys_dist, Key) of -- [#connection{state=up,node=Node,type=Type}] -> -- [{Node,Type}|get_up_nodes(ets:next(sys_dist, Key))]; -- _ -> -- get_up_nodes(ets:next(sys_dist, Key)) -- end. -+%% Return a list of all nodes that are 'up' and not hidden. -+get_nodes_up_normal() -> -+ ets:select(sys_dist, [{#connection{node = '$1', state = up, type = normal, _ = '_'}, [], ['$1']}]). - - ticker(Kernel, Tick) when is_integer(Tick) -> - process_flag(priority, max), -@@ -1640,15 +1607,14 @@ get_node_info(Node, Key) -> - end. - - get_nodes_info() -> -- get_nodes_info(get_nodes(all), []). -- --get_nodes_info([Node|Nodes], InfoList) -> -- case get_node_info(Node) of -- {ok, Info} -> get_nodes_info(Nodes, [{Node, Info}|InfoList]); -- _ -> get_nodes_info(Nodes, InfoList) -- end; --get_nodes_info([], InfoList) -> -- {ok, InfoList}. -+ Nodes = ets:select(sys_dist, [{#connection{node = '$1', _ = '_'}, [], ['$1']}]), -+ {ok, lists:filtermap( -+ fun(Node) -> -+ case get_node_info(Node) of -+ {ok, Info} -> {true, {Node, Info}}; -+ _ -> false -+ end -+ end, Nodes)}. - - %% ------------------------------------------------------------ - %% Misc. functions diff --git a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch new file mode 100644 index 0000000..0a2a3a5 --- /dev/null +++ b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch @@ -0,0 +1,64 @@ +From 8a5bf2ad16c416c389147ca59c56545e038470e1 Mon Sep 17 00:00:00 2001 +From: John Eckersberg +Date: Fri, 11 Oct 2019 13:06:20 -0400 +Subject: [PATCH] erl_child_setup: reduce number of calls to close() + +On systems without closefrom(), such as Linux, iterating over all +possible file descriptors and calling close() for each is inefficient. +This is markedly so when the maximum number of file descriptors has +been tuned to a large number. + +Instead, walk the open descriptors under /dev/fd and close only those +which are open. +--- + erts/emulator/sys/unix/erl_child_setup.c | 25 +++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c +index 129861ebd5..7ddd753136 100644 +--- a/erts/emulator/sys/unix/erl_child_setup.c ++++ b/erts/emulator/sys/unix/erl_child_setup.c +@@ -411,6 +411,7 @@ main(int argc, char *argv[]) + int uds_fd = 3, max_fd = 3; + #ifndef HAVE_CLOSEFROM + int i; ++ DIR *dir; + #endif + struct sigaction sa; + +@@ -426,11 +427,29 @@ main(int argc, char *argv[]) + #if defined(HAVE_CLOSEFROM) + closefrom(4); + #else +- for (i = 4; i < max_files; i++) ++ dir = opendir("/dev/fd"); ++ if (dir == NULL) { /* /dev/fd not available */ ++ for (i = 4; i < max_files; i++) + #if defined(__ANDROID__) +- if (i != system_properties_fd()) ++ if (i != system_properties_fd()) + #endif +- (void) close(i); ++ (void) close(i); ++ } else { ++ /* Iterate over fds obtained from /dev/fd */ ++ struct dirent *entry; ++ int dir_fd = dirfd(dir); ++ ++ while ((entry = readdir(dir)) != NULL) { ++ i = atoi(entry->d_name); ++#if defined(__ANDROID__) ++ if (i != system_properties_fd()) ++#endif ++ if (i >= 4 && i != dir_fd) ++ (void) close(i); ++ } ++ ++ closedir(dir); ++ } + #endif + + if (pipe(sigchld_pipe) < 0) { +-- +2.23.0 + diff --git a/sources b/sources index 2313247..80f0067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.0.7.tar.gz) = cf84cc20b97ed46f9ab3c7f1d77bcf6254ac3ebbb5c1e4e5202f4d5ba3d9c3bf5542567b047edaa68c204bc67ca667b1d96eb8153ac660e628c78fe271b6a8d9 +SHA512 (otp-OTP-22.1.5.tar.gz) = 0a32a1a7ca8092ee316c5e954384f133938e214101b54a37705b0c97b3e1ba26bd330da7d30fc6aaf667e21106476ddcf13cd48a59513e53e4abfc3fc8109231 From c384b28bf7fcfe177a81132061ac0c18e3afed8b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 11 Nov 2019 11:00:39 -0500 Subject: [PATCH 196/340] Ver. 22.1.7 --- erlang.spec | 9 ++++++++- sources | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index bc2d166..d9ced1d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.1.5 +Version: 22.1.7 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -83,6 +83,9 @@ Source8: epmd@.socket Source998: otp-make-subpackages.py Source999: otp-get-patches.sh +# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved +ExcludeArch: s390x + # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp # @@ -1936,6 +1939,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Nov 11 2019 John Eckersberg - 22.1.7-1 +- Ver. 22.1.7 +- Add ExcludeArch for s390x, see rhbz#1770256 + * Tue Nov 5 2019 John Eckersberg - 22.1.5-1 - Ver. 22.1.5 diff --git a/sources b/sources index 80f0067..cd6a102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.1.5.tar.gz) = 0a32a1a7ca8092ee316c5e954384f133938e214101b54a37705b0c97b3e1ba26bd330da7d30fc6aaf667e21106476ddcf13cd48a59513e53e4abfc3fc8109231 +SHA512 (otp-OTP-22.1.7.tar.gz) = 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05 From d286cacc6587d5d47eb7f6a7afe3178abba1d8e2 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 21 Nov 2019 16:11:21 -0500 Subject: [PATCH 197/340] Erlang ver. 22.1.8 --- erlang.spec | 16 ++++++++++++---- sources | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index d9ced1d..3a62e98 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.1.7 +Version: 22.1.8 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -83,9 +83,6 @@ Source8: epmd@.socket Source998: otp-make-subpackages.py Source999: otp-get-patches.sh -# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved -ExcludeArch: s390x - # For the source of the Fedora specific patches, see the respective # branch at https://github.com/lemenkov/otp # @@ -734,8 +731,15 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif +# Kernel poll is buggy on s390x for unknown reasons, disable it +# See rhbz#1770256 +%ifarch s390x +%define __without_kernel_poll 1 +%endif + CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \ %{?__with_hipe:--enable-hipe} \ + %{?__without_kernel_poll:--disable-kernel-poll} \ %if %{__with_java} \ %else @@ -1939,6 +1943,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Nov 21 2019 John Eckersberg - 22.1.8-1 +- Ver. 22.1.8 +- Re-enable s390x, but disable kernel polling, see rhbz#1770256 + * Mon Nov 11 2019 John Eckersberg - 22.1.7-1 - Ver. 22.1.7 - Add ExcludeArch for s390x, see rhbz#1770256 diff --git a/sources b/sources index cd6a102..9f7d87a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.1.7.tar.gz) = 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05 +SHA512 (otp-OTP-22.1.8.tar.gz) = 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda From fd8131a35e1f66355986ee3d92d47e1f12ad3d74 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 28 Dec 2019 11:28:19 +0300 Subject: [PATCH 198/340] Erlang ver. 22.2.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 +- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 48 +++++++++---------- ...man-pages-from-system-wide-directory.patch | 4 +- ...etup-reduce-number-of-calls-to-close.patch | 7 --- sources | 2 +- 8 files changed, 37 insertions(+), 41 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3a62e98..4083ac1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.1.8 +Version: 22.2.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Dec 28 2019 Peter Lemenkov - 22.2.1-1 +- Ver. 22.2.1 + * Thu Nov 21 2019 John Eckersberg - 22.1.8-1 - Ver. 22.1.8 - Re-enable s390x, but disable kernel polling, see rhbz#1770256 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 5f2f83f..e252e26 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 1f35cef669..f603eb2946 100644 +index 3a03374fbf..aef68348dd 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -496,10 +496,6 @@ endif +@@ -504,10 +504,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index dd08460..b590de1 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index b6a65d7488..cd60549711 100644 +index f922c3fb9b..78ce3eeec6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index f70afb1..86e64ee 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index cd60549711..5be70391d2 100644 +index 78ce3eeec6..5bcb8363f3 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -223,16 +223,11 @@ docs: +@@ -222,16 +222,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 595a92d..a2cdd5f 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 27d450c873..d3ea19286e 100644 +index 38b85915cc..1501eadd29 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -112,8 +112,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -120,8 +120,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -34,10 +34,10 @@ index ba459f6cd3..5565126214 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 80eaed70bd..cde0c6823d 100644 +index 76689dab8c..1f3512b027 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -343,10 +343,10 @@ index 8248e37c44..1f1b23184b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 1c05d454a5..88f9f62d3b 100644 +index 9848fd4b35..387475febb 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index fcb599859b..14f82f9ea4 100644 +index 2d2b84c206..9d67cb0c01 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -231,7 +231,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -534,7 +534,7 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index a920ea87ea..7672ef3470 100644 +index 10952106c6..dc07102803 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -588,10 +588,10 @@ index 76286c5499..d921f9f294 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index fd62588f5c..07373bfa78 100644 +index a5b9a5e731..69bda2e0e1 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile -@@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -600,17 +600,17 @@ index fd62588f5c..07373bfa78 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 2943a4d550..8203e62361 100644 +index 1bde1ca972..acc42385f3 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile -@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile index 6f2b8a4077..bd062a6473 100644 @@ -626,10 +626,10 @@ index 6f2b8a4077..bd062a6473 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 4093ffa9ca..18878aa5db 100644 +index d9678669a5..ff9dff95d9 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -639,17 +639,17 @@ index 4093ffa9ca..18878aa5db 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 0cc87492f1..d203f2846a 100644 +index 57ff08c160..d51f627ca5 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" - $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile index adc2c4858f..89ce954e99 100644 @@ -665,7 +665,7 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 6d64a45112..5b1249ca5b 100644 +index 9627b70eeb..a4853985f5 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -678,10 +678,10 @@ index 6d64a45112..5b1249ca5b 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 8dc76f2638..3c2f73f5be 100644 +index e961f05b37..5cac5a231b 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -183,7 +183,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -716,10 +716,10 @@ index c21d2f49c8..03dbc74ef7 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index 602ae845a4..a1f2f09a00 100644 +index 029bd731bd..85c633b4f0 100644 --- a/lib/tftp/src/Makefile +++ b/lib/tftp/src/Makefile -@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 4cd87ce..dc1ca1b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 8203c46a39..631b93a92e 100644 +index f18ed0c983..5bdbe5153a 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -706,8 +706,10 @@ int main(int argc, char **argv) +@@ -719,8 +719,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch index 0a2a3a5..8739391 100644 --- a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch +++ b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch @@ -1,4 +1,3 @@ -From 8a5bf2ad16c416c389147ca59c56545e038470e1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 11 Oct 2019 13:06:20 -0400 Subject: [PATCH] erl_child_setup: reduce number of calls to close() @@ -10,9 +9,6 @@ been tuned to a large number. Instead, walk the open descriptors under /dev/fd and close only those which are open. ---- - erts/emulator/sys/unix/erl_child_setup.c | 25 +++++++++++++++++++++--- - 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c index 129861ebd5..7ddd753136 100644 @@ -59,6 +55,3 @@ index 129861ebd5..7ddd753136 100644 #endif if (pipe(sigchld_pipe) < 0) { --- -2.23.0 - diff --git a/sources b/sources index 9f7d87a..d2e45f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.1.8.tar.gz) = 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda +SHA512 (otp-OTP-22.2.1.tar.gz) = 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 From b6851757ccb6d73c8839b577bd3f7ce3d824c2eb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 13 Jan 2020 15:07:51 +0100 Subject: [PATCH 199/340] Erlang ver. 22.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 4083ac1..633d428 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.2.1 +Version: 22.2.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jan 13 2020 Peter Lemenkov - 22.2.2-1 +- Ver. 22.2.2 + * Sat Dec 28 2019 Peter Lemenkov - 22.2.1-1 - Ver. 22.2.1 diff --git a/sources b/sources index d2e45f3..51ef9fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.1.tar.gz) = 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 +SHA512 (otp-OTP-22.2.2.tar.gz) = c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42 From c0694acb8d45280e113eb8268989f3eab31d7309 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 17:27:18 +0000 Subject: [PATCH 200/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 633d428..c9bdffb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 22.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 22.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 13 2020 Peter Lemenkov - 22.2.2-1 - Ver. 22.2.2 From 0485c6fa0f90317e3b0fa6178fb5c8d92ca665e2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 6 Feb 2020 13:52:17 +0100 Subject: [PATCH 201/340] Erlang ver. 22.2.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c9bdffb..d3683af 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.2.2 +Version: 22.2.6 Release: 2%{?dist} Summary: General-purpose programming language and runtime environment @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Feb 6 2020 Peter Lemenkov - 22.2.6-1 +- Ver. 22.2.6 + * Tue Jan 28 2020 Fedora Release Engineering - 22.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 51ef9fa..8bfe0f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.2.tar.gz) = c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42 +SHA512 (otp-OTP-22.2.6.tar.gz) = 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b From ef571008873ca2b19a8413e44fe0576e1fd6f927 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Feb 2020 15:16:25 +0100 Subject: [PATCH 202/340] Erlang ver. 22.2.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index d3683af..d0e1820 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 22.2.6 -Release: 2%{?dist} +Version: 22.2.7 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1943,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Feb 21 2020 Peter Lemenkov - 22.2.7-1 +- Ver. 22.2.7 + * Thu Feb 6 2020 Peter Lemenkov - 22.2.6-1 - Ver. 22.2.6 diff --git a/sources b/sources index 8bfe0f5..bae4d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.6.tar.gz) = 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b +SHA512 (otp-OTP-22.2.7.tar.gz) = 1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b From 5ded90e887d3a635014cf6a4695751be291c2688 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Feb 2020 17:06:16 +0100 Subject: [PATCH 203/340] Fix building with GCC 10 (-fno-common) Signed-off-by: Peter Lemenkov --- erlang.spec | 10 +++-- otp-0011-Add-fno-common-gcc-option.patch | 56 ++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 otp-0011-Add-fno-common-gcc-option.patch diff --git a/erlang.spec b/erlang.spec index d0e1820..63209fd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 22.2.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -107,6 +107,7 @@ 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 Patch10: otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch +Patch11: otp-0011-Add-fno-common-gcc-option.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -726,9 +727,9 @@ Provides support for XML 1.0. # Set up proper cflags/cxxflags first %ifarch sparcv9 sparc64 -ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" +ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing -fcommon" %else -ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" +ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fcommon" %endif # Kernel poll is buggy on s390x for unknown reasons, disable it @@ -1943,6 +1944,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Feb 21 2020 Peter Lemenkov - 22.2.7-2 +- Fix building with GCC 10 (-fno-common) + * Fri Feb 21 2020 Peter Lemenkov - 22.2.7-1 - Ver. 22.2.7 diff --git a/otp-0011-Add-fno-common-gcc-option.patch b/otp-0011-Add-fno-common-gcc-option.patch new file mode 100644 index 0000000..758c78d --- /dev/null +++ b/otp-0011-Add-fno-common-gcc-option.patch @@ -0,0 +1,56 @@ +From: Sverker Eriksson +Date: Fri, 17 Jan 2020 17:21:32 +0100 +Subject: [PATCH] Add -fno-common gcc option + + +diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 +index 5fefd72d5d..5d274e69c3 100644 +--- a/erts/aclocal.m4 ++++ b/erts/aclocal.m4 +@@ -2935,6 +2935,12 @@ fi + # DED_EMU_THR_DEFS=$EMU_THR_DEFS + DED_CFLAGS="$CFLAGS $CPPFLAGS $DED_CFLAGS" + if test "x$GCC" = xyes; then ++ # Use -fno-common for gcc, that is link error if multiple definitions of ++ # global variables are encountered. This is ISO C compliant. ++ # Until version 10, gcc has had -fcommon as default, which allows and merges ++ # such dubious duplicates. ++ LM_TRY_ENABLE_CFLAG([-fno-common], [DED_CFLAGS]) ++ + DED_STATIC_CFLAGS="$DED_CFLAGS" + DED_CFLAGS="$DED_CFLAGS -fPIC" + fi +diff --git a/erts/configure.in b/erts/configure.in +index a887f86621..0a466ad5cc 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -566,6 +566,12 @@ if test "x$GCC" = xyes; then + WFLAGS="$WFLAGS -Wdeclaration-after-statement" + fi + CFLAGS=$saved_CFLAGS ++ ++ # Use -fno-common for gcc, that is link error if multiple definitions of ++ # global variables are encountered. This is ISO C compliant. ++ # Until version 10, gcc has had -fcommon as default, which allows and merges ++ # such dubious duplicates. ++ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) + else + WFLAGS="" + WERRORFLAGS="" +diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in +index f0e9b2eb3f..230dba25d6 100644 +--- a/lib/erl_interface/configure.in ++++ b/lib/erl_interface/configure.in +@@ -315,6 +315,12 @@ if test "x$GCC" = xyes; then + WFLAGS="$WFLAGS -fno-strict-aliasing";; + esac + CFLAGS="$WERRORFLAGS $CFLAGS" ++ ++ # Use -fno-common for gcc, that is link error if multiple definitions of ++ # global variables are encountered. This is ISO C compliant. ++ # Until version 10, gcc has had -fcommon as default, which allows and merges ++ # such dubious duplicates. ++ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) + else + WFLAGS="" + WERRORFLAGS="" From dfa4d5e1d4c8bab5f8cfb26290aecd6bdeee0e12 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 28 Feb 2020 14:46:01 +0100 Subject: [PATCH 204/340] Erlang ver. 22.2.8 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erlang.spec b/erlang.spec index 63209fd..280cafb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 22.2.7 -Release: 2%{?dist} +Version: 22.2.8 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1944,6 +1944,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Feb 28 2020 Peter Lemenkov - 22.2.8-1 +- Ver. 22.2.8 + * Fri Feb 21 2020 Peter Lemenkov - 22.2.7-2 - Fix building with GCC 10 (-fno-common) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index a2cdd5f..5bbcf37 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -117,10 +117,10 @@ index bddd761705..f0c2e7c35b 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 98636ed6e2..171846f1e4 100644 +index d6854cfd27..fab5f3dec3 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -250,11 +250,8 @@ release_spec: opt +@@ -257,11 +257,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: diff --git a/sources b/sources index bae4d9c..fbc61b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.7.tar.gz) = 1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b +SHA512 (otp-OTP-22.2.8.tar.gz) = ed65067e1cff82eb17e0ea758dac93f860ec4e2b661690cffa6bd43575de23f8dfbd570e13e548faef2ee51c6482faca35e21ea69ac0c585f61105f930df483d From a27b5d77d29d0dadd5213d90afbfb6fc4d00361c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 9 Apr 2020 19:22:02 +0200 Subject: [PATCH 205/340] Erlang ver. 22.3.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +- ...n-pages-and-do-not-install-miscellan.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0003-Do-not-install-C-sources.patch | 8 +-- otp-0006-Do-not-install-erlang-sources.patch | 34 +++++------ otp-0007-Add-extra-search-directory.patch | 2 +- ...man-pages-from-system-wide-directory.patch | 2 +- otp-0011-Add-fno-common-gcc-option.patch | 56 ------------------- sources | 2 +- 9 files changed, 30 insertions(+), 84 deletions(-) delete mode 100644 otp-0011-Add-fno-common-gcc-option.patch diff --git a/erlang.spec b/erlang.spec index 280cafb..85fa346 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 22.2.8 +Version: 22.3.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -107,7 +107,6 @@ 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 Patch10: otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch -Patch11: otp-0011-Add-fno-common-gcc-option.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1944,6 +1943,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Apr 9 2020 Peter Lemenkov - 22.3.2-1 +- Ver. 22.3.2 + * Fri Feb 28 2020 Peter Lemenkov - 22.2.8-1 - Ver. 22.2.8 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index e252e26..dff0d12 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 3a03374fbf..aef68348dd 100644 +index 05d7b5679f..cbac9956bc 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -504,10 +504,6 @@ endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index b590de1..51bfbad 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index f922c3fb9b..78ce3eeec6 100644 +index 129d0a7822..56af1b60bc 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 86e64ee..08d9363 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,7 +27,7 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 78ce3eeec6..5bcb8363f3 100644 +index 56af1b60bc..141168d3f8 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -222,16 +222,11 @@ docs: @@ -48,7 +48,7 @@ index 78ce3eeec6..5bcb8363f3 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 6e0d3476c7..55499fd9d4 100644 +index ba0164ea51..9ccbbee1b3 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -848,14 +848,14 @@ ifneq ($(EXE_TARGETS),) @@ -75,7 +75,7 @@ index 6e0d3476c7..55499fd9d4 100644 release_docs: diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 26d2ddd44c..753925ed77 100644 +index cd409fa54f..c65e817385 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -251,7 +251,7 @@ release_spec: opt @@ -117,7 +117,7 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 289322b6fa..9e2b9b7e7c 100644 +index 0cd760b137..b2d7cf94c9 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -189,8 +189,6 @@ include ../vsn.mk diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 5bbcf37..8533794 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 38b85915cc..1501eadd29 100644 +index d2153f23e1..1eb33a5922 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -120,8 +120,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -121,8 +121,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 @@ index 38b85915cc..1501eadd29 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index ba459f6cd3..5565126214 100644 +index a6ff72898c..35d4530f32 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -154,7 +154,7 @@ release_spec: opt +@@ -155,7 +155,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 @@ index ba459f6cd3..5565126214 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 76689dab8c..1f3512b027 100644 +index a20de14e0e..3ef8516521 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -149,7 +149,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -150,7 +150,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,7 +63,7 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 87b0d345f2..db0ea47135 100644 +index e42032c3ae..501ed4d3d6 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -179,8 +179,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -205,7 +205,7 @@ index 3510d3cc93..9179e9b4c2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 5c367b5b77..b7a85ba115 100644 +index affbb10ff6..44598beff2 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -244,7 +244,7 @@ index b220bc16a0..d4073277be 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 9f7a2def6d..def1b4be52 100644 +index 5e8f2076db..06d3f2684d 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile @@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -283,7 +283,7 @@ index e5033e444b..74a444b386 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 0c0f6e24f5..fcffc1f8b5 100644 +index 67485875a6..f83a2bb9e2 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -420,7 +420,7 @@ index 869b516b05..fa7d774d84 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 753925ed77..c6b68e225f 100644 +index c65e817385..3bc4dea207 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -248,7 +248,6 @@ release_spec: opt @@ -534,7 +534,7 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 10952106c6..dc07102803 100644 +index 1fef168463..e5411b903b 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -588,7 +588,7 @@ index 76286c5499..d921f9f294 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index a5b9a5e731..69bda2e0e1 100644 +index 16a42caf11..674364281d 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -665,10 +665,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 9627b70eeb..a4853985f5 100644 +index 2b96020678..3e692d25b2 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -139,7 +139,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -148,7 +148,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -678,7 +678,7 @@ index 9627b70eeb..a4853985f5 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index e961f05b37..5cac5a231b 100644 +index 03c39b4722..4a8fc58a18 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -691,7 +691,7 @@ index e961f05b37..5cac5a231b 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 86003c953d..69bfbefeb9 100644 +index 9d8a5f98f9..e5afdcfa27 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile @@ -216,7 +216,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index a8b3649..18d8e5e 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 68e1205301..0f534ff814 100644 +index 126de66d13..ad926ea1da 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index dc1ca1b..0b6cb3d 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,7 +7,7 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index f18ed0c983..5bdbe5153a 100644 +index 681a4c1299..034f7902ae 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -719,8 +719,10 @@ int main(int argc, char **argv) diff --git a/otp-0011-Add-fno-common-gcc-option.patch b/otp-0011-Add-fno-common-gcc-option.patch deleted file mode 100644 index 758c78d..0000000 --- a/otp-0011-Add-fno-common-gcc-option.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Sverker Eriksson -Date: Fri, 17 Jan 2020 17:21:32 +0100 -Subject: [PATCH] Add -fno-common gcc option - - -diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 -index 5fefd72d5d..5d274e69c3 100644 ---- a/erts/aclocal.m4 -+++ b/erts/aclocal.m4 -@@ -2935,6 +2935,12 @@ fi - # DED_EMU_THR_DEFS=$EMU_THR_DEFS - DED_CFLAGS="$CFLAGS $CPPFLAGS $DED_CFLAGS" - if test "x$GCC" = xyes; then -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [DED_CFLAGS]) -+ - DED_STATIC_CFLAGS="$DED_CFLAGS" - DED_CFLAGS="$DED_CFLAGS -fPIC" - fi -diff --git a/erts/configure.in b/erts/configure.in -index a887f86621..0a466ad5cc 100644 ---- a/erts/configure.in -+++ b/erts/configure.in -@@ -566,6 +566,12 @@ if test "x$GCC" = xyes; then - WFLAGS="$WFLAGS -Wdeclaration-after-statement" - fi - CFLAGS=$saved_CFLAGS -+ -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) - else - WFLAGS="" - WERRORFLAGS="" -diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in -index f0e9b2eb3f..230dba25d6 100644 ---- a/lib/erl_interface/configure.in -+++ b/lib/erl_interface/configure.in -@@ -315,6 +315,12 @@ if test "x$GCC" = xyes; then - WFLAGS="$WFLAGS -fno-strict-aliasing";; - esac - CFLAGS="$WERRORFLAGS $CFLAGS" -+ -+ # Use -fno-common for gcc, that is link error if multiple definitions of -+ # global variables are encountered. This is ISO C compliant. -+ # Until version 10, gcc has had -fcommon as default, which allows and merges -+ # such dubious duplicates. -+ LM_TRY_ENABLE_CFLAG([-fno-common], [CFLAGS]) - else - WFLAGS="" - WERRORFLAGS="" diff --git a/sources b/sources index fbc61b7..d17587f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.2.8.tar.gz) = ed65067e1cff82eb17e0ea758dac93f860ec4e2b661690cffa6bd43575de23f8dfbd570e13e548faef2ee51c6482faca35e21ea69ac0c585f61105f930df483d +SHA512 (otp-OTP-22.3.2.tar.gz) = 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1 From 68c6fc718d348a219673542548fe921bdd60ad70 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 19 Apr 2020 23:16:20 +0200 Subject: [PATCH 206/340] Erlang ver. 23.0-rc2 Signed-off-by: Peter Lemenkov --- erlang.spec | 44 ++++++++------ ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 17 +++--- otp-0004-Do-not-install-Java-sources.patch | 4 +- ...teventlog-and-related-doc-files-on-n.patch | 10 ++-- otp-0006-Do-not-install-erlang-sources.patch | 54 +++++++++--------- otp-0007-Add-extra-search-directory.patch | 2 +- ...man-pages-from-system-wide-directory.patch | 4 +- ...etup-reduce-number-of-calls-to-close.patch | 57 ------------------- sources | 2 +- 11 files changed, 78 insertions(+), 124 deletions(-) delete mode 100644 otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch diff --git a/erlang.spec b/erlang.spec index 85fa346..0b1243d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 22.3.2 -Release: 1%{?dist} +Version: 23.0 +Release: 0.1.rc2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -74,7 +74,8 @@ 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 +#Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc2/otp-OTP-%{version}-rc2.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -106,7 +107,6 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -712,17 +712,16 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version} +%autosetup -p1 -n otp-OTP-%{version}-rc2 # FIXME we should come up with a better solution # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] -# Reconfigure everything to apply changes to the autotools templates -./otp_build autoconf - %build +# Reconfigure everything to apply changes to the autotools templates +./otp_build autoconf # Set up proper cflags/cxxflags first %ifarch sparcv9 sparc64 @@ -1017,6 +1016,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files compiler %{_libdir}/erlang/lib/compiler-*/ %if %{with doc} +%{_mandir}/man3/cerl.* +%{_mandir}/man3/cerl_clauses.* +%{_mandir}/man3/cerl_trees.* %{_mandir}/man3/compile.* %endif @@ -1048,8 +1050,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/dialyzer-*/ %if %{with doc} +%{_mandir}/man1/typer.* %{_mandir}/man3/dialyzer.* -%{_mandir}/man3/typer.* %endif %endif # __with_wxwidgets @@ -1107,13 +1109,14 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man1/erl_call.* %{_mandir}/man3/ei.* %{_mandir}/man3/ei_connect.* -%{_mandir}/man3/erl_connect.* -%{_mandir}/man3/erl_error.* -%{_mandir}/man3/erl_eterm.* -%{_mandir}/man3/erl_format.* -%{_mandir}/man3/erl_global.* -%{_mandir}/man3/erl_malloc.* -%{_mandir}/man3/erl_marshal.* +%{_mandir}/man3/ei_global.* +#%%{_mandir}/man3/erl_connect.* +#%%{_mandir}/man3/erl_error.* +#%%{_mandir}/man3/erl_eterm.* +#%%{_mandir}/man3/erl_format.* +#%%{_mandir}/man3/erl_global.* +#%%{_mandir}/man3/erl_malloc.* +#%%{_mandir}/man3/erl_marshal.* %{_mandir}/man3/registry.* %endif @@ -1165,6 +1168,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/erts-*/bin/start.src %{_libdir}/erlang/erts-*/bin/start_erl.src %{_libdir}/erlang/erts-*/bin/to_erl +%{_libdir}/erlang/erts-*/bin/yielding_c_fun %{_libdir}/erlang/erts-*/include %{_libdir}/erlang/erts-*/lib/ %{_libdir}/erlang/erts-*/src/ @@ -1296,6 +1300,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ +%{_mandir}/man3/jinterface.* %endif # __with_java %files kernel @@ -1313,6 +1318,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erl_epmd.* %{_mandir}/man3/erl_prim_loader_stub.* %{_mandir}/man3/erlang_stub.* +%{_mandir}/man3/erpc.* %{_mandir}/man3/error_handler.* %{_mandir}/man3/error_logger.* %{_mandir}/man3/file.* @@ -1333,6 +1339,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/net_adm.* %{_mandir}/man3/net_kernel.* %{_mandir}/man3/os.* +%{_mandir}/man3/pg.* %{_mandir}/man3/pg2.* %{_mandir}/man3/rpc.* %{_mandir}/man3/seq_trace.* @@ -1533,6 +1540,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/ssh-*/src %if %{with doc} %{_mandir}/man3/ssh.* +%{_mandir}/man3/ssh_agent.* %{_mandir}/man3/ssh_client_channel.* %{_mandir}/man3/ssh_client_key_api.* %{_mandir}/man3/ssh_connection.* @@ -1613,6 +1621,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/sets.* %{_mandir}/man3/shell.* %{_mandir}/man3/shell_default.* +%{_mandir}/man3/shell_docs.* %{_mandir}/man3/slave.* %{_mandir}/man3/sofs.* %{_mandir}/man3/string.* @@ -1943,6 +1952,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sun Apr 19 2020 Peter Lemenkov - 23.0-0.1.rc2 +- Ver. 23.0-rc2 + * Thu Apr 9 2020 Peter Lemenkov - 22.3.2-1 - Ver. 22.3.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index dff0d12..418b2a8 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 05d7b5679f..cbac9956bc 100644 +index ef40341c87..84e6c3cb2f 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -504,10 +504,6 @@ endif +@@ -501,10 +501,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 51bfbad..8c1671d 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 129d0a7822..56af1b60bc 100644 +index d06dc95aa4..c9d5a7064a 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 08d9363..340a15a 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 56af1b60bc..141168d3f8 100644 +index c9d5a7064a..5f2dfb8e02 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -222,16 +222,11 @@ docs: +@@ -223,16 +223,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -48,10 +48,10 @@ index 56af1b60bc..141168d3f8 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index ba0164ea51..9ccbbee1b3 100644 +index 55827ce097..e01ab3ef36 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -848,14 +848,14 @@ ifneq ($(EXE_TARGETS),) +@@ -748,14 +748,13 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -61,7 +61,7 @@ index ba0164ea51..9ccbbee1b3 100644 - $(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" @@ -69,7 +69,6 @@ index ba0164ea51..9ccbbee1b3 100644 + $(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: @@ -88,7 +87,7 @@ index cd409fa54f..c65e817385 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 294d832797..173f660f26 100644 +index 3c16e7e294..82fe1492ef 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 @@ -117,10 +116,10 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 0cd760b137..b2d7cf94c9 100644 +index 8e13571786..ae18ef3cf4 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -189,8 +189,6 @@ include ../vsn.mk +@@ -188,8 +188,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 7b8bbd4..29f1fde 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index ee616f3d7e..fdd28e79b3 100644 +index bcbb206db6..1451378b35 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 diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index cfd78de..a36294b 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/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 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 8e9a4c333c..33b32b09b9 100644 +index d16f2b4831..c5b721f995 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile -@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) +@@ -31,11 +31,16 @@ APPLICATION=os_mon # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml @@ -28,20 +28,20 @@ index 8e9a4c333c..33b32b09b9 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 923a31f290..5963351b0f 100644 +index 98c5ced068..e2f4d5a090 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) # ---------------------------------------------------- # Target Specs # ---------------------------------------------------- --MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo nteventlog +-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_sup os_mon_sysinfo \ ++MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \ + $(NTEVENTLOG) INCLUDE=../include diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 8533794..54605e7 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -21,10 +21,10 @@ index d2153f23e1..1eb33a5922 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index a6ff72898c..35d4530f32 100644 +index 1c3bdfcaa8..8c2e6c9fbc 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -155,7 +155,7 @@ release_spec: opt +@@ -154,7 +154,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,10 +63,10 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index e42032c3ae..501ed4d3d6 100644 +index b1531ac985..dbcfe0042c 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -179,8 +179,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -184,8 +184,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -104,10 +104,10 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index bddd761705..f0c2e7c35b 100644 +index 1f5b308c7d..1f728c56d6 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -160,7 +160,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -117,10 +117,10 @@ index bddd761705..f0c2e7c35b 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index d6854cfd27..fab5f3dec3 100644 +index 36e8fefd4c..d3a10890ce 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -257,11 +257,8 @@ release_spec: opt +@@ -263,11 +263,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: @@ -168,10 +168,10 @@ index b79a537424..d0b231e5fc 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 82d051e9bb..950fdbe177 100644 +index 4c6f542ebb..d0cd6d8f68 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile -@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -343,10 +343,10 @@ index 8248e37c44..1f1b23184b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 9848fd4b35..387475febb 100644 +index da9549406f..eaa14b628f 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile -@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 2d2b84c206..9d67cb0c01 100644 +index 07f4f2304c..9c8913a5c1 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -231,7 +231,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -235,7 +235,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -394,10 +394,10 @@ index ab45548099..5c7a7f0be9 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index b9643669f6..5b5a4cf482 100644 +index 7fc90fd6d5..6ad086ed01 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile -@@ -176,7 +176,7 @@ release_spec: opt +@@ -177,7 +177,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" @@ -445,10 +445,10 @@ index d07db3fa4b..7f421d24cc 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index 8e7e82b276..2a118d24e3 100644 +index 3dd24b1df7..836e163499 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile -@@ -135,7 +135,7 @@ release_spec: opt +@@ -131,7 +131,7 @@ release_spec: opt $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/text" @@ -471,10 +471,10 @@ index 028a63e98e..9e11e9bfb2 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 7d316df263..60fdefb5d0 100644 +index 90e8780754..1a13d764b3 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -509,7 +509,7 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 5963351b0f..22c41137d0 100644 +index e2f4d5a090..57f21a145b 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -665,10 +665,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 2b96020678..3e692d25b2 100644 +index 4985774f4c..afd93dc922 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -148,7 +148,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -678,10 +678,10 @@ index 2b96020678..3e692d25b2 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 03c39b4722..4a8fc58a18 100644 +index 0b99cdde52..7ffa86b1fc 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -196,7 +196,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -691,10 +691,10 @@ index 03c39b4722..4a8fc58a18 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 9d8a5f98f9..e5afdcfa27 100644 +index e3e0c9c03d..ff9bad32ab 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -216,7 +216,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index 18d8e5e..ed9e2ac 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 126de66d13..ad926ea1da 100644 +index 4c4823eb38..de0ab149fb 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 0b6cb3d..64c270b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 681a4c1299..034f7902ae 100644 +index 890a5b381a..9f84a16353 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -719,8 +719,10 @@ int main(int argc, char **argv) +@@ -721,8 +721,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch b/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch deleted file mode 100644 index 8739391..0000000 --- a/otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: John Eckersberg -Date: Fri, 11 Oct 2019 13:06:20 -0400 -Subject: [PATCH] erl_child_setup: reduce number of calls to close() - -On systems without closefrom(), such as Linux, iterating over all -possible file descriptors and calling close() for each is inefficient. -This is markedly so when the maximum number of file descriptors has -been tuned to a large number. - -Instead, walk the open descriptors under /dev/fd and close only those -which are open. - -diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c -index 129861ebd5..7ddd753136 100644 ---- a/erts/emulator/sys/unix/erl_child_setup.c -+++ b/erts/emulator/sys/unix/erl_child_setup.c -@@ -411,6 +411,7 @@ main(int argc, char *argv[]) - int uds_fd = 3, max_fd = 3; - #ifndef HAVE_CLOSEFROM - int i; -+ DIR *dir; - #endif - struct sigaction sa; - -@@ -426,11 +427,29 @@ main(int argc, char *argv[]) - #if defined(HAVE_CLOSEFROM) - closefrom(4); - #else -- for (i = 4; i < max_files; i++) -+ dir = opendir("/dev/fd"); -+ if (dir == NULL) { /* /dev/fd not available */ -+ for (i = 4; i < max_files; i++) - #if defined(__ANDROID__) -- if (i != system_properties_fd()) -+ if (i != system_properties_fd()) - #endif -- (void) close(i); -+ (void) close(i); -+ } else { -+ /* Iterate over fds obtained from /dev/fd */ -+ struct dirent *entry; -+ int dir_fd = dirfd(dir); -+ -+ while ((entry = readdir(dir)) != NULL) { -+ i = atoi(entry->d_name); -+#if defined(__ANDROID__) -+ if (i != system_properties_fd()) -+#endif -+ if (i >= 4 && i != dir_fd) -+ (void) close(i); -+ } -+ -+ closedir(dir); -+ } - #endif - - if (pipe(sigchld_pipe) < 0) { diff --git a/sources b/sources index d17587f..cb89363 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-22.3.2.tar.gz) = 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1 +SHA512 (otp-OTP-23.0-rc2.tar.gz) = 38c68e9731814911a867bb663802fb6b290d892097c1f834c5fad33c0f202c34a9237025d189553bcf8775cdf2e960072fad65d89dedb90ced7c34e13ee45c6f From 468685baa4a79dcbe10f4510c1c976dbd8a2e1bf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 20 Apr 2020 14:01:52 +0200 Subject: [PATCH 207/340] Don't build jinterface man-page for arm Signed-off-by: Peter Lemenkov --- erlang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erlang.spec b/erlang.spec index 0b1243d..2ce6608 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1300,7 +1300,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %dir %{_javadir}/%{name}/ %{_javadir}/%{name}/OtpErlang.jar %{_libdir}/erlang/lib/jinterface-*/ +%if %{with doc} %{_mandir}/man3/jinterface.* +%endif %endif # __with_java %files kernel From 8bb7bd01fa5d7fb773de5184cc25ca6b3a70c82b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 23 Apr 2020 00:06:40 +0200 Subject: [PATCH 208/340] Erlang ver. 23.0-rc3 Signed-off-by: Peter Lemenkov --- erlang.spec | 13 ++++++++----- otp-0003-Do-not-install-C-sources.patch | 4 ++-- otp-0006-Do-not-install-erlang-sources.patch | 12 ++++++------ sources | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/erlang.spec b/erlang.spec index 2ce6608..7c5c0fc 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 23.0 -Release: 0.1.rc2%{?dist} +Release: 0.2.rc3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -75,7 +75,7 @@ URL: https://www.erlang.org VCS: scm:git:https://github.com/erlang/otp %endif #Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz -Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc2/otp-OTP-%{version}-rc2.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc3/otp-OTP-%{version}-rc3.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -712,7 +712,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version}-rc2 +%autosetup -p1 -n otp-OTP-%{version}-rc3 # FIXME we should come up with a better solution # remove shipped zlib sources @@ -725,9 +725,9 @@ Provides support for XML 1.0. # Set up proper cflags/cxxflags first %ifarch sparcv9 sparc64 -ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing -fcommon" +ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing" %else -ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fcommon" +ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif # Kernel poll is buggy on s390x for unknown reasons, disable it @@ -1954,6 +1954,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Apr 23 2020 Peter Lemenkov - 23.0-0.2.rc3 +- Ver. 23.0-rc3 + * Sun Apr 19 2020 Peter Lemenkov - 23.0-0.1.rc2 - Ver. 23.0-rc2 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 340a15a..5940508 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -48,10 +48,10 @@ index c9d5a7064a..5f2dfb8e02 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 55827ce097..e01ab3ef36 100644 +index 5a07b5542a..dd16380160 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -748,14 +748,13 @@ ifneq ($(EXE_TARGETS),) +@@ -749,14 +749,13 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 54605e7..875ec9d 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index d2153f23e1..1eb33a5922 100644 +index b0c205cec8..7fad1ddc75 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -21,10 +21,10 @@ index d2153f23e1..1eb33a5922 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 1c3bdfcaa8..8c2e6c9fbc 100644 +index a6ff72898c..35d4530f32 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -154,7 +154,7 @@ release_spec: opt +@@ -155,7 +155,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -369,10 +369,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 07f4f2304c..9c8913a5c1 100644 +index 6c75bcffee..d15bdb867a 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -235,7 +235,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -236,7 +236,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -678,7 +678,7 @@ index 4985774f4c..afd93dc922 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 0b99cdde52..7ffa86b1fc 100644 +index d53b73a747..c74b9b8ca3 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -196,7 +196,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/sources b/sources index cb89363..611512a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0-rc2.tar.gz) = 38c68e9731814911a867bb663802fb6b290d892097c1f834c5fad33c0f202c34a9237025d189553bcf8775cdf2e960072fad65d89dedb90ced7c34e13ee45c6f +SHA512 (otp-OTP-23.0-rc3.tar.gz) = 4b900016687c6b66570d9ed3a70859d91c9c5bdbb0deadd0c658c94ed1156816cd14bb57dbf2e9c9d984f643ef25842a248b10813b227ecb3e8dcdd29e8da1ed From cdf874dc770e0c4240c85137a7856d1bee234c71 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 1 May 2020 17:05:41 +0200 Subject: [PATCH 209/340] We no longer ship man 6 ssh Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 7c5c0fc..9b05d66 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1551,7 +1551,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ssh_server_key_api.* %{_mandir}/man3/ssh_sftp.* %{_mandir}/man3/ssh_sftpd.* -%{_mandir}/man6/ssh.* +#%%{_mandir}/man6/ssh.* %endif %files ssl From 755939eed8e374a5c86fa78ad2e978c1f6aaa3c0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 1 May 2020 18:05:09 +0200 Subject: [PATCH 210/340] We no longer ship man 6 ssh - we ship man 6 SSH Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 9b05d66..d15f7d7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1551,7 +1551,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ssh_server_key_api.* %{_mandir}/man3/ssh_sftp.* %{_mandir}/man3/ssh_sftpd.* -#%%{_mandir}/man6/ssh.* +%{_mandir}/man6/SSH.* %endif %files ssl From 4a788b08bd9b469753f2b46060faf53061a46059 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 13 May 2020 11:43:44 +0200 Subject: [PATCH 211/340] Erlang ver. 23.0 Signed-off-by: Peter Lemenkov --- erlang.spec | 10 ++++++---- ...format-man-pages-and-do-not-install-miscellan.patch | 8 ++++---- otp-0003-Do-not-install-C-sources.patch | 6 +++--- ...009-Load-man-pages-from-system-wide-directory.patch | 4 ++-- sources | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/erlang.spec b/erlang.spec index d15f7d7..253595f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 23.0 -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -74,8 +74,7 @@ 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 -Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc3/otp-OTP-%{version}-rc3.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -712,7 +711,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version}-rc3 +%autosetup -p1 -n otp-OTP-%{version} # FIXME we should come up with a better solution # remove shipped zlib sources @@ -1954,6 +1953,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 13 2020 Peter Lemenkov - 23.0-1 +- Ver. 23.0 + * Thu Apr 23 2020 Peter Lemenkov - 23.0-0.2.rc3 - Ver. 23.0-rc3 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 418b2a8..3bb6243 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index ef40341c87..84e6c3cb2f 100644 +index 650ab1f6fe..fc9a200c3c 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -501,10 +501,6 @@ endif +@@ -521,10 +521,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,10 +21,10 @@ index ef40341c87..84e6c3cb2f 100644 $(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 e4b842877c..382561821f 100644 +index 2dbf628972..5151f5130a 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 . +@@ -142,14 +142,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 diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 5940508..920480e 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -48,12 +48,12 @@ index c9d5a7064a..5f2dfb8e02 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 5a07b5542a..dd16380160 100644 +index 7ff3f09abb..2b94ce7de0 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -749,14 +749,13 @@ ifneq ($(EXE_TARGETS),) +@@ -748,14 +748,13 @@ release: opt + $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" $(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" diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 64c270b..edc2a75 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 890a5b381a..9f84a16353 100644 +index 9a2488c93c..b0e46745db 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -721,8 +721,10 @@ int main(int argc, char **argv) +@@ -726,8 +726,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index 611512a..4cee182 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0-rc3.tar.gz) = 4b900016687c6b66570d9ed3a70859d91c9c5bdbb0deadd0c658c94ed1156816cd14bb57dbf2e9c9d984f643ef25842a248b10813b227ecb3e8dcdd29e8da1ed +SHA512 (otp-OTP-23.0.tar.gz) = e5d1e4b52951234f8bd4f8db7bef59a330d2783aae317468e0b94ad23cd55a60afba5d3841efad49dfcda6d7ba0a51e60208bb6a950951683fd297df56636f83 From 9946af651b8655afbcf4956feff3731bce581a06 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 13 May 2020 12:38:14 +0200 Subject: [PATCH 212/340] new executable - erl_call Signed-off-by: Peter Lemenkov --- erlang.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erlang.spec b/erlang.spec index 253595f..70fd0bb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1103,6 +1103,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %files erl_interface +%{_libdir}/erlang/bin/erl_call +%{_libdir}/erlang/erts-*/bin/erl_call %{_libdir}/erlang/lib/erl_interface-*/ %if %{with doc} %{_mandir}/man1/erl_call.* From 989a16e8e740b7a19a22e98e2cd5f40a5e948291 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 20 May 2020 15:54:04 +0200 Subject: [PATCH 213/340] Erlang ver. 23.0.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 70fd0bb..6c4f32f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.0 +Version: 23.0.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 20 2020 Peter Lemenkov - 23.0.1-1 +- Ver. 23.0.1 + * Wed May 13 2020 Peter Lemenkov - 23.0-1 - Ver. 23.0 diff --git a/sources b/sources index 4cee182..8a398be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0.tar.gz) = e5d1e4b52951234f8bd4f8db7bef59a330d2783aae317468e0b94ad23cd55a60afba5d3841efad49dfcda6d7ba0a51e60208bb6a950951683fd297df56636f83 +SHA512 (otp-OTP-23.0.1.tar.gz) = fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4 From 7595736931d498f4a26a40f770aeae021f6de277 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 28 May 2020 21:34:39 +0200 Subject: [PATCH 214/340] Erlang ver. 23.0.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 6c4f32f..6816eed 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.0.1 +Version: 23.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu May 28 2020 Peter Lemenkov - 23.0.2-1 +- Ver. 23.0.2 + * Wed May 20 2020 Peter Lemenkov - 23.0.1-1 - Ver. 23.0.1 diff --git a/sources b/sources index 8a398be..4d9aa98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0.1.tar.gz) = fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4 +SHA512 (otp-OTP-23.0.2.tar.gz) = 82764ab879ea7588de505c6d58716999dc207163d8dcded226fe6849a3239c00088cb614558b77c038dcad1440f9b2e3ca2b2f1251df5d71b423d3f6e7497c6e From f4bbbaa33f7e53cc1c5f2b87e3ec4e17a8957f94 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 18:40:03 +0200 Subject: [PATCH 215/340] Rebuilt for JDK-11 --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 6816eed..7f6f0d8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 23.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jul 10 2020 Jiri Vanek - 23.0.2-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu May 28 2020 Peter Lemenkov - 23.0.2-1 - Ver. 23.0.2 From e322f8d8e30f6a4d87184293031f67c335ab1586 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 20 Jul 2020 22:16:34 +0200 Subject: [PATCH 216/340] Erlang ver. 23.0.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 7f6f0d8..7c31779 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 23.0.2 -Release: 2%{?dist} +Version: 23.0.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 20 2020 Peter Lemenkov - 23.0.3-1 +- Ver. 23.0.3 + * Fri Jul 10 2020 Jiri Vanek - 23.0.2-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 diff --git a/sources b/sources index 4d9aa98..64f9ff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0.2.tar.gz) = 82764ab879ea7588de505c6d58716999dc207163d8dcded226fe6849a3239c00088cb614558b77c038dcad1440f9b2e3ca2b2f1251df5d71b423d3f6e7497c6e +SHA512 (otp-OTP-23.0.3.tar.gz) = f7752bfa06dd283b36e330ba4270ee37ca759be697c804e6ac249becdc67de4bccb43f60a8d47f9a094d778f11fb17cf6d29de8ce60471aeb18c5fbd64cdfb4d From bb67f2a92efbbac96bf5d26b5ec3f9eb6f5ae76f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:39:18 +0000 Subject: [PATCH 217/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 7c31779..b5cbdaa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -66,7 +66,7 @@ Name: erlang Version: 23.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 23.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 20 2020 Peter Lemenkov - 23.0.3-1 - Ver. 23.0.3 From 2b4952392ecb50a3548de1e66a05a7b26e1a8a50 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 15 Sep 2020 16:16:56 +0200 Subject: [PATCH 218/340] Erlang ver. 23.0.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index b5cbdaa..87cd3d4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,8 +65,8 @@ Name: erlang -Version: 23.0.3 -Release: 2%{?dist} +Version: 23.0.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Sep 15 2020 Peter Lemenkov - 23.0.4-1 +- Ver. 23.0.4 + * Mon Jul 27 2020 Fedora Release Engineering - 23.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 64f9ff7..145ce1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0.3.tar.gz) = f7752bfa06dd283b36e330ba4270ee37ca759be697c804e6ac249becdc67de4bccb43f60a8d47f9a094d778f11fb17cf6d29de8ce60471aeb18c5fbd64cdfb4d +SHA512 (otp-OTP-23.0.4.tar.gz) = 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348 From c07d3ab79fd0b2000c2d8dac5373ed62f6969351 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 3 Oct 2020 22:09:17 +0200 Subject: [PATCH 219/340] Erlang ver. 23.1.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- ...rmat-man-pages-and-do-not-install-miscellan.patch | 4 ++-- otp-0002-Remove-rpath.patch | 2 +- otp-0003-Do-not-install-C-sources.patch | 6 +++--- otp-0006-Do-not-install-erlang-sources.patch | 12 ++++++------ ...9-Load-man-pages-from-system-wide-directory.patch | 4 ++-- sources | 2 +- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/erlang.spec b/erlang.spec index 87cd3d4..48b15cd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.0.4 +Version: 23.1.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Oct 3 2020 Peter Lemenkov - 23.1.1-1 +- Ver. 23.1.1 + * Tue Sep 15 2020 Peter Lemenkov - 23.0.4-1 - Ver. 23.0.4 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 3bb6243..3fd02f3 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 650ab1f6fe..fc9a200c3c 100644 +index 7a2b821c46..f5f3ee69cb 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -521,10 +521,6 @@ endif +@@ -528,10 +528,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 8c1671d..06c9b9b 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index d06dc95aa4..c9d5a7064a 100644 +index 786fbc1031..530022eb0d 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 920480e..befada3 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 1f714df357..95835d6ed2 100644 +index cb606fd74e..48a7c2f4f1 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile @@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -27,10 +27,10 @@ index 1f714df357..95835d6ed2 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c9d5a7064a..5f2dfb8e02 100644 +index 530022eb0d..a37eeb1b12 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -223,16 +223,11 @@ docs: +@@ -225,16 +225,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 875ec9d..5c97b4f 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -193,10 +193,10 @@ index b6347d8b6d..a695d2cc2d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 3510d3cc93..9179e9b4c2 100644 +index 32f75202a0..a89fa7f2d2 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile -@@ -120,7 +120,6 @@ release_spec: opt +@@ -121,7 +121,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -549,10 +549,10 @@ index 1fef168463..e5411b903b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index e61390bce3..6ed6c2cf9f 100644 +index 76bdffe089..fc5e4dfa8e 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -110,8 +110,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -678,10 +678,10 @@ index 4985774f4c..afd93dc922 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index d53b73a747..c74b9b8ca3 100644 +index b0f4cfd2da..122d4d5c31 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -196,7 +196,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -201,7 +201,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index edc2a75..93f3ccf 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 9a2488c93c..b0e46745db 100644 +index 59dcf700d7..dc9cb5828a 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -726,8 +726,10 @@ int main(int argc, char **argv) +@@ -727,8 +727,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index 145ce1c..92b7978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.0.4.tar.gz) = 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348 +SHA512 (otp-OTP-23.1.1.tar.gz) = 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9 From 7b0e9887acc89e6f31f7d26d181b5908be67ecd0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 17 Nov 2020 17:52:05 +0100 Subject: [PATCH 220/340] Erlang ver. 23.1.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 48b15cd..76e6bf0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.1.1 +Version: 23.1.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Nov 17 2020 Peter Lemenkov - 23.1.3-1 +- Ver. 23.1.3 + * Sat Oct 3 2020 Peter Lemenkov - 23.1.1-1 - Ver. 23.1.1 diff --git a/sources b/sources index 92b7978..7a1c818 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.1.1.tar.gz) = 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9 +SHA512 (otp-OTP-23.1.3.tar.gz) = ae88070b226df54c22693887352d3e0bd8cc3f77a872731cf52b59c386c0416efdc7f00db2690f4ab566e95d31fc828e4039ae1e9914fe35220d354c12bf086c From 9315954432e54b20f156cf3f9f491d99b0bcf8a0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 20 Nov 2020 17:20:22 +0100 Subject: [PATCH 221/340] Erlang ver. 23.1.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 76e6bf0..aa1798b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.1.3 +Version: 23.1.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Nov 20 2020 Peter Lemenkov - 23.1.4-1 +- Ver. 23.1.4 + * Tue Nov 17 2020 Peter Lemenkov - 23.1.3-1 - Ver. 23.1.3 diff --git a/sources b/sources index 7a1c818..e95dbeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.1.3.tar.gz) = ae88070b226df54c22693887352d3e0bd8cc3f77a872731cf52b59c386c0416efdc7f00db2690f4ab566e95d31fc828e4039ae1e9914fe35220d354c12bf086c +SHA512 (otp-OTP-23.1.4.tar.gz) = 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367 From c505375f3e6d3de1fc5278846a8c3298528d897c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 11 Dec 2020 12:52:45 +0100 Subject: [PATCH 222/340] Erlang ver. 23.1.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index aa1798b..f57ae3d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.1.4 +Version: 23.1.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1955,6 +1955,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Dec 11 2020 Peter Lemenkov - 23.1.5-1 +- Ver. 23.1.5 + * Fri Nov 20 2020 Peter Lemenkov - 23.1.4-1 - Ver. 23.1.4 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 5c97b4f..a5f7f08 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -665,10 +665,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 4985774f4c..afd93dc922 100644 +index ab6137e518..bdeabca8c3 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -153,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/sources b/sources index e95dbeb..ce6de21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.1.4.tar.gz) = 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367 +SHA512 (otp-OTP-23.1.5.tar.gz) = dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955 From 30b1bae6ce3d9e5dd6f70173815684ab41e2244a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 05:09:18 +0000 Subject: [PATCH 223/340] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index f57ae3d..70e000a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -689,6 +689,7 @@ A set of programming tools including a coverage analyzer etc. %package wx Summary: A library for wxWidgets support in Erlang BuildRequires: wxGTK3-devel +BuildRequires: make Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} From 372de3ec49542b4effab6c7b034924541c35aa28 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 17 Dec 2020 12:11:53 +0100 Subject: [PATCH 224/340] Erlang ver. 23.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- otp-0002-Remove-rpath.patch | 4 ++-- otp-0003-Do-not-install-C-sources.patch | 4 ++-- otp-0006-Do-not-install-erlang-sources.patch | 8 ++++---- otp-0009-Load-man-pages-from-system-wide-directory.patch | 2 +- sources | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/erlang.spec b/erlang.spec index 70e000a..d4d1a2e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.1.5 +Version: 23.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -111,6 +111,7 @@ Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: flex +BuildRequires: make %if %{with doc} %if 0%{?need_bootstrap} < 1 @@ -689,7 +690,6 @@ A set of programming tools including a coverage analyzer etc. %package wx Summary: A library for wxWidgets support in Erlang BuildRequires: wxGTK3-devel -BuildRequires: make Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -1956,6 +1956,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Dec 17 2020 Peter Lemenkov - 23.2-1 +- Ver. 23.2 + * Fri Dec 11 2020 Peter Lemenkov - 23.1.5-1 - Ver. 23.1.5 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 06c9b9b..396235c 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 786fbc1031..530022eb0d 100644 +index ecccc33d8d..149ed127ff 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -114,7 +114,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -120,7 +120,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index befada3..a41024a 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 530022eb0d..a37eeb1b12 100644 +index 149ed127ff..4cf27ed6c7 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -225,16 +225,11 @@ docs: +@@ -231,16 +231,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index a5f7f08..88e6171 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -34,10 +34,10 @@ index a6ff72898c..35d4530f32 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index a20de14e0e..3ef8516521 100644 +index 7d7b5ed203..9151e4097b 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile -@@ -150,7 +150,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" @@ -678,10 +678,10 @@ index ab6137e518..bdeabca8c3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index b0f4cfd2da..122d4d5c31 100644 +index 8abd7820f7..8a49484592 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -201,7 +201,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -204,7 +204,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 93f3ccf..d68a78b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,7 +7,7 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 59dcf700d7..dc9cb5828a 100644 +index 9dba684cbb..b4c5a8413f 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -727,8 +727,10 @@ int main(int argc, char **argv) diff --git a/sources b/sources index ce6de21..190fd6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.1.5.tar.gz) = dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955 +SHA512 (otp-OTP-23.2.tar.gz) = 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313 From 231c205a17641d7b57bd560b2fb4e988f462e79c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 17 Dec 2020 13:18:56 +0100 Subject: [PATCH 225/340] Missing man-page Signed-off-by: Peter Lemenkov --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index d4d1a2e..020560b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1006,6 +1006,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ct_slave.* %{_mandir}/man3/ct_snmp.* %{_mandir}/man3/ct_ssh.* +%{_mandir}/man3/ct_suite.* %{_mandir}/man3/ct_telnet.* %{_mandir}/man3/ct_testspec.* %{_mandir}/man3/unix_telnet.* From 70363e6ebb75a729a37f3868bcd751226c7ed276 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 22 Dec 2020 14:34:05 +0100 Subject: [PATCH 226/340] Erlang ver. 23.2.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 020560b..17f1a13 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.2 +Version: 23.2.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1957,6 +1957,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Dec 22 2020 Peter Lemenkov - 23.2.1-1 +- Ver. 23.2.1 + * Thu Dec 17 2020 Peter Lemenkov - 23.2-1 - Ver. 23.2 diff --git a/sources b/sources index 190fd6e..e15a248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.tar.gz) = 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313 +SHA512 (otp-OTP-23.2.1.tar.gz) = 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531 From fccbcf972353733c250f00a82d85dd89f3390e52 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jan 2021 13:12:34 +0100 Subject: [PATCH 227/340] Erlang ver. 23.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 17f1a13..664d7a6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang -Version: 23.2.1 +Version: 23.2.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1957,6 +1957,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jan 15 2021 Peter Lemenkov - 23.2.2-1 +- Ver. 23.2.2 + * Tue Dec 22 2020 Peter Lemenkov - 23.2.1-1 - Ver. 23.2.1 diff --git a/sources b/sources index e15a248..b166728 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.1.tar.gz) = 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531 +SHA512 (otp-OTP-23.2.2.tar.gz) = 26743a7a4b2e31e63c0940ed6fdad64427c22e0f08fc063e1b8639bea6fa89c6b24e9c87ca572475d3ce39a18857ef6143676653cdf97b374656ae49f5892633 From 8a31902294703fd9cd83ce96bc3dfe4c102d909e Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jan 2021 13:20:17 +0100 Subject: [PATCH 228/340] Disable XEmacs Signed-off-by: Peter Lemenkov --- erlang.spec | 46 +---------------------------------------- otp-make-subpackages.py | 8 +------ 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/erlang.spec b/erlang.spec index 664d7a6..b8451bf 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,6 @@ ## %global __with_emacs 1 -%global __with_xemacs 0 %global __with_examples 1 %global __with_java 1 # @@ -661,10 +660,6 @@ Summary: A set of programming tools including a coverage analyzer etc BuildRequires: emacs BuildRequires: emacs-el %endif %{__with_emacs} -%if %{__with_xemacs} -BuildRequires: xemacs -BuildRequires: xemacs-packages-extra-el -%endif %{__with_xemacs} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -676,11 +671,6 @@ Requires: emacs-filesystem Obsoletes: emacs-erlang Obsoletes: emacs-erlang-el %endif %{__with_emacs} -%if %{__with_xemacs} -Requires: xemacs-filesystem -Obsoletes: xemacs-erlang -Obsoletes: xemacs-erlang-el -%endif %{__with_xemacs} %description tools @@ -777,21 +767,6 @@ pushd emacs-erlang %{_emacs_bytecompile} *.el popd %endif %{__with_emacs} -%if %{__with_xemacs} -# XEmacs related stuff -cat > xemacs-erlang-init.el << EOF -(setq load-path (cons "%{_xemacs_sitelispdir}/erlang" load-path)) -(setq erlang-root-dir "%{_libdir}/erlang") -(setq exec-path (cons "%{_libdir}/erlang/bin" exec-path)) -(require 'erlang-start) -EOF -mkdir xemacs-erlang -cp lib/tools/emacs/*.el xemacs-erlang/ -rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el xemacs-erlang/erldoc.el xemacs-erlang/erlang-edoc.el -pushd xemacs-erlang -%{_xemacs_bytecompile} *.el -popd -%endif %{__with_xemacs} make @@ -822,19 +797,6 @@ for f in lib/tools/emacs/{README,*.el}; do done install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" %endif %{__with_emacs} -%if %{__with_xemacs} -# XEmacs related stuff -install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}" -install -m 0755 -d "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang" -install -m 0644 xemacs-erlang-init.el "$RPM_BUILD_ROOT%{_xemacs_sitestartdir}/erlang-init.el" -for f in lib/tools/emacs/{README,*.el}; do - b="$(basename "$f")"; - ln -s "%{_libdir}/erlang/lib/tools-${erlang_tools_vsn}/emacs/$b" \ - "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" -done -rm -f "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/erlang-flymake.el" -install -m 0644 xemacs-erlang/*.elc "$RPM_BUILD_ROOT%{_xemacs_sitelispdir}/erlang/" -%endif %{__with_xemacs} make DESTDIR=$RPM_BUILD_ROOT install @@ -1692,13 +1654,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_emacs_sitelispdir}/erlang/*.elc %{_emacs_sitestartdir}/erlang-init.el %endif %{__with_emacs} -%if %{__with_xemacs} -%dir %{_xemacs_sitelispdir}/erlang -%doc %{_xemacs_sitelispdir}/erlang/README -%{_xemacs_sitelispdir}/erlang/*.el -%{_xemacs_sitelispdir}/erlang/*.elc -%{_xemacs_sitestartdir}/erlang-init.el -%endif %{__with_xemacs} %if %{__with_wxwidgets} %files wx @@ -1959,6 +1914,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog * Fri Jan 15 2021 Peter Lemenkov - 23.2.2-1 - Ver. 23.2.2 +- Disable XEmacs support (dead upstream, scheduled for removal from Fedora) * Tue Dec 22 2020 Peter Lemenkov - 23.2.1-1 - Ver. 23.2.1 diff --git a/otp-make-subpackages.py b/otp-make-subpackages.py index e004bf3..fd9df5e 100644 --- a/otp-make-subpackages.py +++ b/otp-make-subpackages.py @@ -24,9 +24,7 @@ package_headers = {} package_noarch = [ "emacs-erlang", "emacs-erlang-el", - "erlang-doc", - "xemacs-erlang", - "xemacs-erlang-el"] + "erlang-doc"] # These are additional Requires which cannot be picked up automatically (yet). # TODO these should be added automatically @@ -44,8 +42,6 @@ package_additional_requires = { # 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"], - "xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"], - "xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"] } package_additional_buildrequires = { @@ -70,8 +66,6 @@ package_additional_buildrequires = { "erlang-jinterface": ["java-devel"], "erlang-odbc": ["unixODBC-devel"], - "erlang-wx": ["wxGTK-devel"], - "xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"], } package_additional_obsoletes = { From 8b84e201ddc84bbbaaed222a08691b16fe98642d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 20 Jan 2021 21:25:45 +0100 Subject: [PATCH 229/340] Erlang ver. 23.2.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index b8451bf..304a38d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.2.2 +Version: 23.2.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jan 20 2021 Peter Lemenkov - 23.2.3-1 +- Ver. 23.2.3 + * Fri Jan 15 2021 Peter Lemenkov - 23.2.2-1 - Ver. 23.2.2 - Disable XEmacs support (dead upstream, scheduled for removal from Fedora) diff --git a/sources b/sources index b166728..9d4e3a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.2.tar.gz) = 26743a7a4b2e31e63c0940ed6fdad64427c22e0f08fc063e1b8639bea6fa89c6b24e9c87ca572475d3ce39a18857ef6143676653cdf97b374656ae49f5892633 +SHA512 (otp-OTP-23.2.3.tar.gz) = c1c176d908ac0a2470926997ec62d0e2d330aac25202e24314af1d57171d460fd5582e9ece9e289d7eb5c2728a6966b130e14ada10ba8ead04d47a849287ded4 From 8ee0d3868ac169b1b795b5d6130a18f79f4bec39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:42:04 +0000 Subject: [PATCH 230/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 304a38d..77067d4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -65,7 +65,7 @@ Name: erlang Version: 23.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 23.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Peter Lemenkov - 23.2.3-1 - Ver. 23.2.3 From fe61b20ca681a97ce592896aa502b8e3e848de12 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 4 Feb 2021 15:03:12 -0500 Subject: [PATCH 231/340] Erlang ver. 23.2.4 --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 77067d4..e914eb9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,8 +64,8 @@ Name: erlang -Version: 23.2.3 -Release: 2%{?dist} +Version: 23.2.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Feb 4 2021 John Eckersberg - 23.2.4-1 +- Ver. 23.2.4 + * Tue Jan 26 2021 Fedora Release Engineering - 23.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 9d4e3a9..ab86455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.3.tar.gz) = c1c176d908ac0a2470926997ec62d0e2d330aac25202e24314af1d57171d460fd5582e9ece9e289d7eb5c2728a6966b130e14ada10ba8ead04d47a849287ded4 +SHA512 (otp-OTP-23.2.4.tar.gz) = 12d10d0f2522a6df0007ee662335055dee3e2dad2be2a877e42c6fb7c3ca6ff613437a92523845a5e41c2b18ee2221de96c3d4a33acf5c3c5e4e3a1d093c2cac From 45d7d01f6fc8da4a5f2204069b63120a78a2255d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 16 Feb 2021 12:46:23 +0100 Subject: [PATCH 232/340] Erlang ver. 23.2.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index e914eb9..f90fefa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.2.4 +Version: 23.2.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 16 2021 Peter Lemenkov - 23.2.5-1 +- Ver. 23.2.5 + * Thu Feb 4 2021 John Eckersberg - 23.2.4-1 - Ver. 23.2.4 diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 88e6171..307d616 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -678,10 +678,10 @@ index ab6137e518..bdeabca8c3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 8abd7820f7..8a49484592 100644 +index 1a55ee7b83..39fc380c32 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -204,7 +204,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -207,7 +207,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/sources b/sources index ab86455..7c67aee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.4.tar.gz) = 12d10d0f2522a6df0007ee662335055dee3e2dad2be2a877e42c6fb7c3ca6ff613437a92523845a5e41c2b18ee2221de96c3d4a33acf5c3c5e4e3a1d093c2cac +SHA512 (otp-OTP-23.2.5.tar.gz) = 8738adc67901e6a118338057e56f28e7c8a0482e452ec53b643d3af2c3aad04c95a856f9a4f0c2938d2db13fd6891c1be8770e34fa377444cd667da558033df3 From 5a781e9b49425354264258da10be695f8467d4da Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2021 19:21:46 +0100 Subject: [PATCH 233/340] Erlang ver. 23.2.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index f90fefa..3bb0ef9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.2.5 +Version: 23.2.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Feb 25 2021 Peter Lemenkov - 23.2.6-1 +- Ver. 23.2.6 + * Tue Feb 16 2021 Peter Lemenkov - 23.2.5-1 - Ver. 23.2.5 diff --git a/sources b/sources index 7c67aee..533db7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.5.tar.gz) = 8738adc67901e6a118338057e56f28e7c8a0482e452ec53b643d3af2c3aad04c95a856f9a4f0c2938d2db13fd6891c1be8770e34fa377444cd667da558033df3 +SHA512 (otp-OTP-23.2.6.tar.gz) = b8fb509e573188f3228192acb44a7df849f7e43a4ac03d566d7dfe530837630a17572857b114e8eadbc7236d169d26658a88f4a5896b28075b31e296ea4e63f1 From a686b04383bf3d61a5dc2734ff281a1acebe25f5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 5 Mar 2021 21:37:35 +0100 Subject: [PATCH 234/340] Erlang ver. 23.2.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3bb0ef9..5f4f561 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.2.6 +Version: 23.2.7 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Mar 5 2021 Peter Lemenkov - 23.2.7-1 +- Ver. 23.2.7 + * Thu Feb 25 2021 Peter Lemenkov - 23.2.6-1 - Ver. 23.2.6 diff --git a/sources b/sources index 533db7a..5f1e1f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.6.tar.gz) = b8fb509e573188f3228192acb44a7df849f7e43a4ac03d566d7dfe530837630a17572857b114e8eadbc7236d169d26658a88f4a5896b28075b31e296ea4e63f1 +SHA512 (otp-OTP-23.2.7.tar.gz) = 1e94b641644edb1edc3d15679222dd5d198abf1cae6daa4b91304317f8df21514029971f208767396625c0a0be7107c357c9ef80974c9865113a760aa2655220 From 0fa176ad3b9fe67f5f3c2cbf057209d9a310de03 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 24 Mar 2021 12:26:33 +0100 Subject: [PATCH 235/340] Erlang ver. 23.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0002-Remove-rpath.patch | 4 ++-- otp-0003-Do-not-install-C-sources.patch | 4 ++-- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/erlang.spec b/erlang.spec index 5f4f561..706552e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.2.7 +Version: 23.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Mar 24 2021 Peter Lemenkov - 23.3-1 +- Ver. 23.3 + * Fri Mar 5 2021 Peter Lemenkov - 23.2.7-1 - Ver. 23.2.7 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 396235c..f44a974 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index ecccc33d8d..149ed127ff 100644 +index 0821bd8d00..c94f01420e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -120,7 +120,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -126,7 +126,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index a41024a..0745b8a 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 149ed127ff..4cf27ed6c7 100644 +index c94f01420e..e2cae1692f 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -231,16 +231,11 @@ docs: +@@ -237,16 +237,11 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 307d616..1bc3055 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -78,7 +78,7 @@ index b1531ac985..dbcfe0042c 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 1753ba4f36..2cd09475e8 100644 +index c3f1c859e5..0d72d6c82d 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -81,8 +81,6 @@ docs: @@ -678,7 +678,7 @@ index ab6137e518..bdeabca8c3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 1a55ee7b83..39fc380c32 100644 +index 5edd6cb4b9..39008882ca 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -207,7 +207,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/sources b/sources index 5f1e1f0..752e602 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.2.7.tar.gz) = 1e94b641644edb1edc3d15679222dd5d198abf1cae6daa4b91304317f8df21514029971f208767396625c0a0be7107c357c9ef80974c9865113a760aa2655220 +SHA512 (otp-OTP-23.3.tar.gz) = 1ee12b7f045bd7fd5e05fd7c418ff176ebb6fe183664ea6a7e615bbb547b99287c9c44c927177a12bb079b84c4ed9e3a53d15a5e42473420b79b0816774fbdd4 From 1755bf23c184b784c212fc1d8817f5dfd28e4791 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 30 Mar 2021 16:41:57 +0200 Subject: [PATCH 236/340] Erlang ver. 23.3.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 706552e..1b08d44 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang -Version: 23.3 +Version: 23.3.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 30 2021 Peter Lemenkov - 23.3.1-1 +- Ver. 23.3.1 + * Wed Mar 24 2021 Peter Lemenkov - 23.3-1 - Ver. 23.3 diff --git a/sources b/sources index 752e602..dd69d34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.3.tar.gz) = 1ee12b7f045bd7fd5e05fd7c418ff176ebb6fe183664ea6a7e615bbb547b99287c9c44c927177a12bb079b84c4ed9e3a53d15a5e42473420b79b0816774fbdd4 +SHA512 (otp-OTP-23.3.1.tar.gz) = 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0 From d8da3b9c78276cfd7b3a367d065cbbe39c97fd07 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 4 Apr 2021 00:08:20 +0200 Subject: [PATCH 237/340] Erlang ver. 24.0-rc2 Signed-off-by: Peter Lemenkov --- erlang.spec | 51 ++--- ...n-pages-and-do-not-install-miscellan.patch | 4 +- otp-0002-Remove-rpath.patch | 17 +- otp-0003-Do-not-install-C-sources.patch | 31 +-- otp-0006-Do-not-install-erlang-sources.patch | 178 ++++-------------- otp-0007-Add-extra-search-directory.patch | 2 +- ...08-Avoid-forking-sed-to-get-basename.patch | 6 +- ...man-pages-from-system-wide-directory.patch | 4 +- sources | 2 +- 9 files changed, 68 insertions(+), 227 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1b08d44..13ae569 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,10 +16,6 @@ %endif %endif -%ifarch %{arm} %{ix86} x86_64 ppc %{power64} -%global __with_hipe 1 -%endif - ## ## Optional components ## @@ -64,8 +60,8 @@ Name: erlang -Version: 23.3.1 -Release: 1%{?dist} +Version: 24.0 +Release: 0.1.rc2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -73,7 +69,7 @@ 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 +Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc2/otp-OTP-%{version}-rc2.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -153,7 +149,6 @@ Requires: %{name}-et%{?_isa} = %{version}-%{release} %endif # __with_wxwidgets Requires: %{name}-eunit%{?_isa} = %{version}-%{release} Requires: %{name}-ftp%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} %if %{__with_java} Requires: %{name}-jinterface%{?_isa} = %{version}-%{release} @@ -232,7 +227,6 @@ A portable framework for automatic testing. Summary: A byte code compiler for Erlang which produces highly compact code Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -267,7 +261,6 @@ A debugger for debugging and testing of Erlang programs. Summary: A DIscrepancy AnaLYZer for ERlang programs Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-hipe%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} @@ -364,6 +357,7 @@ Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs +Obsoletes: erlang-hipe Obsoletes: erlang-inviso Obsoletes: erlang-ose Obsoletes: erlang-otp_mibs @@ -422,17 +416,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description ftp FTP client. -%package hipe -Summary: High Performance Erlang -Requires: %{name}-compiler%{?_isa} = %{version}-%{release} -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} - -%description hipe -High Performance Erlang. - %package inets Summary: A set of services such as a Web server and a HTTP client etc Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -702,7 +685,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version} +%autosetup -p1 -n otp-OTP-%{version}-rc2 # FIXME we should come up with a better solution # remove shipped zlib sources @@ -727,7 +710,6 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %endif CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \ - %{?__with_hipe:--enable-hipe} \ %{?__without_kernel_poll:--disable-kernel-poll} \ %if %{__with_java} \ @@ -1046,10 +1028,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files edoc %{_libdir}/erlang/lib/edoc-*/ %if %{with doc} +%{_mandir}/man1/edoc.* %{_mandir}/man3/edoc.* %{_mandir}/man3/edoc_doclet.* +%{_mandir}/man3/edoc_doclet_chunks.* %{_mandir}/man3/edoc_extract.* %{_mandir}/man3/edoc_layout.* +%{_mandir}/man3/edoc_layout_chunks.* %{_mandir}/man3/edoc_lib.* %{_mandir}/man3/edoc_run.* %endif @@ -1082,7 +1067,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ #%%{_mandir}/man3/erl_global.* #%%{_mandir}/man3/erl_malloc.* #%%{_mandir}/man3/erl_marshal.* -%{_mandir}/man3/registry.* %endif %files erts @@ -1235,9 +1219,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ftp.* %endif -%files hipe -%{_libdir}/erlang/lib/hipe-*/ - %files inets %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin @@ -1307,7 +1288,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/net_kernel.* %{_mandir}/man3/os.* %{_mandir}/man3/pg.* -%{_mandir}/man3/pg2.* %{_mandir}/man3/rpc.* %{_mandir}/man3/seq_trace.* %{_mandir}/man3/user.* @@ -1549,6 +1529,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/digraph_utils.* %{_mandir}/man3/epp.* %{_mandir}/man3/erl_anno.* +%{_mandir}/man3/erl_error.* %{_mandir}/man3/erl_eval.* %{_mandir}/man3/erl_expand_records.* %{_mandir}/man3/erl_id_trans.* @@ -1613,8 +1594,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erl_recomment.* %{_mandir}/man3/erl_syntax.* %{_mandir}/man3/erl_syntax_lib.* -%{_mandir}/man3/erl_tidy.* -%{_mandir}/man3/igor.* %{_mandir}/man3/merl.* %{_mandir}/man3/merl_transform.* %{_mandir}/man3/prettypr.* @@ -1681,6 +1660,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxBitmap.* %{_mandir}/man3/wxBitmapButton.* %{_mandir}/man3/wxBitmapDataObject.* +%{_mandir}/man3/wxBookCtrlBase.* +%{_mandir}/man3/wxBookCtrlEvent.* %{_mandir}/man3/wxBoxSizer.* %{_mandir}/man3/wxBrush.* %{_mandir}/man3/wxBufferedDC.* @@ -1740,11 +1721,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxGBSizerItem.* %{_mandir}/man3/wxGCDC.* %{_mandir}/man3/wxGLCanvas.* +%{_mandir}/man3/wxGLContext.* %{_mandir}/man3/wxGauge.* %{_mandir}/man3/wxGenericDirCtrl.* %{_mandir}/man3/wxGraphicsBrush.* %{_mandir}/man3/wxGraphicsContext.* %{_mandir}/man3/wxGraphicsFont.* +%{_mandir}/man3/wxGraphicsGradientStops.* %{_mandir}/man3/wxGraphicsMatrix.* %{_mandir}/man3/wxGraphicsObject.* %{_mandir}/man3/wxGraphicsPath.* @@ -1809,7 +1792,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxMultiChoiceDialog.* %{_mandir}/man3/wxNavigationKeyEvent.* %{_mandir}/man3/wxNotebook.* -%{_mandir}/man3/wxNotebookEvent.* +%{_mandir}/man3/wxNotificationMessage.* %{_mandir}/man3/wxNotifyEvent.* %{_mandir}/man3/wxOverlay.* %{_mandir}/man3/wxPageSetupDialog.* @@ -1888,6 +1871,8 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/wxTreeEvent.* %{_mandir}/man3/wxTreebook.* %{_mandir}/man3/wxUpdateUIEvent.* +%{_mandir}/man3/wxWebView.* +%{_mandir}/man3/wxWebViewEvent.* %{_mandir}/man3/wxWindow.* %{_mandir}/man3/wxWindowCreateEvent.* %{_mandir}/man3/wxWindowDC.* @@ -1912,6 +1897,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Apr 3 2021 Peter Lemenkov - 24.0-0.1.rc2 +- Ver. 24.0-rc2 +- Removed hipe + * Tue Mar 30 2021 Peter Lemenkov - 23.3.1-1 - Ver. 23.3.1 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 3fd02f3..7034252 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 7a2b821c46..f5f3ee69cb 100644 +index ba4d898f79..a22e557007 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -528,10 +528,6 @@ endif +@@ -525,10 +525,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index f44a974..be5841a 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 0821bd8d00..c94f01420e 100644 +index f962b7b9ad..916d23d69c 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -126,7 +126,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ +@@ -125,7 +125,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ ifeq ($(DYNAMIC_CRYPTO_LIB),yes) @@ -17,16 +17,3 @@ index 0821bd8d00..c94f01420e 100644 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 ff9d3e1dc9..d3aba77808 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) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 0745b8a..12f4eb8 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -26,32 +26,11 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: -diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index c94f01420e..e2cae1692f 100644 ---- a/lib/crypto/c_src/Makefile.in -+++ b/lib/crypto/c_src/Makefile.in -@@ -237,16 +237,11 @@ 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 -- $(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj" - $(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib" - - release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 7ff3f09abb..2b94ce7de0 100644 +index 061fd05a1d..498b7d1370 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -748,14 +748,13 @@ release: opt +@@ -691,13 +691,12 @@ release: opt $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -60,7 +39,6 @@ index 7ff3f09abb..2b94ce7de0 100644 - $(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) global/*.[ch] "$(RELSYSDIR)/src/global" - $(INSTALL_DATA) prog/*.[ch] "$(RELSYSDIR)/src/prog" + $(INSTALL_DATA) connect/*.h "$(RELSYSDIR)/src/connect" @@ -68,7 +46,6 @@ index 7ff3f09abb..2b94ce7de0 100644 + $(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) prog/*.h "$(RELSYSDIR)/src/prog" release_docs: @@ -116,10 +93,10 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 8e13571786..ae18ef3cf4 100644 +index 878aa2cde6..0153885e88 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -188,8 +188,6 @@ include ../vsn.mk +@@ -170,8 +170,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 1bc3055..989f09d 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -21,10 +21,10 @@ index b0c205cec8..7fad1ddc75 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index a6ff72898c..35d4530f32 100644 +index 60a2020dbf..406cc08208 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -155,7 +155,7 @@ release_spec: opt +@@ -151,7 +151,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -63,10 +63,10 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index b1531ac985..dbcfe0042c 100644 +index f195e16dc6..68c6695b9e 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -184,8 +184,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -104,10 +104,10 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 1f5b308c7d..1f728c56d6 100644 +index 0847da9d5a..24a054ac04 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -135,7 +135,7 @@ index 36e8fefd4c..d3a10890ce 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index ea2f45dc4c..84af08eb67 100644 +index 8acef15248..ead1fd3b0f 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -87,7 +87,7 @@ release_spec: opt @@ -204,118 +204,6 @@ index 32f75202a0..a89fa7f2d2 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index affbb10ff6..44598beff2 100644 ---- a/lib/hipe/cerl/Makefile -+++ b/lib/hipe/cerl/Makefile -@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/cerl" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index d883eecf36..3119bc4638 100644 ---- a/lib/hipe/flow/Makefile -+++ b/lib/hipe/flow/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/flow" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" -+ $(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index b220bc16a0..d4073277be 100644 ---- a/lib/hipe/icode/Makefile -+++ b/lib/hipe/icode/Makefile -@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/icode" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index 5e8f2076db..06d3f2684d 100644 ---- a/lib/hipe/llvm/Makefile -+++ b/lib/hipe/llvm/Makefile -@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/llvm -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm -+ $(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm - $(INSTALL_DIR) $(RELSYSDIR)/ebin - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - -diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index 8ef31dbb46..80d28819f2 100644 ---- a/lib/hipe/main/Makefile -+++ b/lib/hipe/main/Makefile -@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" - $(INSTALL_DIR) "$(RELSYSDIR)/main" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index e5033e444b..74a444b386 100644 ---- a/lib/hipe/misc/Makefile -+++ b/lib/hipe/misc/Makefile -@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/misc" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 67485875a6..f83a2bb9e2 100644 ---- a/lib/hipe/rtl/Makefile -+++ b/lib/hipe/rtl/Makefile -@@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/rtl" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 20b1c3bf50..40c642a441 100644 ---- a/lib/hipe/util/Makefile -+++ b/lib/hipe/util/Makefile -@@ -50,7 +50,6 @@ HIPE_MODULES = - endif - MODULES = hipe_timing hipe_dot hipe_digraph hipe_dsets $(HIPE_MODULES) - --HRL_FILES= - ERL_FILES= $(MODULES:%=%.erl) - TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) - DOC_FILES= $(MODULES:%=$(DOCS)/%.html) -@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/util" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile index a1c1f36b70..f2eb86f7ac 100644 --- a/lib/inets/src/http_client/Makefile @@ -356,10 +244,10 @@ index da9549406f..eaa14b628f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index ec1ae70305..88c084ef58 100644 +index edaec7655b..6969b5b5ab 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile -@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -369,10 +257,10 @@ index ec1ae70305..88c084ef58 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 6c75bcffee..d15bdb867a 100644 +index 1bf8459602..bc65afca02 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -236,7 +236,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -394,10 +282,10 @@ index ab45548099..5c7a7f0be9 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 7fc90fd6d5..6ad086ed01 100644 +index 9e33fe3ae5..1db69567bb 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile -@@ -177,7 +177,7 @@ release_spec: opt +@@ -154,7 +154,7 @@ release_spec: opt $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" @@ -445,10 +333,10 @@ index d07db3fa4b..7f421d24cc 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index 3dd24b1df7..836e163499 100644 +index bb5f80403b..a78a4551a8 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile -@@ -131,7 +131,7 @@ release_spec: opt +@@ -133,7 +133,7 @@ release_spec: opt $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/text" @@ -600,10 +488,10 @@ index 16a42caf11..674364281d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 1bde1ca972..acc42385f3 100644 +index 1b7999da20..661b5a5e3f 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile -@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" @@ -613,10 +501,10 @@ index 1bde1ca972..acc42385f3 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 6f2b8a4077..bd062a6473 100644 +index 09ffc7d36a..090df59403 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile -@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/app" @@ -626,10 +514,10 @@ index 6f2b8a4077..bd062a6473 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index d9678669a5..ff9dff95d9 100644 +index a8da839bfc..c9e9e1892d 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -639,10 +527,10 @@ index d9678669a5..ff9dff95d9 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 57ff08c160..d51f627ca5 100644 +index ab8c36ec5e..839dc03917 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile -@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" @@ -652,10 +540,10 @@ index 57ff08c160..d51f627ca5 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index adc2c4858f..89ce954e99 100644 +index 51318b5c66..d4015d71f4 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile -@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" @@ -665,10 +553,10 @@ index adc2c4858f..89ce954e99 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index ab6137e518..bdeabca8c3 100644 +index 4f4b55f5c5..ee966e3eed 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -691,10 +579,10 @@ index 5edd6cb4b9..39008882ca 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index e3e0c9c03d..ff9bad32ab 100644 +index 509648cb2b..0ffc2c6ed1 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -221,7 +221,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -703,10 +591,10 @@ index e3e0c9c03d..ff9bad32ab 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index c21d2f49c8..03dbc74ef7 100644 +index af6a472f3d..6796810ac2 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile -@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -742,10 +630,10 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 52f4008e0a..dc297f1d55 100644 +index 3780e0eea3..05c8416de7 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile -@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) +@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index ed9e2ac..2b7e1e2 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 4c4823eb38..de0ab149fb 100644 +index 3ab50cafe0..f510535714 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> diff --git a/otp-0008-Avoid-forking-sed-to-get-basename.patch b/otp-0008-Avoid-forking-sed-to-get-basename.patch index f98699a..a0ceb3e 100644 --- a/otp-0008-Avoid-forking-sed-to-get-basename.patch +++ b/otp-0008-Avoid-forking-sed-to-get-basename.patch @@ -4,11 +4,11 @@ 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 959c099e8f..861b8bcbf1 100644 +index 0983132ac1..6b55e8f0f3 100644 --- a/erts/etc/unix/erl.src.src +++ b/erts/etc/unix/erl.src.src -@@ -21,7 +21,7 @@ - ROOTDIR="%FINAL_ROOTDIR%" +@@ -26,7 +26,7 @@ else + fi BINDIR=$ROOTDIR/erts-%VSN%/bin EMU=%EMULATOR%%EMULATOR_NUMBER% -PROGNAME=`echo $0 | sed 's/.*\///'` diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index d68a78b..5ee1c9b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 9dba684cbb..b4c5a8413f 100644 +index 0efacd67a1..777079301c 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -727,8 +727,10 @@ int main(int argc, char **argv) +@@ -720,8 +720,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index dd69d34..90abd98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-23.3.1.tar.gz) = 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0 +SHA512 (otp-OTP-24.0-rc2.tar.gz) = 10a658388f6cf2abd70cadbc4e6e0d6547afaa4ba9afdb85431fd7d2e50ded19000472533f54f690e7b0adc747382cfa5af7533fbb9e1ee58c992c03b37d1144 From d813106634590b5860e115630bec2faf2d7c0db6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 21 Apr 2021 15:01:46 +0200 Subject: [PATCH 238/340] Erlang ver. 24.0-rc3 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- otp-0003-Do-not-install-C-sources.patch | 4 ++-- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- otp-0009-Load-man-pages-from-system-wide-directory.patch | 4 ++-- sources | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/erlang.spec b/erlang.spec index 13ae569..b4c2e01 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 24.0 -Release: 0.1.rc2%{?dist} +Release: 0.2.rc3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -69,7 +69,7 @@ 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}-rc2/otp-OTP-%{version}-rc2.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}-rc3/otp-OTP-%{version}-rc3.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Apr 21 2021 Peter Lemenkov - 24.0-0.2.rc3 +- Ver. 24.0-rc3 + * Sat Apr 3 2021 Peter Lemenkov - 24.0-0.1.rc2 - Ver. 24.0-rc2 - Removed hipe diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 12f4eb8..8fa4923 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 061fd05a1d..498b7d1370 100644 +index 56fdaa608e..ff2490ed85 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -691,13 +691,12 @@ release: opt +@@ -690,13 +690,12 @@ release: opt $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 989f09d..504fd2b 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -553,10 +553,10 @@ index 51318b5c66..d4015d71f4 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 4f4b55f5c5..ee966e3eed 100644 +index 517a6611c4..b348d1cfb8 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 5ee1c9b..35c29f3 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 0efacd67a1..777079301c 100644 +index 06182c25ce..b41ae3a90a 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -720,8 +720,10 @@ int main(int argc, char **argv) +@@ -722,8 +722,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index 90abd98..a6d3277 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0-rc2.tar.gz) = 10a658388f6cf2abd70cadbc4e6e0d6547afaa4ba9afdb85431fd7d2e50ded19000472533f54f690e7b0adc747382cfa5af7533fbb9e1ee58c992c03b37d1144 +SHA512 (otp-OTP-24.0-rc3.tar.gz) = bcc4946fafd6fcc0a29d75f8a0168d9db523bec279aaaf4ec3c4b2eb058c6ff6e38459847acf13b7b9327ebbb2c1ea9b28c164e728a004459d89a3e43bf1ea0c From 4fbd6b2c8449df2b0b020041cd826ee2bd8ebf34 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 21 Apr 2021 15:06:52 +0200 Subject: [PATCH 239/340] typo Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index b4c2e01..305f759 100644 --- a/erlang.spec +++ b/erlang.spec @@ -685,7 +685,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version}-rc2 +%autosetup -p1 -n otp-OTP-%{version}-rc3 # FIXME we should come up with a better solution # remove shipped zlib sources From e401b7fca57bc99cecc949fc05747a1ce60ebe12 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 21 Apr 2021 16:03:05 +0200 Subject: [PATCH 240/340] leftover Signed-off-by: Peter Lemenkov --- otp-0003-Do-not-install-C-sources.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 8fa4923..8f3b803 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 56fdaa608e..ff2490ed85 100644 +index 56fdaa608e..25764ce50d 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -690,13 +690,12 @@ release: opt +@@ -690,13 +690,11 @@ release: opt $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -46,7 +46,6 @@ index 56fdaa608e..ff2490ed85 100644 + $(INSTALL_DATA) encode/*.h "$(RELSYSDIR)/src/encode" + $(INSTALL_DATA) epmd/*.h "$(RELSYSDIR)/src/epmd" + $(INSTALL_DATA) misc/*.h "$(RELSYSDIR)/src/misc" -+ $(INSTALL_DATA) prog/*.h "$(RELSYSDIR)/src/prog" release_docs: From 43ba8d5925ba67d5c0f7d849c6745f3d54a92a38 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 12 May 2021 19:12:19 +0300 Subject: [PATCH 241/340] Erlang ver. 24.0 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++++++--- otp-0002-Remove-rpath.patch | 8 ++++---- otp-0006-Do-not-install-erlang-sources.patch | 4 ++-- sources | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 305f759..8058043 100644 --- a/erlang.spec +++ b/erlang.spec @@ -61,7 +61,7 @@ Name: erlang Version: 24.0 -Release: 0.2.rc3%{?dist} +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -69,7 +69,7 @@ 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}-rc3/otp-OTP-%{version}-rc3.tar.gz +Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket Source7: epmd@.service @@ -685,7 +685,7 @@ Provides support for XML 1.0. ### END OF AUTOGENERATED LIST ### %prep -%autosetup -p1 -n otp-OTP-%{version}-rc3 +%autosetup -p1 -n otp-OTP-%{version} # FIXME we should come up with a better solution # remove shipped zlib sources @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 12 2021 Peter Lemenkov - 24.0-1 +- Ver. 24.0 + * Wed Apr 21 2021 Peter Lemenkov - 24.0-0.2.rc3 - Ver. 24.0-rc3 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index be5841a..e55a83c 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index f962b7b9ad..916d23d69c 100644 +index 2eee53bd31..5da20a43a6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -125,7 +125,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@ - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +@@ -136,7 +136,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) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 504fd2b..18ef6d6 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -117,10 +117,10 @@ index 0847da9d5a..24a054ac04 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 36e8fefd4c..d3a10890ce 100644 +index 348cc350e1..9d87858def 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -263,11 +263,8 @@ release_spec: opt +@@ -260,11 +260,8 @@ release_spec: opt $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: diff --git a/sources b/sources index a6d3277..4aad9fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0-rc3.tar.gz) = bcc4946fafd6fcc0a29d75f8a0168d9db523bec279aaaf4ec3c4b2eb058c6ff6e38459847acf13b7b9327ebbb2c1ea9b28c164e728a004459d89a3e43bf1ea0c +SHA512 (otp-OTP-24.0.tar.gz) = bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b From 4eb19b8c14981e4c2e2ef3bb65a777a2e476b33f Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 21 May 2021 08:33:48 -0400 Subject: [PATCH 242/340] Erlang ver. 24.0.1 Signed-off-by: John Eckersberg --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 8058043..ce00b38 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 24.0 +Version: 24.0.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri May 21 2021 John Eckersberg - 24.0.1-1 +- Ver. 24.0.1 + * Wed May 12 2021 Peter Lemenkov - 24.0-1 - Ver. 24.0 diff --git a/sources b/sources index 4aad9fe..5b34bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.tar.gz) = bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b +SHA512 (otp-OTP-24.0.1.tar.gz) = 8e6588e69e58395c92a6cd9e63ff4da688e8fe8b1cc6dea3e3bb5b102940854a73a1a6363e8f94c697117a7be0f8b07712cb584af1d9ef9947eb87b09c8559e6 From 0ce468211a51a03ecbbd2e09b4d40668559c7de1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 1 Jun 2021 17:04:05 +0300 Subject: [PATCH 243/340] Erlang ver. 24.0.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index ce00b38..383cad3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 24.0.1 +Version: 24.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jun 01 2021 Peter Lemenkov - 24.0.2-1 +- Ver. 24.0.2 + * Fri May 21 2021 John Eckersberg - 24.0.1-1 - Ver. 24.0.1 diff --git a/sources b/sources index 5b34bff..40085e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.1.tar.gz) = 8e6588e69e58395c92a6cd9e63ff4da688e8fe8b1cc6dea3e3bb5b102940854a73a1a6363e8f94c697117a7be0f8b07712cb584af1d9ef9947eb87b09c8559e6 +SHA512 (otp-OTP-24.0.2.tar.gz) = d85e3e6a4177ac8c696dd666183f624065a89d35aa7f031cd6a7b105e0d1f9007de8d413880df47daf8f695485d952a81a14a01313b52f66534c1e5bd050093b From 3eb9dec405170b64680d55b2fbeb1420d5dcf400 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 29 Jun 2021 14:07:12 +0200 Subject: [PATCH 244/340] Erlang ver. 24.0.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 383cad3..417a70d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -60,7 +60,7 @@ Name: erlang -Version: 24.0.2 +Version: 24.0.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1897,6 +1897,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jun 29 2021 Peter Lemenkov - 24.0.3-1 +- Ver. 24.0.3 + * Tue Jun 01 2021 Peter Lemenkov - 24.0.2-1 - Ver. 24.0.2 diff --git a/sources b/sources index 40085e1..e0ea8d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.2.tar.gz) = d85e3e6a4177ac8c696dd666183f624065a89d35aa7f031cd6a7b105e0d1f9007de8d413880df47daf8f695485d952a81a14a01313b52f66534c1e5bd050093b +SHA512 (otp-OTP-24.0.3.tar.gz) = 94b16d475b3f2e56ba546668b7fa2491b62c2cf38c6419a6f1fc16b2a1f842250d7bb2d01c8ba152bf13b9c13f52baa3b47e158f66e7bdcd9bb8e21dc5846a80 From 235ce3ea99a411cfe04c344ca39af0d29ca9013c Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 6 Jul 2021 12:32:15 -0400 Subject: [PATCH 245/340] Compile with FIPS support by default --- erlang.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erlang.spec b/erlang.spec index 417a70d..9991139 100644 --- a/erlang.spec +++ b/erlang.spec @@ -16,6 +16,9 @@ %endif %endif +# Compile with FIPS support by default +%bcond_without fips + ## ## Optional components ## @@ -711,6 +714,7 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \ %{?__without_kernel_poll:--disable-kernel-poll} \ + %{?with_fips:--enable-fips} \ %if %{__with_java} \ %else From b1b791bedf32c1f8b5f1555e537aef35c755ea58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:05:41 +0000 Subject: [PATCH 246/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 9991139..95fc090 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1901,6 +1901,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 24.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 29 2021 Peter Lemenkov - 24.0.3-1 - Ver. 24.0.3 From 9b5968fb4d09942b2777376d2e373cd0039753c3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 22 Jul 2021 13:04:55 +0200 Subject: [PATCH 247/340] Erlang ver. 24.0.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 95fc090..ff8f5ca 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.0.3 -Release: 2%{?dist} +Version: 24.0.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1901,6 +1901,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jul 22 2021 Peter Lemenkov - 24.0.4-1 +- Ver. 24.0.4 + * Wed Jul 21 2021 Fedora Release Engineering - 24.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e0ea8d9..e8dda4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.3.tar.gz) = 94b16d475b3f2e56ba546668b7fa2491b62c2cf38c6419a6f1fc16b2a1f842250d7bb2d01c8ba152bf13b9c13f52baa3b47e158f66e7bdcd9bb8e21dc5846a80 +SHA512 (otp-OTP-24.0.4.tar.gz) = a0d4ce8077862a3fa41e092cd9afe3a2c1542d6fae538c170687c463c6002dbc61e760533c213268b41d2cb0e54a8a0f197e6a73beed2b320f973240b8ac99c7 From 37f86696ff29fa7c3d3d7d79f8980ed87b159a87 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 3 Aug 2021 18:37:33 +0200 Subject: [PATCH 248/340] Erlang ver. 24.0.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index ff8f5ca..c06ea2c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} %ifarch %{arm} %{mips} riscv64 -# MIPS does not have all dependencies for fop yet +# 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 @@ -63,7 +63,7 @@ Name: erlang -Version: 24.0.4 +Version: 24.0.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1901,6 +1901,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Aug 3 2021 Peter Lemenkov - 24.0.5-1 +- Ver. 24.0.5 + * Thu Jul 22 2021 Peter Lemenkov - 24.0.4-1 - Ver. 24.0.4 diff --git a/sources b/sources index e8dda4e..869aa18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.4.tar.gz) = a0d4ce8077862a3fa41e092cd9afe3a2c1542d6fae538c170687c463c6002dbc61e760533c213268b41d2cb0e54a8a0f197e6a73beed2b320f973240b8ac99c7 +SHA512 (otp-OTP-24.0.5.tar.gz) = 41c846bee690921fabecc8b227678eedfccdfe1e150b368c221949e851fbfd5808d6f0643e36aa122622662c999a9c703e8b9a0378a1466dda0c0db7caad04b7 From b6aff823efe59b93a6e7ad59876d67a3f8c5fdf8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 3 Sep 2021 18:10:58 +0200 Subject: [PATCH 249/340] Erlang ver. 24.0.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c06ea2c..e6dbbe4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.0.5 +Version: 24.0.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1901,6 +1901,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Sep 3 2021 Peter Lemenkov - 24.0.6-1 +- Ver. 24.0.6 + * Tue Aug 3 2021 Peter Lemenkov - 24.0.5-1 - Ver. 24.0.5 diff --git a/sources b/sources index 869aa18..5ff15d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.5.tar.gz) = 41c846bee690921fabecc8b227678eedfccdfe1e150b368c221949e851fbfd5808d6f0643e36aa122622662c999a9c703e8b9a0378a1466dda0c0db7caad04b7 +SHA512 (otp-OTP-24.0.6.tar.gz) = d9d152a411cbb47eb3282075d90e995766df6129a723f570b65cabe75630b18078070c1510a5f481c5d714b8b0195f632c75d8d4b90893ac9e8902fe6f6bebd4 From 95b5db575d1395890c5575ec640e2d5bfccf760e Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:01:17 +0200 Subject: [PATCH 250/340] Rebuilt with OpenSSL 3.0.0 --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e6dbbe4..f105b83 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1901,6 +1901,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Sep 14 2021 Sahana Prasad - 24.0.6-2 +- Rebuilt with OpenSSL 3.0.0 + * Fri Sep 3 2021 Peter Lemenkov - 24.0.6-1 - Ver. 24.0.6 From a0c224a8fabda07e37b6d314b01243859ce0cada Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 23 Sep 2021 17:20:52 +0200 Subject: [PATCH 251/340] Erlang ver. 24.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 8 ++++++-- otp-0002-Remove-rpath.patch | 2 +- otp-0006-Do-not-install-erlang-sources.patch | 12 ++++++------ sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index f105b83..3523b20 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.0.6 -Release: 2%{?dist} +Version: 24.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -355,6 +355,7 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) +# FIXME has to be 2.16 Provides: erlang(erl_nif_version) = 2.15 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon @@ -1901,6 +1902,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Sep 23 2021 Peter Lemenkov - 24.1-1 +- Ver. 24.1 + * Tue Sep 14 2021 Sahana Prasad - 24.0.6-2 - Rebuilt with OpenSSL 3.0.0 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index e55a83c..1e04c1f 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 2eee53bd31..5da20a43a6 100644 +index d360d9b6cb..614e748896 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -136,7 +136,7 @@ endif diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 18ef6d6..1fc230b 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -257,10 +257,10 @@ index edaec7655b..6969b5b5ab 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 1bf8459602..bc65afca02 100644 +index b2299188eb..bee47366f1 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -228,7 +228,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -229,7 +229,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -372,10 +372,10 @@ index 90e8780754..1a13d764b3 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index f9f239db37..dd061f29f4 100644 +index 4280557d45..eb43ecec23 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -150,7 +150,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -151,7 +151,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -566,10 +566,10 @@ index 517a6611c4..b348d1cfb8 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 5edd6cb4b9..39008882ca 100644 +index 9cbee91946..a0f494874a 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -207,7 +207,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -210,7 +210,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/sources b/sources index 5ff15d0..7f05354 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.0.6.tar.gz) = d9d152a411cbb47eb3282075d90e995766df6129a723f570b65cabe75630b18078070c1510a5f481c5d714b8b0195f632c75d8d4b90893ac9e8902fe6f6bebd4 +SHA512 (otp-OTP-24.1.tar.gz) = 7352090155f49add80567fd527e6f8cb55baa66a014d604cd9cff3a711535486b1a15132bb300657125893584c0339efde7761191a63899b35e4d46d22fc5d45 From 0420c0e4509682cd070e9cfb0e913677afe3bd10 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 4 Oct 2021 22:39:08 +0200 Subject: [PATCH 252/340] Erlang ver. 24.1.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3523b20..366def8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1 +Version: 24.1.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1902,6 +1902,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Oct 4 2021 Peter Lemenkov - 24.1.1-1 +- Ver. 24.1.1 + * Thu Sep 23 2021 Peter Lemenkov - 24.1-1 - Ver. 24.1 diff --git a/sources b/sources index 7f05354..8ad8e6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.tar.gz) = 7352090155f49add80567fd527e6f8cb55baa66a014d604cd9cff3a711535486b1a15132bb300657125893584c0339efde7761191a63899b35e4d46d22fc5d45 +SHA512 (otp-OTP-24.1.1.tar.gz) = 303ccf632473520bbc044cc3e6ce8b3c8f8a2e070d959133d7057a715eba99b148a96d5553ec12d30cc3c3fc1d4aa9cd82b0daf87de41d89c5653226b983b375 From 9aefdf0ecfebfc3173a49aa8d18818fd46500a18 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 5 Oct 2021 17:23:05 +0200 Subject: [PATCH 253/340] Erlang ver. 24.1.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 366def8..c00a925 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.1 +Version: 24.1.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1902,6 +1902,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Oct 5 2021 Peter Lemenkov - 24.1.2-1 +- Ver. 24.1.2 + * Mon Oct 4 2021 Peter Lemenkov - 24.1.1-1 - Ver. 24.1.1 diff --git a/sources b/sources index 8ad8e6b..f3cace6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.1.tar.gz) = 303ccf632473520bbc044cc3e6ce8b3c8f8a2e070d959133d7057a715eba99b148a96d5553ec12d30cc3c3fc1d4aa9cd82b0daf87de41d89c5653226b983b375 +SHA512 (otp-OTP-24.1.2.tar.gz) = 33f1bfc630a4d7b4d17807190f9f461eedd80e59fb183973a86ddb5fdedfaad414b8ca343292dc1e2a3c82954317bc6a6127d02540b75fca54f4e7c727953a3c From 061f3845e182b30093da1e5efbb16056c0313001 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Oct 2021 16:12:20 +0200 Subject: [PATCH 254/340] Fix FTBFS with OpenSSL 3.0 Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +- ...Allow-openssl-3.0.0-FIPS-compilation.patch | 75 +++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch diff --git a/erlang.spec b/erlang.spec index c00a925..e90db9b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -104,6 +104,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 +Patch10: otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1902,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Oct 12 2021 Peter Lemenkov - 24.1.2-2 +- Fix FTBFS with OpenSSL 3.0 + * Tue Oct 5 2021 Peter Lemenkov - 24.1.2-1 - Ver. 24.1.2 diff --git a/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch b/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch new file mode 100644 index 0000000..13c41f7 --- /dev/null +++ b/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch @@ -0,0 +1,75 @@ +From: Michele Baldessari +Date: Tue, 28 Sep 2021 17:26:16 +0200 +Subject: [PATCH] Allow openssl-3.0.0 FIPS compilation + +Openssl 3.0.0 dropped support for the old way of adding fips +and in particular it dropped support for FIPS_mode() and +FIPS_mode_set(). + +In RHEL9, openssl-3.0.0 ships a compat macro for FIPS_mode(), so +this change focuses on replacing FIPS_mode_set() + +Compiled erlang-erts-24.1-1.el9.x86_64 with this patch and then tested as follows: +A. Booted the system with fips enabled: +[root@rhel9 ~]# fips-mode-setup --check +FIPS mode is enabled. + +B. Set up a fips config file: +cat > fips.config< crypto:info_fips(). +not_enabled +2> crypto:enable_fips_mode(true). +true +3> crypto:info_fips(). +enabled + +D. Verified that the ciphers when using fips are a subset of the usual +ciphers: + +4> crypto:supports(). +[{hashs,[sha,sha224,sha256,sha384,sha512,sha3_224,sha3_256, + sha3_384,sha3_512,blake2b,blake2s]}, + {ciphers,[aes_cbc,aes_ccm,aes_cfb128,aes_cfb8,aes_ctr, + aes_ecb,aes_gcm,des_ede3_cfb,aes_128_cbc,aes_192_cbc, + aes_256_cbc,aes_128_cfb128,aes_192_cfb128,aes_256_cfb128, + aes_128_cfb8,aes_192_cfb8,aes_256_cfb8,aes_128_ecb, + aes_192_ecb,aes_256_ecb,aes_256_gcm,aes_256_ccm,aes_192_gcm, + aes_192_ccm,aes_128_gcm|...]}, + {public_keys,[rsa,dss,dh,ecdsa,ecdh]}, + {macs,[cmac,hmac,poly1305]}, + {curves,[]}, + {rsa_opts,[rsa_pkcs1_pss_padding,rsa_pss_saltlen, + rsa_mgf1_md,rsa_pkcs1_oaep_padding,rsa_oaep_label, + rsa_oaep_md,signature_md,rsa_pkcs1_padding,rsa_x931_padding, + rsa_no_padding]}] + +Note that we could probably just have patched out the FIPS_mode_set() +calls as FIPS gets enforced on the system. The automatism is going to +come with a version of openssl that is later than > openssl-3.0.0-2. + +Co-Authored-By: John Eckersberg +Co-Authored-By: Damien Ciabrini + +[1] https://wiki.openssl.org/index.php/OpenSSL_3.0#Upgrading_from_the_OpenSSL_2.0_FIPS_Object_Module + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 9ef04fca3c..59f6e94b23 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -427,6 +427,10 @@ do { \ + # undef FIPS_SUPPORT + #endif + ++#if defined(FIPS_SUPPORT) \ ++ && OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(3,0,0) & ~0xff) ++#define FIPS_mode_set(fips_mode) EVP_default_properties_enable_fips(NULL, fips_mode) ++#endif + + #ifdef FIPS_SUPPORT + /* In FIPS mode non-FIPS algorithms are disabled and return badarg. */ From bcfc34c28afc3d7b99fc83a3729f55c424f68e08 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 28 Oct 2021 13:15:53 +0200 Subject: [PATCH 255/340] Erlang ver. 24.1.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index e90db9b..45360f7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.2 +Version: 24.1.3 Release: 2%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Oct 28 2021 Peter Lemenkov - 24.1.3-1 +- Ver. 24.1.3 + * Tue Oct 12 2021 Peter Lemenkov - 24.1.2-2 - Fix FTBFS with OpenSSL 3.0 diff --git a/sources b/sources index f3cace6..e699671 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.2.tar.gz) = 33f1bfc630a4d7b4d17807190f9f461eedd80e59fb183973a86ddb5fdedfaad414b8ca343292dc1e2a3c82954317bc6a6127d02540b75fca54f4e7c727953a3c +SHA512 (otp-OTP-24.1.3.tar.gz) = ee504cabe013322c3b1a80c1b0e5419302fdd140b8aecb0f8e2aca4e8b444d38ee0fafbb953c2bca8965b00bd2cf1a5bdf2259e1b83567ab2ebbfa07b10001b8 From 385e31c9f7a9736b325f9f6036852c27acba4671 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 2 Nov 2021 11:10:47 +0100 Subject: [PATCH 256/340] Erlang ver. 24.1.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 45360f7..c462471 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.1.3 -Release: 2%{?dist} +Version: 24.1.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Nov 2 2021 Peter Lemenkov - 24.1.4-1 +- Ver. 24.1.4 + * Thu Oct 28 2021 Peter Lemenkov - 24.1.3-1 - Ver. 24.1.3 diff --git a/sources b/sources index e699671..2d6d297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.3.tar.gz) = ee504cabe013322c3b1a80c1b0e5419302fdd140b8aecb0f8e2aca4e8b444d38ee0fafbb953c2bca8965b00bd2cf1a5bdf2259e1b83567ab2ebbfa07b10001b8 +SHA512 (otp-OTP-24.1.4.tar.gz) = b5cf4fbce07b26b97ec8af62d1b86315227ff369f27c996a6df08b322b76721539a55664dcd4ffec49ff77efadc8e4f0c967c064bb4e1f5cdfa2db2eaa02620f From 36536632c358e293b36997afb24423bc94374293 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 13 Nov 2021 14:49:34 +0100 Subject: [PATCH 257/340] Erlang ver. 24.1.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c462471..b8ded1b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.4 +Version: 24.1.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Nov 13 2021 Peter Lemenkov - 24.1.5-1 +- Ver. 24.1.5 + * Tue Nov 2 2021 Peter Lemenkov - 24.1.4-1 - Ver. 24.1.4 diff --git a/sources b/sources index 2d6d297..5adf467 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.4.tar.gz) = b5cf4fbce07b26b97ec8af62d1b86315227ff369f27c996a6df08b322b76721539a55664dcd4ffec49ff77efadc8e4f0c967c064bb4e1f5cdfa2db2eaa02620f +SHA512 (otp-OTP-24.1.5.tar.gz) = 9ac8bdf262676d93e0ed3958e0776712913e860c465a3573d2001545337a86df6642c4c2bfd77cf74862bba52dcb76c39cf4c9de549cea9264ade21f66ca248b From a413f33e79ea44e4f33c44d6930f537d93cbcda6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 18 Nov 2021 17:02:45 +0100 Subject: [PATCH 258/340] Erlang ver. 24.1.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index b8ded1b..edc3ae8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.5 +Version: 24.1.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Nov 18 2021 Peter Lemenkov - 24.1.6-1 +- Ver. 24.1.6 + * Sat Nov 13 2021 Peter Lemenkov - 24.1.5-1 - Ver. 24.1.5 diff --git a/sources b/sources index 5adf467..0c7756f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.5.tar.gz) = 9ac8bdf262676d93e0ed3958e0776712913e860c465a3573d2001545337a86df6642c4c2bfd77cf74862bba52dcb76c39cf4c9de549cea9264ade21f66ca248b +SHA512 (otp-OTP-24.1.6.tar.gz) = ad23e4c7c1feb3132e96ef29905e5841d2a7e9561ef6e58ff565cce21fc10379763de8e5febc7539b91fe1a7956f59d59e5d3557fe400254002c65b085b67c45 From 3bd3a0c7ef647b5a6afeb79a0d37844bca79c614 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 22 Nov 2021 18:22:20 +0100 Subject: [PATCH 259/340] Erlang ver. 24.1.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index edc3ae8..e6db459 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.6 +Version: 24.1.7 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Nov 22 2021 Peter Lemenkov - 24.1.7-1 +- Ver. 24.1.7 + * Thu Nov 18 2021 Peter Lemenkov - 24.1.6-1 - Ver. 24.1.6 diff --git a/sources b/sources index 0c7756f..5a274ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.6.tar.gz) = ad23e4c7c1feb3132e96ef29905e5841d2a7e9561ef6e58ff565cce21fc10379763de8e5febc7539b91fe1a7956f59d59e5d3557fe400254002c65b085b67c45 +SHA512 (otp-OTP-24.1.7.tar.gz) = 052758df429af0971c9d78a4f56e2f333379510db3efbb103e6b869584e54af438b2d43e5172412e0fc624ea68b1df6be84debdae51777a7f4aa327b39b2248f From b606ec2fbd3b9508aeb458165210ff1d60de4a72 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 15 Dec 2021 17:36:57 +0100 Subject: [PATCH 260/340] Erlang ver. 24.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++- ...n-pages-and-do-not-install-miscellan.patch | 6 ++-- otp-0002-Remove-rpath.patch | 4 +-- otp-0006-Do-not-install-erlang-sources.patch | 34 +++++++++---------- ...man-pages-from-system-wide-directory.patch | 4 +-- ...Allow-openssl-3.0.0-FIPS-compilation.patch | 8 ++--- sources | 2 +- 7 files changed, 33 insertions(+), 30 deletions(-) diff --git a/erlang.spec b/erlang.spec index e6db459..d262f2b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.1.7 +Version: 24.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Dec 15 2021 Peter Lemenkov - 24.2-1 +- Ver. 24.2 + * Mon Nov 22 2021 Peter Lemenkov - 24.1.7-1 - Ver. 24.1.7 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 7034252..23652f1 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index ba4d898f79..a22e557007 100644 +index e5ff959078..7ceef28103 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -525,10 +525,6 @@ endif +@@ -550,10 +550,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,7 +21,7 @@ index ba4d898f79..a22e557007 100644 $(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 2dbf628972..5151f5130a 100644 +index 7437e073e0..009ffea706 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -142,14 +142,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 1e04c1f..1f9e1c6 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index d360d9b6cb..614e748896 100644 +index 8ad5c7889e..041bcf7e06 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -136,7 +136,7 @@ endif +@@ -139,7 +139,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 1fc230b..7e008c1 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,7 +8,7 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index b0c205cec8..7fad1ddc75 100644 +index 521e5b6f67..2d818d8f75 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk @@ -63,7 +63,7 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index f195e16dc6..68c6695b9e 100644 +index f050e134f8..653695aa12 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -78,7 +78,7 @@ index f195e16dc6..68c6695b9e 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index c3f1c859e5..0d72d6c82d 100644 +index fea32dc4e3..183c982ff6 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -81,8 +81,6 @@ docs: @@ -104,7 +104,7 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 0847da9d5a..24a054ac04 100644 +index 5f2c24c3c0..99eddc96e3 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -168,7 +168,7 @@ index b79a537424..d0b231e5fc 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 4c6f542ebb..d0cd6d8f68 100644 +index e4339dcb1f..f563d6fd5b 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -231,7 +231,7 @@ index 8248e37c44..1f1b23184b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index da9549406f..eaa14b628f 100644 +index f66a446d40..2858ae7267 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -244,7 +244,7 @@ index da9549406f..eaa14b628f 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index edaec7655b..6969b5b5ab 100644 +index d85df269ce..0193796bc1 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -359,7 +359,7 @@ index 028a63e98e..9e11e9bfb2 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 90e8780754..1a13d764b3 100644 +index dce7a359d3..7051c965b9 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -488,7 +488,7 @@ index 16a42caf11..674364281d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 1b7999da20..661b5a5e3f 100644 +index 1da0f33c9d..9d54271816 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -501,7 +501,7 @@ index 1b7999da20..661b5a5e3f 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 09ffc7d36a..090df59403 100644 +index 02800462a4..133f7c3b59 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -514,7 +514,7 @@ index 09ffc7d36a..090df59403 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index a8da839bfc..c9e9e1892d 100644 +index bbd7f99378..19d1f83dda 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -527,7 +527,7 @@ index a8da839bfc..c9e9e1892d 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index ab8c36ec5e..839dc03917 100644 +index 6f5f5d01f9..d6bc5e3e06 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -540,7 +540,7 @@ index ab8c36ec5e..839dc03917 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index 51318b5c66..d4015d71f4 100644 +index eca2d949d2..4c234caf88 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -553,7 +553,7 @@ index 51318b5c66..d4015d71f4 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 517a6611c4..b348d1cfb8 100644 +index 88126f6289..831cd1d938 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -566,10 +566,10 @@ index 517a6611c4..b348d1cfb8 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 9cbee91946..a0f494874a 100644 +index c8d0d6f12f..92471ac30e 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -210,7 +210,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -630,7 +630,7 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 3780e0eea3..05c8416de7 100644 +index 7e2eb38f2f..939d03670d 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index 35c29f3..f9b074b 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 06182c25ce..b41ae3a90a 100644 +index bda9a94a95..e14fdc49b6 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -722,8 +722,10 @@ int main(int argc, char **argv) +@@ -724,8 +724,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch b/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch index 13c41f7..9e272ec 100644 --- a/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch +++ b/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch @@ -59,10 +59,10 @@ Co-Authored-By: Damien Ciabrini [1] https://wiki.openssl.org/index.php/OpenSSL_3.0#Upgrading_from_the_OpenSSL_2.0_FIPS_Object_Module diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index 9ef04fca3c..59f6e94b23 100644 +index 49627f17e7..1d12174e3e 100644 --- a/lib/crypto/c_src/openssl_config.h +++ b/lib/crypto/c_src/openssl_config.h -@@ -427,6 +427,10 @@ do { \ +@@ -438,6 +438,10 @@ do { \ # undef FIPS_SUPPORT #endif @@ -71,5 +71,5 @@ index 9ef04fca3c..59f6e94b23 100644 +#define FIPS_mode_set(fips_mode) EVP_default_properties_enable_fips(NULL, fips_mode) +#endif - #ifdef FIPS_SUPPORT - /* In FIPS mode non-FIPS algorithms are disabled and return badarg. */ + /* This is not the final FIPS adaptation for 3.0, just making it compilable */ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(3,0,0) diff --git a/sources b/sources index 5a274ab..2b30fb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.1.7.tar.gz) = 052758df429af0971c9d78a4f56e2f333379510db3efbb103e6b869584e54af438b2d43e5172412e0fc624ea68b1df6be84debdae51777a7f4aa327b39b2248f +SHA512 (otp-OTP-24.2.tar.gz) = 88450f935579677eb0d43fd25e5f45b1e78ff8e9c6455d87198decbbb675f90c2e87757b3ee33b43fafb87fced20e984220be9b6b70f8cb8f6d84e4743764495 From f39be19b7a1582ae3e1a8209281e0cdf194df538 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:06:22 +0000 Subject: [PATCH 261/340] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index d262f2b..ab0fd73 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 24.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Dec 15 2021 Peter Lemenkov - 24.2-1 - Ver. 24.2 From 7e15f2f0c75acf8163488674a83768f63ac14d2d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 26 Jan 2022 11:07:50 +0100 Subject: [PATCH 262/340] Erlang ver. 24.2.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index ab0fd73..5fbbd03 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.2 -Release: 2%{?dist} +Version: 24.2.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jan 26 2022 Peter Lemenkov - 24.2.1-1 +- Ver. 24.2.1 + * Thu Jan 20 2022 Fedora Release Engineering - 24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 2b30fb5..ec4fdd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.2.tar.gz) = 88450f935579677eb0d43fd25e5f45b1e78ff8e9c6455d87198decbbb675f90c2e87757b3ee33b43fafb87fced20e984220be9b6b70f8cb8f6d84e4743764495 +SHA512 (otp-OTP-24.2.1.tar.gz) = b4dd5c9506840fcb078b8c5820a70a07794d8e646f66941095cd9536cfcc60ed6c070d1f85952379384f774beec965521cfc567e7a4a94088ec9ce0fefafe984 From 41171a05c2435f17dd265ef8b534f91e8782cd65 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:32:40 +0100 Subject: [PATCH 263/340] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 5fbbd03..0793408 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Feb 05 2022 Jiri Vanek - 24.2.1-2 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 26 2022 Peter Lemenkov - 24.2.1-1 - Ver. 24.2.1 From 9c05865340e6093ee2e9eec263d04ad74172e968 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 1 Mar 2022 16:34:52 +0100 Subject: [PATCH 264/340] Erlang ver. 24.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0793408..c40394a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.2.1 -Release: 2%{?dist} +Version: 24.2.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1903,6 +1903,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 1 2022 Peter Lemenkov - 24.2.2-1 +- Ver. 24.2.2 + * Sat Feb 05 2022 Jiri Vanek - 24.2.1-2 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index ec4fdd5..218dc64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.2.1.tar.gz) = b4dd5c9506840fcb078b8c5820a70a07794d8e646f66941095cd9536cfcc60ed6c070d1f85952379384f774beec965521cfc567e7a4a94088ec9ce0fefafe984 +SHA512 (otp-OTP-24.2.2.tar.gz) = 791bd9cc299168d4a209bcdc797a9671a39d03924dc18c9e0520393adf4eb54922c48eecde44601bde55b4fa80b91e0eddbfc486c5f45a611da60b47c63208c7 From abc6dfa7594dea664542cdb851fc9387c974920b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 28 Mar 2022 12:19:01 -0400 Subject: [PATCH 265/340] Keep documentation chunks in the code path (rhbz#2068758) --- erlang.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c40394a..a4d41aa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -814,7 +814,12 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done +for i in * ; do + mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true + # symlink 'chunks' in the code path for EEP-48 compliance (rhbz#2068758) + mkdir $i/doc + ln -s %{_docdir}/%{name}-%{version}/lib/$i/chunks $i/doc/ +done popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -1026,6 +1031,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{with doc} %files doc +%{_libdir}/erlang/lib/*/doc %doc %{_docdir}/%{name}-%{version}/doc %doc %{_docdir}/%{name}-%{version}/erts-*/ %doc %{_docdir}/%{name}-%{version}/lib/ @@ -1903,6 +1909,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Mar 28 2022 John Eckersberg - 24.2.2-2 +- Keep documentation chunks in the code path (rhbz#2068758) + * Tue Mar 1 2022 Peter Lemenkov - 24.2.2-1 - Ver. 24.2.2 From f92c4b5b4caf8751a446604d48a5bd59fb02f557 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 29 Mar 2022 19:46:16 +0200 Subject: [PATCH 266/340] Erlang ver. 24.3.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 11 ++- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 10 +-- otp-0004-Do-not-install-Java-sources.patch | 2 +- ...teventlog-and-related-doc-files-on-n.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 10 +-- ...Allow-openssl-3.0.0-FIPS-compilation.patch | 75 ------------------- ...mporarily-disable-FIPS-for-cryptolib.patch | 23 ++++++ sources | 2 +- 9 files changed, 46 insertions(+), 95 deletions(-) delete mode 100644 otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch create mode 100644 otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch diff --git a/erlang.spec b/erlang.spec index a4d41aa..3b83304 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.2.2 -Release: 2%{?dist} +Version: 24.3.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -104,7 +104,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch +Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -294,7 +294,6 @@ Diameter (RFC 3588) library Summary: Erlang documentation BuildRequires: fop BuildRequires: libxslt -BuildArch: noarch %description doc Documentation for Erlang. @@ -1909,6 +1908,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Mar 29 2022 Peter Lemenkov - 24.3.3-1 +- Ver. 24.3.3 +- Doc sub-package no longermarked as noarch (contains links to _libdir) + * Mon Mar 28 2022 John Eckersberg - 24.2.2-2 - Keep documentation chunks in the code path (rhbz#2068758) diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 1f9e1c6..1b34b19 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 8ad5c7889e..041bcf7e06 100644 +index 4478ed7d9c..3224c705e6 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -139,7 +139,7 @@ endif +@@ -145,7 +145,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index 8f3b803..fc8f327 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index cb606fd74e..48a7c2f4f1 100644 +index 8fb3360f83..5fb080f206 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile @@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -27,11 +27,11 @@ index cb606fd74e..48a7c2f4f1 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 56fdaa608e..25764ce50d 100644 +index 92459f6223..d2c7b7f765 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -690,13 +690,11 @@ release: opt - $(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib" +@@ -709,13 +709,11 @@ ifeq (@DYNAMIC_LIB@, yes) + endif $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" - $(INSTALL_DATA) connect/*.[ch] "$(RELSYSDIR)/src/connect" @@ -63,7 +63,7 @@ index cd409fa54f..c65e817385 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 3c16e7e294..82fe1492ef 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 diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index 29f1fde..f4a08f4 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index bcbb206db6..1451378b35 100644 +index e42fd9468d..35deacbcf3 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: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index a36294b..c8dbb3c 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index d16f2b4831..c5b721f995 100644 +index 8e3882bfdc..ea999cf9c7 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile @@ -31,11 +31,16 @@ APPLICATION=os_mon @@ -28,7 +28,7 @@ index d16f2b4831..c5b721f995 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 98c5ced068..e2f4d5a090 100644 +index 48a896265b..afb67c1793 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 7e008c1..67a3dee 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -397,7 +397,7 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index e2f4d5a090..57f21a145b 100644 +index afb67c1793..ec6acf1fce 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -437,7 +437,7 @@ index 1fef168463..e5411b903b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 76bdffe089..fc5e4dfa8e 100644 +index e27f02eea9..dec54a8414 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -110,8 +110,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -553,7 +553,7 @@ index eca2d949d2..4c234caf88 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 88126f6289..831cd1d938 100644 +index cc3cfe9e96..9f3cd694f5 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -566,7 +566,7 @@ index 88126f6289..831cd1d938 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index c8d0d6f12f..92471ac30e 100644 +index 1e55bb497d..1cf3cbf5ee 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -604,7 +604,7 @@ index af6a472f3d..6796810ac2 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index 029bd731bd..85c633b4f0 100644 +index 4ece9ffe28..da95babcea 100644 --- a/lib/tftp/src/Makefile +++ b/lib/tftp/src/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk diff --git a/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch b/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch deleted file mode 100644 index 9e272ec..0000000 --- a/otp-0010-Allow-openssl-3.0.0-FIPS-compilation.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Michele Baldessari -Date: Tue, 28 Sep 2021 17:26:16 +0200 -Subject: [PATCH] Allow openssl-3.0.0 FIPS compilation - -Openssl 3.0.0 dropped support for the old way of adding fips -and in particular it dropped support for FIPS_mode() and -FIPS_mode_set(). - -In RHEL9, openssl-3.0.0 ships a compat macro for FIPS_mode(), so -this change focuses on replacing FIPS_mode_set() - -Compiled erlang-erts-24.1-1.el9.x86_64 with this patch and then tested as follows: -A. Booted the system with fips enabled: -[root@rhel9 ~]# fips-mode-setup --check -FIPS mode is enabled. - -B. Set up a fips config file: -cat > fips.config< crypto:info_fips(). -not_enabled -2> crypto:enable_fips_mode(true). -true -3> crypto:info_fips(). -enabled - -D. Verified that the ciphers when using fips are a subset of the usual -ciphers: - -4> crypto:supports(). -[{hashs,[sha,sha224,sha256,sha384,sha512,sha3_224,sha3_256, - sha3_384,sha3_512,blake2b,blake2s]}, - {ciphers,[aes_cbc,aes_ccm,aes_cfb128,aes_cfb8,aes_ctr, - aes_ecb,aes_gcm,des_ede3_cfb,aes_128_cbc,aes_192_cbc, - aes_256_cbc,aes_128_cfb128,aes_192_cfb128,aes_256_cfb128, - aes_128_cfb8,aes_192_cfb8,aes_256_cfb8,aes_128_ecb, - aes_192_ecb,aes_256_ecb,aes_256_gcm,aes_256_ccm,aes_192_gcm, - aes_192_ccm,aes_128_gcm|...]}, - {public_keys,[rsa,dss,dh,ecdsa,ecdh]}, - {macs,[cmac,hmac,poly1305]}, - {curves,[]}, - {rsa_opts,[rsa_pkcs1_pss_padding,rsa_pss_saltlen, - rsa_mgf1_md,rsa_pkcs1_oaep_padding,rsa_oaep_label, - rsa_oaep_md,signature_md,rsa_pkcs1_padding,rsa_x931_padding, - rsa_no_padding]}] - -Note that we could probably just have patched out the FIPS_mode_set() -calls as FIPS gets enforced on the system. The automatism is going to -come with a version of openssl that is later than > openssl-3.0.0-2. - -Co-Authored-By: John Eckersberg -Co-Authored-By: Damien Ciabrini - -[1] https://wiki.openssl.org/index.php/OpenSSL_3.0#Upgrading_from_the_OpenSSL_2.0_FIPS_Object_Module - -diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index 49627f17e7..1d12174e3e 100644 ---- a/lib/crypto/c_src/openssl_config.h -+++ b/lib/crypto/c_src/openssl_config.h -@@ -438,6 +438,10 @@ do { \ - # undef FIPS_SUPPORT - #endif - -+#if defined(FIPS_SUPPORT) \ -+ && OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(3,0,0) & ~0xff) -+#define FIPS_mode_set(fips_mode) EVP_default_properties_enable_fips(NULL, fips_mode) -+#endif - - /* This is not the final FIPS adaptation for 3.0, just making it compilable */ - #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(3,0,0) diff --git a/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch b/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch new file mode 100644 index 0000000..b0419db --- /dev/null +++ b/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch @@ -0,0 +1,23 @@ +From: Peter Lemenkov +Date: Tue, 29 Mar 2022 19:38:13 +0200 +Subject: [PATCH] Revert "crypto: Temporarily disable FIPS for cryptolib ver + 3.0 and above" + +This reverts commit 6bb9c51e900fe8fb5a88bd2498f6e5a92f94ed8d. + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 647ab25ad4..ab681183a3 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -452,11 +452,6 @@ do { \ + # undef FIPS_SUPPORT + #endif + +-/* Disable FIPS for 3.0 temporaryly until the support is added */ +-#if defined(FIPS_SUPPORT) && \ +- defined(HAS_3_0_API) +-# undef FIPS_SUPPORT +-#endif + + #if defined(FIPS_SUPPORT) && \ + defined(HAS_3_0_API) diff --git a/sources b/sources index 218dc64..8f059a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.2.2.tar.gz) = 791bd9cc299168d4a209bcdc797a9671a39d03924dc18c9e0520393adf4eb54922c48eecde44601bde55b4fa80b91e0eddbfc486c5f45a611da60b47c63208c7 +SHA512 (otp-OTP-24.3.3.tar.gz) = 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e From 5143feaabdb0db8d1734d8f60e0bf74fad8f53fc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 8 Apr 2022 14:11:57 +0200 Subject: [PATCH 267/340] Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet) Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 3b83304..59aba56 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -104,7 +104,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch +#Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1908,6 +1908,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Apr 8 2022 Peter Lemenkov - 24.3.3-2 +- Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet) + * Tue Mar 29 2022 Peter Lemenkov - 24.3.3-1 - Ver. 24.3.3 - Doc sub-package no longermarked as noarch (contains links to _libdir) From 397d5fecb3f0a1ccfb7bccc5efbc5916323058bf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 4 May 2022 11:32:58 +0200 Subject: [PATCH 268/340] Erlang ver. 24.3.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 59aba56..832bbd2 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.3.3 -Release: 2%{?dist} +Version: 24.3.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1908,6 +1908,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed May 4 2022 Peter Lemenkov - 24.3.4-1 +- Ver. 24.3.4 + * Fri Apr 8 2022 Peter Lemenkov - 24.3.3-2 - Temporarily disable FIPS (doesn't work reliably with OpenSSL 3.0 yet) diff --git a/sources b/sources index 8f059a2..eb0cdda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.3.3.tar.gz) = 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e +SHA512 (otp-OTP-24.3.4.tar.gz) = bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a From 27dd2644bc9c06c74e709a019a14e60412320dee Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 24 May 2022 19:55:43 +0200 Subject: [PATCH 269/340] Revert back to OpenSSL 1.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 832bbd2..af6e23a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -239,7 +239,10 @@ A byte code compiler for Erlang which produces highly compact code. %package crypto Summary: Cryptographical support -BuildRequires: pkgconfig(openssl) +#BuildRequires: pkgconfig(openssl) +# FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now. +# We have to fallback to OpenSSL1 explicitly. +BuildRequires: openssl1.1-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -1908,6 +1911,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue May 24 2022 Peter Lemenkov - 24.3.4-2 +- Downgrade to OpenSSL 1.x + * Wed May 4 2022 Peter Lemenkov - 24.3.4-1 - Ver. 24.3.4 From b3d8806d004923621e1834b2f0c272b205cf0101 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 8 Jun 2022 18:01:00 +0200 Subject: [PATCH 270/340] Erlang ver. 24.3.4.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 8 ++++--- ...mporarily-disable-FIPS-for-cryptolib.patch | 23 ------------------- sources | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch diff --git a/erlang.spec b/erlang.spec index af6e23a..c9e5e34 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,8 +63,8 @@ Name: erlang -Version: 24.3.4 -Release: 2%{?dist} +Version: 24.3.4.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -104,7 +104,6 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -#Patch10: otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1911,6 +1910,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jun 8 2022 Peter Lemenkov - 24.3.4.1-1 +- Ver. 24.3.4.1 + * Tue May 24 2022 Peter Lemenkov - 24.3.4-2 - Downgrade to OpenSSL 1.x diff --git a/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch b/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch deleted file mode 100644 index b0419db..0000000 --- a/otp-0010-Revert-crypto-Temporarily-disable-FIPS-for-cryptolib.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 29 Mar 2022 19:38:13 +0200 -Subject: [PATCH] Revert "crypto: Temporarily disable FIPS for cryptolib ver - 3.0 and above" - -This reverts commit 6bb9c51e900fe8fb5a88bd2498f6e5a92f94ed8d. - -diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index 647ab25ad4..ab681183a3 100644 ---- a/lib/crypto/c_src/openssl_config.h -+++ b/lib/crypto/c_src/openssl_config.h -@@ -452,11 +452,6 @@ do { \ - # undef FIPS_SUPPORT - #endif - --/* Disable FIPS for 3.0 temporaryly until the support is added */ --#if defined(FIPS_SUPPORT) && \ -- defined(HAS_3_0_API) --# undef FIPS_SUPPORT --#endif - - #if defined(FIPS_SUPPORT) && \ - defined(HAS_3_0_API) diff --git a/sources b/sources index eb0cdda..776b31f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.3.4.tar.gz) = bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a +SHA512 (otp-OTP-24.3.4.1.tar.gz) = 8a793b08cc3b84ff3a14f4a14b27aaaab7193dce33b5506b11817d2aabbfae14c09759595f17ed09e000ebc5de2efaf88746b18b14122bb558f14cf9d2175d6f From 9bffc2796da0b1443273249c17c53bc26c2afe10 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 23 Jun 2022 15:30:12 +0200 Subject: [PATCH 271/340] Erlang ver. 24.3.4.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c9e5e34..c7920c3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.3.4.1 +Version: 24.3.4.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1910,6 +1910,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jun 23 2022 Peter Lemenkov - 24.3.4.2-1 +- Ver. 24.3.4.2 + * Wed Jun 8 2022 Peter Lemenkov - 24.3.4.1-1 - Ver. 24.3.4.1 diff --git a/sources b/sources index 776b31f..527c3cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.3.4.1.tar.gz) = 8a793b08cc3b84ff3a14f4a14b27aaaab7193dce33b5506b11817d2aabbfae14c09759595f17ed09e000ebc5de2efaf88746b18b14122bb558f14cf9d2175d6f +SHA512 (otp-OTP-24.3.4.2.tar.gz) = 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c From 0eed2476695e33ef299c0809034628cb09ba0615 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 13 Jul 2022 20:52:50 +0200 Subject: [PATCH 272/340] Erlang ver. 25.0.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 17 ++- ...n-pages-and-do-not-install-miscellan.patch | 8 +- otp-0002-Remove-rpath.patch | 4 +- otp-0003-Do-not-install-C-sources.patch | 23 +--- otp-0004-Do-not-install-Java-sources.patch | 2 +- ...teventlog-and-related-doc-files-on-n.patch | 2 +- otp-0006-Do-not-install-erlang-sources.patch | 122 +++++++++--------- otp-0007-Add-extra-search-directory.patch | 2 +- ...08-Avoid-forking-sed-to-get-basename.patch | 8 +- ...man-pages-from-system-wide-directory.patch | 4 +- ...pecify-encoding-during-javadoc-stage.patch | 19 +++ sources | 2 +- 12 files changed, 111 insertions(+), 102 deletions(-) create mode 100644 otp-0010-Specify-encoding-during-javadoc-stage.patch diff --git a/erlang.spec b/erlang.spec index c7920c3..159498d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 24.3.4.2 +Version: 25.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -104,6 +104,7 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 +Patch10: otp-0010-Specify-encoding-during-javadoc-stage.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -358,8 +359,8 @@ Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) # FIXME has to be 2.16 -Provides: erlang(erl_nif_version) = 2.15 -Provides: bundled(pcre) = 8.33 +Provides: erlang(erl_nif_version) = 2.16 +Provides: bundled(pcre) = 8.44 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs @@ -668,7 +669,7 @@ A set of programming tools including a coverage analyzer etc. %if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -724,7 +725,7 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- --without-jinterface \ %endif # __with_java %if %{__with_wxwidgets} - --with-wx-config=/usr/bin/wx-config-3.0 + --with-wx-config=/usr/bin/wx-config %else --without-common_test \ --without-debugger \ @@ -1545,6 +1546,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/erl_error.* %{_mandir}/man3/erl_eval.* %{_mandir}/man3/erl_expand_records.* +%{_mandir}/man3/erl_features.* %{_mandir}/man3/erl_id_trans.* %{_mandir}/man3/erl_internal.* %{_mandir}/man3/erl_lint.* @@ -1571,6 +1573,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/ms_transform.* %{_mandir}/man3/orddict.* %{_mandir}/man3/ordsets.* +%{_mandir}/man3/peer.* %{_mandir}/man3/pool.* %{_mandir}/man3/proc_lib.* %{_mandir}/man3/proplists.* @@ -1622,7 +1625,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %files tools %dir %{_libdir}/erlang/lib/tools-*/ -%{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin %{_libdir}/erlang/lib/tools-*/emacs %{_libdir}/erlang/lib/tools-*/src @@ -1910,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Jul 12 2022 Peter Lemenkov - 25.0..2-1 +- Ver. 25.0.2 + * Thu Jun 23 2022 Peter Lemenkov - 24.3.4.2-1 - Ver. 24.3.4.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 23652f1..da44106 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index e5ff959078..7ceef28103 100644 +index 42d4395eb2..307ef11828 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -550,10 +550,6 @@ endif +@@ -552,10 +552,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,10 +21,10 @@ index e5ff959078..7ceef28103 100644 $(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 7437e073e0..009ffea706 100644 +index b00dd09f1a..2147774f50 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src -@@ -142,14 +142,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 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 1b34b19..de2d7a1 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 4478ed7d9c..3224c705e6 100644 +index ec5cb32973..429347a07e 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -145,7 +145,7 @@ endif +@@ -146,7 +146,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index fc8f327..bb55157 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,10 +14,10 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 8fb3360f83..5fb080f206 100644 +index 82a6b6e87a..5f2fe8ba7d 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -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" @@ -27,10 +27,10 @@ index 8fb3360f83..5fb080f206 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 92459f6223..d2c7b7f765 100644 +index 0a5ae800be..2cc354c43e 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -709,13 +709,11 @@ ifeq (@DYNAMIC_LIB@, yes) +@@ -712,13 +712,11 @@ ifeq (@DYNAMIC_LIB@, yes) endif $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -50,7 +50,7 @@ index 92459f6223..d2c7b7f765 100644 release_docs: diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index cd409fa54f..c65e817385 100644 +index 3649e2c392..d8c5c68b99 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -251,7 +251,7 @@ release_spec: opt @@ -91,16 +91,3 @@ index 27b156a2c9..f11ff303b6 100644 $(INSTALL_DIR) "$(RELSYSDIR)/priv/bin" $(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin" -diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in -index 878aa2cde6..0153885e88 100644 ---- a/lib/tools/c_src/Makefile.in -+++ b/lib/tools/c_src/Makefile.in -@@ -170,8 +170,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" diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index f4a08f4..a8037ea 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile -index e42fd9468d..35deacbcf3 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 @@ -123,8 +123,6 @@ release release_docs release_tests release_html: diff --git a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index c8dbb3c..1965881 100644 --- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -28,7 +28,7 @@ index 8e3882bfdc..ea999cf9c7 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 48a896265b..afb67c1793 100644 +index e28fb12548..ee32f3946f 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 67a3dee..e96c821 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 521e5b6f67..2d818d8f75 100644 +index 191341a9f5..35c884e933 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -113,8 +113,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -21,7 +21,7 @@ index 521e5b6f67..2d818d8f75 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 60a2020dbf..406cc08208 100644 +index 6d02075576..15f7054fed 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -151,7 +151,7 @@ release_spec: opt @@ -34,7 +34,7 @@ index 60a2020dbf..406cc08208 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 7d7b5ed203..9151e4097b 100644 +index 00f13589f3..5bf4e50f14 100644 --- a/lib/common_test/src/Makefile +++ b/lib/common_test/src/Makefile @@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -47,10 +47,10 @@ index 7d7b5ed203..9151e4097b 100644 $(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 f015064b39..57f96d2929 100644 +index 4ff5e678ee..4e3fa5c60f 100644 --- a/lib/common_test/test_server/Makefile +++ b/lib/common_test/test_server/Makefile -@@ -86,9 +86,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -83,9 +83,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_tests_spec: opt $(INSTALL_DIR) "$(RELEASE_PATH)/test_server" @@ -63,7 +63,7 @@ index f015064b39..57f96d2929 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index f050e134f8..653695aa12 100644 +index a9027b3ad8..3aaadb8500 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile @@ -182,8 +182,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -78,7 +78,7 @@ index f050e134f8..653695aa12 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index fea32dc4e3..183c982ff6 100644 +index 893f679390..6f8a329421 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -81,8 +81,6 @@ docs: @@ -91,7 +91,7 @@ index fea32dc4e3..183c982ff6 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 118cb6b758..86722d8767 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 @@ -104,10 +104,10 @@ index 118cb6b758..86722d8767 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 5f2c24c3c0..99eddc96e3 100644 +index c934ecdc2b..cc266f48e2 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -165,7 +165,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -117,7 +117,7 @@ index 5f2c24c3c0..99eddc96e3 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 348cc350e1..9d87858def 100644 +index 6dd3667a46..4e37212caa 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -260,11 +260,8 @@ release_spec: opt @@ -135,7 +135,7 @@ index 348cc350e1..9d87858def 100644 $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index 8acef15248..ead1fd3b0f 100644 +index a455662049..e5b2f886ed 100644 --- a/lib/edoc/src/Makefile +++ b/lib/edoc/src/Makefile @@ -87,7 +87,7 @@ release_spec: opt @@ -148,7 +148,7 @@ index 8acef15248..ead1fd3b0f 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index b79a537424..d0b231e5fc 100644 +index 04a84a4766..78fc4a9687 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile @@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -168,7 +168,7 @@ index b79a537424..d0b231e5fc 100644 release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index e4339dcb1f..f563d6fd5b 100644 +index 458094e35f..cc3368ad02 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -181,7 +181,7 @@ index e4339dcb1f..f563d6fd5b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index b6347d8b6d..a695d2cc2d 100644 +index fc66cc1eaf..a567965ed4 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -109,7 +109,6 @@ release_spec: opt @@ -193,19 +193,19 @@ index b6347d8b6d..a695d2cc2d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 32f75202a0..a89fa7f2d2 100644 +index f4eaf6807a..2a49a2ca7a 100644 --- a/lib/eunit/src/Makefile +++ b/lib/eunit/src/Makefile @@ -121,7 +121,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(BEHAVIOUR_SOURCES) "$(RELSYSDIR)/src" $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index a1c1f36b70..f2eb86f7ac 100644 +index 62f62792f0..ca4b539017 100644 --- a/lib/inets/src/http_client/Makefile +++ b/lib/inets/src/http_client/Makefile @@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -218,7 +218,7 @@ index a1c1f36b70..f2eb86f7ac 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 8248e37c44..1f1b23184b 100644 +index 481c4f66eb..896a806695 100644 --- a/lib/inets/src/http_lib/Makefile +++ b/lib/inets/src/http_lib/Makefile @@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -231,7 +231,7 @@ index 8248e37c44..1f1b23184b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index f66a446d40..2858ae7267 100644 +index abf8413f33..42925ba58f 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -244,7 +244,7 @@ index f66a446d40..2858ae7267 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index d85df269ce..0193796bc1 100644 +index 405e86105a..a8b932772a 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -257,7 +257,7 @@ index d85df269ce..0193796bc1 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index b2299188eb..bee47366f1 100644 +index 2149e89776..891d3e6f6a 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile @@ -229,7 +229,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -269,7 +269,7 @@ index b2299188eb..bee47366f1 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index ab45548099..5c7a7f0be9 100644 +index c681b88428..8cb286181a 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ release_spec: opt @@ -282,7 +282,7 @@ index ab45548099..5c7a7f0be9 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 9e33fe3ae5..1db69567bb 100644 +index 9ecb649f0c..3ca5654eb3 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -154,7 +154,7 @@ release_spec: opt @@ -295,7 +295,7 @@ index 9e33fe3ae5..1db69567bb 100644 release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 869b516b05..fa7d774d84 100644 +index cc4974e09d..b7a7c703b3 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -308,7 +308,7 @@ index 869b516b05..fa7d774d84 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index c65e817385..3bc4dea207 100644 +index d8c5c68b99..2053d3297b 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -248,7 +248,6 @@ release_spec: opt @@ -320,7 +320,7 @@ index c65e817385..3bc4dea207 100644 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index d07db3fa4b..7f421d24cc 100644 +index ef4232244a..85cfb4b4ee 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -333,7 +333,7 @@ index d07db3fa4b..7f421d24cc 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index bb5f80403b..a78a4551a8 100644 +index 6872b0ec04..a097be4d48 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -133,7 +133,7 @@ release_spec: opt @@ -346,7 +346,7 @@ index bb5f80403b..a78a4551a8 100644 release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 028a63e98e..9e11e9bfb2 100644 +index 5699c3e952..f8dcb5c681 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -359,7 +359,7 @@ index 028a63e98e..9e11e9bfb2 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index dce7a359d3..7051c965b9 100644 +index 72aa054fb3..08c6c5ffc1 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -372,7 +372,7 @@ index dce7a359d3..7051c965b9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 4280557d45..eb43ecec23 100644 +index 2edb2ceb3e..884e69c7b7 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile @@ -151,7 +151,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -384,7 +384,7 @@ index 4280557d45..eb43ecec23 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index 7ca59495ed..a52ade2fe3 100644 +index e18628e94d..fa01850f38 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -397,7 +397,7 @@ index 7ca59495ed..a52ade2fe3 100644 $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index afb67c1793..ec6acf1fce 100644 +index ee32f3946f..2413fb68bf 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -409,7 +409,7 @@ index afb67c1793..ec6acf1fce 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index ba206904ec..281cc8657c 100644 +index c7971750a7..f6024f1184 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -422,25 +422,23 @@ index ba206904ec..281cc8657c 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index 1fef168463..e5411b903b 100644 +index d33e13fb14..dfa35c6ef2 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile -@@ -96,8 +96,8 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +@@ -99,8 +99,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/asn1" -- $(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \ -- $(GEN_ERLS) "$(RELSYSDIR)/asn1" -+ $(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \ -+ "$(RELSYSDIR)/asn1" + $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ + "$(RELSYSDIR)/asn1" +- $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(ASN_ERLS) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index e27f02eea9..dec54a8414 100644 +index 9b2b442794..a5dcba4ec3 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile -@@ -110,8 +110,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk +@@ -111,8 +111,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -450,7 +448,7 @@ index e27f02eea9..dec54a8414 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 4bddee4664..c714255548 100644 +index 173a557d58..6864febbc3 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -463,7 +461,7 @@ index 4bddee4664..c714255548 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 76286c5499..d921f9f294 100644 +index 8e8c4074f5..6e380e1b11 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile @@ -99,8 +99,6 @@ docs: @@ -476,7 +474,7 @@ index 76286c5499..d921f9f294 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 16a42caf11..674364281d 100644 +index 490e03595d..739830ae3f 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -488,7 +486,7 @@ index 16a42caf11..674364281d 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 1da0f33c9d..9d54271816 100644 +index 815b9f16cc..1eb49e9b93 100644 --- a/lib/snmp/src/agent/Makefile +++ b/lib/snmp/src/agent/Makefile @@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -501,7 +499,7 @@ index 1da0f33c9d..9d54271816 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 02800462a4..133f7c3b59 100644 +index f5a74aa78e..0340088eb3 100644 --- a/lib/snmp/src/app/Makefile +++ b/lib/snmp/src/app/Makefile @@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -514,7 +512,7 @@ index 02800462a4..133f7c3b59 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index bbd7f99378..19d1f83dda 100644 +index d37eaf9636..5d10c1250e 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile @@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -527,7 +525,7 @@ index bbd7f99378..19d1f83dda 100644 $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 6f5f5d01f9..d6bc5e3e06 100644 +index 693ef75469..61b8dc4692 100644 --- a/lib/snmp/src/manager/Makefile +++ b/lib/snmp/src/manager/Makefile @@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -540,7 +538,7 @@ index 6f5f5d01f9..d6bc5e3e06 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index eca2d949d2..4c234caf88 100644 +index e92506e855..8dc421d2a1 100644 --- a/lib/snmp/src/misc/Makefile +++ b/lib/snmp/src/misc/Makefile @@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -553,7 +551,7 @@ index eca2d949d2..4c234caf88 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index cc3cfe9e96..9f3cd694f5 100644 +index 2fcb164301..2c7acf384d 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile @@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -566,7 +564,7 @@ index cc3cfe9e96..9f3cd694f5 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 1e55bb497d..1cf3cbf5ee 100644 +index 789bed5c3f..9cd7f7226c 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -579,10 +577,10 @@ index 1e55bb497d..1cf3cbf5ee 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 509648cb2b..0ffc2c6ed1 100644 +index 369a448fe5..f23e53fd6f 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -221,7 +221,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -591,7 +589,7 @@ index 509648cb2b..0ffc2c6ed1 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index af6a472f3d..6796810ac2 100644 +index dc0ac61734..5bb265e2c2 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -604,7 +602,7 @@ index af6a472f3d..6796810ac2 100644 $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index 4ece9ffe28..da95babcea 100644 +index cfcb1ea134..fba9cc5873 100644 --- a/lib/tftp/src/Makefile +++ b/lib/tftp/src/Makefile @@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -617,7 +615,7 @@ index 4ece9ffe28..da95babcea 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index cc5bee9a8f..7dfa55cb41 100644 +index b05ce883ec..f8d143922d 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile @@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -630,7 +628,7 @@ index cc5bee9a8f..7dfa55cb41 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index 7e2eb38f2f..939d03670d 100644 +index ce14c0b6df..f052399c0f 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) @@ -646,7 +644,7 @@ index 7e2eb38f2f..939d03670d 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 51d9190797..1ab65bd2ed 100644 +index 0a9f8391c7..2ff364c678 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ release_spec: opt diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0007-Add-extra-search-directory.patch index 2b7e1e2..cb84b30 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0007-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index 3ab50cafe0..f510535714 100644 +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]) -> diff --git a/otp-0008-Avoid-forking-sed-to-get-basename.patch b/otp-0008-Avoid-forking-sed-to-get-basename.patch index a0ceb3e..d146ab2 100644 --- a/otp-0008-Avoid-forking-sed-to-get-basename.patch +++ b/otp-0008-Avoid-forking-sed-to-get-basename.patch @@ -4,14 +4,14 @@ 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 0983132ac1..6b55e8f0f3 100644 +index 536fa139d9..4dcffbc4c8 100644 --- a/erts/etc/unix/erl.src.src +++ b/erts/etc/unix/erl.src.src -@@ -26,7 +26,7 @@ else +@@ -49,7 +49,7 @@ else fi - BINDIR=$ROOTDIR/erts-%VSN%/bin + BINDIR="$ROOTDIR/erts-%VSN%/bin" EMU=%EMULATOR%%EMULATOR_NUMBER% --PROGNAME=`echo $0 | sed 's/.*\///'` +-PROGNAME=`basename "$0"` +PROGNAME=${0##*/} export EMU export ROOTDIR diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index f9b074b..c4b4ef4 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index bda9a94a95..e14fdc49b6 100644 +index 9c3dc690ba..7867d32fd0 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -724,8 +724,10 @@ int main(int argc, char **argv) +@@ -708,8 +708,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-Specify-encoding-during-javadoc-stage.patch b/otp-0010-Specify-encoding-during-javadoc-stage.patch new file mode 100644 index 0000000..756bea4 --- /dev/null +++ b/otp-0010-Specify-encoding-during-javadoc-stage.patch @@ -0,0 +1,19 @@ +From: Peter Lemenkov +Date: Wed, 13 Jul 2022 20:51:47 +0200 +Subject: [PATCH] Specify encoding during javadoc stage + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile +index 47e269a273..3e329a3a3f 100644 +--- a/lib/jinterface/doc/src/Makefile ++++ b/lib/jinterface/doc/src/Makefile +@@ -74,7 +74,7 @@ JAVA_SRC_FILES = $(JAVA_FILES:%=$(JAVA_SRC_PATH)/%.java) + + + ../html/java/index.html: $(JAVA_SRC_FILES) +- (cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \ ++ (cd ../../java_src;$(JAVADOC) -encoding UTF-8 -sourcepath . -d $(JAVADOC_DEST) \ + -windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS)) + + html: ../html/java/index.html diff --git a/sources b/sources index 527c3cc..5f85ab7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-24.3.4.2.tar.gz) = 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c +SHA512 (otp-OTP-25.0.2.tar.gz) = 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43 From 000f6a79c5630e28d3c1844be5e70b06737aac33 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 15 Jul 2022 09:38:11 +0200 Subject: [PATCH 273/340] typo Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 159498d..f746e1c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1912,7 +1912,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog -* Tue Jul 12 2022 Peter Lemenkov - 25.0..2-1 +* Tue Jul 12 2022 Peter Lemenkov - 25.0.2-1 - Ver. 25.0.2 * Thu Jun 23 2022 Peter Lemenkov - 24.3.4.2-1 From 7cb92068305589d5e6930076ce38bd7ccdcfb8e9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 16 Jul 2022 11:53:22 +0200 Subject: [PATCH 274/340] Erlang ver. 25.0.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index f746e1c..6d7d162 100644 --- a/erlang.spec +++ b/erlang.spec @@ -63,7 +63,7 @@ Name: erlang -Version: 25.0.2 +Version: 25.0.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1912,6 +1912,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Jul 16 2022 Peter Lemenkov - 25.0.3-1 +- Ver. 25.0.3 + * Tue Jul 12 2022 Peter Lemenkov - 25.0.2-1 - Ver. 25.0.2 diff --git a/sources b/sources index 5f85ab7..d78f2ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.0.2.tar.gz) = 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43 +SHA512 (otp-OTP-25.0.3.tar.gz) = d6c83722bd86e20568b879cb770e95e37b6227b932e4e74e50bbb9dc426b1f7f5286600a182011baa2b83ff7f006717ee62812959f133868765d819ddf57399f From 46be8d8adf2be9806e9915ba529262c2f0a00f05 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 18 Jul 2022 10:39:50 +0200 Subject: [PATCH 275/340] No more Java for ix86 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 6d7d162..c4be3d1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -2,7 +2,7 @@ %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} -%ifarch %{arm} %{mips} riscv64 +%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 From d9f78fa41534df0546d99f6457c5d1ea06de5406 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 18 Jul 2022 12:04:51 +0200 Subject: [PATCH 276/340] No more Java for ix86 (2) Signed-off-by: Peter Lemenkov --- erlang.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erlang.spec b/erlang.spec index c4be3d1..ec299ab 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,7 +25,11 @@ %global __with_emacs 1 %global __with_examples 1 +%ifarch %{ix86} %global __with_java 1 +%else +%global __with_java 0 +%endif # # wxWidgets plugin blocks the following ones: # From 40e6735f03fad19fcdd4bf172b6779927b4d91cf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 18 Jul 2022 12:39:13 +0200 Subject: [PATCH 277/340] No more Java for ix86 (3) Signed-off-by: Peter Lemenkov --- erlang.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index ec299ab..fc5d677 100644 --- a/erlang.spec +++ b/erlang.spec @@ -26,9 +26,9 @@ %global __with_emacs 1 %global __with_examples 1 %ifarch %{ix86} -%global __with_java 1 -%else %global __with_java 0 +%else +%global __with_java 1 %endif # # wxWidgets plugin blocks the following ones: From 066ab5f6cfc51b4b8843607014e5527b4bd6eb77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:10:33 +0000 Subject: [PATCH 278/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index fc5d677..de049db 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang Version: 25.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1916,6 +1916,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 25.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 16 2022 Peter Lemenkov - 25.0.3-1 - Ver. 25.0.3 From c1aef905ce343155dabdfe297f24cffbe663a188 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 28 Jul 2022 16:59:45 +0200 Subject: [PATCH 279/340] Rebuild with new wxWidgets Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index de049db..feab00b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang Version: 25.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1916,6 +1916,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jul 28 2022 Peter Lemenkov - 25.0.3-3 +- Rebuild with new wxWidgets + * Thu Jul 21 2022 Fedora Release Engineering - 25.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 13e953841be608ac9e260a32b18db6e56171f731 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 18 Aug 2022 19:18:32 +0200 Subject: [PATCH 280/340] Erlang ver. 25.0.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/erlang.spec b/erlang.spec index feab00b..224358d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -25,10 +25,10 @@ %global __with_emacs 1 %global __with_examples 1 -%ifarch %{ix86} -%global __with_java 0 -%else +%ifarch %{java_arches} %global __with_java 1 +%else +%global __with_java 0 %endif # # wxWidgets plugin blocks the following ones: @@ -67,8 +67,8 @@ Name: erlang -Version: 25.0.3 -Release: 3%{?dist} +Version: 25.0.4 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1916,6 +1916,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Aug 18 2022 Peter Lemenkov - 25.0.4-1 +- Ver. 25.0.4 + * Thu Jul 28 2022 Peter Lemenkov - 25.0.3-3 - Rebuild with new wxWidgets diff --git a/sources b/sources index d78f2ee..5502eef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.0.3.tar.gz) = d6c83722bd86e20568b879cb770e95e37b6227b932e4e74e50bbb9dc426b1f7f5286600a182011baa2b83ff7f006717ee62812959f133868765d819ddf57399f +SHA512 (otp-OTP-25.0.4.tar.gz) = 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363 From 3afa7cbab8e293f42eb79de468eb58ad8853b9de Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 21 Sep 2022 16:57:28 +0200 Subject: [PATCH 281/340] Erlang ver. 25.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 6 ++- otp-0002-Remove-rpath.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 44 +++++++++---------- ...pecify-encoding-during-javadoc-stage.patch | 19 -------- sources | 2 +- 5 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 otp-0010-Specify-encoding-during-javadoc-stage.patch diff --git a/erlang.spec b/erlang.spec index 224358d..ba482ed 100644 --- a/erlang.spec +++ b/erlang.spec @@ -67,7 +67,7 @@ Name: erlang -Version: 25.0.4 +Version: 25.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -108,7 +108,6 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-Specify-encoding-during-javadoc-stage.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1916,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Sep 21 2022 Peter Lemenkov - 25.1-1 +- Ver. 25.1 + * Thu Aug 18 2022 Peter Lemenkov - 25.0.4-1 - Ver. 25.0.4 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index de2d7a1..b906050 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index ec5cb32973..429347a07e 100644 +index 25167a8a3a..2345970fa9 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -146,7 +146,7 @@ endif +@@ -147,7 +147,7 @@ endif endif ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index e96c821..e40945b 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 191341a9f5..35c884e933 100644 +index 1994aa1302..007b7d44bd 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -113,8 +113,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 @@ index 191341a9f5..35c884e933 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 6d02075576..15f7054fed 100644 +index 9e13d02c8a..77ba98c2f8 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile -@@ -151,7 +151,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" @@ -63,10 +63,10 @@ index 4ff5e678ee..4e3fa5c60f 100644 $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index a9027b3ad8..3aaadb8500 100644 +index d801d6baa0..4eed19b516 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -182,8 +182,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" @@ -117,11 +117,11 @@ index c934ecdc2b..cc266f48e2 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 6dd3667a46..4e37212caa 100644 +index 75e23d4191..7097541548 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile -@@ -260,11 +260,8 @@ release_spec: opt - $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) +@@ -266,11 +266,8 @@ release_spec: opt + $(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%) $(TARGET_DIRS:%/=release_src_%): release_src_%: - $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" @@ -422,10 +422,10 @@ index c7971750a7..f6024f1184 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index d33e13fb14..dfa35c6ef2 100644 +index c1adf58ed4..bba7cae5d6 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile -@@ -99,8 +99,6 @@ release_spec: opt +@@ -103,8 +103,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/asn1" $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ "$(RELSYSDIR)/asn1" @@ -485,11 +485,11 @@ index 490e03595d..739830ae3f 100644 $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile -index 815b9f16cc..1eb49e9b93 100644 ---- a/lib/snmp/src/agent/Makefile -+++ b/lib/snmp/src/agent/Makefile -@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +diff --git a/lib/snmp/src/agent/Makefile.in b/lib/snmp/src/agent/Makefile.in +index 6ab9ed437a..14ae0bbc79 100644 +--- a/lib/snmp/src/agent/Makefile.in ++++ b/lib/snmp/src/agent/Makefile.in +@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" @@ -512,10 +512,10 @@ index f5a74aa78e..0340088eb3 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index d37eaf9636..5d10c1250e 100644 +index f255237a04..04232658c7 100644 --- a/lib/snmp/src/compile/Makefile +++ b/lib/snmp/src/compile/Makefile -@@ -137,7 +137,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" @@ -577,10 +577,10 @@ index 789bed5c3f..9cd7f7226c 100644 $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 369a448fe5..f23e53fd6f 100644 +index 761d6c4c28..43e7a650a5 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -223,7 +223,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -230,7 +230,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -644,10 +644,10 @@ index ce14c0b6df..f052399c0f 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 0a9f8391c7..2ff364c678 100644 +index e7e7c8e978..37b7843605 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile -@@ -218,9 +218,7 @@ release_spec: opt +@@ -223,9 +223,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" diff --git a/otp-0010-Specify-encoding-during-javadoc-stage.patch b/otp-0010-Specify-encoding-during-javadoc-stage.patch deleted file mode 100644 index 756bea4..0000000 --- a/otp-0010-Specify-encoding-during-javadoc-stage.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Peter Lemenkov -Date: Wed, 13 Jul 2022 20:51:47 +0200 -Subject: [PATCH] Specify encoding during javadoc stage - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile -index 47e269a273..3e329a3a3f 100644 ---- a/lib/jinterface/doc/src/Makefile -+++ b/lib/jinterface/doc/src/Makefile -@@ -74,7 +74,7 @@ JAVA_SRC_FILES = $(JAVA_FILES:%=$(JAVA_SRC_PATH)/%.java) - - - ../html/java/index.html: $(JAVA_SRC_FILES) -- (cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \ -+ (cd ../../java_src;$(JAVADOC) -encoding UTF-8 -sourcepath . -d $(JAVADOC_DEST) \ - -windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS)) - - html: ../html/java/index.html diff --git a/sources b/sources index 5502eef..a592ad1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.0.4.tar.gz) = 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363 +SHA512 (otp-OTP-25.1.tar.gz) = d9ad3f41a01121ce1e299ce3532a4bb498bb804a28ea01715cdda3308a89d84ebe14ad3da421a400e403ccb218fb8b3b708344ff10fcfd9e3b28286cac85d81a From f2cfc269fe63bc501f2984a2394d4c0d4428af43 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 3 Oct 2022 19:45:09 +0200 Subject: [PATCH 282/340] Erlang ver. 25.1.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index ba482ed..f0ec2a0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -67,7 +67,7 @@ Name: erlang -Version: 25.1 +Version: 25.1.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1915,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Oct 3 2022 Peter Lemenkov - 25.1.1-1 +- Ver. 25.1.1 + * Wed Sep 21 2022 Peter Lemenkov - 25.1-1 - Ver. 25.1 diff --git a/sources b/sources index a592ad1..2d5cb3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.1.tar.gz) = d9ad3f41a01121ce1e299ce3532a4bb498bb804a28ea01715cdda3308a89d84ebe14ad3da421a400e403ccb218fb8b3b708344ff10fcfd9e3b28286cac85d81a +SHA512 (otp-OTP-25.1.1.tar.gz) = 7e34eca772d29132dc907181ee9829ea58a47e622a9a65c0d4f66e79cb2e8f22a9f9e2edefad67ee6c151ee09027ed3927be65228780cdbe606a0abe59209243 From 449541a182dd37d3615b7aa7919ab6484045d40c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 25 Oct 2022 15:08:59 +0200 Subject: [PATCH 283/340] Erlang ver. 25.1.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- otp-0009-Load-man-pages-from-system-wide-directory.patch | 4 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index f0ec2a0..4200c0d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -67,7 +67,7 @@ Name: erlang -Version: 25.1.1 +Version: 25.1.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1915,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Oct 25 2022 Peter Lemenkov - 25.1.2-1 +- Ver. 25.1.2 + * Mon Oct 3 2022 Peter Lemenkov - 25.1.1-1 - Ver. 25.1.1 diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index c4b4ef4..a7e0945 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 9c3dc690ba..7867d32fd0 100644 +index 3e44ad2b77..d92bf75be0 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -708,8 +708,10 @@ int main(int argc, char **argv) +@@ -709,8 +709,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/sources b/sources index 2d5cb3c..4e933aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.1.1.tar.gz) = 7e34eca772d29132dc907181ee9829ea58a47e622a9a65c0d4f66e79cb2e8f22a9f9e2edefad67ee6c151ee09027ed3927be65228780cdbe606a0abe59209243 +SHA512 (otp-OTP-25.1.2.tar.gz) = a478799cb7df70a552043da55757b811e8b97182be15ab928e05b58537bb7bc4899aee406648767f538d8bd5c09e0a9d7e3655c99a8df0e6a0b77db83a720fb8 From 793ca1acf2d01d48460596a77ae1fb2c0be0e912 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 24 Nov 2022 14:42:16 +0100 Subject: [PATCH 284/340] Fix C99 compatibility issues in configure checks Related to: --- erlang-configure-c99.patch | 89 ++++++++++++++++++++++++++++++++++++++ erlang.spec | 5 ++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 erlang-configure-c99.patch diff --git a/erlang-configure-c99.patch b/erlang-configure-c99.patch new file mode 100644 index 0000000..e7abc79 --- /dev/null +++ b/erlang-configure-c99.patch @@ -0,0 +1,89 @@ +Configure changes to adjust to stricter C99 compilers: Avoid +implicit function declarations, and define main as returning int. + +Submitted upstream: + +diff --git a/erts/configure b/erts/configure +index 815428caaf61c914..7d057e69ae5e3a93 100755 +--- a/erts/configure ++++ b/erts/configure +@@ -20529,6 +20529,9 @@ else $as_nop + #ifdef HAVE_MALLOC_H + # include + #endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif + #if defined(HAVE_END_SYMBOL) + extern char end; + #elif defined(HAVE__END_SYMBOL) +@@ -24437,10 +24440,13 @@ else $as_nop + /* end confdefs.h. */ + + #include +-main() ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++int main() + { + #ifdef _POLL_EMUL_H_ +- exit(1); /* Implemented using select() -- fail */ ++ return 1; /* Implemented using select() -- fail */ + #else + struct pollfd fds[1]; + int fd; +@@ -24449,9 +24455,9 @@ main() + fds[0].events = POLLIN; + fds[0].revents = 0; + if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { +- exit(1); /* Does not work for devices -- fail */ ++ return 1; /* Does not work for devices -- fail */ + } +- exit(0); ++ return 0; + #endif + } + +diff --git a/erts/configure.ac b/erts/configure.ac +index ab2ee78acdca211e..f658b66e3c0e508a 100644 +--- a/erts/configure.ac ++++ b/erts/configure.ac +@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], + #ifdef HAVE_MALLOC_H + # include + #endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif + #if defined(HAVE_END_SYMBOL) + extern char end; + #elif defined(HAVE__END_SYMBOL) +@@ -3033,10 +3036,13 @@ poll_works=no + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include +-main() ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++int main() + { + #ifdef _POLL_EMUL_H_ +- exit(1); /* Implemented using select() -- fail */ ++ return 1; /* Implemented using select() -- fail */ + #else + struct pollfd fds[1]; + int fd; +@@ -3045,9 +3051,9 @@ main() + fds[0].events = POLLIN; + fds[0].revents = 0; + if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { +- exit(1); /* Does not work for devices -- fail */ ++ return 1; /* Does not work for devices -- fail */ + } +- exit(0); ++ return 0; + #endif + } + ]])],[poll_works=yes],[poll_works=no],[ diff --git a/erlang.spec b/erlang.spec index 4200c0d..2e4d13d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang Version: 25.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1915,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Nov 24 2022 Florian Weimer - 25.1.2-2 +- Fix C99 compatibility issues in configure checks + * Tue Oct 25 2022 Peter Lemenkov - 25.1.2-1 - Ver. 25.1.2 From 86ebbb5d6e7ef53c8a16b9a2feb3dee1105aeabb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 27 Nov 2022 11:14:50 +0900 Subject: [PATCH 285/340] Rebuild due to wxGLCanvas ABI change --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 2e4d13d..9376166 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang Version: 25.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1915,6 +1915,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sun Nov 27 2022 Mamoru TASAKA - 25.1.2-3 +- Rebuild due to wxGLCanvas ABI change + * Thu Nov 24 2022 Florian Weimer - 25.1.2-2 - Fix C99 compatibility issues in configure checks From c397a8243a0b9418711f126f98f9a3f66ea15412 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 14 Dec 2022 10:07:19 +0100 Subject: [PATCH 286/340] Erlang ver. 25.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 ++- ...-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 35 +++++++++ ...re.ac-C99-fixes-for-poll_works-check.patch | 72 +++++++++++++++++++ sources | 2 +- 4 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch create mode 100644 otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch diff --git a/erlang.spec b/erlang.spec index 9376166..be0a508 100644 --- a/erlang.spec +++ b/erlang.spec @@ -67,8 +67,8 @@ Name: erlang -Version: 25.1.2 -Release: 3%{?dist} +Version: 25.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -108,6 +108,8 @@ Patch6: otp-0006-Do-not-install-erlang-sources.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 +Patch10: otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +Patch11: otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1915,6 +1917,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Dec 14 2022 Peter Lemenkov - 25.2-1 +- Ver. 25.2 + * Sun Nov 27 2022 Mamoru TASAKA - 25.1.2-3 - Rebuild due to wxGLCanvas ABI change diff --git a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch new file mode 100644 index 0000000..cc45495 --- /dev/null +++ b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -0,0 +1,35 @@ +From: Florian Weimer +Date: Thu, 24 Nov 2022 11:57:49 +0100 +Subject: [PATCH] configure.ac: C99 fix for + ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC + +#include for the sbrk function if the header is available. + +diff --git a/erts/configure b/erts/configure +index 815428caaf..47a1eab97a 100755 +--- a/erts/configure ++++ b/erts/configure +@@ -20529,6 +20529,9 @@ else $as_nop + #ifdef HAVE_MALLOC_H + # include + #endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif + #if defined(HAVE_END_SYMBOL) + extern char end; + #elif defined(HAVE__END_SYMBOL) +diff --git a/erts/configure.ac b/erts/configure.ac +index ab2ee78acd..71423a4c4d 100644 +--- a/erts/configure.ac ++++ b/erts/configure.ac +@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], + #ifdef HAVE_MALLOC_H + # include + #endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif + #if defined(HAVE_END_SYMBOL) + extern char end; + #elif defined(HAVE__END_SYMBOL) diff --git a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch new file mode 100644 index 0000000..581f1fd --- /dev/null +++ b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch @@ -0,0 +1,72 @@ +From: Florian Weimer +Date: Thu, 24 Nov 2022 11:59:22 +0100 +Subject: [PATCH] configure.ac: C99 fixes for poll_works check + +Include if it is available for the open prototype. +Return from main instead of calling exit, so that no function +declaration is needed. + +diff --git a/erts/configure b/erts/configure +index 47a1eab97a..7d057e69ae 100755 +--- a/erts/configure ++++ b/erts/configure +@@ -24440,10 +24440,13 @@ else $as_nop + /* end confdefs.h. */ + + #include +-main() ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++int main() + { + #ifdef _POLL_EMUL_H_ +- exit(1); /* Implemented using select() -- fail */ ++ return 1; /* Implemented using select() -- fail */ + #else + struct pollfd fds[1]; + int fd; +@@ -24452,9 +24455,9 @@ main() + fds[0].events = POLLIN; + fds[0].revents = 0; + if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { +- exit(1); /* Does not work for devices -- fail */ ++ return 1; /* Does not work for devices -- fail */ + } +- exit(0); ++ return 0; + #endif + } + +diff --git a/erts/configure.ac b/erts/configure.ac +index 71423a4c4d..f658b66e3c 100644 +--- a/erts/configure.ac ++++ b/erts/configure.ac +@@ -3036,10 +3036,13 @@ poll_works=no + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include +-main() ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++int main() + { + #ifdef _POLL_EMUL_H_ +- exit(1); /* Implemented using select() -- fail */ ++ return 1; /* Implemented using select() -- fail */ + #else + struct pollfd fds[1]; + int fd; +@@ -3048,9 +3051,9 @@ main() + fds[0].events = POLLIN; + fds[0].revents = 0; + if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { +- exit(1); /* Does not work for devices -- fail */ ++ return 1; /* Does not work for devices -- fail */ + } +- exit(0); ++ return 0; + #endif + } + ]])],[poll_works=yes],[poll_works=no],[ diff --git a/sources b/sources index 4e933aa..1ca63ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.1.2.tar.gz) = a478799cb7df70a552043da55757b811e8b97182be15ab928e05b58537bb7bc4899aee406648767f538d8bd5c09e0a9d7e3655c99a8df0e6a0b77db83a720fb8 +SHA512 (otp-OTP-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28 From 4e833ec92087b4062ec0d58efe5d9de90a357684 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 4 Jan 2023 20:51:47 +0100 Subject: [PATCH 287/340] Restore source code installation LSP applications require source code to be available (rhbz #2157170). Let's restore it in a separate package. Signed-off-by: Peter Lemenkov --- erlang.spec | 60 +- ...Revert-Do-not-install-erlang-sources.patch | 657 ++++++++++++++++++ 2 files changed, 716 insertions(+), 1 deletion(-) create mode 100644 otp-0012-Revert-Do-not-install-erlang-sources.patch diff --git a/erlang.spec b/erlang.spec index be0a508..35e07ef 100644 --- a/erlang.spec +++ b/erlang.spec @@ -30,6 +30,7 @@ %else %global __with_java 0 %endif +%global __with_sources 1 # # wxWidgets plugin blocks the following ones: # @@ -68,7 +69,7 @@ Name: erlang Version: 25.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -110,6 +111,7 @@ Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch Patch10: otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch Patch11: otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch +Patch12: otp-0012-Revert-Do-not-install-erlang-sources.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -180,6 +182,7 @@ Requires: %{name}-reltool%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} +Requires: %{name}-src%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -596,6 +599,50 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Simple Network Management Protocol (SNMP) support including a MIB compiler and tools for creating SNMP agents. +%if %{__with_sources} +%package src +Summary: Erlang sources +Requires: %{name}-asn%{?_isa} = %{version}-%{release} +Requires: %{name}-common%{?_isa} = %{version}-%{release} +Requires: %{name}-compiler%{?_isa} = %{version}-%{release} +Requires: %{name}-crypto%{?_isa} = %{version}-%{release} +Requires: %{name}-debugger%{?_isa} = %{version}-%{release} +Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} +Requires: %{name}-diameter%{?_isa} = %{version}-%{release} +Requires: %{name}-edoc%{?_isa} = %{version}-%{release} +Requires: %{name}-eldap%{?_isa} = %{version}-%{release} +Requires: %{name}-erl%{?_isa} = %{version}-%{release} +Requires: %{name}-erts%{?_isa} = %{version}-%{release} +Requires: %{name}-et%{?_isa} = %{version}-%{release} +Requires: %{name}-eunit%{?_isa} = %{version}-%{release} +Requires: %{name}-ftp%{?_isa} = %{version}-%{release} +Requires: %{name}-inets%{?_isa} = %{version}-%{release} +Requires: %{name}-kernel%{?_isa} = %{version}-%{release} +Requires: %{name}-megaco%{?_isa} = %{version}-%{release} +Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} +Requires: %{name}-observer%{?_isa} = %{version}-%{release} +Requires: %{name}-odbc%{?_isa} = %{version}-%{release} +Requires: %{name}-os%{?_isa} = %{version}-%{release} +Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} +Requires: %{name}-public%{?_isa} = %{version}-%{release} +Requires: %{name}-reltool%{?_isa} = %{version}-%{release} +Requires: %{name}-runtime%{?_isa} = %{version}-%{release} +Requires: %{name}-sasl%{?_isa} = %{version}-%{release} +Requires: %{name}-snmp%{?_isa} = %{version}-%{release} +Requires: %{name}-ssh%{?_isa} = %{version}-%{release} +Requires: %{name}-ssl%{?_isa} = %{version}-%{release} +Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax%{?_isa} = %{version}-%{release} +Requires: %{name}-tftp%{?_isa} = %{version}-%{release} +Requires: %{name}-tools%{?_isa} = %{version}-%{release} +Requires: %{name}-wx%{?_isa} = %{version}-%{release} +Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} + +%description src +Erlang sources. It may be useful as a reference for code completion tools in +various editors, for documentation or automatical-code generation purposes. +%endif # __with_sources + %package ssh Summary: Secure Shell application with sftp and ssh support Requires: %{name}-crypto%{?_isa} = %{version}-%{release} @@ -1499,6 +1546,13 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man7/TRANSPORT-ADDRESS-MIB.* %endif +%if %{__with_sources} +%files src +%dir %{_libdir}/erlang/lib/*/src/ +%{_libdir}/erlang/lib/*/src/*.erl +%{_libdir}/erlang/lib/*/src/*.yrl +%endif + %files ssh %dir %{_libdir}/erlang/lib/ssh-*/ %{_libdir}/erlang/lib/ssh-*/ebin @@ -1917,6 +1971,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jan 4 2023 Peter Lemenkov - 25.2-2 +- LSP applications require source code to be available (rhbz #2157170). Let's + restore it in a separate package + * Wed Dec 14 2022 Peter Lemenkov - 25.2-1 - Ver. 25.2 diff --git a/otp-0012-Revert-Do-not-install-erlang-sources.patch b/otp-0012-Revert-Do-not-install-erlang-sources.patch new file mode 100644 index 0000000..1a0bb85 --- /dev/null +++ b/otp-0012-Revert-Do-not-install-erlang-sources.patch @@ -0,0 +1,657 @@ +From: Peter Lemenkov +Date: Wed, 4 Jan 2023 20:49:01 +0100 +Subject: [PATCH] Revert "Do not install erlang sources" + +This reverts commit 02d89974af96987a7cbcfe9d18533d509ad33690. + +diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile +index 007b7d44bd..1994aa1302 100644 +--- a/erts/preloaded/src/Makefile ++++ b/erts/preloaded/src/Makefile +@@ -117,6 +117,8 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: $(APP_TARGET) ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" + +diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile +index 77ba98c2f8..9e13d02c8a 100644 +--- a/lib/asn1/src/Makefile ++++ b/lib/asn1/src/Makefile +@@ -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" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" + +diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile +index 5bf4e50f14..00f13589f3 100644 +--- a/lib/common_test/src/Makefile ++++ b/lib/common_test/src/Makefile +@@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" + $(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 4e3fa5c60f..4ff5e678ee 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_HRL_FILES) \ ++ $(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \ + $(TS_TARGET_FILES) \ +- $(CONFIG) \ ++ $(AUTOCONF_FILES) $(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 4eed19b516..d801d6baa0 100644 +--- a/lib/compiler/src/Makefile ++++ b/lib/compiler/src/Makefile +@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ +- "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ ++ $(YRL_FILE) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile +index 6f8a329421..893f679390 100644 +--- a/lib/crypto/src/Makefile ++++ b/lib/crypto/src/Makefile +@@ -81,6 +81,8 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile +index 6ddce27ec1..2fb955b2e3 100644 +--- a/lib/debugger/src/Makefile ++++ b/lib/debugger/src/Makefile +@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile +index cc266f48e2..c934ecdc2b 100644 +--- a/lib/dialyzer/src/Makefile ++++ b/lib/dialyzer/src/Makefile +@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ + "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile +index 7097541548..75e23d4191 100644 +--- a/lib/diameter/src/Makefile ++++ b/lib/diameter/src/Makefile +@@ -266,8 +266,11 @@ release_spec: opt + $(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%) + + $(TARGET_DIRS:%/=release_src_%): release_src_%: +- $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ +- "$(RELSYSDIR)/src/$*" || true ++ $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" ++ $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ ++ $(INTERNAL_HRLS)) \ ++ $(filter $*/%, compiler/$(DICT_YRL).yrl) \ ++ "$(RELSYSDIR)/src/$*" + + $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: + $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" +diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile +index e5b2f886ed..a455662049 100644 +--- a/lib/edoc/src/Makefile ++++ b/lib/edoc/src/Makefile +@@ -87,7 +87,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src" + + release_docs_spec: + +diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile +index 78fc4a9687..04a84a4766 100644 +--- a/lib/eldap/src/Makefile ++++ b/lib/eldap/src/Makefile +@@ -98,9 +98,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +- $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ++ $(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DIR) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ++ $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + + release_docs_spec: + +diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile +index cc3368ad02..458094e35f 100644 +--- a/lib/erl_docgen/src/Makefile ++++ b/lib/erl_docgen/src/Makefile +@@ -91,6 +91,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile +index a567965ed4..fc66cc1eaf 100644 +--- a/lib/et/src/Makefile ++++ b/lib/et/src/Makefile +@@ -109,6 +109,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile +index 2a49a2ca7a..f4eaf6807a 100644 +--- a/lib/eunit/src/Makefile ++++ b/lib/eunit/src/Makefile +@@ -121,6 +121,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(BEHAVIOUR_SOURCES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" +diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile +index ca4b539017..62f62792f0 100644 +--- a/lib/inets/src/http_client/Makefile ++++ b/lib/inets/src/http_client/Makefile +@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client" ++ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile +index 896a806695..481c4f66eb 100644 +--- a/lib/inets/src/http_lib/Makefile ++++ b/lib/inets/src/http_lib/Makefile +@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib" ++ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile +index 42925ba58f..abf8413f33 100644 +--- a/lib/inets/src/http_server/Makefile ++++ b/lib/inets/src/http_server/Makefile +@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" ++ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile +index a8b932772a..405e86105a 100644 +--- a/lib/inets/src/inets_app/Makefile ++++ b/lib/inets/src/inets_app/Makefile +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile +index 891d3e6f6a..2149e89776 100644 +--- a/lib/kernel/src/Makefile ++++ b/lib/kernel/src/Makefile +@@ -229,6 +229,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile +index 8cb286181a..c681b88428 100644 +--- a/lib/megaco/src/app/Makefile ++++ b/lib/megaco/src/app/Makefile +@@ -114,7 +114,7 @@ release_spec: opt + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" + +diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile +index 3ca5654eb3..9ecb649f0c 100644 +--- a/lib/megaco/src/binary/Makefile ++++ b/lib/megaco/src/binary/Makefile +@@ -154,7 +154,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary" + + + release_docs_spec: +diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile +index b7a7c703b3..cc4974e09d 100644 +--- a/lib/megaco/src/engine/Makefile ++++ b/lib/megaco/src/engine/Makefile +@@ -102,7 +102,7 @@ release_spec: opt + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 2053d3297b..d8c5c68b99 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -248,6 +248,7 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" + $(INSTALL_DIR) "$(RELSYSDIR)/include" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" +diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile +index 85cfb4b4ee..ef4232244a 100644 +--- a/lib/megaco/src/tcp/Makefile ++++ b/lib/megaco/src/tcp/Makefile +@@ -94,7 +94,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" + + + release_docs_spec: +diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile +index a097be4d48..6872b0ec04 100644 +--- a/lib/megaco/src/text/Makefile ++++ b/lib/megaco/src/text/Makefile +@@ -133,7 +133,7 @@ release_spec: opt + $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/text" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" + + + release_docs_spec: +diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile +index f8dcb5c681..5699c3e952 100644 +--- a/lib/megaco/src/udp/Makefile ++++ b/lib/megaco/src/udp/Makefile +@@ -94,7 +94,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" + + + release_docs_spec: +diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile +index 08c6c5ffc1..72aa054fb3 100644 +--- a/lib/mnesia/src/Makefile ++++ b/lib/mnesia/src/Makefile +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile +index 884e69c7b7..2edb2ceb3e 100644 +--- a/lib/observer/src/Makefile ++++ b/lib/observer/src/Makefile +@@ -151,6 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" + $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" +diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile +index fa01850f38..e18628e94d 100644 +--- a/lib/odbc/src/Makefile ++++ b/lib/odbc/src/Makefile +@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile +index 2413fb68bf..ee32f3946f 100644 +--- a/lib/os_mon/src/Makefile ++++ b/lib/os_mon/src/Makefile +@@ -105,6 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile +index f6024f1184..c7971750a7 100644 +--- a/lib/parsetools/src/Makefile ++++ b/lib/parsetools/src/Makefile +@@ -91,6 +91,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile +index bba7cae5d6..c1adf58ed4 100644 +--- a/lib/public_key/asn1/Makefile ++++ b/lib/public_key/asn1/Makefile +@@ -103,6 +103,8 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/asn1" + $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ + "$(RELSYSDIR)/asn1" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ASN_ERLS) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + +diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile +index a5dcba4ec3..9b2b442794 100644 +--- a/lib/public_key/src/Makefile ++++ b/lib/public_key/src/Makefile +@@ -111,6 +111,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile +index 6864febbc3..173a557d58 100644 +--- a/lib/reltool/src/Makefile ++++ b/lib/reltool/src/Makefile +@@ -100,7 +100,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) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile +index 6e380e1b11..8e8c4074f5 100644 +--- a/lib/runtime_tools/src/Makefile ++++ b/lib/runtime_tools/src/Makefile +@@ -99,6 +99,8 @@ docs: + include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/examples" +diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile +index 739830ae3f..490e03595d 100644 +--- a/lib/sasl/src/Makefile ++++ b/lib/sasl/src/Makefile +@@ -94,6 +94,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/agent/Makefile.in b/lib/snmp/src/agent/Makefile.in +index 14ae0bbc79..6ab9ed437a 100644 +--- a/lib/snmp/src/agent/Makefile.in ++++ b/lib/snmp/src/agent/Makefile.in +@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile +index 0340088eb3..f5a74aa78e 100644 +--- a/lib/snmp/src/app/Makefile ++++ b/lib/snmp/src/app/Makefile +@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/app" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile +index 04232658c7..f255237a04 100644 +--- a/lib/snmp/src/compile/Makefile ++++ b/lib/snmp/src/compile/Makefile +@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" ++ $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/bin" +diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile +index 61b8dc4692..693ef75469 100644 +--- a/lib/snmp/src/manager/Makefile ++++ b/lib/snmp/src/manager/Makefile +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile +index 8dc421d2a1..e92506e855 100644 +--- a/lib/snmp/src/misc/Makefile ++++ b/lib/snmp/src/misc/Makefile +@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + # $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile +index 2c7acf384d..2fcb164301 100644 +--- a/lib/ssh/src/Makefile ++++ b/lib/ssh/src/Makefile +@@ -182,7 +182,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) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile +index 9cd7f7226c..789bed5c3f 100644 +--- a/lib/ssl/src/Makefile ++++ b/lib/ssl/src/Makefile +@@ -211,7 +211,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) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile +index 43e7a650a5..761d6c4c28 100644 +--- a/lib/stdlib/src/Makefile ++++ b/lib/stdlib/src/Makefile +@@ -230,6 +230,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src" + $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" +diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile +index 5bb265e2c2..dc0ac61734 100644 +--- a/lib/syntax_tools/src/Makefile ++++ b/lib/syntax_tools/src/Makefile +@@ -96,6 +96,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" ++ $(INSTALL_DIR) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" + +diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile +index fba9cc5873..cfcb1ea134 100644 +--- a/lib/tftp/src/Makefile ++++ b/lib/tftp/src/Makefile +@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ + $(APPUP_TARGET) "$(RELSYSDIR)/ebin" +diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile +index f8d143922d..b05ce883ec 100644 +--- a/lib/tools/src/Makefile ++++ b/lib/tools/src/Makefile +@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ + "$(RELSYSDIR)/ebin" +diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile +index f052399c0f..ce14c0b6df 100644 +--- a/lib/wx/src/Makefile ++++ b/lib/wx/src/Makefile +@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) + include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/src/gen" +- $(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen" ++ $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" +diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile +index 37b7843605..e7e7c8e978 100644 +--- a/lib/xmerl/src/Makefile ++++ b/lib/xmerl/src/Makefile +@@ -223,7 +223,9 @@ release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/ebin" + $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" + $(INSTALL_DIR) "$(RELSYSDIR)/src" +- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src" ++ $(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src" + $(INSTALL_DIR) "$(RELSYSDIR)/include" + $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + From c143d243796193dd1825bece6d5ae1aab7dd48d2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 6 Jan 2023 00:13:12 +0100 Subject: [PATCH 288/340] Fix deps Signed-off-by: Peter Lemenkov --- erlang.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/erlang.spec b/erlang.spec index 35e07ef..fd3c80c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 25.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -602,8 +602,8 @@ MIB compiler and tools for creating SNMP agents. %if %{__with_sources} %package src Summary: Erlang sources -Requires: %{name}-asn%{?_isa} = %{version}-%{release} -Requires: %{name}-common%{?_isa} = %{version}-%{release} +Requires: %{name}-asn1%{?_isa} = %{version}-%{release} +Requires: %{name}-common_test%{?_isa} = %{version}-%{release} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-debugger%{?_isa} = %{version}-%{release} @@ -611,7 +611,7 @@ Requires: %{name}-dialyzer%{?_isa} = %{version}-%{release} Requires: %{name}-diameter%{?_isa} = %{version}-%{release} Requires: %{name}-edoc%{?_isa} = %{version}-%{release} Requires: %{name}-eldap%{?_isa} = %{version}-%{release} -Requires: %{name}-erl%{?_isa} = %{version}-%{release} +Requires: %{name}-erl_docgen%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-et%{?_isa} = %{version}-%{release} Requires: %{name}-eunit%{?_isa} = %{version}-%{release} @@ -622,17 +622,17 @@ Requires: %{name}-megaco%{?_isa} = %{version}-%{release} Requires: %{name}-mnesia%{?_isa} = %{version}-%{release} Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} -Requires: %{name}-os%{?_isa} = %{version}-%{release} +Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} -Requires: %{name}-public%{?_isa} = %{version}-%{release} +Requires: %{name}-public_key%{?_isa} = %{version}-%{release} Requires: %{name}-reltool%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime%{?_isa} = %{version}-%{release} +Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tftp%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-wx%{?_isa} = %{version}-%{release} @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jan 6 2023 Peter Lemenkov - 25.2-3 +- Fix deps + * Wed Jan 4 2023 Peter Lemenkov - 25.2-2 - LSP applications require source code to be available (rhbz #2157170). Let's restore it in a separate package From e5a32454da2c2bd159f87472e647be164b02e63b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 18 Jan 2023 18:58:21 +0100 Subject: [PATCH 289/340] Erlang ver. 25.2.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index fd3c80c..3231f51 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 25.2 -Release: 3%{?dist} +Version: 25.2.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jan 18 2023 Peter Lemenkov - 25.2.1-1 +- Ver. 25.2.1 + * Fri Jan 6 2023 Peter Lemenkov - 25.2-3 - Fix deps diff --git a/sources b/sources index 1ca63ff..92c4554 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.2.tar.gz) = bad37d287bd79f42ea19183c959e2865a0ecc19409dfffe96483e29d8cd199ea0b85e3263c9a2297137f640fb9a53ff2cd79ddad1b8d83bb2a95a987a9fdfa28 +SHA512 (otp-OTP-25.2.1.tar.gz) = 517e6b3a2929c26a95a4b723cfeb1fe48bef3ea519a977c2aa9e12954c749f25418afbe570b288a3d6bb1124cbda515d06516db4fb0eac99e780c3b493219f3d From 3e9f7a3e121b5ca60cc9d89d641df1326791dc8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:29:25 +0000 Subject: [PATCH 290/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 3231f51..d7617c0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 25.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 25.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Peter Lemenkov - 25.2.1-1 - Ver. 25.2.1 From aab72e1ede35fc15c6321eef423540246a67b024 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 30 Jan 2023 13:58:08 +0100 Subject: [PATCH 291/340] Erlang ver. 25.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index d7617c0..f64c418 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 25.2.1 -Release: 2%{?dist} +Version: 25.2.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Jan 30 2023 Peter Lemenkov - 25.2.2-1 +- Ver. 25.2.2 + * Thu Jan 19 2023 Fedora Release Engineering - 25.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 92c4554..6dd5e0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.2.1.tar.gz) = 517e6b3a2929c26a95a4b723cfeb1fe48bef3ea519a977c2aa9e12954c749f25418afbe570b288a3d6bb1124cbda515d06516db4fb0eac99e780c3b493219f3d +SHA512 (otp-OTP-25.2.2.tar.gz) = e93f5b7079f9cf1e00528587a8fc96ed5b4a29b6b329a38e238341f79d98f20f811548875fbaf137fd64b38d5950989e885a2293680475a0b7198307eef1de4a From d713068e22d33067e5b2a9434deefdea7e1df722 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 17 Feb 2023 22:16:08 +0100 Subject: [PATCH 292/340] Erlang ver. 25.2.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index f64c418..76ca198 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 25.2.2 +Version: 25.2.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Feb 17 2023 Peter Lemenkov - 25.2.3-1 +- Ver. 25.2.3 + * Mon Jan 30 2023 Peter Lemenkov - 25.2.2-1 - Ver. 25.2.2 diff --git a/sources b/sources index 6dd5e0d..20efeca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.2.2.tar.gz) = e93f5b7079f9cf1e00528587a8fc96ed5b4a29b6b329a38e238341f79d98f20f811548875fbaf137fd64b38d5950989e885a2293680475a0b7198307eef1de4a +SHA512 (otp-OTP-25.2.3.tar.gz) = aa51ebcb9c4977ebd695d416488fc8ac94e7d19b962f6d470c5e6377151781ed6c50319eeb2cbbac75438d9f759302d1e48d2c2118ec86063a33a22ed8651f27 From 9a8f56b741ecbe05f3fdf684c3b7a3d0c30b2e0a Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 24 Feb 2023 17:55:28 +0000 Subject: [PATCH 293/340] Use parallel make for build On my system it improves build time from 20+ minutes to a few and does not cause any issues in test suite or similar. --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 76ca198..02cfb37 100644 --- a/erlang.spec +++ b/erlang.spec @@ -810,7 +810,7 @@ pushd emacs-erlang popd %endif %{__with_emacs} -make +%make_build %if %{with doc} # should use FOP_OPTS after #832323 is resolved From 61b51141c3afb617849087b6ed1a190c7d64bd35 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 8 Mar 2023 15:22:58 +0100 Subject: [PATCH 294/340] Erlang ver. 25.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- ...-not-format-man-pages-and-do-not-install-miscellan.patch | 4 ++-- otp-0009-Load-man-pages-from-system-wide-directory.patch | 2 +- ...nfigure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 4 ++-- otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch | 6 +++--- sources | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index 02cfb37..ba99aeb 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 25.2.3 +Version: 25.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Mar 8 2023 Peter Lemenkov - 25.3-1 +- Ver. 25.3 + * Fri Feb 17 2023 Peter Lemenkov - 25.2.3-1 - Ver. 25.2.3 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index da44106..96f0494 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 42d4395eb2..307ef11828 100644 +index 86f63dcf41..b74c789775 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -552,10 +552,6 @@ endif +@@ -555,10 +555,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0009-Load-man-pages-from-system-wide-directory.patch index a7e0945..2075f81 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0009-Load-man-pages-from-system-wide-directory.patch @@ -7,7 +7,7 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index 3e44ad2b77..d92bf75be0 100644 +index fa951ae770..9cce3857db 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -709,8 +709,10 @@ int main(int argc, char **argv) diff --git a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index cc45495..7647ebe 100644 --- a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,10 +6,10 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index 815428caaf..47a1eab97a 100755 +index a84ffe4342..16fd52dad4 100755 --- a/erts/configure +++ b/erts/configure -@@ -20529,6 +20529,9 @@ else $as_nop +@@ -20644,6 +20644,9 @@ else $as_nop #ifdef HAVE_MALLOC_H # include #endif diff --git a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch index 581f1fd..0c99732 100644 --- a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 47a1eab97a..7d057e69ae 100755 +index 16fd52dad4..a991217017 100755 --- a/erts/configure +++ b/erts/configure -@@ -24440,10 +24440,13 @@ else $as_nop +@@ -24555,10 +24555,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 47a1eab97a..7d057e69ae 100755 #else struct pollfd fds[1]; int fd; -@@ -24452,9 +24455,9 @@ main() +@@ -24567,9 +24570,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/sources b/sources index 20efeca..c9f923c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.2.3.tar.gz) = aa51ebcb9c4977ebd695d416488fc8ac94e7d19b962f6d470c5e6377151781ed6c50319eeb2cbbac75438d9f759302d1e48d2c2118ec86063a33a22ed8651f27 +SHA512 (otp-OTP-25.3.tar.gz) = cf104918917e33db250b48aaad3c098899739358035d764ea2ee1fc9ba7937504190752163ce8430bdbfc576ce2c2533d4f50fc8f0994ff155e3df188a8db99e From 492b64b29b48bb3ea5729835d6d5e2f7c7005caa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 27 Apr 2023 16:16:54 +0200 Subject: [PATCH 295/340] Erlang ver. 25.3.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- ....ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 4 ++-- ...configure.ac-C99-fixes-for-poll_works-check.patch | 12 ++++++------ sources | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/erlang.spec b/erlang.spec index ba99aeb..9989a6d 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 25.3 +Version: 25.3.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Apr 27 2023 Peter Lemenkov - 25.3.1-1 +- Ver. 25.3.1 + * Wed Mar 8 2023 Peter Lemenkov - 25.3-1 - Ver. 25.3 diff --git a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index 7647ebe..dc89898 100644 --- a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,7 +6,7 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index a84ffe4342..16fd52dad4 100755 +index fbdb6baba8..46e882e99a 100755 --- a/erts/configure +++ b/erts/configure @@ -20644,6 +20644,9 @@ else $as_nop @@ -20,7 +20,7 @@ index a84ffe4342..16fd52dad4 100755 extern char end; #elif defined(HAVE__END_SYMBOL) diff --git a/erts/configure.ac b/erts/configure.ac -index ab2ee78acd..71423a4c4d 100644 +index 307be5042d..316345079b 100644 --- a/erts/configure.ac +++ b/erts/configure.ac @@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], diff --git a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch index 0c99732..d3d2a71 100644 --- a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 16fd52dad4..a991217017 100755 +index 46e882e99a..7cc6f802ce 100755 --- a/erts/configure +++ b/erts/configure -@@ -24555,10 +24555,13 @@ else $as_nop +@@ -24575,10 +24575,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 16fd52dad4..a991217017 100755 #else struct pollfd fds[1]; int fd; -@@ -24567,9 +24570,9 @@ main() +@@ -24587,9 +24590,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { @@ -39,10 +39,10 @@ index 16fd52dad4..a991217017 100755 } diff --git a/erts/configure.ac b/erts/configure.ac -index 71423a4c4d..f658b66e3c 100644 +index 316345079b..439ec5d4a1 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -3036,10 +3036,13 @@ poll_works=no +@@ -3055,10 +3055,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -58,7 +58,7 @@ index 71423a4c4d..f658b66e3c 100644 #else struct pollfd fds[1]; int fd; -@@ -3048,9 +3051,9 @@ main() +@@ -3067,9 +3070,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/sources b/sources index c9f923c..282ac43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.3.tar.gz) = cf104918917e33db250b48aaad3c098899739358035d764ea2ee1fc9ba7937504190752163ce8430bdbfc576ce2c2533d4f50fc8f0994ff155e3df188a8db99e +SHA512 (otp-OTP-25.3.1.tar.gz) = f9f56a2fed2a8110472ed424592d750fc2073232a6ccbacd7928d3cea38340e2c1b2c8e14330e4013b89a507efe6ef003c165eddecffe1461ca4bdaf5083ee87 From 68768b9a58c9823d8e64991da40a5da5bbcba358 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 7 May 2023 13:21:50 +0200 Subject: [PATCH 296/340] Erlang ver. 25.3.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 9989a6d..0df3c66 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 25.3.1 +Version: 25.3.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1971,6 +1971,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat May 6 2023 Peter Lemenkov - 25.3.2-1 +- Ver. 25.3.2 + * Thu Apr 27 2023 Peter Lemenkov - 25.3.1-1 - Ver. 25.3.1 diff --git a/sources b/sources index 282ac43..74779cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.3.1.tar.gz) = f9f56a2fed2a8110472ed424592d750fc2073232a6ccbacd7928d3cea38340e2c1b2c8e14330e4013b89a507efe6ef003c165eddecffe1461ca4bdaf5083ee87 +SHA512 (otp-OTP-25.3.2.tar.gz) = d307d59708da8e6f233ec60292925fc9c0f4c1aaf14643790b7ead27ae858ac14bab7356c926055872df63500eac117db31b0b69cc0416a5f535b0443cda457d From 2b17ab754a6ae916c593e27c73bc9948a9a19700 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 20 May 2023 17:09:11 +0200 Subject: [PATCH 297/340] Erlang ver. 26.0 Signed-off-by: Peter Lemenkov --- erlang.spec | 24 +- ...n-pages-and-do-not-install-miscellan.patch | 4 +- ... otp-0006-Add-extra-search-directory.patch | 4 +- otp-0006-Do-not-install-erlang-sources.patch | 660 ------------------ ...07-Avoid-forking-sed-to-get-basename.patch | 0 ...man-pages-from-system-wide-directory.patch | 4 +- ...-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 8 +- ...re.ac-C99-fixes-for-poll_works-check.patch | 12 +- ...Revert-Do-not-install-erlang-sources.patch | 657 ----------------- sources | 2 +- 10 files changed, 29 insertions(+), 1346 deletions(-) rename otp-0007-Add-extra-search-directory.patch => otp-0006-Add-extra-search-directory.patch (90%) delete mode 100644 otp-0006-Do-not-install-erlang-sources.patch rename otp-0008-Avoid-forking-sed-to-get-basename.patch => otp-0007-Avoid-forking-sed-to-get-basename.patch (100%) rename otp-0009-Load-man-pages-from-system-wide-directory.patch => otp-0008-Load-man-pages-from-system-wide-directory.patch (89%) rename otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch => otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch (82%) rename otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch => otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch (88%) delete mode 100644 otp-0012-Revert-Do-not-install-erlang-sources.patch diff --git a/erlang.spec b/erlang.spec index 0df3c66..bb2da74 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 25.3.2 +Version: 26.0 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -105,13 +105,11 @@ Patch2: otp-0002-Remove-rpath.patch Patch3: otp-0003-Do-not-install-C-sources.patch Patch4: otp-0004-Do-not-install-Java-sources.patch Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -Patch6: otp-0006-Do-not-install-erlang-sources.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 -Patch10: otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch -Patch11: otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch -Patch12: otp-0012-Revert-Do-not-install-erlang-sources.patch +Patch6: otp-0006-Add-extra-search-directory.patch +Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch +Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch +Patch9: otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +Patch10: otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -366,8 +364,7 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -# FIXME has to be 2.16 -Provides: erlang(erl_nif_version) = 2.16 +Provides: erlang(erl_nif_version) = 2.17 Provides: bundled(pcre) = 8.44 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder @@ -1356,7 +1353,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/pg.* %{_mandir}/man3/rpc.* %{_mandir}/man3/seq_trace.* -%{_mandir}/man3/user.* %{_mandir}/man3/wrap_log_reader.* %{_mandir}/man3/zlib_stub.* %{_mandir}/man4/app.* @@ -1462,7 +1458,6 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{with doc} %{_mandir}/man3/dbg.* %{_mandir}/man3/dyntrace.* -%{_mandir}/man3/erts_alloc_config.* %{_mandir}/man3/msacc.* %{_mandir}/man3/system_information.* %{_mandir}/man6/runtime_tools.* @@ -1590,6 +1585,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_libdir}/erlang/lib/stdlib-*/include %{_libdir}/erlang/lib/stdlib-*/src %if %{with doc} +%{_mandir}/man3/argparse.* %{_mandir}/man3/array.* %{_mandir}/man3/base64.* %{_mandir}/man3/beam_lib.* @@ -1600,6 +1596,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/dict.* %{_mandir}/man3/digraph.* %{_mandir}/man3/digraph_utils.* +%{_mandir}/man3/edlin_expand.* %{_mandir}/man3/epp.* %{_mandir}/man3/erl_anno.* %{_mandir}/man3/erl_error.* @@ -1971,6 +1968,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat May 20 2023 Peter Lemenkov - 26.0-1 +- Ver. 26.0 + * Sat May 6 2023 Peter Lemenkov - 25.3.2-1 - Ver. 25.3.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 96f0494..0cc953a 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 86f63dcf41..b74c789775 100644 +index 3c5a5cee64..3c3dbda661 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -555,10 +555,6 @@ endif +@@ -552,10 +552,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif diff --git a/otp-0007-Add-extra-search-directory.patch b/otp-0006-Add-extra-search-directory.patch similarity index 90% rename from otp-0007-Add-extra-search-directory.patch rename to otp-0006-Add-extra-search-directory.patch index cb84b30..3c7339a 100644 --- a/otp-0007-Add-extra-search-directory.patch +++ b/otp-0006-Add-extra-search-directory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index af8531271f..66050d6cdb 100644 +index f420337eb7..7e056ac2f6 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl -@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) -> +@@ -89,11 +89,17 @@ init(Ref, Parent, [Root,Mode]) -> IPath = case Mode of interactive -> diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch deleted file mode 100644 index e40945b..0000000 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ /dev/null @@ -1,660 +0,0 @@ -From: Hans Ulrich Niedermann -Date: Mon, 21 Mar 2011 15:41:49 +0100 -Subject: [PATCH] Do not install erlang sources - -Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all. - -Signed-off-by: Peter Lemenkov -Signed-off-by: Hans Ulrich Niedermann - -diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 1994aa1302..007b7d44bd 100644 ---- a/erts/preloaded/src/Makefile -+++ b/erts/preloaded/src/Makefile -@@ -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) -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" - -diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 9e13d02c8a..77ba98c2f8 100644 ---- a/lib/asn1/src/Makefile -+++ b/lib/asn1/src/Makefile -@@ -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" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" - $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" - -diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 00f13589f3..5bf4e50f14 100644 ---- a/lib/common_test/src/Makefile -+++ b/lib/common_test/src/Makefile -@@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(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 d801d6baa0..4eed19b516 100644 ---- a/lib/compiler/src/Makefile -+++ b/lib/compiler/src/Makefile -@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -- $(YRL_FILE) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ -+ "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 893f679390..6f8a329421 100644 ---- a/lib/crypto/src/Makefile -+++ b/lib/crypto/src/Makefile -@@ -81,8 +81,6 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -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 - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index c934ecdc2b..cc266f48e2 100644 ---- a/lib/dialyzer/src/Makefile -+++ b/lib/dialyzer/src/Makefile -@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ - "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 75e23d4191..7097541548 100644 ---- a/lib/diameter/src/Makefile -+++ b/lib/diameter/src/Makefile -@@ -266,11 +266,8 @@ release_spec: opt - $(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%) - - $(TARGET_DIRS:%/=release_src_%): release_src_%: -- $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" -- $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ -- $(INTERNAL_HRLS)) \ -- $(filter $*/%, compiler/$(DICT_YRL).yrl) \ -- "$(RELSYSDIR)/src/$*" -+ $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ -+ "$(RELSYSDIR)/src/$*" || true - - $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: - $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" -diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index a455662049..e5b2f886ed 100644 ---- a/lib/edoc/src/Makefile -+++ b/lib/edoc/src/Makefile -@@ -87,7 +87,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - - release_docs_spec: - -diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index 04a84a4766..78fc4a9687 100644 ---- a/lib/eldap/src/Makefile -+++ b/lib/eldap/src/Makefile -@@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -- $(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" -- $(INSTALL_DIR) "$(RELSYSDIR)/asn1" -- $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" -+ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - - release_docs_spec: - -diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 458094e35f..cc3368ad02 100644 ---- a/lib/erl_docgen/src/Makefile -+++ b/lib/erl_docgen/src/Makefile -@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index fc66cc1eaf..a567965ed4 100644 ---- a/lib/et/src/Makefile -+++ b/lib/et/src/Makefile -@@ -109,7 +109,6 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index f4eaf6807a..2a49a2ca7a 100644 ---- a/lib/eunit/src/Makefile -+++ b/lib/eunit/src/Makefile -@@ -121,7 +121,6 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(BEHAVIOUR_SOURCES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index 62f62792f0..ca4b539017 100644 ---- a/lib/inets/src/http_client/Makefile -+++ b/lib/inets/src/http_client/Makefile -@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 481c4f66eb..896a806695 100644 ---- a/lib/inets/src/http_lib/Makefile -+++ b/lib/inets/src/http_lib/Makefile -@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index abf8413f33..42925ba58f 100644 ---- a/lib/inets/src/http_server/Makefile -+++ b/lib/inets/src/http_server/Makefile -@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index 405e86105a..a8b932772a 100644 ---- a/lib/inets/src/inets_app/Makefile -+++ b/lib/inets/src/inets_app/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 2149e89776..891d3e6f6a 100644 ---- a/lib/kernel/src/Makefile -+++ b/lib/kernel/src/Makefile -@@ -229,7 +229,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index c681b88428..8cb286181a 100644 ---- a/lib/megaco/src/app/Makefile -+++ b/lib/megaco/src/app/Makefile -@@ -114,7 +114,7 @@ release_spec: opt - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/app" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" - -diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 9ecb649f0c..3ca5654eb3 100644 ---- a/lib/megaco/src/binary/Makefile -+++ b/lib/megaco/src/binary/Makefile -@@ -154,7 +154,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary" - - - release_docs_spec: -diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index cc4974e09d..b7a7c703b3 100644 ---- a/lib/megaco/src/engine/Makefile -+++ b/lib/megaco/src/engine/Makefile -@@ -102,7 +102,7 @@ release_spec: opt - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index d8c5c68b99..2053d3297b 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -248,7 +248,6 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" - $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" -diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index ef4232244a..85cfb4b4ee 100644 ---- a/lib/megaco/src/tcp/Makefile -+++ b/lib/megaco/src/tcp/Makefile -@@ -94,7 +94,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" - - - release_docs_spec: -diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index 6872b0ec04..a097be4d48 100644 ---- a/lib/megaco/src/text/Makefile -+++ b/lib/megaco/src/text/Makefile -@@ -133,7 +133,7 @@ release_spec: opt - $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/text" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" - - - release_docs_spec: -diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 5699c3e952..f8dcb5c681 100644 ---- a/lib/megaco/src/udp/Makefile -+++ b/lib/megaco/src/udp/Makefile -@@ -94,7 +94,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" - - - release_docs_spec: -diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 72aa054fb3..08c6c5ffc1 100644 ---- a/lib/mnesia/src/Makefile -+++ b/lib/mnesia/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 2edb2ceb3e..884e69c7b7 100644 ---- a/lib/observer/src/Makefile -+++ b/lib/observer/src/Makefile -@@ -151,7 +151,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" - $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" -diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index e18628e94d..fa01850f38 100644 ---- a/lib/odbc/src/Makefile -+++ b/lib/odbc/src/Makefile -@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index ee32f3946f..2413fb68bf 100644 ---- a/lib/os_mon/src/Makefile -+++ b/lib/os_mon/src/Makefile -@@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index c7971750a7..f6024f1184 100644 ---- a/lib/parsetools/src/Makefile -+++ b/lib/parsetools/src/Makefile -@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index c1adf58ed4..bba7cae5d6 100644 ---- a/lib/public_key/asn1/Makefile -+++ b/lib/public_key/asn1/Makefile -@@ -103,8 +103,6 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/asn1" - $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ - "$(RELSYSDIR)/asn1" -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ASN_ERLS) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 9b2b442794..a5dcba4ec3 100644 ---- a/lib/public_key/src/Makefile -+++ b/lib/public_key/src/Makefile -@@ -111,8 +111,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 173a557d58..6864febbc3 100644 ---- a/lib/reltool/src/Makefile -+++ b/lib/reltool/src/Makefile -@@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 8e8c4074f5..6e380e1b11 100644 ---- a/lib/runtime_tools/src/Makefile -+++ b/lib/runtime_tools/src/Makefile -@@ -99,8 +99,6 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" -diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 490e03595d..739830ae3f 100644 ---- a/lib/sasl/src/Makefile -+++ b/lib/sasl/src/Makefile -@@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/agent/Makefile.in b/lib/snmp/src/agent/Makefile.in -index 6ab9ed437a..14ae0bbc79 100644 ---- a/lib/snmp/src/agent/Makefile.in -+++ b/lib/snmp/src/agent/Makefile.in -@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index f5a74aa78e..0340088eb3 100644 ---- a/lib/snmp/src/app/Makefile -+++ b/lib/snmp/src/app/Makefile -@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/app" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index f255237a04..04232658c7 100644 ---- a/lib/snmp/src/compile/Makefile -+++ b/lib/snmp/src/compile/Makefile -@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" -- $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/bin" -diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 693ef75469..61b8dc4692 100644 ---- a/lib/snmp/src/manager/Makefile -+++ b/lib/snmp/src/manager/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index e92506e855..8dc421d2a1 100644 ---- a/lib/snmp/src/misc/Makefile -+++ b/lib/snmp/src/misc/Makefile -@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 2fcb164301..2c7acf384d 100644 ---- a/lib/ssh/src/Makefile -+++ b/lib/ssh/src/Makefile -@@ -182,7 +182,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 789bed5c3f..9cd7f7226c 100644 ---- a/lib/ssl/src/Makefile -+++ b/lib/ssl/src/Makefile -@@ -211,7 +211,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 761d6c4c28..43e7a650a5 100644 ---- a/lib/stdlib/src/Makefile -+++ b/lib/stdlib/src/Makefile -@@ -230,7 +230,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index dc0ac61734..5bb265e2c2 100644 ---- a/lib/syntax_tools/src/Makefile -+++ b/lib/syntax_tools/src/Makefile -@@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" -- $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" - -diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index cfcb1ea134..fba9cc5873 100644 ---- a/lib/tftp/src/Makefile -+++ b/lib/tftp/src/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index b05ce883ec..f8d143922d 100644 ---- a/lib/tools/src/Makefile -+++ b/lib/tools/src/Makefile -@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index ce14c0b6df..f052399c0f 100644 ---- a/lib/wx/src/Makefile -+++ b/lib/wx/src/Makefile -@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) - include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/gen" -- $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen" -+ $(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index e7e7c8e978..37b7843605 100644 ---- a/lib/xmerl/src/Makefile -+++ b/lib/xmerl/src/Makefile -@@ -223,9 +223,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src" -- $(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - diff --git a/otp-0008-Avoid-forking-sed-to-get-basename.patch b/otp-0007-Avoid-forking-sed-to-get-basename.patch similarity index 100% rename from otp-0008-Avoid-forking-sed-to-get-basename.patch rename to otp-0007-Avoid-forking-sed-to-get-basename.patch diff --git a/otp-0009-Load-man-pages-from-system-wide-directory.patch b/otp-0008-Load-man-pages-from-system-wide-directory.patch similarity index 89% rename from otp-0009-Load-man-pages-from-system-wide-directory.patch rename to otp-0008-Load-man-pages-from-system-wide-directory.patch index 2075f81..e014671 100644 --- a/otp-0009-Load-man-pages-from-system-wide-directory.patch +++ b/otp-0008-Load-man-pages-from-system-wide-directory.patch @@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command. as required by Debian policy.) diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c -index fa951ae770..9cce3857db 100644 +index 888df87e35..14272f06c6 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c -@@ -709,8 +709,10 @@ int main(int argc, char **argv) +@@ -716,8 +716,10 @@ int main(int argc, char **argv) error("-man not supported on Windows"); #else argv[i] = "man"; diff --git a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch similarity index 82% rename from otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch rename to otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index dc89898..3790e65 100644 --- a/otp-0010-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,10 +6,10 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index fbdb6baba8..46e882e99a 100755 +index a09c84ff09..478ebaa206 100755 --- a/erts/configure +++ b/erts/configure -@@ -20644,6 +20644,9 @@ else $as_nop +@@ -20890,6 +20890,9 @@ else $as_nop #ifdef HAVE_MALLOC_H # include #endif @@ -20,10 +20,10 @@ index fbdb6baba8..46e882e99a 100755 extern char end; #elif defined(HAVE__END_SYMBOL) diff --git a/erts/configure.ac b/erts/configure.ac -index 307be5042d..316345079b 100644 +index 540cc4b3cb..0d4d9377ef 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], +@@ -2449,6 +2449,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], #ifdef HAVE_MALLOC_H # include #endif diff --git a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch similarity index 88% rename from otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch rename to otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch index d3d2a71..255158c 100644 --- a/otp-0011-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 46e882e99a..7cc6f802ce 100755 +index 478ebaa206..549b53546c 100755 --- a/erts/configure +++ b/erts/configure -@@ -24575,10 +24575,13 @@ else $as_nop +@@ -24821,10 +24821,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 46e882e99a..7cc6f802ce 100755 #else struct pollfd fds[1]; int fd; -@@ -24587,9 +24590,9 @@ main() +@@ -24833,9 +24836,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { @@ -39,10 +39,10 @@ index 46e882e99a..7cc6f802ce 100755 } diff --git a/erts/configure.ac b/erts/configure.ac -index 316345079b..439ec5d4a1 100644 +index 0d4d9377ef..296a72bacc 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -3055,10 +3055,13 @@ poll_works=no +@@ -3068,10 +3068,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -58,7 +58,7 @@ index 316345079b..439ec5d4a1 100644 #else struct pollfd fds[1]; int fd; -@@ -3067,9 +3070,9 @@ main() +@@ -3080,9 +3083,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/otp-0012-Revert-Do-not-install-erlang-sources.patch b/otp-0012-Revert-Do-not-install-erlang-sources.patch deleted file mode 100644 index 1a0bb85..0000000 --- a/otp-0012-Revert-Do-not-install-erlang-sources.patch +++ /dev/null @@ -1,657 +0,0 @@ -From: Peter Lemenkov -Date: Wed, 4 Jan 2023 20:49:01 +0100 -Subject: [PATCH] Revert "Do not install erlang sources" - -This reverts commit 02d89974af96987a7cbcfe9d18533d509ad33690. - -diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 007b7d44bd..1994aa1302 100644 ---- a/erts/preloaded/src/Makefile -+++ b/erts/preloaded/src/Makefile -@@ -117,6 +117,8 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: $(APP_TARGET) -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" - -diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 77ba98c2f8..9e13d02c8a 100644 ---- a/lib/asn1/src/Makefile -+++ b/lib/asn1/src/Makefile -@@ -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" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" - $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" - -diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 5bf4e50f14..00f13589f3 100644 ---- a/lib/common_test/src/Makefile -+++ b/lib/common_test/src/Makefile -@@ -157,7 +157,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" - $(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 4e3fa5c60f..4ff5e678ee 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_HRL_FILES) \ -+ $(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \ - $(TS_TARGET_FILES) \ -- $(CONFIG) \ -+ $(AUTOCONF_FILES) $(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 4eed19b516..d801d6baa0 100644 ---- a/lib/compiler/src/Makefile -+++ b/lib/compiler/src/Makefile -@@ -188,8 +188,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ -- "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(YRL_FILE) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 6f8a329421..893f679390 100644 ---- a/lib/crypto/src/Makefile -+++ b/lib/crypto/src/Makefile -@@ -81,6 +81,8 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index 6ddce27ec1..2fb955b2e3 100644 ---- a/lib/debugger/src/Makefile -+++ b/lib/debugger/src/Makefile -@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index cc266f48e2..c934ecdc2b 100644 ---- a/lib/dialyzer/src/Makefile -+++ b/lib/dialyzer/src/Makefile -@@ -162,7 +162,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \ -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \ - "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index 7097541548..75e23d4191 100644 ---- a/lib/diameter/src/Makefile -+++ b/lib/diameter/src/Makefile -@@ -266,8 +266,11 @@ release_spec: opt - $(MAKE) ERL_DETERMINISTIC=$(ERL_DETERMINISTIC) $(EXAMPLE_DIRS:%/=release_examples_%) - - $(TARGET_DIRS:%/=release_src_%): release_src_%: -- $(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \ -- "$(RELSYSDIR)/src/$*" || true -+ $(INSTALL_DIR) "$(RELSYSDIR)/src/$*" -+ $(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \ -+ $(INTERNAL_HRLS)) \ -+ $(filter $*/%, compiler/$(DICT_YRL).yrl) \ -+ "$(RELSYSDIR)/src/$*" - - $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: - $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" -diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile -index e5b2f886ed..a455662049 100644 ---- a/lib/edoc/src/Makefile -+++ b/lib/edoc/src/Makefile -@@ -87,7 +87,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src" - - release_docs_spec: - -diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index 78fc4a9687..04a84a4766 100644 ---- a/lib/eldap/src/Makefile -+++ b/lib/eldap/src/Makefile -@@ -98,9 +98,13 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -- $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -+ $(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DIR) "$(RELSYSDIR)/asn1" -+ $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -+ $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" - - release_docs_spec: - -diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index cc3368ad02..458094e35f 100644 ---- a/lib/erl_docgen/src/Makefile -+++ b/lib/erl_docgen/src/Makefile -@@ -91,6 +91,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index a567965ed4..fc66cc1eaf 100644 ---- a/lib/et/src/Makefile -+++ b/lib/et/src/Makefile -@@ -109,6 +109,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile -index 2a49a2ca7a..f4eaf6807a 100644 ---- a/lib/eunit/src/Makefile -+++ b/lib/eunit/src/Makefile -@@ -121,6 +121,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) $(BEHAVIOUR_SOURCES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" -diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index ca4b539017..62f62792f0 100644 ---- a/lib/inets/src/http_client/Makefile -+++ b/lib/inets/src/http_client/Makefile -@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_client" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client" -+ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 896a806695..481c4f66eb 100644 ---- a/lib/inets/src/http_lib/Makefile -+++ b/lib/inets/src/http_lib/Makefile -@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_lib" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib" -+ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile -index 42925ba58f..abf8413f33 100644 ---- a/lib/inets/src/http_server/Makefile -+++ b/lib/inets/src/http_server/Makefile -@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/http_server" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server" -+ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile -index a8b932772a..405e86105a 100644 ---- a/lib/inets/src/inets_app/Makefile -+++ b/lib/inets/src/inets_app/Makefile -@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 891d3e6f6a..2149e89776 100644 ---- a/lib/kernel/src/Makefile -+++ b/lib/kernel/src/Makefile -@@ -229,6 +229,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile -index 8cb286181a..c681b88428 100644 ---- a/lib/megaco/src/app/Makefile -+++ b/lib/megaco/src/app/Makefile -@@ -114,7 +114,7 @@ release_spec: opt - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/app" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" - -diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 3ca5654eb3..9ecb649f0c 100644 ---- a/lib/megaco/src/binary/Makefile -+++ b/lib/megaco/src/binary/Makefile -@@ -154,7 +154,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/binary" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary" - - - release_docs_spec: -diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index b7a7c703b3..cc4974e09d 100644 ---- a/lib/megaco/src/engine/Makefile -+++ b/lib/megaco/src/engine/Makefile -@@ -102,7 +102,7 @@ release_spec: opt - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/engine" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - - -diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 2053d3297b..d8c5c68b99 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -248,6 +248,7 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" - $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" -diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile -index 85cfb4b4ee..ef4232244a 100644 ---- a/lib/megaco/src/tcp/Makefile -+++ b/lib/megaco/src/tcp/Makefile -@@ -94,7 +94,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/tcp" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp" - - - release_docs_spec: -diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index a097be4d48..6872b0ec04 100644 ---- a/lib/megaco/src/text/Makefile -+++ b/lib/megaco/src/text/Makefile -@@ -133,7 +133,7 @@ release_spec: opt - $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/text" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text" - - - release_docs_spec: -diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index f8dcb5c681..5699c3e952 100644 ---- a/lib/megaco/src/udp/Makefile -+++ b/lib/megaco/src/udp/Makefile -@@ -94,7 +94,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/udp" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp" - - - release_docs_spec: -diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index 08c6c5ffc1..72aa054fb3 100644 ---- a/lib/mnesia/src/Makefile -+++ b/lib/mnesia/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 884e69c7b7..2edb2ceb3e 100644 ---- a/lib/observer/src/Makefile -+++ b/lib/observer/src/Makefile -@@ -151,6 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" - $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" -diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index fa01850f38..e18628e94d 100644 ---- a/lib/odbc/src/Makefile -+++ b/lib/odbc/src/Makefile -@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 2413fb68bf..ee32f3946f 100644 ---- a/lib/os_mon/src/Makefile -+++ b/lib/os_mon/src/Makefile -@@ -105,6 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index f6024f1184..c7971750a7 100644 ---- a/lib/parsetools/src/Makefile -+++ b/lib/parsetools/src/Makefile -@@ -91,6 +91,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile -index bba7cae5d6..c1adf58ed4 100644 ---- a/lib/public_key/asn1/Makefile -+++ b/lib/public_key/asn1/Makefile -@@ -103,6 +103,8 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/asn1" - $(INSTALL_DATA) $(ASN_ASNS) $(ASN_CONFIGS) \ - "$(RELSYSDIR)/asn1" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ASN_ERLS) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - -diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index a5dcba4ec3..9b2b442794 100644 ---- a/lib/public_key/src/Makefile -+++ b/lib/public_key/src/Makefile -@@ -111,6 +111,8 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 6864febbc3..173a557d58 100644 ---- a/lib/reltool/src/Makefile -+++ b/lib/reltool/src/Makefile -@@ -100,7 +100,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) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile -index 6e380e1b11..8e8c4074f5 100644 ---- a/lib/runtime_tools/src/Makefile -+++ b/lib/runtime_tools/src/Makefile -@@ -99,6 +99,8 @@ docs: - include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/examples" -diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 739830ae3f..490e03595d 100644 ---- a/lib/sasl/src/Makefile -+++ b/lib/sasl/src/Makefile -@@ -94,6 +94,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/agent/Makefile.in b/lib/snmp/src/agent/Makefile.in -index 14ae0bbc79..6ab9ed437a 100644 ---- a/lib/snmp/src/agent/Makefile.in -+++ b/lib/snmp/src/agent/Makefile.in -@@ -161,7 +161,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/agent" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile -index 0340088eb3..f5a74aa78e 100644 ---- a/lib/snmp/src/app/Makefile -+++ b/lib/snmp/src/app/Makefile -@@ -144,7 +144,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/app" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile -index 04232658c7..f255237a04 100644 ---- a/lib/snmp/src/compile/Makefile -+++ b/lib/snmp/src/compile/Makefile -@@ -141,7 +141,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/compiler" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" -+ $(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/bin" -diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile -index 61b8dc4692..693ef75469 100644 ---- a/lib/snmp/src/manager/Makefile -+++ b/lib/snmp/src/manager/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/manager" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile -index 8dc421d2a1..e92506e855 100644 ---- a/lib/snmp/src/misc/Makefile -+++ b/lib/snmp/src/misc/Makefile -@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/misc" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - # $(INSTALL_DIR) "$(RELSYSDIR)/include" -diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index 2c7acf384d..2fcb164301 100644 ---- a/lib/ssh/src/Makefile -+++ b/lib/ssh/src/Makefile -@@ -182,7 +182,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) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile -index 9cd7f7226c..789bed5c3f 100644 ---- a/lib/ssl/src/Makefile -+++ b/lib/ssl/src/Makefile -@@ -211,7 +211,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) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile -index 43e7a650a5..761d6c4c28 100644 ---- a/lib/stdlib/src/Makefile -+++ b/lib/stdlib/src/Makefile -@@ -230,6 +230,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" -diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile -index 5bb265e2c2..dc0ac61734 100644 ---- a/lib/syntax_tools/src/Makefile -+++ b/lib/syntax_tools/src/Makefile -@@ -96,6 +96,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" -+ $(INSTALL_DIR) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" - -diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile -index fba9cc5873..cfcb1ea134 100644 ---- a/lib/tftp/src/Makefile -+++ b/lib/tftp/src/Makefile -@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ - $(APPUP_TARGET) "$(RELSYSDIR)/ebin" -diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile -index f8d143922d..b05ce883ec 100644 ---- a/lib/tools/src/Makefile -+++ b/lib/tools/src/Makefile -@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk - - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ - "$(RELSYSDIR)/ebin" -diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile -index f052399c0f..ce14c0b6df 100644 ---- a/lib/wx/src/Makefile -+++ b/lib/wx/src/Makefile -@@ -121,9 +121,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) - include $(ERL_TOP)/make/otp_release_targets.mk - release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/src/gen" -- $(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen" -+ $(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" -diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index 37b7843605..e7e7c8e978 100644 ---- a/lib/xmerl/src/Makefile -+++ b/lib/xmerl/src/Makefile -@@ -223,7 +223,9 @@ release_spec: opt - $(INSTALL_DIR) "$(RELSYSDIR)/ebin" - $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" -- $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src" -+ $(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" - diff --git a/sources b/sources index 74779cc..7ba9b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-25.3.2.tar.gz) = d307d59708da8e6f233ec60292925fc9c0f4c1aaf14643790b7ead27ae858ac14bab7356c926055872df63500eac117db31b0b69cc0416a5f535b0443cda457d +SHA512 (otp-OTP-26.0.tar.gz) = 732e259f2018102b62a5d8076953a6a78d3e1f1714edde2c306fe863e5377b9a7f87052e03e92df93eea270a608b29ab4e22d5841d1314f9a532dac4aeff5436 From 91e2729af1ab566845ee13023e2b49fab63b1d9a Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 9 Jun 2023 11:05:15 +0200 Subject: [PATCH 298/340] Erlang ver. 26.0.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index bb2da74..a0c598e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.0 +Version: 26.0.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1968,6 +1968,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jun 9 2023 Peter Lemenkov - 26.0.1-1 +- Ver. 26.0.1 + * Sat May 20 2023 Peter Lemenkov - 26.0-1 - Ver. 26.0 diff --git a/sources b/sources index 7ba9b4b..fb8d706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.0.tar.gz) = 732e259f2018102b62a5d8076953a6a78d3e1f1714edde2c306fe863e5377b9a7f87052e03e92df93eea270a608b29ab4e22d5841d1314f9a532dac4aeff5436 +SHA512 (otp-OTP-26.0.1.tar.gz) = d4fcfa6dede0f655fbed12ea795af44863f29b6e5a7a537d06c7a97d49c533eeb280e21fb6c9034c6e08c01a87bf036ea83dfd586f442461e6842ebf530feb2b From 88f5e377f10cd79bdc642fa8815a9bcf1c4a72f1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 1 Jul 2023 18:24:25 +0200 Subject: [PATCH 299/340] Erlang ver. 26.0.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a0c598e..bfb7fa7 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.0.1 +Version: 26.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1968,6 +1968,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Jul 1 2023 Peter Lemenkov - 26.0.2-1 +- Ver. 26.0.2 + * Fri Jun 9 2023 Peter Lemenkov - 26.0.1-1 - Ver. 26.0.1 diff --git a/sources b/sources index fb8d706..e0f0ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.0.1.tar.gz) = d4fcfa6dede0f655fbed12ea795af44863f29b6e5a7a537d06c7a97d49c533eeb280e21fb6c9034c6e08c01a87bf036ea83dfd586f442461e6842ebf530feb2b +SHA512 (otp-OTP-26.0.2.tar.gz) = 9bbf1099e902e10000c218c24dd510e2432659c50fe9b795c67f5bf61b243127aeb44ff60d62a9a3cdfce9d23ec97ae5d154690df99c2d781199f68b124eb44c From ae03c451da60998a96472615a8e233cf0e033aa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:38:57 +0000 Subject: [PATCH 300/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index bfb7fa7..9572a2e 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1968,6 +1968,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 26.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 1 2023 Peter Lemenkov - 26.0.2-1 - Ver. 26.0.2 From 2489ccddf94b294df87f22a8580b08d29f6d2d07 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 8 Aug 2023 17:52:30 +0200 Subject: [PATCH 301/340] Reenable OpenSSL 3 Signed-off-by: Peter Lemenkov --- erlang.spec | 23 +- ...ate_key-3-for-ecdh-to-only-use-OpenS.patch | 215 +++++ ...ssl_BN_param_from_bin_sz-to-not-abus.patch | 102 +++ ...-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch | 22 + ...IPS-bug-in-check_pkey_algorithm_type.patch | 18 + ...nge-to-longer-dss-keys-acceptable-to.patch | 28 + ...Remove-sha-1-as-hash-for-dss-if-FIPS.patch | 33 + ...ove-md5-ripemd160-and-sha-as-hash-fo.patch | 24 + ...-generate-ec-key-by-name-if-possible.patch | 284 ++++++ ...rypto_SUITE-Skip-sha-1-sign-for-FIPS.patch | 59 ++ ...0-crypto-Unalias-some-ec-curve-names.patch | 806 ++++++++++++++++++ ...Skip-ec-curves-with-224-bits-if-FIPS.patch | 78 ++ ...ITE-Fix-safe-primes-for-DH-with-FIPS.patch | 37 + ...o-Skip-entire-engine_SUITE-if-notsup.patch | 53 ++ ...ypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch | 21 + 15 files changed, 1800 insertions(+), 3 deletions(-) create mode 100644 otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch create mode 100644 otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch create mode 100644 otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch create mode 100644 otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch create mode 100644 otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch create mode 100644 otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch create mode 100644 otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch create mode 100644 otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch create mode 100644 otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch create mode 100644 otp-0020-crypto-Unalias-some-ec-curve-names.patch create mode 100644 otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch create mode 100644 otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch create mode 100644 otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch create mode 100644 otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch diff --git a/erlang.spec b/erlang.spec index 9572a2e..da51e3b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -110,6 +110,20 @@ Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch Patch9: otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch Patch10: otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch +Patch11: otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch +Patch12: otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch +Patch13: otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch +Patch14: otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch +Patch15: otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch +Patch16: otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch +Patch17: otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch +Patch18: otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch +Patch19: otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch +Patch20: otp-0020-crypto-Unalias-some-ec-curve-names.patch +Patch21: otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch +Patch22: otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch +Patch23: otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch +Patch24: otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -245,10 +259,10 @@ A byte code compiler for Erlang which produces highly compact code. %package crypto Summary: Cryptographical support -#BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl) # FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now. # We have to fallback to OpenSSL1 explicitly. -BuildRequires: openssl1.1-devel +# BuildRequires: openssl1.1-devel Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} @@ -1968,6 +1982,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Aug 8 2023 Peter Lemenkov - 26.0.2-3 +- Reenable OpenSSL 3 + * Wed Jul 19 2023 Fedora Release Engineering - 26.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch b/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch new file mode 100644 index 0000000..ca059e6 --- /dev/null +++ b/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch @@ -0,0 +1,215 @@ +From: Sverker Eriksson +Date: Wed, 7 Jun 2023 18:52:46 +0200 +Subject: [PATCH] crypto: Fix generate_key/3 for ecdh to only use OpenSSL 3.0 + API + +to prepare for using FIPS on OpenSSL 3.0 + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index 2345970fa9..28f7b595e8 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -205,9 +205,9 @@ $(LIBDIR)/otp_test_engine$(TYPEMARKER).dll: $(TEST_ENGINE_OBJS) + $(V_LD) $(LDFLAGS) -o $@ $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(TEST_ENGINE_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME) $(SSL_EXTRA_LIBS) + endif + +-$(OBJDIR)/ec$(TYPEMARKER).o: ec.c +- $(V_at)$(INSTALL_DIR) $(OBJDIR) +- $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< ++# $(OBJDIR)/ec$(TYPEMARKER).o: ec.c ++# $(V_at)$(INSTALL_DIR) $(OBJDIR) ++# $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< + + $(OBJDIR)/%$(TYPEMARKER).o: %.c + $(V_at)$(INSTALL_DIR) $(OBJDIR) +diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c +index 124582c4f8..852f3ba79c 100644 +--- a/lib/crypto/c_src/ec.c ++++ b/lib/crypto/c_src/ec.c +@@ -24,6 +24,8 @@ + #ifdef HAVE_EC + # if defined(HAS_3_0_API) + ++# include ++ + int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + OSSL_PARAM params[], int *i, + size_t *order_size) +@@ -253,13 +255,7 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) + } + + +-int get_ec_private_key_2(ErlNifEnv* env, +- ERL_NIF_TERM curve, ERL_NIF_TERM key, +- EVP_PKEY **pkey, +- ERL_NIF_TERM *ret, +- size_t *order_size); +- +-int get_ec_private_key_2(ErlNifEnv* env, ++static int get_ec_private_key_2(ErlNifEnv* env, + ERL_NIF_TERM curve, ERL_NIF_TERM key, + EVP_PKEY **pkey, + ERL_NIF_TERM *ret, +@@ -319,7 +315,8 @@ int get_ec_private_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) + return 0; + } + +-int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY **peer_pkey, ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret); ++static int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY *peer_pkey, ++ ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret); + + ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) + { /* (Curve, PrivKey|undefined) */ +@@ -339,9 +336,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + + /* Get the two keys, pub as binary and priv as BN. + Since the private key is explicitly given, it must be calculated. +- I haven't found any way to do that with the pure 3.0 interface yet. + */ +- if (!mk_pub_key_binary(env, &peer_pkey, &pubkey_bin, &ret)) ++ if (!mk_pub_key_binary(env, peer_pkey, &pubkey_bin, &ret)) + goto err; + + if (!EVP_PKEY_get_bn_param(peer_pkey, "priv", &priv_bn)) +@@ -398,67 +394,81 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + return ret; + } + +-int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY **peer_pkey, ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret) ++static int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY *peer_pkey, ++ ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret) + { +- EC_KEY *ec_key = NULL; +- EC_POINT *public_key = NULL; +- EC_GROUP *group = NULL; +- BIGNUM *priv_bn = NULL; +- +- *ret = atom_undefined; +- +- /* Use the deprecated interface to get the curve and +- private key in pre 3.0 form: */ +- if ((ec_key = EVP_PKEY_get1_EC_KEY(*peer_pkey)) == NULL) +- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC key")); +- +- if ((group = EC_GROUP_dup(EC_KEY_get0_group(ec_key))) == NULL) ++ size_t pub_key_size = 0; ++ size_t group_name_size = 0; ++ char group_name_buf[20]; ++ char* group_name = group_name_buf; ++ int group_nid; ++ EC_GROUP* ec_group = NULL; ++ EC_POINT* pub_key = NULL; ++ BIGNUM* priv_bn = NULL; ++ int ok = 0; ++ ++ /* This code was inspired by ++ * https://github.com/openssl/openssl/issues/18437 ++ * which first tried to get public key directly with ++ * EVP_PKEY_get_octet_string_param(peer_pkey, OSSL_PKEY_PARAM_PUB_KEY,..) ++ * ++ * I removed that since I don't know what key format that will produce ++ * if it succeeds. That is, we go directly to the "fallback" and calculate ++ * the public key. ++ */ ++ ++ if (!EVP_PKEY_get_utf8_string_param(peer_pkey, OSSL_PKEY_PARAM_GROUP_NAME, ++ NULL, 0, &group_name_size)) ++ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group name size")); ++ ++ if (group_name_size >= sizeof(group_name_buf)) ++ group_name = enif_alloc(group_name_size + 1); ++ if (!EVP_PKEY_get_utf8_string_param(peer_pkey, OSSL_PKEY_PARAM_GROUP_NAME, ++ group_name, group_name_size+1, ++ NULL)) ++ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group name")); ++ ++ group_nid = OBJ_sn2nid(group_name); ++ if (group_nid == NID_undef) ++ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group nid")); ++ ++ ec_group = EC_GROUP_new_by_curve_name(group_nid); ++ if (ec_group == NULL) + assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC_GROUP")); + +- if ((public_key = EC_POINT_new(group)) == NULL) ++ pub_key = EC_POINT_new(ec_group); ++ if (pub_key == NULL) + assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't create POINT")); + +- if (!EC_POINT_copy(public_key, EC_GROUP_get0_generator(group))) +- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't copy POINT")); +- +- /* Make the corresponding public key */ +- if (!EVP_PKEY_get_bn_param(*peer_pkey, "priv", &priv_bn)) ++ if (!EVP_PKEY_get_bn_param(peer_pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv_bn)) + assign_goto(*ret, err, EXCP_BADARG_N(env, 1, "Couldn't get peer priv key bytes")); + +- if (BN_is_zero(priv_bn)) +- assign_goto(*ret, err, EXCP_BADARG_N(env, 1, "peer priv key must not be 0")); +- +- if (!EC_POINT_mul(group, public_key, priv_bn, NULL, NULL, NULL)) ++ if (!EC_POINT_mul(ec_group, pub_key, priv_bn, NULL, NULL, NULL)) + assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't multiply POINT")); + +- if (!EC_KEY_set_public_key(ec_key, public_key)) +- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't set EC_KEY")); +- +- if (!EVP_PKEY_assign_EC_KEY(*peer_pkey, ec_key)) +- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't assign EC_KEY to PKEY")); +- +- /* And now get the binary representation (by some reason we can't read it from +- peer_pubkey in the calling function with 3.0-functions.) +- */ +- { +- point_conversion_form_t form = EC_KEY_get_conv_form(ec_key); +- size_t dlen = EC_POINT_point2oct(group, public_key, form, NULL, 0, NULL); +- +- if (!enif_alloc_binary(dlen, pubkey_bin) || +- !EC_POINT_point2oct(group, public_key, form, pubkey_bin->data, pubkey_bin->size, NULL) +- ) +- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get public key")); ++ pub_key_size = EC_POINT_point2oct(ec_group, pub_key, ++ POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL); ++ if (pub_key_size == 0) ++ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get pub_key_size")); ++ ++ enif_alloc_binary(pub_key_size, pubkey_bin); ++ if (!EC_POINT_point2oct(ec_group, pub_key, POINT_CONVERSION_UNCOMPRESSED, ++ pubkey_bin->data, ++ pubkey_bin->size, NULL)) { ++ enif_release_binary(pubkey_bin); ++ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get pub key bytes")); + } + +- err: +- if (public_key) EC_POINT_free(public_key); +- if (group) EC_GROUP_free(group); ++ *ret = enif_make_binary(env, pubkey_bin); ++ ok = 1; ++ ++err: ++ if (group_name != group_name_buf) enif_free(group_name); ++ if (pub_key) EC_POINT_free(pub_key); ++ if (ec_group) EC_GROUP_free(ec_group); + if (priv_bn) BN_free(priv_bn); + +- if (*ret == atom_undefined) +- return 1; +- else +- return 0; ++ return ok; + } + + # endif /* HAS_3_0_API */ +@@ -908,10 +918,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + + # endif /* ! HAS_3_0_API */ + +-#endif /* HAVE_EC */ +- ++#else /* ifndef HAVE_EC */ + +-#if ! defined(HAVE_EC) + ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) + { /* (Curve, PrivKey) */ + return EXCP_NOTSUP_N(env, 0, "EC not supported"); diff --git a/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch b/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch new file mode 100644 index 0000000..fca43ef --- /dev/null +++ b/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch @@ -0,0 +1,102 @@ +From: Sverker Eriksson +Date: Wed, 7 Jun 2023 18:50:23 +0200 +Subject: [PATCH] crypto: Fix get_ossl_BN_param_from_bin_sz() to not abuse + ErlNifBinary + +It is not allowed to write to the binary buffer returned by +enif_inspect_binary() (even if you created the binary yourself). + +In DEBUG built VM such abuse will be punished with: + +"Readonly data written by NIF, checksums differ 8000425 != 25040008 +ABORTING" + +Instead use enif_make_new_binary() to create a writable binary buffer. + +diff --git a/lib/crypto/c_src/bn.c b/lib/crypto/c_src/bn.c +index f06ed9002e..5e9fec5093 100644 +--- a/lib/crypto/c_src/bn.c ++++ b/lib/crypto/c_src/bn.c +@@ -212,23 +212,38 @@ int get_ossl_BN_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL + return get_ossl_BN_param_from_bin_sz(env, key, bin, dest, NULL); + } + +-int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest, size_t *size) ++int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, ++ OSSL_PARAM *dest, size_t *size) + { + BIGNUM *bn = NULL; +- ErlNifBinary tmp; ++ int ok = 0; + +- if (!get_bn_from_bin_sz(env, bin, &bn, size) || +- !enif_inspect_binary(env, bin_from_bn(env,bn), &tmp) || // Allocate buf +- BN_bn2nativepad(bn, tmp.data, tmp.size) < 0) {// Fill with BN in right endianity +- if (bn) BN_free(bn); ++ if (!get_bn_from_bin_sz(env, bin, &bn, size)) + return 0; +- } +- +- *dest = OSSL_PARAM_construct_BN(key, tmp.data, tmp.size); +- if (bn) BN_free(bn); ++ ++ ok = get_ossl_BN_param_from_bn(env, key, bn, dest); ++ BN_free(bn); ++ return ok; ++} ++ ++int get_ossl_BN_param_from_bn(ErlNifEnv* env, char* key, const BIGNUM* bn, ++ OSSL_PARAM *dest) ++{ ++ const size_t bn_sz = BN_num_bytes(bn); ++ unsigned char* tmp_buf; ++ ERL_NIF_TERM dummy_term; ++ ++ /* Create a binary term just as a convenient tmp buffer */ ++ tmp_buf = enif_make_new_binary(env, bn_sz, &dummy_term); ++ if (BN_bn2nativepad(bn, tmp_buf, bn_sz) < 0) // Fill with BN in right endianity ++ return 0; ++ ++ *dest = OSSL_PARAM_construct_BN(key, tmp_buf, bn_sz); + return 1; + } + ++ ++ + int get_ossl_param_from_bin_in_list(ErlNifEnv* env, char* key, ERL_NIF_TERM *listcell, OSSL_PARAM *dest) + { + ERL_NIF_TERM head; +diff --git a/lib/crypto/c_src/bn.h b/lib/crypto/c_src/bn.h +index 5e207aed2d..662a32dc29 100644 +--- a/lib/crypto/c_src/bn.h ++++ b/lib/crypto/c_src/bn.h +@@ -38,6 +38,7 @@ int get_bn_from_bin_sz(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp, size_t* + int get_ossl_octet_string_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest); + int get_ossl_BN_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest); + int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest, size_t *size); ++int get_ossl_BN_param_from_bn(ErlNifEnv* env, char* key, const BIGNUM* bn, OSSL_PARAM *dest); + + int get_ossl_param_from_bin_in_list(ErlNifEnv* env, char* key, ERL_NIF_TERM *listcell, OSSL_PARAM *dest); + #endif +diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c +index 852f3ba79c..af5f5d6f4a 100644 +--- a/lib/crypto/c_src/ec.c ++++ b/lib/crypto/c_src/ec.c +@@ -189,15 +189,8 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + } else + assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad last field")); + +- { +- ErlNifBinary tmp; +- +- if (!enif_inspect_binary(env, bin_from_bn(env,p), &tmp) || // Allocate buf +- BN_bn2nativepad(p, tmp.data, tmp.size) < 0) {// Fill with BN in right endianity +- assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "BN padding failed")); +- } +- params[(*i)++] = OSSL_PARAM_construct_BN("p", tmp.data, tmp.size); +- } ++ if (!get_ossl_BN_param_from_bn(env, "p", p, ¶ms[(*i)++])) ++ assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "BN padding failed")); + # endif + } + else diff --git a/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch b/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch new file mode 100644 index 0000000..1ae1141 --- /dev/null +++ b/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch @@ -0,0 +1,22 @@ +From: Sverker Eriksson +Date: Wed, 7 Jun 2023 20:38:11 +0200 +Subject: [PATCH] crypto: Re-enable FIPS_SUPPORT for HAS_3_0_API + + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index d034590a2e..b73141a530 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -468,12 +468,6 @@ do { \ + # undef FIPS_SUPPORT + #endif + +-/* Disable FIPS for 3.0 temporaryly until the support is added */ +-#if defined(FIPS_SUPPORT) && \ +- defined(HAS_3_0_API) +-# undef FIPS_SUPPORT +-#endif +- + #if defined(FIPS_SUPPORT) && \ + defined(HAS_3_0_API) + # define FIPS_mode() EVP_default_properties_is_fips_enabled(NULL) diff --git a/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch b/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch new file mode 100644 index 0000000..fea8a04 --- /dev/null +++ b/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch @@ -0,0 +1,18 @@ +From: Sverker Eriksson +Date: Mon, 12 Jun 2023 17:14:19 +0200 +Subject: [PATCH] crypto: Fix FIPS bug in check_pkey_algorithm_type + + +diff --git a/lib/crypto/c_src/pkey.c b/lib/crypto/c_src/pkey.c +index bfdcfe3553..afdff78f48 100644 +--- a/lib/crypto/c_src/pkey.c ++++ b/lib/crypto/c_src/pkey.c +@@ -100,7 +100,7 @@ static int check_pkey_algorithm_type(ErlNifEnv *env, + + + #ifdef HAVE_EDDSA +- if (FIPS_MODE()) ++ if (FIPS_MODE() && algorithm == atom_eddsa) + assign_goto(*err_return, err, EXCP_NOTSUP_N(env, alg_arg_num, "Unsupported algorithm in FIPS mode")); + #endif + diff --git a/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch b/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch new file mode 100644 index 0000000..cf011e3 --- /dev/null +++ b/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch @@ -0,0 +1,28 @@ +From: Sverker Eriksson +Date: Tue, 13 Jun 2023 18:58:31 +0200 +Subject: [PATCH] crypto_SUITE: Change to longer dss keys acceptable to FIPS + + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index 0572feaf33..29dba82c41 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -3677,13 +3677,13 @@ rsa_private_stronger() -> + dss_plain() -> + rsa_plain(). + dss_public() -> +- 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978. ++ 16#289ff18c32a56bb0b8839370647683a38a5a7e291410b93207212adc8088d30f93e9e4abc523f3d46936e7d5c90d88742b36afd37563408f15c8c1a4f7ac24bf05f01008ffee70c8825d57c3a9308bad8a095af2b53b2dda3cbed846d95e301eb9b84766415d11f6c33209a0d28571096ab04a79aa0dc465997529686b68e887cd8a205c2dc8195aef0422eba9979f549ac85548e419413643b7244361153ada1480d238cd00dc16527938955548dd5d027ded1029eeeb8ed6c61b4cd59341d8b15466e9da890a989996f4d7691e6072de136af28b5874bf08bd1f8a60cfb1c00888132909f515e04bce81b02951aa41baac68ffdb8c5dc77a1d32d8f2c10dd7. + dss_private() -> +- 441502407453038284293378221372000880210588566361. ++ 16#6132e551cdac88409183bd37ee1452cd247d4834b08814b275be3ff5. + dss_params() -> +- [109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797, +- 1349199015905534965792122312016505075413456283393, +- 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669]. ++ [16#f2d39ed3062b13c916273600a0f2a029e86d7a4b9217b4f1815bf2b24d9710a57ab33f997294b014585b8d0198dfdccbcd75314da5ff85aa344b45adaeaa979b51a312a7bfa94472fb633f1a6f156bb4458867dfd38403f06b851f00fe2d3484077bded71ab7513d04a140220575fb693395480e4c8402b7a46cec2d37a778c305accd1f13e9f62e865315f4b22cc467c8986ec8e4961ddf810566b0c4ee369ac6aa15e43f4744005826f5bde8071a19e30b6909aac4b3d174237270dad02799d09b8a2cc5f22e66894b5422228b2c234f11f5a771c5b89cf465a2acecbbeeaa1725fe8f9b59422be8991052cb556ddf2c8ce8fa9206dbf39feadc194e00f8e5, ++ 16#8000000000000000c118f49835e4ef733c4d15800fcf059e884d31b1, ++ 16#e3a93c09da6f560e4d483a382a4c546f2335c36a4c35ac1463c08a3e6dd415df56fdc537f25fd5372be63e4f5300780b782f1acd01c8b4eb33414615fd0ea82573acba7ef83f5a943854151afc2d7dfe121fb8cd03335b065b549c5dcc606be9052483bc284e12ac3c8dba09b426e08402030e70bc1cc2bf8957c4ba0630f3f32ad689389ac47443176063f247d9e2296b3ea5b5bc2335828ea1a080ed35918dee212fd031279d1b894f01afec523833669eac031a420e540ba1320a59c424a3e5849a460a56bcb001647885b1433c4f992971746bfe2977ce7259c550b551a6c35761e4a41af764e8d92132fcc0a59d1684eab90d863f29f41cf7578faa908c]. + + ec_key_named() -> + Curve = hd(crypto:ec_curves()), diff --git a/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch b/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch new file mode 100644 index 0000000..d073b00 --- /dev/null +++ b/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch @@ -0,0 +1,33 @@ +From: Sverker Eriksson +Date: Tue, 13 Jun 2023 19:00:31 +0200 +Subject: [PATCH] crypto_SUITE: Remove sha-1 as hash for dss if FIPS + + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index 29dba82c41..00d4a0a6fe 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -2257,15 +2257,19 @@ group_config(dss = Type, Config) -> + Public = dss_params() ++ [dss_public()], + Private = dss_params() ++ [dss_private()], + SupportedHashs = proplists:get_value(hashs, crypto:supports(), []), +- DssHashs = ++ DssHashs0 = + case crypto:info_lib() of + [{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer), LibVer > 16#10001000 -> +- [sha, sha224, sha256, sha384, sha512]; ++ [sha224, sha256, sha384, sha512]; + [{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer), LibVer > 16#10000000 -> +- [sha, sha224, sha256]; ++ [sha224, sha256]; + _Else -> +- [sha] ++ [] + end, ++ DssHashs = case crypto:info_fips() of ++ enabled -> DssHashs0; ++ _ -> [sha | DssHashs0] ++ end, + SignVerify = [{Type, Hash, Public, Private, Msg} + || Hash <- DssHashs, + lists:member(Hash, SupportedHashs)], diff --git a/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch b/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch new file mode 100644 index 0000000..6d436a2 --- /dev/null +++ b/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch @@ -0,0 +1,24 @@ +From: Sverker Eriksson +Date: Tue, 13 Jun 2023 19:02:32 +0200 +Subject: [PATCH] crypto_SUITE: Remove md5, ripemd160 and sha as hash for rsa + sign if FIPS + + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index 00d4a0a6fe..afacdde051 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -2420,7 +2420,12 @@ rsa_sign_verify_tests(Config, Msg, Public, Private, PublicS, PrivateS, OptsToTry + end. + + rsa_sign_verify_tests(Msg, Public, Private, PublicS, PrivateS, OptsToTry) -> +- gen_rsa_sign_verify_tests([md5, ripemd160, sha, sha224, sha256], Msg, Public, Private, ++ Hashs0 = [sha224, sha256], ++ Hashs = case crypto:info_fips() of ++ enabled -> Hashs0; ++ _ -> [md5, ripemd160, sha | Hashs0] ++ end, ++ gen_rsa_sign_verify_tests(Hashs, Msg, Public, Private, + [undefined | OptsToTry]) ++ + gen_rsa_sign_verify_tests([sha384, sha512], Msg, PublicS, PrivateS, + [undefined | OptsToTry]). diff --git a/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch b/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch new file mode 100644 index 0000000..02603cd --- /dev/null +++ b/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch @@ -0,0 +1,284 @@ +From: Sverker Eriksson +Date: Wed, 14 Jun 2023 22:00:35 +0200 +Subject: [PATCH] crypto: Try generate ec key by name if possible + +OpenSSL 3 FIPS does only accept named ec curves. + +So we try that first, and if it fails we retry +with the params passed down by crypto.erl. + +diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c +index af5f5d6f4a..49e1da4fe4 100644 +--- a/lib/crypto/c_src/ec.c ++++ b/lib/crypto/c_src/ec.c +@@ -28,7 +28,8 @@ + + int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + OSSL_PARAM params[], int *i, +- size_t *order_size) ++ size_t *order_size, ++ struct get_curve_def_ctx* gcd) + { + const ERL_NIF_TERM* curve; + int c_arity = -1; +@@ -40,6 +41,7 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + int arity = -1; + const ERL_NIF_TERM* curve_tuple; + ++ + /* Here are two random curve definition examples, one prime_field and + one characteristic_two_field. Both are from the crypto/src/crypto_ec_curves.erl. + +@@ -79,6 +81,23 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + c_arity != 5) + assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad curve def. Expect 5-tuple.")); + ++ if (gcd->use_curve_name ++ && curve_tuple[1] != atom_undefined ++ && enif_get_atom(env, curve_tuple[1], gcd->curve_name, ++ sizeof(gcd->curve_name), ERL_NIF_LATIN1)) { ++ ErlNifBinary order_bin; ++ params[(*i)++] = OSSL_PARAM_construct_utf8_string("group", gcd->curve_name, 0); ++ ++ if (order_size) { ++ if (!enif_inspect_binary(env, curve[3], &order_bin)) ++ assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad order")); ++ *order_size = order_bin.size; ++ } ++ gcd->use_curve_name = 1; ++ return 1; ++ } ++ gcd->use_curve_name = 0; ++ + if (!get_ossl_octet_string_param_from_bin(env, "generator", curve[2], ¶ms[(*i)++])) + assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad Generator (Point)")); + +@@ -211,6 +230,7 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) + int tpl_arity; + int i = 0; + OSSL_PARAM params[15]; ++ struct get_curve_def_ctx gcd; + EVP_PKEY_CTX *pctx = NULL; + + if (!enif_get_tuple(env, key, &tpl_arity, &tpl_terms) || +@@ -222,19 +242,27 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) + if (!get_ossl_octet_string_param_from_bin(env, "pub", tpl_terms[1], ¶ms[i++])) + assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Bad public key")); + +- if (!get_curve_definition(env, &ret, tpl_terms[0], params, &i, NULL)) ++ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) ++ assign_goto(ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); ++ ++ gcd.use_curve_name = 1; ++retry_without_name: ++ if (!get_curve_definition(env, &ret, tpl_terms[0], params, &i, NULL, &gcd)) + goto err; + + params[i++] = OSSL_PARAM_construct_end(); + +- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) +- assign_goto(ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); +- + if (EVP_PKEY_fromdata_init(pctx) <= 0) + assign_goto(ret, err, EXCP_ERROR(env, "Can't init fromdata")); + +- if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) ++ if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { ++ if (gcd.use_curve_name) { ++ gcd.use_curve_name = 0; ++ i = 1; ++ goto retry_without_name; ++ } + assign_goto(ret, err, EXCP_ERROR(env, "Can't do fromdata")); ++ } + + if (!*pkey) + assign_goto(ret, err, EXCP_ERROR(env, "Couldn't get a public key")); +@@ -256,24 +284,33 @@ static int get_ec_private_key_2(ErlNifEnv* env, + { + int i = 0; + OSSL_PARAM params[15]; ++ struct get_curve_def_ctx gcd; + EVP_PKEY_CTX *pctx = NULL; + + if (!get_ossl_BN_param_from_bin(env, "priv", key, ¶ms[i++])) + assign_goto(*ret, err, EXCP_BADARG_N(env, 0, "Bad private key")); + +- if (!get_curve_definition(env, ret, curve, params, &i, order_size)) ++ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) ++ assign_goto(*ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); ++ ++ gcd.use_curve_name = 1; ++retry_without_name: ++ if (!get_curve_definition(env, ret, curve, params, &i, order_size, &gcd)) + goto err; + + params[i++] = OSSL_PARAM_construct_end(); + +- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) +- assign_goto(*ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); +- + if (EVP_PKEY_fromdata_init(pctx) <= 0) + assign_goto(*ret, err, EXCP_ERROR(env, "Can't init fromdata")); + +- if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_KEYPAIR, params) <= 0) ++ if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_KEYPAIR, params) <= 0) { ++ if (gcd.use_curve_name) { ++ gcd.use_curve_name = 0; ++ i = 1; ++ goto retry_without_name; ++ } + assign_goto(*ret, err, EXCP_ERROR(env, "Can't do fromdata")); ++ } + + if (!*pkey) + assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get a private key")); +@@ -316,9 +353,10 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + ERL_NIF_TERM ret = atom_undefined; + int i = 0; + OSSL_PARAM params[15]; ++ struct get_curve_def_ctx gcd; + EVP_PKEY_CTX *pctx = NULL; + EVP_PKEY *pkey = NULL, *peer_pkey = NULL; +- size_t sz, order_size; ++ size_t sz, order_size = 0; + BIGNUM *priv_bn = NULL; + ErlNifBinary pubkey_bin; + +@@ -338,26 +376,36 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + } + else + { ++ /* Neither the private nor the public key is known, so we generate the pair: */ ++ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) ++ assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_new_from_name")); ++ ++ gcd.use_curve_name = 1; ++ retry_without_name: + /* PrivKey (that is, argv[1]) == atom_undefined */ +- if (!get_curve_definition(env, &ret, argv[0], params, &i, &order_size)) ++ if (!get_curve_definition(env, &ret, argv[0], params, &i, ++ &order_size, &gcd)) + // INSERT "ret" parameter in get_curve_definition !! + assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Couldn't get Curve definition")); + + params[i++] = OSSL_PARAM_construct_end(); + +- /* Neither the private nor the public key is known, so we generate the pair: */ +- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) +- assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_new_from_name")); +- + if (EVP_PKEY_keygen_init(pctx) <= 0) + assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_keygen_init")); + + if (!EVP_PKEY_CTX_set_params(pctx, params)) + assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_set_params")); +- +- if (!EVP_PKEY_generate(pctx, &pkey)) ++ ++ if (!EVP_PKEY_generate(pctx, &pkey)) { ++ if (gcd.use_curve_name) { ++ gcd.use_curve_name = 0; ++ i = 0; ++ goto retry_without_name; ++ } + assign_goto(ret, err, EXCP_ERROR(env, "Couldn't generate EC key")); +- ++ } ++ ++ + /* Get the two keys, pub as binary and priv as BN */ + if (!EVP_PKEY_get_octet_string_param(pkey, "encoded-pub-key", NULL, 0, &sz)) + assign_goto(ret, err, EXCP_ERROR(env, "Can't get pub octet string size")); +@@ -375,6 +423,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar + assign_goto(ret, err, EXCP_BADARG_N(env, 1, "Couldn't get priv key bytes")); + } + ++ if (order_size == 0) ++ order_size = BN_num_bytes(priv_bn); + ret = enif_make_tuple2(env, + enif_make_binary(env, &pubkey_bin), + bn2term(env, order_size, priv_bn)); +diff --git a/lib/crypto/c_src/ec.h b/lib/crypto/c_src/ec.h +index e53986d64e..f0b0b96207 100644 +--- a/lib/crypto/c_src/ec.h ++++ b/lib/crypto/c_src/ec.h +@@ -26,9 +26,17 @@ + #if defined(HAVE_EC) + + # if defined(HAS_3_0_API) ++ ++struct get_curve_def_ctx ++{ ++ char curve_name[20]; ++ int use_curve_name; ++}; ++ + int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, + OSSL_PARAM params[], int *i, +- size_t *order_size); ++ size_t *order_size, ++ struct get_curve_def_ctx*); + # endif /* HAS_3_0_API */ + + # if ! defined(HAS_3_0_API) +diff --git a/lib/crypto/c_src/ecdh.c b/lib/crypto/c_src/ecdh.c +index 7509d9cb84..f1b0f7eb28 100644 +--- a/lib/crypto/c_src/ecdh.c ++++ b/lib/crypto/c_src/ecdh.c +@@ -42,6 +42,7 @@ ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a + int ret_bin_alloc = 0; + int i = 0, i_key = 0; + OSSL_PARAM params[15]; ++ struct get_curve_def_ctx gcd; + EVP_PKEY_CTX *own_pctx = NULL, *peer_pctx = NULL, *pctx_gen = NULL; + EVP_PKEY *own_pkey = NULL, *peer_pkey = NULL; + int err; +@@ -53,21 +54,29 @@ ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a + if (!get_ossl_octet_string_param_from_bin(env, "pub", argv[0], ¶ms[i++])) + assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Bad peer public key; binary expected")); + ++ /* Build the remote public key in peer_pkey */ ++ peer_pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL); ++ ++ gcd.use_curve_name = 1; ++retry_without_name: + /* Curve definition/name */ +- if (!get_curve_definition(env, &ret, argv[1], params, &i, NULL)) ++ if (!get_curve_definition(env, &ret, argv[1], params, &i, NULL, &gcd)) + goto err; + + /* End of params */ + params[i++] = OSSL_PARAM_construct_end(); + +- /* Build the remote public key in peer_pkey */ +- peer_pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL); +- + if (EVP_PKEY_fromdata_init(peer_pctx) <= 0) + assign_goto(ret, err, EXCP_ERROR(env, "Can't init fromdata")); + +- if (EVP_PKEY_fromdata(peer_pctx, &peer_pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) ++ if (EVP_PKEY_fromdata(peer_pctx, &peer_pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { ++ if (gcd.use_curve_name) { ++ gcd.use_curve_name = 0; ++ i = 1; ++ goto retry_without_name; ++ } + assign_goto(ret, err, EXCP_ERROR(env, "Can't do fromdata")); ++ } + + if (!peer_pkey) + assign_goto(ret, err, EXCP_ERROR(env, "No peer_pkey")); +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index afacdde051..e047964daa 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -3695,7 +3695,7 @@ dss_params() -> + 16#e3a93c09da6f560e4d483a382a4c546f2335c36a4c35ac1463c08a3e6dd415df56fdc537f25fd5372be63e4f5300780b782f1acd01c8b4eb33414615fd0ea82573acba7ef83f5a943854151afc2d7dfe121fb8cd03335b065b549c5dcc606be9052483bc284e12ac3c8dba09b426e08402030e70bc1cc2bf8957c4ba0630f3f32ad689389ac47443176063f247d9e2296b3ea5b5bc2335828ea1a080ed35918dee212fd031279d1b894f01afec523833669eac031a420e540ba1320a59c424a3e5849a460a56bcb001647885b1433c4f992971746bfe2977ce7259c550b551a6c35761e4a41af764e8d92132fcc0a59d1684eab90d863f29f41cf7578faa908c]. + + ec_key_named() -> +- Curve = hd(crypto:ec_curves()), ++ Curve = secp224r1, %hd(crypto:ec_curves()), + {D2_pub, D2_priv} = crypto:generate_key(ecdh, Curve), + {[D2_priv, Curve], [D2_pub, Curve]}. + diff --git a/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch b/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch new file mode 100644 index 0000000..c85e46e --- /dev/null +++ b/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch @@ -0,0 +1,59 @@ +From: Sverker Eriksson +Date: Thu, 15 Jun 2023 19:53:14 +0200 +Subject: [PATCH] crypto_SUITE: Skip sha-1 sign for FIPS + + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index e047964daa..c56faa9bc4 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -1268,6 +1268,12 @@ use_all_ec_sign_verify(_Config) -> + crypto:info_fips(), + Curves, + Hashs]), ++ SkipHashs0 = [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, ++ blake2b, blake2s], ++ SkipHashs = case crypto:info_fips() of ++ enabled -> [sha | SkipHashs0]; ++ _ -> SkipHashs0 ++ end, + Results = + [{{Curve,Hash}, + try +@@ -1282,7 +1288,7 @@ use_all_ec_sign_verify(_Config) -> + {C,E} + end} + || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4], +- Hash <- Hashs -- [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, blake2b, blake2s] ++ Hash <- Hashs -- SkipHashs + ], + Fails = + lists:filter(fun({_,true}) -> false; +@@ -1730,14 +1736,19 @@ do_sign_verify({Type, undefined=Hash, Private, Public, Msg, Signature}) -> + end; + + do_sign_verify({Type, Hash, Public, Private, Msg}) -> +- Signature = crypto:sign(Type, Hash, Msg, Private), +- case crypto:verify(Type, Hash, Msg, Signature, Public) of +- true -> +- ct:log("OK crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), +- negative_verify(Type, Hash, Msg, <<10,20>>, Public); +- false -> +- ct:log("ERROR crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), +- ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}}) ++ case {Hash, crypto:info_fips()} of ++ {sha, enabled} -> ++ io:format("Skip sign with SHA for FIPS\n"); ++ _ -> ++ Signature = crypto:sign(Type, Hash, Msg, Private), ++ case crypto:verify(Type, Hash, Msg, Signature, Public) of ++ true -> ++ ct:log("OK crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), ++ negative_verify(Type, Hash, Msg, <<10,20>>, Public); ++ false -> ++ ct:log("ERROR crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), ++ ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}}) ++ end + end; + do_sign_verify({Type, Hash, Public, Private, Msg, Options}) -> + LibVer = diff --git a/otp-0020-crypto-Unalias-some-ec-curve-names.patch b/otp-0020-crypto-Unalias-some-ec-curve-names.patch new file mode 100644 index 0000000..c3c9df4 --- /dev/null +++ b/otp-0020-crypto-Unalias-some-ec-curve-names.patch @@ -0,0 +1,806 @@ +From: Sverker Eriksson +Date: Fri, 16 Jun 2023 16:55:41 +0200 +Subject: [PATCH] crypto: Unalias some ec curve names + +to pass OpenSSL the name it accepts. + +diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl +index 6abaacad5c..1cc11aa6eb 100644 +--- a/lib/crypto/src/crypto.erl ++++ b/lib/crypto/src/crypto.erl +@@ -2372,14 +2372,12 @@ nif_curve_params(CurveName) when is_atom(CurveName) -> + x448 -> {evp,CurveName}; + x25519 -> {evp,CurveName}; + _ -> +- Spec = +- try +- crypto_ec_curves:curve(CurveName) +- catch +- _:_ -> +- undefined +- end, +- {Spec, CurveName} ++ try ++ crypto_ec_curves:curve_with_name(CurveName) ++ catch ++ _:_ -> ++ {undefined, CurveName} ++ end + end. + + +diff --git a/lib/crypto/src/crypto_ec_curves.erl b/lib/crypto/src/crypto_ec_curves.erl +index a0a2f99601..3f14c34a26 100644 +--- a/lib/crypto/src/crypto_ec_curves.erl ++++ b/lib/crypto/src/crypto_ec_curves.erl +@@ -1,11 +1,22 @@ + -module(crypto_ec_curves). + +--export([curve/1, curves/0]). ++-export([curve/1, curves/0, curve_with_name/1]). + + curves() -> + proplists:get_value(curves, crypto:supports()) -- [x25519,x448]. + +-curve(secp112r1) -> ++real_name(secp192r1) -> prime192v1; ++real_name(secp256r1) -> prime256v1; ++real_name(Name) -> Name. ++ ++curve_with_name(Curve) -> ++ RealName = real_name(Curve), ++ {params(RealName), RealName}. ++ ++curve(Curve) -> ++ params(real_name(Curve)). ++ ++params(secp112r1) -> + { + {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime + {<<16#DB7C2ABF62E35E668076BEAD2088:112>>, %% A +@@ -18,7 +29,7 @@ curve(secp112r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp112r2) -> ++params(secp112r2) -> + { + {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime + {<<16#6127C24C05F38A0AAAF65C0EF02C:112>>, %% A +@@ -31,7 +42,7 @@ curve(secp112r2) -> + <<16#04:8>> %% CoFactor + }; + +-curve(secp128r1) -> ++params(secp128r1) -> + { + {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>}, %% Prime + {<<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC:128>>, %% A +@@ -44,7 +55,7 @@ curve(secp128r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp128r2) -> ++params(secp128r2) -> + { + {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>}, %% Prime + {<<16#D6031998D1B3BBFEBF59CC9BBFF9AEE1:128>>, %% A +@@ -57,7 +68,7 @@ curve(secp128r2) -> + <<16#04:8>> %% CoFactor + }; + +-curve(secp160k1) -> ++params(secp160k1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime + {<<16#00:8>>, %% A +@@ -70,7 +81,7 @@ curve(secp160k1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp160r1) -> ++params(secp160r1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF:160>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC:160>>, %% A +@@ -83,7 +94,7 @@ curve(secp160r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp160r2) -> ++params(secp160r2) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>, %% A +@@ -96,20 +107,7 @@ curve(secp160r2) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp192r1) -> +- { +- {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime +- {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A +- <<16#64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1:192>>, %% B +- <<16#3045AE6FC8422F64ED579528D38120EAE12196D5:160>>}, %% Seed +- <<16#04:8, +- 16#188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012:192, %% X(p0) +- 16#07192B95FFC8DA78631011ED6B24CDD573F977A11E794811:192>>, %% Y(p0) +- <<16#FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831:192>>, %% Order +- <<16#01:8>> %% CoFactor +- }; +- +-curve(secp192k1) -> ++params(secp192k1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37:192>>}, %% Prime + {<<16#00:8>>, %% A +@@ -122,7 +120,7 @@ curve(secp192k1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp224k1) -> ++params(secp224k1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D:224>>}, %% Prime + {<<16#00:8>>, %% A +@@ -135,7 +133,7 @@ curve(secp224k1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp224r1) -> ++params(secp224r1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>, %% A +@@ -148,7 +146,7 @@ curve(secp224r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp256k1) -> ++params(secp256k1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F:256>>}, %% Prime + {<<16#00:8>>, %% A +@@ -161,20 +159,7 @@ curve(secp256k1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp256r1) -> +- { +- {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>}, %% Prime +- {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>, %% A +- <<16#5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B:256>>, %% B +- <<16#C49D360886E704936A6678E1139D26B7819F7E90:160>>}, %% Seed +- <<16#04:8, +- 16#6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296:256, %% X(p0) +- 16#4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5:256>>, %% Y(p0) +- <<16#FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551:256>>, %% Order +- <<16#01:8>> %% CoFactor +- }; +- +-curve(secp384r1) -> ++params(secp384r1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE:256, %% Prime + 16#FFFFFFFF0000000000000000FFFFFFFF:128>>}, +@@ -193,7 +178,7 @@ curve(secp384r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(secp521r1) -> ++params(secp521r1) -> + { + {prime_field, <<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256, %% Prime + 16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256, +@@ -218,7 +203,7 @@ curve(secp521r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime192v1) -> ++params(prime192v1) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A +@@ -231,7 +216,7 @@ curve(prime192v1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime192v2) -> ++params(prime192v2) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A +@@ -244,7 +229,7 @@ curve(prime192v2) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime192v3) -> ++params(prime192v3) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A +@@ -257,7 +242,7 @@ curve(prime192v3) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime239v1) -> ++params(prime239v1) -> + { + {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime + {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A +@@ -270,7 +255,7 @@ curve(prime239v1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime239v2) -> ++params(prime239v2) -> + { + {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime + {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A +@@ -283,7 +268,7 @@ curve(prime239v2) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime239v3) -> ++params(prime239v3) -> + { + {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime + {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A +@@ -296,7 +281,7 @@ curve(prime239v3) -> + <<16#01:8>> %% CoFactor + }; + +-curve(prime256v1) -> ++params(prime256v1) -> + { + {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>}, %% Prime + {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>, %% A +@@ -309,7 +294,7 @@ curve(prime256v1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(sect113r1) -> ++params(sect113r1) -> + { + {characteristic_two_field, 113, {tpbasis,9}}, + {<<16#3088250CA6E7C7FE649CE85820F7:112>>, %% A +@@ -322,7 +307,7 @@ curve(sect113r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect113r2) -> ++params(sect113r2) -> + { + {characteristic_two_field, 113, {tpbasis,9}}, + {<<16#689918DBEC7E5A0DD6DFC0AA55C7:112>>, %% A +@@ -335,7 +320,7 @@ curve(sect113r2) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect131r1) -> ++params(sect131r1) -> + { + {characteristic_two_field, 131, {ppbasis,2,3,8}}, + {<<16#07A11B09A76B562144418FF3FF8C2570B8:136>>, %% A +@@ -348,7 +333,7 @@ curve(sect131r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect131r2) -> ++params(sect131r2) -> + { + {characteristic_two_field, 131, {ppbasis,2,3,8}}, + {<<16#03E5A88919D7CAFCBF415F07C2176573B2:136>>, %% A +@@ -361,7 +346,7 @@ curve(sect131r2) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect163k1) -> ++params(sect163k1) -> + { + {characteristic_two_field, 163, {ppbasis,3,6,7}}, + {<<16#01:8>>, %% A +@@ -374,7 +359,7 @@ curve(sect163k1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect163r1) -> ++params(sect163r1) -> + { + {characteristic_two_field, 163, {ppbasis,3,6,7}}, + {<<16#07B6882CAAEFA84F9554FF8428BD88E246D2782AE2:168>>, %% A +@@ -387,7 +372,7 @@ curve(sect163r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect163r2) -> ++params(sect163r2) -> + { + {characteristic_two_field, 163, {ppbasis,3,6,7}}, + {<<16#01:8>>, %% A +@@ -400,7 +385,7 @@ curve(sect163r2) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect193r1) -> ++params(sect193r1) -> + { + {characteristic_two_field, 193, {tpbasis,15}}, + {<<16#17858FEB7A98975169E171F77B4087DE098AC8A911DF7B01:192>>, %% A +@@ -413,7 +398,7 @@ curve(sect193r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect193r2) -> ++params(sect193r2) -> + { + {characteristic_two_field, 193, {tpbasis,15}}, + {<<16#0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B:200>>, %% A +@@ -426,7 +411,7 @@ curve(sect193r2) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect233k1) -> ++params(sect233k1) -> + { + {characteristic_two_field, 233, {tpbasis,74}}, + {<<16#00:8>>, %% A +@@ -439,7 +424,7 @@ curve(sect233k1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(sect233r1) -> ++params(sect233r1) -> + { + {characteristic_two_field, 233, {tpbasis,74}}, + {<<16#01:8>>, %% A +@@ -452,7 +437,7 @@ curve(sect233r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect239k1) -> ++params(sect239k1) -> + { + {characteristic_two_field, 239, {tpbasis,158}}, + {<<16#00:8>>, %% A +@@ -465,7 +450,7 @@ curve(sect239k1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(sect283k1) -> ++params(sect283k1) -> + { + {characteristic_two_field, 283, {ppbasis,5,7,12}}, + {<<16#00:8>>, %% A +@@ -481,7 +466,7 @@ curve(sect283k1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(sect283r1) -> ++params(sect283r1) -> + { + {characteristic_two_field, 283, {ppbasis,5,7,12}}, + {<<16#01:8>>, %% A +@@ -498,7 +483,7 @@ curve(sect283r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect409k1) -> ++params(sect409k1) -> + { + {characteristic_two_field, 409, {tpbasis,87}}, + {<<16#00:8>>, %% A +@@ -514,7 +499,7 @@ curve(sect409k1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(sect409r1) -> ++params(sect409r1) -> + { + {characteristic_two_field, 409, {tpbasis,87}}, + {<<16#01:8>>, %% A +@@ -531,7 +516,7 @@ curve(sect409r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(sect571k1) -> ++params(sect571k1) -> + { + {characteristic_two_field, 571, {ppbasis,2,5,10}}, + {<<16#00:8>>, %% A +@@ -550,7 +535,7 @@ curve(sect571k1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(sect571r1) -> ++params(sect571r1) -> + { + {characteristic_two_field, 571, {ppbasis,2,5,10}}, + {<<16#01:8>>, %% A +@@ -571,7 +556,7 @@ curve(sect571r1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(c2pnb163v1) -> ++params(c2pnb163v1) -> + { + {characteristic_two_field, 163, {ppbasis,1,2,8}}, + {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>, %% A +@@ -584,7 +569,7 @@ curve(c2pnb163v1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(c2pnb163v2) -> ++params(c2pnb163v2) -> + { + {characteristic_two_field, 163, {ppbasis,1,2,8}}, + {<<16#0108B39E77C4B108BED981ED0E890E117C511CF072:168>>, %% A +@@ -597,7 +582,7 @@ curve(c2pnb163v2) -> + <<16#02:8>> %% CoFactor + }; + +-curve(c2pnb163v3) -> ++params(c2pnb163v3) -> + { + {characteristic_two_field, 163, {ppbasis,1,2,8}}, + {<<16#07A526C63D3E25A256A007699F5447E32AE456B50E:168>>, %% A +@@ -610,7 +595,7 @@ curve(c2pnb163v3) -> + <<16#02:8>> %% CoFactor + }; + +-curve(c2pnb176v1) -> ++params(c2pnb176v1) -> + { + {characteristic_two_field, 176, {ppbasis,1,2,43}}, + {<<16#E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B:176>>, %% A +@@ -623,7 +608,7 @@ curve(c2pnb176v1) -> + <<16#FF6E:16>> %% CoFactor + }; + +-curve(c2tnb191v1) -> ++params(c2tnb191v1) -> + { + {characteristic_two_field, 191, {tpbasis,9}}, + {<<16#2866537B676752636A68F56554E12640276B649EF7526267:192>>, %% A +@@ -636,7 +621,7 @@ curve(c2tnb191v1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(c2tnb191v2) -> ++params(c2tnb191v2) -> + { + {characteristic_two_field, 191, {tpbasis,9}}, + {<<16#401028774D7777C7B7666D1366EA432071274F89FF01E718:192>>, %% A +@@ -649,7 +634,7 @@ curve(c2tnb191v2) -> + <<16#04:8>> %% CoFactor + }; + +-curve(c2tnb191v3) -> ++params(c2tnb191v3) -> + { + {characteristic_two_field, 191, {tpbasis,9}}, + {<<16#6C01074756099122221056911C77D77E77A777E7E7E77FCB:192>>, %% A +@@ -662,7 +647,7 @@ curve(c2tnb191v3) -> + <<16#06:8>> %% CoFactor + }; + +-curve(c2pnb208w1) -> ++params(c2pnb208w1) -> + { + {characteristic_two_field, 208, {ppbasis,1,2,83}}, + {<<16#00:8>>, %% A +@@ -675,7 +660,7 @@ curve(c2pnb208w1) -> + <<16#FE48:16>> %% CoFactor + }; + +-curve(c2tnb239v1) -> ++params(c2tnb239v1) -> + { + {characteristic_two_field, 239, {tpbasis,36}}, + {<<16#32010857077C5431123A46B808906756F543423E8D27877578125778AC76:240>>, %% A +@@ -688,7 +673,7 @@ curve(c2tnb239v1) -> + <<16#04:8>> %% CoFactor + }; + +-curve(c2tnb239v2) -> ++params(c2tnb239v2) -> + { + {characteristic_two_field, 239, {tpbasis,36}}, + {<<16#4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F:240>>, %% A +@@ -701,7 +686,7 @@ curve(c2tnb239v2) -> + <<16#06:8>> %% CoFactor + }; + +-curve(c2tnb239v3) -> ++params(c2tnb239v3) -> + { + {characteristic_two_field, 239, {tpbasis,36}}, + {<<16#01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F:240>>, %% A +@@ -714,7 +699,7 @@ curve(c2tnb239v3) -> + <<16#0A:8>> %% CoFactor + }; + +-curve(c2pnb272w1) -> ++params(c2pnb272w1) -> + { + {characteristic_two_field, 272, {ppbasis,1,3,56}}, + {<<16#91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586:256, %% A +@@ -732,7 +717,7 @@ curve(c2pnb272w1) -> + <<16#FF06:16>> %% CoFactor + }; + +-curve(c2pnb304w1) -> ++params(c2pnb304w1) -> + { + {characteristic_two_field, 304, {ppbasis,1,2,11}}, + {<<16#FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C128807836:256, %% A +@@ -750,7 +735,7 @@ curve(c2pnb304w1) -> + <<16#FE2E:16>> %% CoFactor + }; + +-curve(c2tnb359v1) -> ++params(c2tnb359v1) -> + { + {characteristic_two_field, 359, {tpbasis,68}}, + {<<16#5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223:256, %% A +@@ -768,7 +753,7 @@ curve(c2tnb359v1) -> + <<16#4C:8>> %% CoFactor + }; + +-curve(c2pnb368w1) -> ++params(c2pnb368w1) -> + { + {characteristic_two_field, 368, {ppbasis,1,2,85}}, + {<<16#E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C5:256, %% A +@@ -786,7 +771,7 @@ curve(c2pnb368w1) -> + <<16#FF70:16>> %% CoFactor + }; + +-curve(c2tnb431r1) -> ++params(c2tnb431r1) -> + { + {characteristic_two_field, 431, {tpbasis,120}}, + {<<16#1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF6:256, %% A +@@ -804,7 +789,7 @@ curve(c2tnb431r1) -> + <<16#2760:16>> %% CoFactor + }; + +-curve(wtls1) -> ++params(wtls1) -> + { + {characteristic_two_field, 113, {tpbasis,9}}, + {<<16#01:8>>, %% A +@@ -817,7 +802,7 @@ curve(wtls1) -> + <<16#02:8>> %% CoFactor + }; + +-curve(wtls3) -> ++params(wtls3) -> + { + {characteristic_two_field, 163, {ppbasis,3,6,7}}, + {<<16#01:8>>, %% A +@@ -830,7 +815,7 @@ curve(wtls3) -> + <<16#02:8>> %% CoFactor + }; + +-curve(wtls4) -> ++params(wtls4) -> + { + {characteristic_two_field, 113, {tpbasis,9}}, + {<<16#3088250CA6E7C7FE649CE85820F7:112>>, %% A +@@ -843,7 +828,7 @@ curve(wtls4) -> + <<16#02:8>> %% CoFactor + }; + +-curve(wtls5) -> ++params(wtls5) -> + { + {characteristic_two_field, 163, {ppbasis,1,2,8}}, + {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>, %% A +@@ -856,7 +841,7 @@ curve(wtls5) -> + <<16#02:8>> %% CoFactor + }; + +-curve(wtls6) -> ++params(wtls6) -> + { + {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime + {<<16#DB7C2ABF62E35E668076BEAD2088:112>>, %% A +@@ -869,7 +854,7 @@ curve(wtls6) -> + <<16#01:8>> %% CoFactor + }; + +-curve(wtls7) -> ++params(wtls7) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>, %% A +@@ -882,7 +867,7 @@ curve(wtls7) -> + <<16#01:8>> %% CoFactor + }; + +-curve(wtls8) -> ++params(wtls8) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFDE7:112>>}, %% Prime + {<<16#00:8>>, %% A +@@ -895,7 +880,7 @@ curve(wtls8) -> + <<16#01:8>> %% CoFactor + }; + +-curve(wtls9) -> ++params(wtls9) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F:160>>}, %% Prime + {<<16#00:8>>, %% A +@@ -908,7 +893,7 @@ curve(wtls9) -> + <<16#01:8>> %% CoFactor + }; + +-curve(wtls10) -> ++params(wtls10) -> + { + {characteristic_two_field, 233, {tpbasis,74}}, + {<<16#00:8>>, %% A +@@ -921,7 +906,7 @@ curve(wtls10) -> + <<16#04:8>> %% CoFactor + }; + +-curve(wtls11) -> ++params(wtls11) -> + { + {characteristic_two_field, 233, {tpbasis,74}}, + {<<16#01:8>>, %% A +@@ -934,7 +919,7 @@ curve(wtls11) -> + <<16#02:8>> %% CoFactor + }; + +-curve(wtls12) -> ++params(wtls12) -> + { + {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>}, %% Prime + {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>, %% A +@@ -947,7 +932,7 @@ curve(wtls12) -> + <<16#01:8>> %% CoFactor + }; + +-curve(ipsec3) -> ++params(ipsec3) -> + { + {characteristic_two_field, 155, {tpbasis,62}}, + {<<16#00:8>>, %% A +@@ -960,7 +945,7 @@ curve(ipsec3) -> + <<16#03:8>> %% CoFactor + }; + +-curve(ipsec4) -> ++params(ipsec4) -> + { + {characteristic_two_field, 185, {tpbasis,69}}, + {<<16#00:8>>, %% A +@@ -973,7 +958,7 @@ curve(ipsec4) -> + <<16#02:8>> %% CoFactor + }; + +-curve(brainpoolP160r1) -> ++params(brainpoolP160r1) -> + { + {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>}, %% Prime + {<<16#340E7BE2A280EB74E2BE61BADA745D97E8F7C300:160>>, %% A +@@ -986,7 +971,7 @@ curve(brainpoolP160r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP160t1) -> ++params(brainpoolP160t1) -> + { + {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>}, %% Prime + {<<16#E95E4A5F737059DC60DFC7AD95B3D8139515620C:160>>, %% A +@@ -999,7 +984,7 @@ curve(brainpoolP160t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP192r1) -> ++params(brainpoolP192r1) -> + { + {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>}, %% Prime + {<<16#6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF:192>>, %% A +@@ -1012,7 +997,7 @@ curve(brainpoolP192r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP192t1) -> ++params(brainpoolP192t1) -> + { + {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>}, %% Prime + {<<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294:192>>, %% A +@@ -1025,7 +1010,7 @@ curve(brainpoolP192t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP224r1) -> ++params(brainpoolP224r1) -> + { + {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>}, %% Prime + {<<16#68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43:224>>, %% A +@@ -1038,7 +1023,7 @@ curve(brainpoolP224r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP224t1) -> ++params(brainpoolP224t1) -> + { + {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>}, %% Prime + {<<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC:224>>, %% A +@@ -1051,7 +1036,7 @@ curve(brainpoolP224t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP256r1) -> ++params(brainpoolP256r1) -> + { + {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>}, %% Prime + {<<16#7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9:256>>, %% A +@@ -1064,7 +1049,7 @@ curve(brainpoolP256r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP256t1) -> ++params(brainpoolP256t1) -> + { + {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>}, %% Prime + {<<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374:256>>, %% A +@@ -1077,7 +1062,7 @@ curve(brainpoolP256t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP320r1) -> ++params(brainpoolP320r1) -> + { + {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256, %% Prime + 16#FCD412B1F1B32E27:64>>}, +@@ -1096,7 +1081,7 @@ curve(brainpoolP320r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP320t1) -> ++params(brainpoolP320t1) -> + { + {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256, %% Prime + 16#FCD412B1F1B32E27:64>>}, +@@ -1115,7 +1100,7 @@ curve(brainpoolP320t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP384r1) -> ++params(brainpoolP384r1) -> + { + {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256, %% Prime + 16#ACD3A729901D1A71874700133107EC53:128>>}, +@@ -1134,7 +1119,7 @@ curve(brainpoolP384r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP384t1) -> ++params(brainpoolP384t1) -> + { + {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256, %% Prime + 16#ACD3A729901D1A71874700133107EC53:128>>}, +@@ -1153,7 +1138,7 @@ curve(brainpoolP384t1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP512r1) -> ++params(brainpoolP512r1) -> + { + {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256, %% Prime + 16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>}, +@@ -1172,7 +1157,7 @@ curve(brainpoolP512r1) -> + <<16#01:8>> %% CoFactor + }; + +-curve(brainpoolP512t1) -> ++params(brainpoolP512t1) -> + { + {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256, %% Prime + 16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>}, diff --git a/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch b/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch new file mode 100644 index 0000000..5615558 --- /dev/null +++ b/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch @@ -0,0 +1,78 @@ +From: Sverker Eriksson +Date: Fri, 16 Jun 2023 19:31:34 +0200 +Subject: [PATCH] crypto_SUITE: Skip ec curves with < 224 bits if FIPS + + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index c56faa9bc4..1179a516b2 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -1256,8 +1256,19 @@ no_generate_compute(Config) when is_list(Config) -> + compute() -> + [{doc, " Test crypto:compute_key"}]. + compute(Config) when is_list(Config) -> +- Gen = proplists:get_value(compute, Config), ++ Gen0 = proplists:get_value(compute, Config), ++ Gen = case crypto:info_fips() of ++ enabled -> ++ SkipCurves = [secp192r1], ++ lists:filter(fun({_,_,_,Curve,_}) -> ++ not lists:member(Curve,SkipCurves) ++ end, ++ Gen0); ++ _ -> ++ Gen0 ++ end, + lists:foreach(fun do_compute/1, Gen). ++ + %%-------------------------------------------------------------------- + use_all_ec_sign_verify(_Config) -> + Msg = <<"hello world!">>, +@@ -1270,10 +1281,17 @@ use_all_ec_sign_verify(_Config) -> + Hashs]), + SkipHashs0 = [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, + blake2b, blake2s], +- SkipHashs = case crypto:info_fips() of +- enabled -> [sha | SkipHashs0]; +- _ -> SkipHashs0 +- end, ++ SkipCurves0 = [ed25519, ed448, x25519, x448, ipsec3, ipsec4], ++ ++ {SkipHashs, SkipCurves} ++ = case crypto:info_fips() of ++ enabled -> ++ {[sha | SkipHashs0], ++ [secp192r1, prime192v1, sect163k1, sect163r2]}; ++ _ -> ++ {SkipHashs0, SkipCurves0} ++ end, ++ + Results = + [{{Curve,Hash}, + try +@@ -1287,7 +1305,7 @@ use_all_ec_sign_verify(_Config) -> + C:E -> + {C,E} + end} +- || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4], ++ || Curve <- Curves -- SkipCurves, + Hash <- Hashs -- SkipHashs + ], + Fails = +@@ -1316,7 +1334,15 @@ use_all_ec_sign_verify(_Config) -> + + %%-------------------------------------------------------------------- + use_all_ecdh_generate_compute(Config) -> +- Curves = crypto:supports(curves) -- [ed25519, ed448, x25519, x448], ++ SkipCurves0 = [ed25519, ed448, x25519, x448], ++ SkipCurves = ++ case crypto:info_fips() of ++ enabled -> ++ [secp192r1, prime192v1, sect163k1, sect163r2 | SkipCurves0]; ++ _ -> ++ SkipCurves0 ++ end, ++ Curves = crypto:supports(curves) -- SkipCurves, + do_dh_curves(Config, Curves). + + use_all_eddh_generate_compute(Config) -> diff --git a/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch b/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch new file mode 100644 index 0000000..3181670 --- /dev/null +++ b/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch @@ -0,0 +1,37 @@ +From: Sverker Eriksson +Date: Tue, 20 Jun 2023 14:50:27 +0200 +Subject: [PATCH] crypto_SUITE: Fix safe primes for DH with FIPS + +FIPs on OpenSSL 3 seems to demand P to be a safe prime +where Q = (P-1)/2 is also prime. + +diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl +index 1179a516b2..eea60a523d 100644 +--- a/lib/crypto/test/crypto_SUITE.erl ++++ b/lib/crypto/test/crypto_SUITE.erl +@@ -1220,6 +1220,15 @@ generate_compute(Config) when is_list(Config) -> + compute_bug() -> + [{doc, "Test that it works even if the Secret is smaller than expected"}]. + compute_bug(_Config) -> ++ case crypto:info_fips() of ++ enabled -> ++ %% FIPs on OpenSSL 3 seems to demand P to be a safe prime ++ %% where Q = (P-1)/2 is also prime. ++ skip; ++ _ -> do_compute_bug() ++ end. ++ ++do_compute_bug() -> + ExpectedSecret = <<118,89,171,16,156,18,156,103,189,134,130,49,28,144,111,241,247,82,79,32,228,11,209,141,119,176,251,80,105,143,235,251,203,121,223,211,129,3,233,133,45,2,31,157,24,111,5,75,153,66,135,185,128,115,229,178,216,39,73,52,80,151,8,241,34,52,226,71,137,167,53,48,59,224,175,154,89,110,76,83,24,117,149,21,72,6,186,78,149,74,188,56,98,244,30,77,108,248,88,194,195,237,23,51,20,242,254,123,21,12,209,74,217,168,230,65,7,60,211,139,128,239,234,153,22,229,180,59,159,121,41,156,121,200,177,130,163,162,54,224,93,1,94,11,177,254,118,28,156,26,116,10,207,145,219,166,214,189,214,230,221,170,228,15,69,88,31,68,94,255,113,58,49,82,86,192,248,176,131,133,39,186,194,172,206,84,184,16,66,68,153,128,178,227,27,118,52,130,122,92,24,222,102,195,221,207,255,13,152,175,65,32,167,84,54,244,243,109,244,18,234,16,159,224,188,2,106,123,27,17,131,171,226,34,111,251,62,119,155,124,221,124,254,62,97,167,1,105,116,98,98,19,197,30,72,180,79,221,100,134,120,117,124,85,73,132,224,223,222,41,155,137,218,130,238,237,157,161,134,150,69,206,91,141,17,89,120,218,235,229,37,150,76,197,7,157,56,144,42,203,137,100,200,72,141,194,239,1,67,236,238,183,48,214,75,76,108,235,3,237,67,40,137,45,182,236,246,37,116,103,144,237,142,211,88,233,11,24,21,218,41,245,250,51,130,250,104,74,189,17,69,145,70,50,50,215,253,155,10,128,41,114,185,211,82,164,72,92,17,145,104,66,6,140,226,80,43,62,1,166,216,153,118,96,15,147,126,137,118,191,192,75,149,241,206,18,92,17,154,215,219,18,6,139,190,103,210,156,184,29,224,213,157,60,112,189,104,220,125,40,186,50,119,17,143,136,149,38,74,107,21,192,59,61,59,42,231,144,59,175,3,176,87,23,16,122,54,31,82,34,230,211,44,81,41,47,86,37,228,175,130,148,88,136,131,254,241,202,99,199,175,1,141,215,124,155,120,43,141,89,11,140,120,141,29,35,82,219,155,204,75,12,66,241,253,33,250,84,24,85,68,13,80,85,142,227,34,139,26,146,24>>, + OthersPublicKey = 635619632099733175381667940709387641100492974601603060984753028943194386334921787463327680809776598322996634648015962954045728174069768874873236397421720142610982770302060309928552098274817978606093380781524199673890631795310930242601197479471368910519338301177304682162189801040921618559902948819107531088646753320486728060005223263561551402855338732899079439899705951063999951507319258050864346087428042978411873495523439615429804957374639092580169417598963105885529553632847023899713490485619763926900318508906706745060947269748612049634207985438016935262521715769812475329234748426647554362991758104620357149045960316987533503707855364806010494793980069245562784050236811004893018183726397041999426883788660276453352521120006817370050691205529335316794439089316232980047277245051173281601960196573681285904611182521967067911862467395705665888521948321299521549941618586026714676885890192323289343756440666276226084448279082483536164085883288884231665240707495770544705648564889889198060417915693315346959170105413290799314390963124178046425737828369059171472978294050322371452255088799865552038756937873388385970088906560408959959429398326288750834357514847891423941047433478384621074116184703014798814515161475596555032391555842, + MyPrivateKey = 387759582879975726965038486537011291913744975764132199838375902680222019267527675651273586836110220500657652661706223760165097275862806031329642160439090779625708664007910974206651834216043397115514725827856461492311499129200688538220719685637154290305617686974719521885238198226075381217068175824097878445476010193039590876624464274744156624589136789060427283492343902761765833713520850870233407503430180028104167029073459918756981323130062648615262139444306321256382009848217866984408901761817655567071716275177768316006340055589170095799943481591033461616307776069027985761229636731465482676467627154100912586936231051371168178564599296638350391246393336702334311781595616786107810962134407697848002331639021101685320844880636050048769216986088652236979636019052557155807310341483407890060105599892252118584570558049301477535792498672552850760356632076013402382600669875697284264329434950712239302528367835155163504374877787288116104285944993818319105835423479332617802010952731990182088670508346704423006877514817882782443833997288652405892920173712497948376815825396272381214976859009518623799156300136570204539240675245115597412280078940442452936425561984312708387584800789375684525365060589104566195610526570099527133097201479, +@@ -4403,8 +4412,7 @@ ecdh() -> + ). + + dh() -> +- {dh, 90970053988169282502023478715631717259407236400413906591937635666709823903223997309250405131675572047545403771567755831138144089197560332757755059848492919215391041119286178688014693040542889497092308638580104031455627238700168892909539193174537248629499995652186913900511641708112112482297874449292467498403, 2}. +- ++ {dh, 16#FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF97D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD65612433F51F5F066ED0856365553DED1AF3B557135E7F57C935984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE73530ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FBB96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB190B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F619172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD733BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA886B423861285C97FFFFFFFFFFFFFFFF, 2}. + + + rsa_oaep() -> diff --git a/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch b/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch new file mode 100644 index 0000000..770826f --- /dev/null +++ b/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch @@ -0,0 +1,53 @@ +From: Sverker Eriksson +Date: Tue, 20 Jun 2023 15:29:57 +0200 +Subject: [PATCH] crypto: Skip entire engine_SUITE if notsup + + +diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl +index 8907d3968f..b2c25bdcae 100644 +--- a/lib/crypto/test/engine_SUITE.erl ++++ b/lib/crypto/test/engine_SUITE.erl +@@ -136,20 +136,23 @@ groups() -> + + + init_per_suite(Config) -> +- try {os:type(), crypto:info_lib()} of +- {_, [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}]} -> ++ try {engine_supported(), os:type(), crypto:info_lib()} of ++ {false,_,[{_,_,OpenSSLversion}]} -> ++ {skip, "Engine not supported by " ++ OpenSSLversion}; ++ ++ {_,_, [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}]} -> + {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"}; + +- {_, [{_,_,<<"LibreSSL 2.1.",_/binary>>}]} -> ++ {_,_, [{_,_,<<"LibreSSL 2.1.",_/binary>>}]} -> + {skip, "Problem with engine on older LibreSSL 2.1.*"}; + +- {{unix,darwin}, _} -> ++ {_,{unix,darwin}, _} -> + {skip, "Engine unsupported on Darwin"}; +- +- {{win32,_}, _} -> ++ ++ {_,{win32,_}, _} -> + {skip, "Engine unsupported on Windows"}; +- +- {OS, Res} -> ++ ++ {_,OS, Res} -> + ct:log("crypto:info_lib() -> ~p\nos:type() -> ~p", [Res,OS]), + try crypto:start() of + ok -> +@@ -166,6 +169,11 @@ init_per_suite(Config) -> + end_per_suite(_Config) -> + ok. + ++engine_supported() -> ++ try crypto:engine_list(), true ++ catch error:notsup -> false ++ end. ++ + %%-------------------------------------------------------------------- + init_per_group(engine_stored_key, Config) -> + group_load_engine(Config, [engine_method_rsa]); diff --git a/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch b/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch new file mode 100644 index 0000000..36a0c8b --- /dev/null +++ b/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch @@ -0,0 +1,21 @@ +From: Sverker Eriksson +Date: Tue, 20 Jun 2023 20:55:03 +0200 +Subject: [PATCH] crypto: Fix doc for FIPS with OpenSSL 3 + + +diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml +index dcc86cd49c..4bc019f244 100644 +--- a/lib/crypto/doc/src/crypto_app.xml ++++ b/lib/crypto/doc/src/crypto_app.xml +@@ -50,9 +50,9 @@ + LibreSSL should also work.

+ +

The crypto app is tested daily with at least one version of each of the +- OpenSSL 1.0.1, 1.0.2, 1.1.0, 1.1.1 and 3.0. FIPS mode is also tested for 1.0.1 and 1.0.2.

++ OpenSSL 1.0.1, 1.0.2, 1.1.0, 1.1.1 and 3.0. FIPS mode is also tested for 1.0.1, 1.0.2 and 3.0.

+ +-

Using OpenSSL 3.0 with Engines or in FIPS mode is not yet supported by the OTP/crypto app.

++

Using OpenSSL 3.0 with Engines is not yet supported by the OTP/crypto app.

+ +

Source releases of OpenSSL can be downloaded from the OpenSSL project home page, + or mirror sites listed there. From 88aca5c203ffa55c07661a5e05deeb8c7f21ed36 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 20 Sep 2023 11:07:56 +0200 Subject: [PATCH 302/340] Erlang ver. 26.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 21 +- otp-0002-Remove-rpath.patch | 2 +- otp-0006-Add-extra-search-directory.patch | 4 +- ...ate_key-3-for-ecdh-to-only-use-OpenS.patch | 215 ----- ...ssl_BN_param_from_bin_sz-to-not-abus.patch | 102 --- ...-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch | 22 - ...IPS-bug-in-check_pkey_algorithm_type.patch | 18 - ...nge-to-longer-dss-keys-acceptable-to.patch | 28 - ...Remove-sha-1-as-hash-for-dss-if-FIPS.patch | 33 - ...ove-md5-ripemd160-and-sha-as-hash-fo.patch | 24 - ...-generate-ec-key-by-name-if-possible.patch | 284 ------ ...rypto_SUITE-Skip-sha-1-sign-for-FIPS.patch | 59 -- ...0-crypto-Unalias-some-ec-curve-names.patch | 806 ------------------ ...Skip-ec-curves-with-224-bits-if-FIPS.patch | 78 -- ...ITE-Fix-safe-primes-for-DH-with-FIPS.patch | 37 - ...o-Skip-entire-engine_SUITE-if-notsup.patch | 53 -- ...ypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch | 21 - sources | 2 +- 18 files changed, 9 insertions(+), 1800 deletions(-) delete mode 100644 otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch delete mode 100644 otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch delete mode 100644 otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch delete mode 100644 otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch delete mode 100644 otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch delete mode 100644 otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch delete mode 100644 otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch delete mode 100644 otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch delete mode 100644 otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch delete mode 100644 otp-0020-crypto-Unalias-some-ec-curve-names.patch delete mode 100644 otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch delete mode 100644 otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch delete mode 100644 otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch delete mode 100644 otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch diff --git a/erlang.spec b/erlang.spec index da51e3b..b4e6469 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.0.2 -Release: 3%{?dist} +Version: 26.1 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -110,20 +110,6 @@ Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch Patch9: otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch Patch10: otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch -Patch11: otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch -Patch12: otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch -Patch13: otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch -Patch14: otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch -Patch15: otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch -Patch16: otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch -Patch17: otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch -Patch18: otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch -Patch19: otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch -Patch20: otp-0020-crypto-Unalias-some-ec-curve-names.patch -Patch21: otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch -Patch22: otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch -Patch23: otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch -Patch24: otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1982,6 +1968,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Sep 20 2023 Peter Lemenkov - 26.1-1 +- Ver. 26.1 + * Tue Aug 8 2023 Peter Lemenkov - 26.0.2-3 - Reenable OpenSSL 3 diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index b906050..c3685c9 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 25167a8a3a..2345970fa9 100644 +index 1691a7d120..48dcff51d0 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -147,7 +147,7 @@ endif diff --git a/otp-0006-Add-extra-search-directory.patch b/otp-0006-Add-extra-search-directory.patch index 3c7339a..9717baa 100644 --- a/otp-0006-Add-extra-search-directory.patch +++ b/otp-0006-Add-extra-search-directory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index f420337eb7..7e056ac2f6 100644 +index c5ba677c6e..0d23c61c0c 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl -@@ -89,11 +89,17 @@ init(Ref, Parent, [Root,Mode]) -> +@@ -90,11 +90,17 @@ init(Ref, Parent, [Root,Mode]) -> IPath = case Mode of interactive -> diff --git a/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch b/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch deleted file mode 100644 index ca059e6..0000000 --- a/otp-0011-crypto-Fix-generate_key-3-for-ecdh-to-only-use-OpenS.patch +++ /dev/null @@ -1,215 +0,0 @@ -From: Sverker Eriksson -Date: Wed, 7 Jun 2023 18:52:46 +0200 -Subject: [PATCH] crypto: Fix generate_key/3 for ecdh to only use OpenSSL 3.0 - API - -to prepare for using FIPS on OpenSSL 3.0 - -diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 2345970fa9..28f7b595e8 100644 ---- a/lib/crypto/c_src/Makefile.in -+++ b/lib/crypto/c_src/Makefile.in -@@ -205,9 +205,9 @@ $(LIBDIR)/otp_test_engine$(TYPEMARKER).dll: $(TEST_ENGINE_OBJS) - $(V_LD) $(LDFLAGS) -o $@ $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(TEST_ENGINE_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME) $(SSL_EXTRA_LIBS) - endif - --$(OBJDIR)/ec$(TYPEMARKER).o: ec.c -- $(V_at)$(INSTALL_DIR) $(OBJDIR) -- $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< -+# $(OBJDIR)/ec$(TYPEMARKER).o: ec.c -+# $(V_at)$(INSTALL_DIR) $(OBJDIR) -+# $(V_CC) -c -o $@ $(ALL_CFLAGS) $(CRYPTO_NO_DEPRECATE_WARN) $< - - $(OBJDIR)/%$(TYPEMARKER).o: %.c - $(V_at)$(INSTALL_DIR) $(OBJDIR) -diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c -index 124582c4f8..852f3ba79c 100644 ---- a/lib/crypto/c_src/ec.c -+++ b/lib/crypto/c_src/ec.c -@@ -24,6 +24,8 @@ - #ifdef HAVE_EC - # if defined(HAS_3_0_API) - -+# include -+ - int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - OSSL_PARAM params[], int *i, - size_t *order_size) -@@ -253,13 +255,7 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) - } - - --int get_ec_private_key_2(ErlNifEnv* env, -- ERL_NIF_TERM curve, ERL_NIF_TERM key, -- EVP_PKEY **pkey, -- ERL_NIF_TERM *ret, -- size_t *order_size); -- --int get_ec_private_key_2(ErlNifEnv* env, -+static int get_ec_private_key_2(ErlNifEnv* env, - ERL_NIF_TERM curve, ERL_NIF_TERM key, - EVP_PKEY **pkey, - ERL_NIF_TERM *ret, -@@ -319,7 +315,8 @@ int get_ec_private_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) - return 0; - } - --int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY **peer_pkey, ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret); -+static int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY *peer_pkey, -+ ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret); - - ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) - { /* (Curve, PrivKey|undefined) */ -@@ -339,9 +336,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - - /* Get the two keys, pub as binary and priv as BN. - Since the private key is explicitly given, it must be calculated. -- I haven't found any way to do that with the pure 3.0 interface yet. - */ -- if (!mk_pub_key_binary(env, &peer_pkey, &pubkey_bin, &ret)) -+ if (!mk_pub_key_binary(env, peer_pkey, &pubkey_bin, &ret)) - goto err; - - if (!EVP_PKEY_get_bn_param(peer_pkey, "priv", &priv_bn)) -@@ -398,67 +394,81 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - return ret; - } - --int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY **peer_pkey, ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret) -+static int mk_pub_key_binary(ErlNifEnv* env, EVP_PKEY *peer_pkey, -+ ErlNifBinary *pubkey_bin, ERL_NIF_TERM *ret) - { -- EC_KEY *ec_key = NULL; -- EC_POINT *public_key = NULL; -- EC_GROUP *group = NULL; -- BIGNUM *priv_bn = NULL; -- -- *ret = atom_undefined; -- -- /* Use the deprecated interface to get the curve and -- private key in pre 3.0 form: */ -- if ((ec_key = EVP_PKEY_get1_EC_KEY(*peer_pkey)) == NULL) -- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC key")); -- -- if ((group = EC_GROUP_dup(EC_KEY_get0_group(ec_key))) == NULL) -+ size_t pub_key_size = 0; -+ size_t group_name_size = 0; -+ char group_name_buf[20]; -+ char* group_name = group_name_buf; -+ int group_nid; -+ EC_GROUP* ec_group = NULL; -+ EC_POINT* pub_key = NULL; -+ BIGNUM* priv_bn = NULL; -+ int ok = 0; -+ -+ /* This code was inspired by -+ * https://github.com/openssl/openssl/issues/18437 -+ * which first tried to get public key directly with -+ * EVP_PKEY_get_octet_string_param(peer_pkey, OSSL_PKEY_PARAM_PUB_KEY,..) -+ * -+ * I removed that since I don't know what key format that will produce -+ * if it succeeds. That is, we go directly to the "fallback" and calculate -+ * the public key. -+ */ -+ -+ if (!EVP_PKEY_get_utf8_string_param(peer_pkey, OSSL_PKEY_PARAM_GROUP_NAME, -+ NULL, 0, &group_name_size)) -+ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group name size")); -+ -+ if (group_name_size >= sizeof(group_name_buf)) -+ group_name = enif_alloc(group_name_size + 1); -+ if (!EVP_PKEY_get_utf8_string_param(peer_pkey, OSSL_PKEY_PARAM_GROUP_NAME, -+ group_name, group_name_size+1, -+ NULL)) -+ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group name")); -+ -+ group_nid = OBJ_sn2nid(group_name); -+ if (group_nid == NID_undef) -+ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC group nid")); -+ -+ ec_group = EC_GROUP_new_by_curve_name(group_nid); -+ if (ec_group == NULL) - assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get EC_GROUP")); - -- if ((public_key = EC_POINT_new(group)) == NULL) -+ pub_key = EC_POINT_new(ec_group); -+ if (pub_key == NULL) - assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't create POINT")); - -- if (!EC_POINT_copy(public_key, EC_GROUP_get0_generator(group))) -- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't copy POINT")); -- -- /* Make the corresponding public key */ -- if (!EVP_PKEY_get_bn_param(*peer_pkey, "priv", &priv_bn)) -+ if (!EVP_PKEY_get_bn_param(peer_pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv_bn)) - assign_goto(*ret, err, EXCP_BADARG_N(env, 1, "Couldn't get peer priv key bytes")); - -- if (BN_is_zero(priv_bn)) -- assign_goto(*ret, err, EXCP_BADARG_N(env, 1, "peer priv key must not be 0")); -- -- if (!EC_POINT_mul(group, public_key, priv_bn, NULL, NULL, NULL)) -+ if (!EC_POINT_mul(ec_group, pub_key, priv_bn, NULL, NULL, NULL)) - assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't multiply POINT")); - -- if (!EC_KEY_set_public_key(ec_key, public_key)) -- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't set EC_KEY")); -- -- if (!EVP_PKEY_assign_EC_KEY(*peer_pkey, ec_key)) -- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't assign EC_KEY to PKEY")); -- -- /* And now get the binary representation (by some reason we can't read it from -- peer_pubkey in the calling function with 3.0-functions.) -- */ -- { -- point_conversion_form_t form = EC_KEY_get_conv_form(ec_key); -- size_t dlen = EC_POINT_point2oct(group, public_key, form, NULL, 0, NULL); -- -- if (!enif_alloc_binary(dlen, pubkey_bin) || -- !EC_POINT_point2oct(group, public_key, form, pubkey_bin->data, pubkey_bin->size, NULL) -- ) -- assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get public key")); -+ pub_key_size = EC_POINT_point2oct(ec_group, pub_key, -+ POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL); -+ if (pub_key_size == 0) -+ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get pub_key_size")); -+ -+ enif_alloc_binary(pub_key_size, pubkey_bin); -+ if (!EC_POINT_point2oct(ec_group, pub_key, POINT_CONVERSION_UNCOMPRESSED, -+ pubkey_bin->data, -+ pubkey_bin->size, NULL)) { -+ enif_release_binary(pubkey_bin); -+ assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get pub key bytes")); - } - -- err: -- if (public_key) EC_POINT_free(public_key); -- if (group) EC_GROUP_free(group); -+ *ret = enif_make_binary(env, pubkey_bin); -+ ok = 1; -+ -+err: -+ if (group_name != group_name_buf) enif_free(group_name); -+ if (pub_key) EC_POINT_free(pub_key); -+ if (ec_group) EC_GROUP_free(ec_group); - if (priv_bn) BN_free(priv_bn); - -- if (*ret == atom_undefined) -- return 1; -- else -- return 0; -+ return ok; - } - - # endif /* HAS_3_0_API */ -@@ -908,10 +918,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - - # endif /* ! HAS_3_0_API */ - --#endif /* HAVE_EC */ -- -+#else /* ifndef HAVE_EC */ - --#if ! defined(HAVE_EC) - ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) - { /* (Curve, PrivKey) */ - return EXCP_NOTSUP_N(env, 0, "EC not supported"); diff --git a/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch b/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch deleted file mode 100644 index fca43ef..0000000 --- a/otp-0012-crypto-Fix-get_ossl_BN_param_from_bin_sz-to-not-abus.patch +++ /dev/null @@ -1,102 +0,0 @@ -From: Sverker Eriksson -Date: Wed, 7 Jun 2023 18:50:23 +0200 -Subject: [PATCH] crypto: Fix get_ossl_BN_param_from_bin_sz() to not abuse - ErlNifBinary - -It is not allowed to write to the binary buffer returned by -enif_inspect_binary() (even if you created the binary yourself). - -In DEBUG built VM such abuse will be punished with: - -"Readonly data written by NIF, checksums differ 8000425 != 25040008 -ABORTING" - -Instead use enif_make_new_binary() to create a writable binary buffer. - -diff --git a/lib/crypto/c_src/bn.c b/lib/crypto/c_src/bn.c -index f06ed9002e..5e9fec5093 100644 ---- a/lib/crypto/c_src/bn.c -+++ b/lib/crypto/c_src/bn.c -@@ -212,23 +212,38 @@ int get_ossl_BN_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL - return get_ossl_BN_param_from_bin_sz(env, key, bin, dest, NULL); - } - --int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest, size_t *size) -+int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, -+ OSSL_PARAM *dest, size_t *size) - { - BIGNUM *bn = NULL; -- ErlNifBinary tmp; -+ int ok = 0; - -- if (!get_bn_from_bin_sz(env, bin, &bn, size) || -- !enif_inspect_binary(env, bin_from_bn(env,bn), &tmp) || // Allocate buf -- BN_bn2nativepad(bn, tmp.data, tmp.size) < 0) {// Fill with BN in right endianity -- if (bn) BN_free(bn); -+ if (!get_bn_from_bin_sz(env, bin, &bn, size)) - return 0; -- } -- -- *dest = OSSL_PARAM_construct_BN(key, tmp.data, tmp.size); -- if (bn) BN_free(bn); -+ -+ ok = get_ossl_BN_param_from_bn(env, key, bn, dest); -+ BN_free(bn); -+ return ok; -+} -+ -+int get_ossl_BN_param_from_bn(ErlNifEnv* env, char* key, const BIGNUM* bn, -+ OSSL_PARAM *dest) -+{ -+ const size_t bn_sz = BN_num_bytes(bn); -+ unsigned char* tmp_buf; -+ ERL_NIF_TERM dummy_term; -+ -+ /* Create a binary term just as a convenient tmp buffer */ -+ tmp_buf = enif_make_new_binary(env, bn_sz, &dummy_term); -+ if (BN_bn2nativepad(bn, tmp_buf, bn_sz) < 0) // Fill with BN in right endianity -+ return 0; -+ -+ *dest = OSSL_PARAM_construct_BN(key, tmp_buf, bn_sz); - return 1; - } - -+ -+ - int get_ossl_param_from_bin_in_list(ErlNifEnv* env, char* key, ERL_NIF_TERM *listcell, OSSL_PARAM *dest) - { - ERL_NIF_TERM head; -diff --git a/lib/crypto/c_src/bn.h b/lib/crypto/c_src/bn.h -index 5e207aed2d..662a32dc29 100644 ---- a/lib/crypto/c_src/bn.h -+++ b/lib/crypto/c_src/bn.h -@@ -38,6 +38,7 @@ int get_bn_from_bin_sz(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp, size_t* - int get_ossl_octet_string_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest); - int get_ossl_BN_param_from_bin(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest); - int get_ossl_BN_param_from_bin_sz(ErlNifEnv* env, char* key, ERL_NIF_TERM bin, OSSL_PARAM *dest, size_t *size); -+int get_ossl_BN_param_from_bn(ErlNifEnv* env, char* key, const BIGNUM* bn, OSSL_PARAM *dest); - - int get_ossl_param_from_bin_in_list(ErlNifEnv* env, char* key, ERL_NIF_TERM *listcell, OSSL_PARAM *dest); - #endif -diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c -index 852f3ba79c..af5f5d6f4a 100644 ---- a/lib/crypto/c_src/ec.c -+++ b/lib/crypto/c_src/ec.c -@@ -189,15 +189,8 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - } else - assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad last field")); - -- { -- ErlNifBinary tmp; -- -- if (!enif_inspect_binary(env, bin_from_bn(env,p), &tmp) || // Allocate buf -- BN_bn2nativepad(p, tmp.data, tmp.size) < 0) {// Fill with BN in right endianity -- assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "BN padding failed")); -- } -- params[(*i)++] = OSSL_PARAM_construct_BN("p", tmp.data, tmp.size); -- } -+ if (!get_ossl_BN_param_from_bn(env, "p", p, ¶ms[(*i)++])) -+ assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "BN padding failed")); - # endif - } - else diff --git a/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch b/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch deleted file mode 100644 index 1ae1141..0000000 --- a/otp-0013-crypto-Re-enable-FIPS_SUPPORT-for-HAS_3_0_API.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sverker Eriksson -Date: Wed, 7 Jun 2023 20:38:11 +0200 -Subject: [PATCH] crypto: Re-enable FIPS_SUPPORT for HAS_3_0_API - - -diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h -index d034590a2e..b73141a530 100644 ---- a/lib/crypto/c_src/openssl_config.h -+++ b/lib/crypto/c_src/openssl_config.h -@@ -468,12 +468,6 @@ do { \ - # undef FIPS_SUPPORT - #endif - --/* Disable FIPS for 3.0 temporaryly until the support is added */ --#if defined(FIPS_SUPPORT) && \ -- defined(HAS_3_0_API) --# undef FIPS_SUPPORT --#endif -- - #if defined(FIPS_SUPPORT) && \ - defined(HAS_3_0_API) - # define FIPS_mode() EVP_default_properties_is_fips_enabled(NULL) diff --git a/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch b/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch deleted file mode 100644 index fea8a04..0000000 --- a/otp-0014-crypto-Fix-FIPS-bug-in-check_pkey_algorithm_type.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Sverker Eriksson -Date: Mon, 12 Jun 2023 17:14:19 +0200 -Subject: [PATCH] crypto: Fix FIPS bug in check_pkey_algorithm_type - - -diff --git a/lib/crypto/c_src/pkey.c b/lib/crypto/c_src/pkey.c -index bfdcfe3553..afdff78f48 100644 ---- a/lib/crypto/c_src/pkey.c -+++ b/lib/crypto/c_src/pkey.c -@@ -100,7 +100,7 @@ static int check_pkey_algorithm_type(ErlNifEnv *env, - - - #ifdef HAVE_EDDSA -- if (FIPS_MODE()) -+ if (FIPS_MODE() && algorithm == atom_eddsa) - assign_goto(*err_return, err, EXCP_NOTSUP_N(env, alg_arg_num, "Unsupported algorithm in FIPS mode")); - #endif - diff --git a/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch b/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch deleted file mode 100644 index cf011e3..0000000 --- a/otp-0015-crypto_SUITE-Change-to-longer-dss-keys-acceptable-to.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 13 Jun 2023 18:58:31 +0200 -Subject: [PATCH] crypto_SUITE: Change to longer dss keys acceptable to FIPS - - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index 0572feaf33..29dba82c41 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -3677,13 +3677,13 @@ rsa_private_stronger() -> - dss_plain() -> - rsa_plain(). - dss_public() -> -- 25854665488880835237281628794585130313500176551981812527054397586638455298000483144002221850980183404910190346416063318160497344811383498859129095184158800144312512447497510551471331451396405348497845813002058423110442376886564659959543650802132345311573634832461635601376738282831340827591903548964194832978. -+ 16#289ff18c32a56bb0b8839370647683a38a5a7e291410b93207212adc8088d30f93e9e4abc523f3d46936e7d5c90d88742b36afd37563408f15c8c1a4f7ac24bf05f01008ffee70c8825d57c3a9308bad8a095af2b53b2dda3cbed846d95e301eb9b84766415d11f6c33209a0d28571096ab04a79aa0dc465997529686b68e887cd8a205c2dc8195aef0422eba9979f549ac85548e419413643b7244361153ada1480d238cd00dc16527938955548dd5d027ded1029eeeb8ed6c61b4cd59341d8b15466e9da890a989996f4d7691e6072de136af28b5874bf08bd1f8a60cfb1c00888132909f515e04bce81b02951aa41baac68ffdb8c5dc77a1d32d8f2c10dd7. - dss_private() -> -- 441502407453038284293378221372000880210588566361. -+ 16#6132e551cdac88409183bd37ee1452cd247d4834b08814b275be3ff5. - dss_params() -> -- [109799869232806890760655301608454668257695818999841877165019612946154359052535682480084145133201304812979481136659521529774182959764860329095546511521488413513097576425638476458000255392402120367876345280670101492199681798674053929238558140260669578407351853803102625390950534052428162468100618240968893110797, -- 1349199015905534965792122312016505075413456283393, -- 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669]. -+ [16#f2d39ed3062b13c916273600a0f2a029e86d7a4b9217b4f1815bf2b24d9710a57ab33f997294b014585b8d0198dfdccbcd75314da5ff85aa344b45adaeaa979b51a312a7bfa94472fb633f1a6f156bb4458867dfd38403f06b851f00fe2d3484077bded71ab7513d04a140220575fb693395480e4c8402b7a46cec2d37a778c305accd1f13e9f62e865315f4b22cc467c8986ec8e4961ddf810566b0c4ee369ac6aa15e43f4744005826f5bde8071a19e30b6909aac4b3d174237270dad02799d09b8a2cc5f22e66894b5422228b2c234f11f5a771c5b89cf465a2acecbbeeaa1725fe8f9b59422be8991052cb556ddf2c8ce8fa9206dbf39feadc194e00f8e5, -+ 16#8000000000000000c118f49835e4ef733c4d15800fcf059e884d31b1, -+ 16#e3a93c09da6f560e4d483a382a4c546f2335c36a4c35ac1463c08a3e6dd415df56fdc537f25fd5372be63e4f5300780b782f1acd01c8b4eb33414615fd0ea82573acba7ef83f5a943854151afc2d7dfe121fb8cd03335b065b549c5dcc606be9052483bc284e12ac3c8dba09b426e08402030e70bc1cc2bf8957c4ba0630f3f32ad689389ac47443176063f247d9e2296b3ea5b5bc2335828ea1a080ed35918dee212fd031279d1b894f01afec523833669eac031a420e540ba1320a59c424a3e5849a460a56bcb001647885b1433c4f992971746bfe2977ce7259c550b551a6c35761e4a41af764e8d92132fcc0a59d1684eab90d863f29f41cf7578faa908c]. - - ec_key_named() -> - Curve = hd(crypto:ec_curves()), diff --git a/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch b/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch deleted file mode 100644 index d073b00..0000000 --- a/otp-0016-crypto_SUITE-Remove-sha-1-as-hash-for-dss-if-FIPS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 13 Jun 2023 19:00:31 +0200 -Subject: [PATCH] crypto_SUITE: Remove sha-1 as hash for dss if FIPS - - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index 29dba82c41..00d4a0a6fe 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -2257,15 +2257,19 @@ group_config(dss = Type, Config) -> - Public = dss_params() ++ [dss_public()], - Private = dss_params() ++ [dss_private()], - SupportedHashs = proplists:get_value(hashs, crypto:supports(), []), -- DssHashs = -+ DssHashs0 = - case crypto:info_lib() of - [{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer), LibVer > 16#10001000 -> -- [sha, sha224, sha256, sha384, sha512]; -+ [sha224, sha256, sha384, sha512]; - [{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer), LibVer > 16#10000000 -> -- [sha, sha224, sha256]; -+ [sha224, sha256]; - _Else -> -- [sha] -+ [] - end, -+ DssHashs = case crypto:info_fips() of -+ enabled -> DssHashs0; -+ _ -> [sha | DssHashs0] -+ end, - SignVerify = [{Type, Hash, Public, Private, Msg} - || Hash <- DssHashs, - lists:member(Hash, SupportedHashs)], diff --git a/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch b/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch deleted file mode 100644 index 6d436a2..0000000 --- a/otp-0017-crypto_SUITE-Remove-md5-ripemd160-and-sha-as-hash-fo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 13 Jun 2023 19:02:32 +0200 -Subject: [PATCH] crypto_SUITE: Remove md5, ripemd160 and sha as hash for rsa - sign if FIPS - - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index 00d4a0a6fe..afacdde051 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -2420,7 +2420,12 @@ rsa_sign_verify_tests(Config, Msg, Public, Private, PublicS, PrivateS, OptsToTry - end. - - rsa_sign_verify_tests(Msg, Public, Private, PublicS, PrivateS, OptsToTry) -> -- gen_rsa_sign_verify_tests([md5, ripemd160, sha, sha224, sha256], Msg, Public, Private, -+ Hashs0 = [sha224, sha256], -+ Hashs = case crypto:info_fips() of -+ enabled -> Hashs0; -+ _ -> [md5, ripemd160, sha | Hashs0] -+ end, -+ gen_rsa_sign_verify_tests(Hashs, Msg, Public, Private, - [undefined | OptsToTry]) ++ - gen_rsa_sign_verify_tests([sha384, sha512], Msg, PublicS, PrivateS, - [undefined | OptsToTry]). diff --git a/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch b/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch deleted file mode 100644 index 02603cd..0000000 --- a/otp-0018-crypto-Try-generate-ec-key-by-name-if-possible.patch +++ /dev/null @@ -1,284 +0,0 @@ -From: Sverker Eriksson -Date: Wed, 14 Jun 2023 22:00:35 +0200 -Subject: [PATCH] crypto: Try generate ec key by name if possible - -OpenSSL 3 FIPS does only accept named ec curves. - -So we try that first, and if it fails we retry -with the params passed down by crypto.erl. - -diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c -index af5f5d6f4a..49e1da4fe4 100644 ---- a/lib/crypto/c_src/ec.c -+++ b/lib/crypto/c_src/ec.c -@@ -28,7 +28,8 @@ - - int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - OSSL_PARAM params[], int *i, -- size_t *order_size) -+ size_t *order_size, -+ struct get_curve_def_ctx* gcd) - { - const ERL_NIF_TERM* curve; - int c_arity = -1; -@@ -40,6 +41,7 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - int arity = -1; - const ERL_NIF_TERM* curve_tuple; - -+ - /* Here are two random curve definition examples, one prime_field and - one characteristic_two_field. Both are from the crypto/src/crypto_ec_curves.erl. - -@@ -79,6 +81,23 @@ int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - c_arity != 5) - assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad curve def. Expect 5-tuple.")); - -+ if (gcd->use_curve_name -+ && curve_tuple[1] != atom_undefined -+ && enif_get_atom(env, curve_tuple[1], gcd->curve_name, -+ sizeof(gcd->curve_name), ERL_NIF_LATIN1)) { -+ ErlNifBinary order_bin; -+ params[(*i)++] = OSSL_PARAM_construct_utf8_string("group", gcd->curve_name, 0); -+ -+ if (order_size) { -+ if (!enif_inspect_binary(env, curve[3], &order_bin)) -+ assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad order")); -+ *order_size = order_bin.size; -+ } -+ gcd->use_curve_name = 1; -+ return 1; -+ } -+ gcd->use_curve_name = 0; -+ - if (!get_ossl_octet_string_param_from_bin(env, "generator", curve[2], ¶ms[(*i)++])) - assign_goto(*ret, err, EXCP_ERROR_N(env, 1, "Bad Generator (Point)")); - -@@ -211,6 +230,7 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) - int tpl_arity; - int i = 0; - OSSL_PARAM params[15]; -+ struct get_curve_def_ctx gcd; - EVP_PKEY_CTX *pctx = NULL; - - if (!enif_get_tuple(env, key, &tpl_arity, &tpl_terms) || -@@ -222,19 +242,27 @@ int get_ec_public_key(ErlNifEnv* env, ERL_NIF_TERM key, EVP_PKEY **pkey) - if (!get_ossl_octet_string_param_from_bin(env, "pub", tpl_terms[1], ¶ms[i++])) - assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Bad public key")); - -- if (!get_curve_definition(env, &ret, tpl_terms[0], params, &i, NULL)) -+ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -+ assign_goto(ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); -+ -+ gcd.use_curve_name = 1; -+retry_without_name: -+ if (!get_curve_definition(env, &ret, tpl_terms[0], params, &i, NULL, &gcd)) - goto err; - - params[i++] = OSSL_PARAM_construct_end(); - -- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -- assign_goto(ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); -- - if (EVP_PKEY_fromdata_init(pctx) <= 0) - assign_goto(ret, err, EXCP_ERROR(env, "Can't init fromdata")); - -- if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) -+ if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { -+ if (gcd.use_curve_name) { -+ gcd.use_curve_name = 0; -+ i = 1; -+ goto retry_without_name; -+ } - assign_goto(ret, err, EXCP_ERROR(env, "Can't do fromdata")); -+ } - - if (!*pkey) - assign_goto(ret, err, EXCP_ERROR(env, "Couldn't get a public key")); -@@ -256,24 +284,33 @@ static int get_ec_private_key_2(ErlNifEnv* env, - { - int i = 0; - OSSL_PARAM params[15]; -+ struct get_curve_def_ctx gcd; - EVP_PKEY_CTX *pctx = NULL; - - if (!get_ossl_BN_param_from_bin(env, "priv", key, ¶ms[i++])) - assign_goto(*ret, err, EXCP_BADARG_N(env, 0, "Bad private key")); - -- if (!get_curve_definition(env, ret, curve, params, &i, order_size)) -+ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -+ assign_goto(*ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); -+ -+ gcd.use_curve_name = 1; -+retry_without_name: -+ if (!get_curve_definition(env, ret, curve, params, &i, order_size, &gcd)) - goto err; - - params[i++] = OSSL_PARAM_construct_end(); - -- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -- assign_goto(*ret, err, EXCP_ERROR(env, "Can't make EVP_PKEY_CTX")); -- - if (EVP_PKEY_fromdata_init(pctx) <= 0) - assign_goto(*ret, err, EXCP_ERROR(env, "Can't init fromdata")); - -- if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_KEYPAIR, params) <= 0) -+ if (EVP_PKEY_fromdata(pctx, pkey, EVP_PKEY_KEYPAIR, params) <= 0) { -+ if (gcd.use_curve_name) { -+ gcd.use_curve_name = 0; -+ i = 1; -+ goto retry_without_name; -+ } - assign_goto(*ret, err, EXCP_ERROR(env, "Can't do fromdata")); -+ } - - if (!*pkey) - assign_goto(*ret, err, EXCP_ERROR(env, "Couldn't get a private key")); -@@ -316,9 +353,10 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - ERL_NIF_TERM ret = atom_undefined; - int i = 0; - OSSL_PARAM params[15]; -+ struct get_curve_def_ctx gcd; - EVP_PKEY_CTX *pctx = NULL; - EVP_PKEY *pkey = NULL, *peer_pkey = NULL; -- size_t sz, order_size; -+ size_t sz, order_size = 0; - BIGNUM *priv_bn = NULL; - ErlNifBinary pubkey_bin; - -@@ -338,26 +376,36 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - } - else - { -+ /* Neither the private nor the public key is known, so we generate the pair: */ -+ if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -+ assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_new_from_name")); -+ -+ gcd.use_curve_name = 1; -+ retry_without_name: - /* PrivKey (that is, argv[1]) == atom_undefined */ -- if (!get_curve_definition(env, &ret, argv[0], params, &i, &order_size)) -+ if (!get_curve_definition(env, &ret, argv[0], params, &i, -+ &order_size, &gcd)) - // INSERT "ret" parameter in get_curve_definition !! - assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Couldn't get Curve definition")); - - params[i++] = OSSL_PARAM_construct_end(); - -- /* Neither the private nor the public key is known, so we generate the pair: */ -- if (!(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))) -- assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_new_from_name")); -- - if (EVP_PKEY_keygen_init(pctx) <= 0) - assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_keygen_init")); - - if (!EVP_PKEY_CTX_set_params(pctx, params)) - assign_goto(ret, err, EXCP_ERROR(env, "Can't EVP_PKEY_CTX_set_params")); -- -- if (!EVP_PKEY_generate(pctx, &pkey)) -+ -+ if (!EVP_PKEY_generate(pctx, &pkey)) { -+ if (gcd.use_curve_name) { -+ gcd.use_curve_name = 0; -+ i = 0; -+ goto retry_without_name; -+ } - assign_goto(ret, err, EXCP_ERROR(env, "Couldn't generate EC key")); -- -+ } -+ -+ - /* Get the two keys, pub as binary and priv as BN */ - if (!EVP_PKEY_get_octet_string_param(pkey, "encoded-pub-key", NULL, 0, &sz)) - assign_goto(ret, err, EXCP_ERROR(env, "Can't get pub octet string size")); -@@ -375,6 +423,8 @@ ERL_NIF_TERM ec_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar - assign_goto(ret, err, EXCP_BADARG_N(env, 1, "Couldn't get priv key bytes")); - } - -+ if (order_size == 0) -+ order_size = BN_num_bytes(priv_bn); - ret = enif_make_tuple2(env, - enif_make_binary(env, &pubkey_bin), - bn2term(env, order_size, priv_bn)); -diff --git a/lib/crypto/c_src/ec.h b/lib/crypto/c_src/ec.h -index e53986d64e..f0b0b96207 100644 ---- a/lib/crypto/c_src/ec.h -+++ b/lib/crypto/c_src/ec.h -@@ -26,9 +26,17 @@ - #if defined(HAVE_EC) - - # if defined(HAS_3_0_API) -+ -+struct get_curve_def_ctx -+{ -+ char curve_name[20]; -+ int use_curve_name; -+}; -+ - int get_curve_definition(ErlNifEnv* env, ERL_NIF_TERM *ret, ERL_NIF_TERM def, - OSSL_PARAM params[], int *i, -- size_t *order_size); -+ size_t *order_size, -+ struct get_curve_def_ctx*); - # endif /* HAS_3_0_API */ - - # if ! defined(HAS_3_0_API) -diff --git a/lib/crypto/c_src/ecdh.c b/lib/crypto/c_src/ecdh.c -index 7509d9cb84..f1b0f7eb28 100644 ---- a/lib/crypto/c_src/ecdh.c -+++ b/lib/crypto/c_src/ecdh.c -@@ -42,6 +42,7 @@ ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a - int ret_bin_alloc = 0; - int i = 0, i_key = 0; - OSSL_PARAM params[15]; -+ struct get_curve_def_ctx gcd; - EVP_PKEY_CTX *own_pctx = NULL, *peer_pctx = NULL, *pctx_gen = NULL; - EVP_PKEY *own_pkey = NULL, *peer_pkey = NULL; - int err; -@@ -53,21 +54,29 @@ ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a - if (!get_ossl_octet_string_param_from_bin(env, "pub", argv[0], ¶ms[i++])) - assign_goto(ret, err, EXCP_BADARG_N(env, 0, "Bad peer public key; binary expected")); - -+ /* Build the remote public key in peer_pkey */ -+ peer_pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL); -+ -+ gcd.use_curve_name = 1; -+retry_without_name: - /* Curve definition/name */ -- if (!get_curve_definition(env, &ret, argv[1], params, &i, NULL)) -+ if (!get_curve_definition(env, &ret, argv[1], params, &i, NULL, &gcd)) - goto err; - - /* End of params */ - params[i++] = OSSL_PARAM_construct_end(); - -- /* Build the remote public key in peer_pkey */ -- peer_pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL); -- - if (EVP_PKEY_fromdata_init(peer_pctx) <= 0) - assign_goto(ret, err, EXCP_ERROR(env, "Can't init fromdata")); - -- if (EVP_PKEY_fromdata(peer_pctx, &peer_pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) -+ if (EVP_PKEY_fromdata(peer_pctx, &peer_pkey, EVP_PKEY_PUBLIC_KEY, params) <= 0) { -+ if (gcd.use_curve_name) { -+ gcd.use_curve_name = 0; -+ i = 1; -+ goto retry_without_name; -+ } - assign_goto(ret, err, EXCP_ERROR(env, "Can't do fromdata")); -+ } - - if (!peer_pkey) - assign_goto(ret, err, EXCP_ERROR(env, "No peer_pkey")); -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index afacdde051..e047964daa 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -3695,7 +3695,7 @@ dss_params() -> - 16#e3a93c09da6f560e4d483a382a4c546f2335c36a4c35ac1463c08a3e6dd415df56fdc537f25fd5372be63e4f5300780b782f1acd01c8b4eb33414615fd0ea82573acba7ef83f5a943854151afc2d7dfe121fb8cd03335b065b549c5dcc606be9052483bc284e12ac3c8dba09b426e08402030e70bc1cc2bf8957c4ba0630f3f32ad689389ac47443176063f247d9e2296b3ea5b5bc2335828ea1a080ed35918dee212fd031279d1b894f01afec523833669eac031a420e540ba1320a59c424a3e5849a460a56bcb001647885b1433c4f992971746bfe2977ce7259c550b551a6c35761e4a41af764e8d92132fcc0a59d1684eab90d863f29f41cf7578faa908c]. - - ec_key_named() -> -- Curve = hd(crypto:ec_curves()), -+ Curve = secp224r1, %hd(crypto:ec_curves()), - {D2_pub, D2_priv} = crypto:generate_key(ecdh, Curve), - {[D2_priv, Curve], [D2_pub, Curve]}. - diff --git a/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch b/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch deleted file mode 100644 index c85e46e..0000000 --- a/otp-0019-crypto_SUITE-Skip-sha-1-sign-for-FIPS.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Sverker Eriksson -Date: Thu, 15 Jun 2023 19:53:14 +0200 -Subject: [PATCH] crypto_SUITE: Skip sha-1 sign for FIPS - - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index e047964daa..c56faa9bc4 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -1268,6 +1268,12 @@ use_all_ec_sign_verify(_Config) -> - crypto:info_fips(), - Curves, - Hashs]), -+ SkipHashs0 = [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, -+ blake2b, blake2s], -+ SkipHashs = case crypto:info_fips() of -+ enabled -> [sha | SkipHashs0]; -+ _ -> SkipHashs0 -+ end, - Results = - [{{Curve,Hash}, - try -@@ -1282,7 +1288,7 @@ use_all_ec_sign_verify(_Config) -> - {C,E} - end} - || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4], -- Hash <- Hashs -- [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, blake2b, blake2s] -+ Hash <- Hashs -- SkipHashs - ], - Fails = - lists:filter(fun({_,true}) -> false; -@@ -1730,14 +1736,19 @@ do_sign_verify({Type, undefined=Hash, Private, Public, Msg, Signature}) -> - end; - - do_sign_verify({Type, Hash, Public, Private, Msg}) -> -- Signature = crypto:sign(Type, Hash, Msg, Private), -- case crypto:verify(Type, Hash, Msg, Signature, Public) of -- true -> -- ct:log("OK crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), -- negative_verify(Type, Hash, Msg, <<10,20>>, Public); -- false -> -- ct:log("ERROR crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), -- ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}}) -+ case {Hash, crypto:info_fips()} of -+ {sha, enabled} -> -+ io:format("Skip sign with SHA for FIPS\n"); -+ _ -> -+ Signature = crypto:sign(Type, Hash, Msg, Private), -+ case crypto:verify(Type, Hash, Msg, Signature, Public) of -+ true -> -+ ct:log("OK crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), -+ negative_verify(Type, Hash, Msg, <<10,20>>, Public); -+ false -> -+ ct:log("ERROR crypto:sign(~p, ~p, ..., ..., ...)", [Type,Hash]), -+ ct:fail({{crypto, verify, [Type, Hash, Msg, Signature, Public]}}) -+ end - end; - do_sign_verify({Type, Hash, Public, Private, Msg, Options}) -> - LibVer = diff --git a/otp-0020-crypto-Unalias-some-ec-curve-names.patch b/otp-0020-crypto-Unalias-some-ec-curve-names.patch deleted file mode 100644 index c3c9df4..0000000 --- a/otp-0020-crypto-Unalias-some-ec-curve-names.patch +++ /dev/null @@ -1,806 +0,0 @@ -From: Sverker Eriksson -Date: Fri, 16 Jun 2023 16:55:41 +0200 -Subject: [PATCH] crypto: Unalias some ec curve names - -to pass OpenSSL the name it accepts. - -diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl -index 6abaacad5c..1cc11aa6eb 100644 ---- a/lib/crypto/src/crypto.erl -+++ b/lib/crypto/src/crypto.erl -@@ -2372,14 +2372,12 @@ nif_curve_params(CurveName) when is_atom(CurveName) -> - x448 -> {evp,CurveName}; - x25519 -> {evp,CurveName}; - _ -> -- Spec = -- try -- crypto_ec_curves:curve(CurveName) -- catch -- _:_ -> -- undefined -- end, -- {Spec, CurveName} -+ try -+ crypto_ec_curves:curve_with_name(CurveName) -+ catch -+ _:_ -> -+ {undefined, CurveName} -+ end - end. - - -diff --git a/lib/crypto/src/crypto_ec_curves.erl b/lib/crypto/src/crypto_ec_curves.erl -index a0a2f99601..3f14c34a26 100644 ---- a/lib/crypto/src/crypto_ec_curves.erl -+++ b/lib/crypto/src/crypto_ec_curves.erl -@@ -1,11 +1,22 @@ - -module(crypto_ec_curves). - ---export([curve/1, curves/0]). -+-export([curve/1, curves/0, curve_with_name/1]). - - curves() -> - proplists:get_value(curves, crypto:supports()) -- [x25519,x448]. - --curve(secp112r1) -> -+real_name(secp192r1) -> prime192v1; -+real_name(secp256r1) -> prime256v1; -+real_name(Name) -> Name. -+ -+curve_with_name(Curve) -> -+ RealName = real_name(Curve), -+ {params(RealName), RealName}. -+ -+curve(Curve) -> -+ params(real_name(Curve)). -+ -+params(secp112r1) -> - { - {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime - {<<16#DB7C2ABF62E35E668076BEAD2088:112>>, %% A -@@ -18,7 +29,7 @@ curve(secp112r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp112r2) -> -+params(secp112r2) -> - { - {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime - {<<16#6127C24C05F38A0AAAF65C0EF02C:112>>, %% A -@@ -31,7 +42,7 @@ curve(secp112r2) -> - <<16#04:8>> %% CoFactor - }; - --curve(secp128r1) -> -+params(secp128r1) -> - { - {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>}, %% Prime - {<<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC:128>>, %% A -@@ -44,7 +55,7 @@ curve(secp128r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp128r2) -> -+params(secp128r2) -> - { - {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>}, %% Prime - {<<16#D6031998D1B3BBFEBF59CC9BBFF9AEE1:128>>, %% A -@@ -57,7 +68,7 @@ curve(secp128r2) -> - <<16#04:8>> %% CoFactor - }; - --curve(secp160k1) -> -+params(secp160k1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime - {<<16#00:8>>, %% A -@@ -70,7 +81,7 @@ curve(secp160k1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp160r1) -> -+params(secp160r1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF:160>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC:160>>, %% A -@@ -83,7 +94,7 @@ curve(secp160r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp160r2) -> -+params(secp160r2) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>, %% A -@@ -96,20 +107,7 @@ curve(secp160r2) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp192r1) -> -- { -- {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime -- {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A -- <<16#64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1:192>>, %% B -- <<16#3045AE6FC8422F64ED579528D38120EAE12196D5:160>>}, %% Seed -- <<16#04:8, -- 16#188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012:192, %% X(p0) -- 16#07192B95FFC8DA78631011ED6B24CDD573F977A11E794811:192>>, %% Y(p0) -- <<16#FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831:192>>, %% Order -- <<16#01:8>> %% CoFactor -- }; -- --curve(secp192k1) -> -+params(secp192k1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37:192>>}, %% Prime - {<<16#00:8>>, %% A -@@ -122,7 +120,7 @@ curve(secp192k1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp224k1) -> -+params(secp224k1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D:224>>}, %% Prime - {<<16#00:8>>, %% A -@@ -135,7 +133,7 @@ curve(secp224k1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp224r1) -> -+params(secp224r1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>, %% A -@@ -148,7 +146,7 @@ curve(secp224r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp256k1) -> -+params(secp256k1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F:256>>}, %% Prime - {<<16#00:8>>, %% A -@@ -161,20 +159,7 @@ curve(secp256k1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp256r1) -> -- { -- {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>}, %% Prime -- {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>, %% A -- <<16#5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B:256>>, %% B -- <<16#C49D360886E704936A6678E1139D26B7819F7E90:160>>}, %% Seed -- <<16#04:8, -- 16#6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296:256, %% X(p0) -- 16#4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5:256>>, %% Y(p0) -- <<16#FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551:256>>, %% Order -- <<16#01:8>> %% CoFactor -- }; -- --curve(secp384r1) -> -+params(secp384r1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE:256, %% Prime - 16#FFFFFFFF0000000000000000FFFFFFFF:128>>}, -@@ -193,7 +178,7 @@ curve(secp384r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(secp521r1) -> -+params(secp521r1) -> - { - {prime_field, <<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256, %% Prime - 16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256, -@@ -218,7 +203,7 @@ curve(secp521r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime192v1) -> -+params(prime192v1) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A -@@ -231,7 +216,7 @@ curve(prime192v1) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime192v2) -> -+params(prime192v2) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A -@@ -244,7 +229,7 @@ curve(prime192v2) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime192v3) -> -+params(prime192v3) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>, %% A -@@ -257,7 +242,7 @@ curve(prime192v3) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime239v1) -> -+params(prime239v1) -> - { - {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime - {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A -@@ -270,7 +255,7 @@ curve(prime239v1) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime239v2) -> -+params(prime239v2) -> - { - {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime - {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A -@@ -283,7 +268,7 @@ curve(prime239v2) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime239v3) -> -+params(prime239v3) -> - { - {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>}, %% Prime - {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>, %% A -@@ -296,7 +281,7 @@ curve(prime239v3) -> - <<16#01:8>> %% CoFactor - }; - --curve(prime256v1) -> -+params(prime256v1) -> - { - {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>}, %% Prime - {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>, %% A -@@ -309,7 +294,7 @@ curve(prime256v1) -> - <<16#01:8>> %% CoFactor - }; - --curve(sect113r1) -> -+params(sect113r1) -> - { - {characteristic_two_field, 113, {tpbasis,9}}, - {<<16#3088250CA6E7C7FE649CE85820F7:112>>, %% A -@@ -322,7 +307,7 @@ curve(sect113r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect113r2) -> -+params(sect113r2) -> - { - {characteristic_two_field, 113, {tpbasis,9}}, - {<<16#689918DBEC7E5A0DD6DFC0AA55C7:112>>, %% A -@@ -335,7 +320,7 @@ curve(sect113r2) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect131r1) -> -+params(sect131r1) -> - { - {characteristic_two_field, 131, {ppbasis,2,3,8}}, - {<<16#07A11B09A76B562144418FF3FF8C2570B8:136>>, %% A -@@ -348,7 +333,7 @@ curve(sect131r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect131r2) -> -+params(sect131r2) -> - { - {characteristic_two_field, 131, {ppbasis,2,3,8}}, - {<<16#03E5A88919D7CAFCBF415F07C2176573B2:136>>, %% A -@@ -361,7 +346,7 @@ curve(sect131r2) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect163k1) -> -+params(sect163k1) -> - { - {characteristic_two_field, 163, {ppbasis,3,6,7}}, - {<<16#01:8>>, %% A -@@ -374,7 +359,7 @@ curve(sect163k1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect163r1) -> -+params(sect163r1) -> - { - {characteristic_two_field, 163, {ppbasis,3,6,7}}, - {<<16#07B6882CAAEFA84F9554FF8428BD88E246D2782AE2:168>>, %% A -@@ -387,7 +372,7 @@ curve(sect163r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect163r2) -> -+params(sect163r2) -> - { - {characteristic_two_field, 163, {ppbasis,3,6,7}}, - {<<16#01:8>>, %% A -@@ -400,7 +385,7 @@ curve(sect163r2) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect193r1) -> -+params(sect193r1) -> - { - {characteristic_two_field, 193, {tpbasis,15}}, - {<<16#17858FEB7A98975169E171F77B4087DE098AC8A911DF7B01:192>>, %% A -@@ -413,7 +398,7 @@ curve(sect193r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect193r2) -> -+params(sect193r2) -> - { - {characteristic_two_field, 193, {tpbasis,15}}, - {<<16#0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B:200>>, %% A -@@ -426,7 +411,7 @@ curve(sect193r2) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect233k1) -> -+params(sect233k1) -> - { - {characteristic_two_field, 233, {tpbasis,74}}, - {<<16#00:8>>, %% A -@@ -439,7 +424,7 @@ curve(sect233k1) -> - <<16#04:8>> %% CoFactor - }; - --curve(sect233r1) -> -+params(sect233r1) -> - { - {characteristic_two_field, 233, {tpbasis,74}}, - {<<16#01:8>>, %% A -@@ -452,7 +437,7 @@ curve(sect233r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect239k1) -> -+params(sect239k1) -> - { - {characteristic_two_field, 239, {tpbasis,158}}, - {<<16#00:8>>, %% A -@@ -465,7 +450,7 @@ curve(sect239k1) -> - <<16#04:8>> %% CoFactor - }; - --curve(sect283k1) -> -+params(sect283k1) -> - { - {characteristic_two_field, 283, {ppbasis,5,7,12}}, - {<<16#00:8>>, %% A -@@ -481,7 +466,7 @@ curve(sect283k1) -> - <<16#04:8>> %% CoFactor - }; - --curve(sect283r1) -> -+params(sect283r1) -> - { - {characteristic_two_field, 283, {ppbasis,5,7,12}}, - {<<16#01:8>>, %% A -@@ -498,7 +483,7 @@ curve(sect283r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect409k1) -> -+params(sect409k1) -> - { - {characteristic_two_field, 409, {tpbasis,87}}, - {<<16#00:8>>, %% A -@@ -514,7 +499,7 @@ curve(sect409k1) -> - <<16#04:8>> %% CoFactor - }; - --curve(sect409r1) -> -+params(sect409r1) -> - { - {characteristic_two_field, 409, {tpbasis,87}}, - {<<16#01:8>>, %% A -@@ -531,7 +516,7 @@ curve(sect409r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(sect571k1) -> -+params(sect571k1) -> - { - {characteristic_two_field, 571, {ppbasis,2,5,10}}, - {<<16#00:8>>, %% A -@@ -550,7 +535,7 @@ curve(sect571k1) -> - <<16#04:8>> %% CoFactor - }; - --curve(sect571r1) -> -+params(sect571r1) -> - { - {characteristic_two_field, 571, {ppbasis,2,5,10}}, - {<<16#01:8>>, %% A -@@ -571,7 +556,7 @@ curve(sect571r1) -> - <<16#02:8>> %% CoFactor - }; - --curve(c2pnb163v1) -> -+params(c2pnb163v1) -> - { - {characteristic_two_field, 163, {ppbasis,1,2,8}}, - {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>, %% A -@@ -584,7 +569,7 @@ curve(c2pnb163v1) -> - <<16#02:8>> %% CoFactor - }; - --curve(c2pnb163v2) -> -+params(c2pnb163v2) -> - { - {characteristic_two_field, 163, {ppbasis,1,2,8}}, - {<<16#0108B39E77C4B108BED981ED0E890E117C511CF072:168>>, %% A -@@ -597,7 +582,7 @@ curve(c2pnb163v2) -> - <<16#02:8>> %% CoFactor - }; - --curve(c2pnb163v3) -> -+params(c2pnb163v3) -> - { - {characteristic_two_field, 163, {ppbasis,1,2,8}}, - {<<16#07A526C63D3E25A256A007699F5447E32AE456B50E:168>>, %% A -@@ -610,7 +595,7 @@ curve(c2pnb163v3) -> - <<16#02:8>> %% CoFactor - }; - --curve(c2pnb176v1) -> -+params(c2pnb176v1) -> - { - {characteristic_two_field, 176, {ppbasis,1,2,43}}, - {<<16#E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B:176>>, %% A -@@ -623,7 +608,7 @@ curve(c2pnb176v1) -> - <<16#FF6E:16>> %% CoFactor - }; - --curve(c2tnb191v1) -> -+params(c2tnb191v1) -> - { - {characteristic_two_field, 191, {tpbasis,9}}, - {<<16#2866537B676752636A68F56554E12640276B649EF7526267:192>>, %% A -@@ -636,7 +621,7 @@ curve(c2tnb191v1) -> - <<16#02:8>> %% CoFactor - }; - --curve(c2tnb191v2) -> -+params(c2tnb191v2) -> - { - {characteristic_two_field, 191, {tpbasis,9}}, - {<<16#401028774D7777C7B7666D1366EA432071274F89FF01E718:192>>, %% A -@@ -649,7 +634,7 @@ curve(c2tnb191v2) -> - <<16#04:8>> %% CoFactor - }; - --curve(c2tnb191v3) -> -+params(c2tnb191v3) -> - { - {characteristic_two_field, 191, {tpbasis,9}}, - {<<16#6C01074756099122221056911C77D77E77A777E7E7E77FCB:192>>, %% A -@@ -662,7 +647,7 @@ curve(c2tnb191v3) -> - <<16#06:8>> %% CoFactor - }; - --curve(c2pnb208w1) -> -+params(c2pnb208w1) -> - { - {characteristic_two_field, 208, {ppbasis,1,2,83}}, - {<<16#00:8>>, %% A -@@ -675,7 +660,7 @@ curve(c2pnb208w1) -> - <<16#FE48:16>> %% CoFactor - }; - --curve(c2tnb239v1) -> -+params(c2tnb239v1) -> - { - {characteristic_two_field, 239, {tpbasis,36}}, - {<<16#32010857077C5431123A46B808906756F543423E8D27877578125778AC76:240>>, %% A -@@ -688,7 +673,7 @@ curve(c2tnb239v1) -> - <<16#04:8>> %% CoFactor - }; - --curve(c2tnb239v2) -> -+params(c2tnb239v2) -> - { - {characteristic_two_field, 239, {tpbasis,36}}, - {<<16#4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F:240>>, %% A -@@ -701,7 +686,7 @@ curve(c2tnb239v2) -> - <<16#06:8>> %% CoFactor - }; - --curve(c2tnb239v3) -> -+params(c2tnb239v3) -> - { - {characteristic_two_field, 239, {tpbasis,36}}, - {<<16#01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F:240>>, %% A -@@ -714,7 +699,7 @@ curve(c2tnb239v3) -> - <<16#0A:8>> %% CoFactor - }; - --curve(c2pnb272w1) -> -+params(c2pnb272w1) -> - { - {characteristic_two_field, 272, {ppbasis,1,3,56}}, - {<<16#91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586:256, %% A -@@ -732,7 +717,7 @@ curve(c2pnb272w1) -> - <<16#FF06:16>> %% CoFactor - }; - --curve(c2pnb304w1) -> -+params(c2pnb304w1) -> - { - {characteristic_two_field, 304, {ppbasis,1,2,11}}, - {<<16#FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C128807836:256, %% A -@@ -750,7 +735,7 @@ curve(c2pnb304w1) -> - <<16#FE2E:16>> %% CoFactor - }; - --curve(c2tnb359v1) -> -+params(c2tnb359v1) -> - { - {characteristic_two_field, 359, {tpbasis,68}}, - {<<16#5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223:256, %% A -@@ -768,7 +753,7 @@ curve(c2tnb359v1) -> - <<16#4C:8>> %% CoFactor - }; - --curve(c2pnb368w1) -> -+params(c2pnb368w1) -> - { - {characteristic_two_field, 368, {ppbasis,1,2,85}}, - {<<16#E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C5:256, %% A -@@ -786,7 +771,7 @@ curve(c2pnb368w1) -> - <<16#FF70:16>> %% CoFactor - }; - --curve(c2tnb431r1) -> -+params(c2tnb431r1) -> - { - {characteristic_two_field, 431, {tpbasis,120}}, - {<<16#1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF6:256, %% A -@@ -804,7 +789,7 @@ curve(c2tnb431r1) -> - <<16#2760:16>> %% CoFactor - }; - --curve(wtls1) -> -+params(wtls1) -> - { - {characteristic_two_field, 113, {tpbasis,9}}, - {<<16#01:8>>, %% A -@@ -817,7 +802,7 @@ curve(wtls1) -> - <<16#02:8>> %% CoFactor - }; - --curve(wtls3) -> -+params(wtls3) -> - { - {characteristic_two_field, 163, {ppbasis,3,6,7}}, - {<<16#01:8>>, %% A -@@ -830,7 +815,7 @@ curve(wtls3) -> - <<16#02:8>> %% CoFactor - }; - --curve(wtls4) -> -+params(wtls4) -> - { - {characteristic_two_field, 113, {tpbasis,9}}, - {<<16#3088250CA6E7C7FE649CE85820F7:112>>, %% A -@@ -843,7 +828,7 @@ curve(wtls4) -> - <<16#02:8>> %% CoFactor - }; - --curve(wtls5) -> -+params(wtls5) -> - { - {characteristic_two_field, 163, {ppbasis,1,2,8}}, - {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>, %% A -@@ -856,7 +841,7 @@ curve(wtls5) -> - <<16#02:8>> %% CoFactor - }; - --curve(wtls6) -> -+params(wtls6) -> - { - {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>}, %% Prime - {<<16#DB7C2ABF62E35E668076BEAD2088:112>>, %% A -@@ -869,7 +854,7 @@ curve(wtls6) -> - <<16#01:8>> %% CoFactor - }; - --curve(wtls7) -> -+params(wtls7) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>, %% A -@@ -882,7 +867,7 @@ curve(wtls7) -> - <<16#01:8>> %% CoFactor - }; - --curve(wtls8) -> -+params(wtls8) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFDE7:112>>}, %% Prime - {<<16#00:8>>, %% A -@@ -895,7 +880,7 @@ curve(wtls8) -> - <<16#01:8>> %% CoFactor - }; - --curve(wtls9) -> -+params(wtls9) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F:160>>}, %% Prime - {<<16#00:8>>, %% A -@@ -908,7 +893,7 @@ curve(wtls9) -> - <<16#01:8>> %% CoFactor - }; - --curve(wtls10) -> -+params(wtls10) -> - { - {characteristic_two_field, 233, {tpbasis,74}}, - {<<16#00:8>>, %% A -@@ -921,7 +906,7 @@ curve(wtls10) -> - <<16#04:8>> %% CoFactor - }; - --curve(wtls11) -> -+params(wtls11) -> - { - {characteristic_two_field, 233, {tpbasis,74}}, - {<<16#01:8>>, %% A -@@ -934,7 +919,7 @@ curve(wtls11) -> - <<16#02:8>> %% CoFactor - }; - --curve(wtls12) -> -+params(wtls12) -> - { - {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>}, %% Prime - {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>, %% A -@@ -947,7 +932,7 @@ curve(wtls12) -> - <<16#01:8>> %% CoFactor - }; - --curve(ipsec3) -> -+params(ipsec3) -> - { - {characteristic_two_field, 155, {tpbasis,62}}, - {<<16#00:8>>, %% A -@@ -960,7 +945,7 @@ curve(ipsec3) -> - <<16#03:8>> %% CoFactor - }; - --curve(ipsec4) -> -+params(ipsec4) -> - { - {characteristic_two_field, 185, {tpbasis,69}}, - {<<16#00:8>>, %% A -@@ -973,7 +958,7 @@ curve(ipsec4) -> - <<16#02:8>> %% CoFactor - }; - --curve(brainpoolP160r1) -> -+params(brainpoolP160r1) -> - { - {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>}, %% Prime - {<<16#340E7BE2A280EB74E2BE61BADA745D97E8F7C300:160>>, %% A -@@ -986,7 +971,7 @@ curve(brainpoolP160r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP160t1) -> -+params(brainpoolP160t1) -> - { - {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>}, %% Prime - {<<16#E95E4A5F737059DC60DFC7AD95B3D8139515620C:160>>, %% A -@@ -999,7 +984,7 @@ curve(brainpoolP160t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP192r1) -> -+params(brainpoolP192r1) -> - { - {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>}, %% Prime - {<<16#6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF:192>>, %% A -@@ -1012,7 +997,7 @@ curve(brainpoolP192r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP192t1) -> -+params(brainpoolP192t1) -> - { - {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>}, %% Prime - {<<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294:192>>, %% A -@@ -1025,7 +1010,7 @@ curve(brainpoolP192t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP224r1) -> -+params(brainpoolP224r1) -> - { - {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>}, %% Prime - {<<16#68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43:224>>, %% A -@@ -1038,7 +1023,7 @@ curve(brainpoolP224r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP224t1) -> -+params(brainpoolP224t1) -> - { - {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>}, %% Prime - {<<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC:224>>, %% A -@@ -1051,7 +1036,7 @@ curve(brainpoolP224t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP256r1) -> -+params(brainpoolP256r1) -> - { - {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>}, %% Prime - {<<16#7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9:256>>, %% A -@@ -1064,7 +1049,7 @@ curve(brainpoolP256r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP256t1) -> -+params(brainpoolP256t1) -> - { - {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>}, %% Prime - {<<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374:256>>, %% A -@@ -1077,7 +1062,7 @@ curve(brainpoolP256t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP320r1) -> -+params(brainpoolP320r1) -> - { - {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256, %% Prime - 16#FCD412B1F1B32E27:64>>}, -@@ -1096,7 +1081,7 @@ curve(brainpoolP320r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP320t1) -> -+params(brainpoolP320t1) -> - { - {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256, %% Prime - 16#FCD412B1F1B32E27:64>>}, -@@ -1115,7 +1100,7 @@ curve(brainpoolP320t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP384r1) -> -+params(brainpoolP384r1) -> - { - {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256, %% Prime - 16#ACD3A729901D1A71874700133107EC53:128>>}, -@@ -1134,7 +1119,7 @@ curve(brainpoolP384r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP384t1) -> -+params(brainpoolP384t1) -> - { - {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256, %% Prime - 16#ACD3A729901D1A71874700133107EC53:128>>}, -@@ -1153,7 +1138,7 @@ curve(brainpoolP384t1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP512r1) -> -+params(brainpoolP512r1) -> - { - {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256, %% Prime - 16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>}, -@@ -1172,7 +1157,7 @@ curve(brainpoolP512r1) -> - <<16#01:8>> %% CoFactor - }; - --curve(brainpoolP512t1) -> -+params(brainpoolP512t1) -> - { - {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256, %% Prime - 16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>}, diff --git a/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch b/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch deleted file mode 100644 index 5615558..0000000 --- a/otp-0021-crypto_SUITE-Skip-ec-curves-with-224-bits-if-FIPS.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Sverker Eriksson -Date: Fri, 16 Jun 2023 19:31:34 +0200 -Subject: [PATCH] crypto_SUITE: Skip ec curves with < 224 bits if FIPS - - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index c56faa9bc4..1179a516b2 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -1256,8 +1256,19 @@ no_generate_compute(Config) when is_list(Config) -> - compute() -> - [{doc, " Test crypto:compute_key"}]. - compute(Config) when is_list(Config) -> -- Gen = proplists:get_value(compute, Config), -+ Gen0 = proplists:get_value(compute, Config), -+ Gen = case crypto:info_fips() of -+ enabled -> -+ SkipCurves = [secp192r1], -+ lists:filter(fun({_,_,_,Curve,_}) -> -+ not lists:member(Curve,SkipCurves) -+ end, -+ Gen0); -+ _ -> -+ Gen0 -+ end, - lists:foreach(fun do_compute/1, Gen). -+ - %%-------------------------------------------------------------------- - use_all_ec_sign_verify(_Config) -> - Msg = <<"hello world!">>, -@@ -1270,10 +1281,17 @@ use_all_ec_sign_verify(_Config) -> - Hashs]), - SkipHashs0 = [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, - blake2b, blake2s], -- SkipHashs = case crypto:info_fips() of -- enabled -> [sha | SkipHashs0]; -- _ -> SkipHashs0 -- end, -+ SkipCurves0 = [ed25519, ed448, x25519, x448, ipsec3, ipsec4], -+ -+ {SkipHashs, SkipCurves} -+ = case crypto:info_fips() of -+ enabled -> -+ {[sha | SkipHashs0], -+ [secp192r1, prime192v1, sect163k1, sect163r2]}; -+ _ -> -+ {SkipHashs0, SkipCurves0} -+ end, -+ - Results = - [{{Curve,Hash}, - try -@@ -1287,7 +1305,7 @@ use_all_ec_sign_verify(_Config) -> - C:E -> - {C,E} - end} -- || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4], -+ || Curve <- Curves -- SkipCurves, - Hash <- Hashs -- SkipHashs - ], - Fails = -@@ -1316,7 +1334,15 @@ use_all_ec_sign_verify(_Config) -> - - %%-------------------------------------------------------------------- - use_all_ecdh_generate_compute(Config) -> -- Curves = crypto:supports(curves) -- [ed25519, ed448, x25519, x448], -+ SkipCurves0 = [ed25519, ed448, x25519, x448], -+ SkipCurves = -+ case crypto:info_fips() of -+ enabled -> -+ [secp192r1, prime192v1, sect163k1, sect163r2 | SkipCurves0]; -+ _ -> -+ SkipCurves0 -+ end, -+ Curves = crypto:supports(curves) -- SkipCurves, - do_dh_curves(Config, Curves). - - use_all_eddh_generate_compute(Config) -> diff --git a/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch b/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch deleted file mode 100644 index 3181670..0000000 --- a/otp-0022-crypto_SUITE-Fix-safe-primes-for-DH-with-FIPS.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 20 Jun 2023 14:50:27 +0200 -Subject: [PATCH] crypto_SUITE: Fix safe primes for DH with FIPS - -FIPs on OpenSSL 3 seems to demand P to be a safe prime -where Q = (P-1)/2 is also prime. - -diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl -index 1179a516b2..eea60a523d 100644 ---- a/lib/crypto/test/crypto_SUITE.erl -+++ b/lib/crypto/test/crypto_SUITE.erl -@@ -1220,6 +1220,15 @@ generate_compute(Config) when is_list(Config) -> - compute_bug() -> - [{doc, "Test that it works even if the Secret is smaller than expected"}]. - compute_bug(_Config) -> -+ case crypto:info_fips() of -+ enabled -> -+ %% FIPs on OpenSSL 3 seems to demand P to be a safe prime -+ %% where Q = (P-1)/2 is also prime. -+ skip; -+ _ -> do_compute_bug() -+ end. -+ -+do_compute_bug() -> - ExpectedSecret = <<118,89,171,16,156,18,156,103,189,134,130,49,28,144,111,241,247,82,79,32,228,11,209,141,119,176,251,80,105,143,235,251,203,121,223,211,129,3,233,133,45,2,31,157,24,111,5,75,153,66,135,185,128,115,229,178,216,39,73,52,80,151,8,241,34,52,226,71,137,167,53,48,59,224,175,154,89,110,76,83,24,117,149,21,72,6,186,78,149,74,188,56,98,244,30,77,108,248,88,194,195,237,23,51,20,242,254,123,21,12,209,74,217,168,230,65,7,60,211,139,128,239,234,153,22,229,180,59,159,121,41,156,121,200,177,130,163,162,54,224,93,1,94,11,177,254,118,28,156,26,116,10,207,145,219,166,214,189,214,230,221,170,228,15,69,88,31,68,94,255,113,58,49,82,86,192,248,176,131,133,39,186,194,172,206,84,184,16,66,68,153,128,178,227,27,118,52,130,122,92,24,222,102,195,221,207,255,13,152,175,65,32,167,84,54,244,243,109,244,18,234,16,159,224,188,2,106,123,27,17,131,171,226,34,111,251,62,119,155,124,221,124,254,62,97,167,1,105,116,98,98,19,197,30,72,180,79,221,100,134,120,117,124,85,73,132,224,223,222,41,155,137,218,130,238,237,157,161,134,150,69,206,91,141,17,89,120,218,235,229,37,150,76,197,7,157,56,144,42,203,137,100,200,72,141,194,239,1,67,236,238,183,48,214,75,76,108,235,3,237,67,40,137,45,182,236,246,37,116,103,144,237,142,211,88,233,11,24,21,218,41,245,250,51,130,250,104,74,189,17,69,145,70,50,50,215,253,155,10,128,41,114,185,211,82,164,72,92,17,145,104,66,6,140,226,80,43,62,1,166,216,153,118,96,15,147,126,137,118,191,192,75,149,241,206,18,92,17,154,215,219,18,6,139,190,103,210,156,184,29,224,213,157,60,112,189,104,220,125,40,186,50,119,17,143,136,149,38,74,107,21,192,59,61,59,42,231,144,59,175,3,176,87,23,16,122,54,31,82,34,230,211,44,81,41,47,86,37,228,175,130,148,88,136,131,254,241,202,99,199,175,1,141,215,124,155,120,43,141,89,11,140,120,141,29,35,82,219,155,204,75,12,66,241,253,33,250,84,24,85,68,13,80,85,142,227,34,139,26,146,24>>, - OthersPublicKey = 635619632099733175381667940709387641100492974601603060984753028943194386334921787463327680809776598322996634648015962954045728174069768874873236397421720142610982770302060309928552098274817978606093380781524199673890631795310930242601197479471368910519338301177304682162189801040921618559902948819107531088646753320486728060005223263561551402855338732899079439899705951063999951507319258050864346087428042978411873495523439615429804957374639092580169417598963105885529553632847023899713490485619763926900318508906706745060947269748612049634207985438016935262521715769812475329234748426647554362991758104620357149045960316987533503707855364806010494793980069245562784050236811004893018183726397041999426883788660276453352521120006817370050691205529335316794439089316232980047277245051173281601960196573681285904611182521967067911862467395705665888521948321299521549941618586026714676885890192323289343756440666276226084448279082483536164085883288884231665240707495770544705648564889889198060417915693315346959170105413290799314390963124178046425737828369059171472978294050322371452255088799865552038756937873388385970088906560408959959429398326288750834357514847891423941047433478384621074116184703014798814515161475596555032391555842, - MyPrivateKey = 387759582879975726965038486537011291913744975764132199838375902680222019267527675651273586836110220500657652661706223760165097275862806031329642160439090779625708664007910974206651834216043397115514725827856461492311499129200688538220719685637154290305617686974719521885238198226075381217068175824097878445476010193039590876624464274744156624589136789060427283492343902761765833713520850870233407503430180028104167029073459918756981323130062648615262139444306321256382009848217866984408901761817655567071716275177768316006340055589170095799943481591033461616307776069027985761229636731465482676467627154100912586936231051371168178564599296638350391246393336702334311781595616786107810962134407697848002331639021101685320844880636050048769216986088652236979636019052557155807310341483407890060105599892252118584570558049301477535792498672552850760356632076013402382600669875697284264329434950712239302528367835155163504374877787288116104285944993818319105835423479332617802010952731990182088670508346704423006877514817882782443833997288652405892920173712497948376815825396272381214976859009518623799156300136570204539240675245115597412280078940442452936425561984312708387584800789375684525365060589104566195610526570099527133097201479, -@@ -4403,8 +4412,7 @@ ecdh() -> - ). - - dh() -> -- {dh, 90970053988169282502023478715631717259407236400413906591937635666709823903223997309250405131675572047545403771567755831138144089197560332757755059848492919215391041119286178688014693040542889497092308638580104031455627238700168892909539193174537248629499995652186913900511641708112112482297874449292467498403, 2}. -- -+ {dh, 16#FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF97D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD65612433F51F5F066ED0856365553DED1AF3B557135E7F57C935984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE73530ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FBB96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB190B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F619172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD733BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA886B423861285C97FFFFFFFFFFFFFFFF, 2}. - - - rsa_oaep() -> diff --git a/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch b/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch deleted file mode 100644 index 770826f..0000000 --- a/otp-0023-crypto-Skip-entire-engine_SUITE-if-notsup.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 20 Jun 2023 15:29:57 +0200 -Subject: [PATCH] crypto: Skip entire engine_SUITE if notsup - - -diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl -index 8907d3968f..b2c25bdcae 100644 ---- a/lib/crypto/test/engine_SUITE.erl -+++ b/lib/crypto/test/engine_SUITE.erl -@@ -136,20 +136,23 @@ groups() -> - - - init_per_suite(Config) -> -- try {os:type(), crypto:info_lib()} of -- {_, [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}]} -> -+ try {engine_supported(), os:type(), crypto:info_lib()} of -+ {false,_,[{_,_,OpenSSLversion}]} -> -+ {skip, "Engine not supported by " ++ OpenSSLversion}; -+ -+ {_,_, [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}]} -> - {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"}; - -- {_, [{_,_,<<"LibreSSL 2.1.",_/binary>>}]} -> -+ {_,_, [{_,_,<<"LibreSSL 2.1.",_/binary>>}]} -> - {skip, "Problem with engine on older LibreSSL 2.1.*"}; - -- {{unix,darwin}, _} -> -+ {_,{unix,darwin}, _} -> - {skip, "Engine unsupported on Darwin"}; -- -- {{win32,_}, _} -> -+ -+ {_,{win32,_}, _} -> - {skip, "Engine unsupported on Windows"}; -- -- {OS, Res} -> -+ -+ {_,OS, Res} -> - ct:log("crypto:info_lib() -> ~p\nos:type() -> ~p", [Res,OS]), - try crypto:start() of - ok -> -@@ -166,6 +169,11 @@ init_per_suite(Config) -> - end_per_suite(_Config) -> - ok. - -+engine_supported() -> -+ try crypto:engine_list(), true -+ catch error:notsup -> false -+ end. -+ - %%-------------------------------------------------------------------- - init_per_group(engine_stored_key, Config) -> - group_load_engine(Config, [engine_method_rsa]); diff --git a/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch b/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch deleted file mode 100644 index 36a0c8b..0000000 --- a/otp-0024-crypto-Fix-doc-for-FIPS-with-OpenSSL-3.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Sverker Eriksson -Date: Tue, 20 Jun 2023 20:55:03 +0200 -Subject: [PATCH] crypto: Fix doc for FIPS with OpenSSL 3 - - -diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml -index dcc86cd49c..4bc019f244 100644 ---- a/lib/crypto/doc/src/crypto_app.xml -+++ b/lib/crypto/doc/src/crypto_app.xml -@@ -50,9 +50,9 @@ - LibreSSL should also work.

- -

The crypto app is tested daily with at least one version of each of the -- OpenSSL 1.0.1, 1.0.2, 1.1.0, 1.1.1 and 3.0. FIPS mode is also tested for 1.0.1 and 1.0.2.

-+ OpenSSL 1.0.1, 1.0.2, 1.1.0, 1.1.1 and 3.0. FIPS mode is also tested for 1.0.1, 1.0.2 and 3.0.

- --

Using OpenSSL 3.0 with Engines or in FIPS mode is not yet supported by the OTP/crypto app.

-+

Using OpenSSL 3.0 with Engines is not yet supported by the OTP/crypto app.

- -

Source releases of OpenSSL can be downloaded from the OpenSSL project home page, - or mirror sites listed there. diff --git a/sources b/sources index e0f0ac9..bc4dc6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.0.2.tar.gz) = 9bbf1099e902e10000c218c24dd510e2432659c50fe9b795c67f5bf61b243127aeb44ff60d62a9a3cdfce9d23ec97ae5d154690df99c2d781199f68b124eb44c +SHA512 (otp-OTP-26.1.tar.gz) = 5700487223c1e7a317b83c6828bcd3b0e531ffb9ca9c0bd6328f83faa51176bda01aaa3209e8657d1a1a62fb8d85d6d4050b0e97b425e4bb0bfb72aacb1b39bb From 25d796624195aac056a6ac18b44e84c94ef70df2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 20 Sep 2023 12:10:07 +0200 Subject: [PATCH 303/340] A new man-file was added Signed-off-by: Peter Lemenkov --- erlang.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/erlang.spec b/erlang.spec index b4e6469..33081f3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1596,6 +1596,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_mandir}/man3/dict.* %{_mandir}/man3/digraph.* %{_mandir}/man3/digraph_utils.* +%{_mandir}/man3/edlin.* %{_mandir}/man3/edlin_expand.* %{_mandir}/man3/epp.* %{_mandir}/man3/erl_anno.* From 4557df10d56645cde494698eb0b9d7462176c80f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 29 Sep 2023 16:34:06 +0200 Subject: [PATCH 304/340] Erlang ver. 26.1.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 33081f3..fc23db1 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.1 +Version: 26.1.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Sep 29 2023 Peter Lemenkov - 26.1.1-1 +- Ver. 26.1.1 + * Wed Sep 20 2023 Peter Lemenkov - 26.1-1 - Ver. 26.1 diff --git a/sources b/sources index bc4dc6f..a8a8b5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.1.tar.gz) = 5700487223c1e7a317b83c6828bcd3b0e531ffb9ca9c0bd6328f83faa51176bda01aaa3209e8657d1a1a62fb8d85d6d4050b0e97b425e4bb0bfb72aacb1b39bb +SHA512 (otp-OTP-26.1.1.tar.gz) = 2a10a4bd1145ee3a720ed7dcc7db098052c67e5c962611df9d43c596cef0fe0bc25051bd90216030d14b47e91bd2072bcfd21dbc6f509516dfb2fe7c0a7988a6 From 6bddebbe912d7d4467c2a79242f1fe888735f012 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 13 Oct 2023 13:33:13 +0200 Subject: [PATCH 305/340] Erlang ver. 26.1.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index fc23db1..41f693f 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.1.1 +Version: 26.1.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Oct 13 2023 Peter Lemenkov - 26.1.2-1 +- Ver. 26.1.2 + * Fri Sep 29 2023 Peter Lemenkov - 26.1.1-1 - Ver. 26.1.1 diff --git a/sources b/sources index a8a8b5b..d98e324 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (otp-OTP-26.1.1.tar.gz) = 2a10a4bd1145ee3a720ed7dcc7db098052c67e5c962611df9d43c596cef0fe0bc25051bd90216030d14b47e91bd2072bcfd21dbc6f509516dfb2fe7c0a7988a6 +SHA512 (otp-OTP-26.1.2.tar.gz) = 6907bba4ee726582b6344995c73223f725ea628897b34fc807a2a0306536bb15ce55c7fd4da1cb596dc59c9695b3bb6bba59618ca2a7a9a999e183f671656710 From d847a77a0eae0dba10672e822023c93239dae798 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 13 Dec 2023 20:58:41 +0100 Subject: [PATCH 306/340] Erlang ver. 26.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- ...o-not-format-man-pages-and-do-not-install-miscellan.patch | 2 +- otp-0002-Remove-rpath.patch | 2 +- otp-0003-Do-not-install-C-sources.patch | 4 ++-- sources | 3 +-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/erlang.spec b/erlang.spec index 41f693f..51e0d5a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.1.2 +Version: 26.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Dec 13 2023 Peter Lemenkov - 26.2-1 +- Ver. 26.2 + * Fri Oct 13 2023 Peter Lemenkov - 26.1.2-1 - Ver. 26.1.2 diff --git a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch index 0cc953a..270792a 100644 --- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch +++ b/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous Signed-off-by: Peter Lemenkov diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 3c5a5cee64..3c3dbda661 100644 +index 42af9c87dc..c017e0a4ed 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -552,10 +552,6 @@ endif diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index c3685c9..5cadc0c 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index 1691a7d120..48dcff51d0 100644 +index aedc9e7a13..b27c2aa01b 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -147,7 +147,7 @@ endif diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index bb55157..23056c4 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -27,10 +27,10 @@ index 82a6b6e87a..5f2fe8ba7d 100644 release_docs_spec: diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in -index 0a5ae800be..2cc354c43e 100644 +index fa1ea3cd39..b977b6afe5 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -712,13 +712,11 @@ ifeq (@DYNAMIC_LIB@, yes) +@@ -715,13 +715,11 @@ ifeq (@DYNAMIC_LIB@, yes) endif $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" diff --git a/sources b/sources index d98e324..e49994e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (otp-OTP-26.1.1.tar.gz) = 2a10a4bd1145ee3a720ed7dcc7db098052c67e5c962611df9d43c596cef0fe0bc25051bd90216030d14b47e91bd2072bcfd21dbc6f509516dfb2fe7c0a7988a6 -SHA512 (otp-OTP-26.1.2.tar.gz) = 6907bba4ee726582b6344995c73223f725ea628897b34fc807a2a0306536bb15ce55c7fd4da1cb596dc59c9695b3bb6bba59618ca2a7a9a999e183f671656710 +SHA512 (otp-OTP-26.2.tar.gz) = 647f38e7a1d2a0e49aee982d9f6461a83df01d6248756eea3cc926c60dd03e82d881534e3ce3374e233a3ab7b0fad7c775a54d0079f4d5b13de8d8a97c7de642 From 0ec84deb99001d24945b9fc94ce04d743e76d331 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 18 Dec 2023 22:22:49 +0100 Subject: [PATCH 307/340] Erlang ver. 26.2.1 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 51e0d5a..bf2ba6c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2 +Version: 26.2.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Dec 18 2023 Peter Lemenkov - 26.2.1-1 +- Ver. 26.2.1 + * Wed Dec 13 2023 Peter Lemenkov - 26.2-1 - Ver. 26.2 diff --git a/sources b/sources index e49994e..a7e4eab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.tar.gz) = 647f38e7a1d2a0e49aee982d9f6461a83df01d6248756eea3cc926c60dd03e82d881534e3ce3374e233a3ab7b0fad7c775a54d0079f4d5b13de8d8a97c7de642 +SHA512 (otp-OTP-26.2.1.tar.gz) = f4fa0d11ecbd99ca5ef4421abb78ef2aba8ea0f8d19e4aed991c2afcc42bb057a37ae34a416b050fd7ed8ca39ba7cc8b3619ff371bc09f56dfd5b523988a8f8c From bccb7e6b4b4600e35663d2452d3bd8778693bf31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 18:19:06 +0000 Subject: [PATCH 308/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index bf2ba6c..11b3eb0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 26.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Peter Lemenkov - 26.2.1-1 - Ver. 26.2.1 From 31296f6a24fdb1163bb750ad2651ac53603a3b7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:32:33 +0000 Subject: [PATCH 309/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 11b3eb0..61f21ee 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 26.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 26.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d2e9015f83b074984280f16d50ea1c4f8fb52174 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 12 Feb 2024 18:32:42 +0100 Subject: [PATCH 310/340] Erlang ver. 26.2.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- ....ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 4 ++-- ...configure.ac-C99-fixes-for-poll_works-check.patch | 12 ++++++------ sources | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/erlang.spec b/erlang.spec index 61f21ee..75be2be 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.1 -Release: 3%{?dist} +Version: 26.2.2 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Feb 12 2024 Peter Lemenkov - 26.2.2-1 +- Ver. 26.2.2 + * Wed Jan 24 2024 Fedora Release Engineering - 26.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index 3790e65..9270b96 100644 --- a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,7 +6,7 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index a09c84ff09..478ebaa206 100755 +index 8d2083aa48..93e4ae295d 100755 --- a/erts/configure +++ b/erts/configure @@ -20890,6 +20890,9 @@ else $as_nop @@ -20,7 +20,7 @@ index a09c84ff09..478ebaa206 100755 extern char end; #elif defined(HAVE__END_SYMBOL) diff --git a/erts/configure.ac b/erts/configure.ac -index 540cc4b3cb..0d4d9377ef 100644 +index c591393fcd..5d5793518f 100644 --- a/erts/configure.ac +++ b/erts/configure.ac @@ -2449,6 +2449,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], diff --git a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch index 255158c..6fe66dd 100644 --- a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 478ebaa206..549b53546c 100755 +index 93e4ae295d..bdff51a401 100755 --- a/erts/configure +++ b/erts/configure -@@ -24821,10 +24821,13 @@ else $as_nop +@@ -24837,10 +24837,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 478ebaa206..549b53546c 100755 #else struct pollfd fds[1]; int fd; -@@ -24833,9 +24836,9 @@ main() +@@ -24849,9 +24852,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { @@ -39,10 +39,10 @@ index 478ebaa206..549b53546c 100755 } diff --git a/erts/configure.ac b/erts/configure.ac -index 0d4d9377ef..296a72bacc 100644 +index 5d5793518f..d08cf9569c 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -3068,10 +3068,13 @@ poll_works=no +@@ -3083,10 +3083,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -58,7 +58,7 @@ index 0d4d9377ef..296a72bacc 100644 #else struct pollfd fds[1]; int fd; -@@ -3080,9 +3083,9 @@ main() +@@ -3095,9 +3098,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/sources b/sources index a7e4eab..af5cae6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.1.tar.gz) = f4fa0d11ecbd99ca5ef4421abb78ef2aba8ea0f8d19e4aed991c2afcc42bb057a37ae34a416b050fd7ed8ca39ba7cc8b3619ff371bc09f56dfd5b523988a8f8c +SHA512 (otp-OTP-26.2.2.tar.gz) = 27d89f4ee1c7beccd27348ad0d5d9650cda58614f3c278b0a7cf062bf4efc91bd1c7aecfff55b934c57f69cb30c41ead89b94625616817acb2e5910b95bc80fd From bdd905072f2725278a74d085ecb3ec68dbd6e974 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 Mar 2024 21:18:10 +0100 Subject: [PATCH 311/340] Erlang ver. 26.2.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- otp-0006-Add-extra-search-directory.patch | 2 +- ....ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 8 ++++---- ...configure.ac-C99-fixes-for-poll_works-check.patch | 12 ++++++------ sources | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/erlang.spec b/erlang.spec index 75be2be..8d34939 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.2 +Version: 26.2.3 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/otp-0006-Add-extra-search-directory.patch b/otp-0006-Add-extra-search-directory.patch index 9717baa..2f872ef 100644 --- a/otp-0006-Add-extra-search-directory.patch +++ b/otp-0006-Add-extra-search-directory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add extra search directory Signed-off-by: Peter Lemenkov diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl -index c5ba677c6e..0d23c61c0c 100644 +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]) -> diff --git a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index 9270b96..8fd2271 100644 --- a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,10 +6,10 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index 8d2083aa48..93e4ae295d 100755 +index b395d4e891..432067c52c 100755 --- a/erts/configure +++ b/erts/configure -@@ -20890,6 +20890,9 @@ else $as_nop +@@ -20909,6 +20909,9 @@ else $as_nop #ifdef HAVE_MALLOC_H # include #endif @@ -20,10 +20,10 @@ index 8d2083aa48..93e4ae295d 100755 extern char end; #elif defined(HAVE__END_SYMBOL) diff --git a/erts/configure.ac b/erts/configure.ac -index c591393fcd..5d5793518f 100644 +index f944657fba..c55c9e5339 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -2449,6 +2449,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], +@@ -2450,6 +2450,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], #ifdef HAVE_MALLOC_H # include #endif diff --git a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch index 6fe66dd..40d204c 100644 --- a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 93e4ae295d..bdff51a401 100755 +index 432067c52c..17c6065d06 100755 --- a/erts/configure +++ b/erts/configure -@@ -24837,10 +24837,13 @@ else $as_nop +@@ -24865,10 +24865,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 93e4ae295d..bdff51a401 100755 #else struct pollfd fds[1]; int fd; -@@ -24849,9 +24852,9 @@ main() +@@ -24877,9 +24880,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { @@ -39,10 +39,10 @@ index 93e4ae295d..bdff51a401 100755 } diff --git a/erts/configure.ac b/erts/configure.ac -index 5d5793518f..d08cf9569c 100644 +index c55c9e5339..c3a2863193 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -3083,10 +3083,13 @@ poll_works=no +@@ -3093,10 +3093,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -58,7 +58,7 @@ index 5d5793518f..d08cf9569c 100644 #else struct pollfd fds[1]; int fd; -@@ -3095,9 +3098,9 @@ main() +@@ -3105,9 +3108,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/sources b/sources index af5cae6..15685fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.2.tar.gz) = 27d89f4ee1c7beccd27348ad0d5d9650cda58614f3c278b0a7cf062bf4efc91bd1c7aecfff55b934c57f69cb30c41ead89b94625616817acb2e5910b95bc80fd +SHA512 (otp-OTP-26.2.3.tar.gz) = 0c736e15b0ce05bff01a53666f76ac9ed95989b75661d6a2306e447fc7c647ce9d88a55ae7d75d40e75ba0fffd5ddfb12c65ed1a16d9f074729c783a39ca33a5 From 962eed8794116fad3c7d72c3f0a9e60ae9f8095f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 13 Apr 2024 18:15:56 +0200 Subject: [PATCH 312/340] Erlang ver. 26.2.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- ....ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 8 ++++---- ...configure.ac-C99-fixes-for-poll_works-check.patch | 12 ++++++------ sources | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/erlang.spec b/erlang.spec index 8d34939..d1830a8 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.3 +Version: 26.2.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Apr 13 2024 Peter Lemenkov - 26.2.4-1 +- Ver. 26.2.4 + * Mon Feb 12 2024 Peter Lemenkov - 26.2.2-1 - Ver. 26.2.2 diff --git a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch index 8fd2271..8050629 100644 --- a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch @@ -6,10 +6,10 @@ Subject: [PATCH] configure.ac: C99 fix for #include for the sbrk function if the header is available. diff --git a/erts/configure b/erts/configure -index b395d4e891..432067c52c 100755 +index 2044690dc6..f31d7775a4 100755 --- a/erts/configure +++ b/erts/configure -@@ -20909,6 +20909,9 @@ else $as_nop +@@ -20937,6 +20937,9 @@ else $as_nop #ifdef HAVE_MALLOC_H # include #endif @@ -20,10 +20,10 @@ index b395d4e891..432067c52c 100755 extern char end; #elif defined(HAVE__END_SYMBOL) diff --git a/erts/configure.ac b/erts/configure.ac -index f944657fba..c55c9e5339 100644 +index f247c1e71f..59c4d05460 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -2450,6 +2450,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], +@@ -2459,6 +2459,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], #ifdef HAVE_MALLOC_H # include #endif diff --git a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch index 40d204c..65acd3b 100644 --- a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch +++ b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch @@ -7,10 +7,10 @@ Return from main instead of calling exit, so that no function declaration is needed. diff --git a/erts/configure b/erts/configure -index 432067c52c..17c6065d06 100755 +index f31d7775a4..77fb9d0d7f 100755 --- a/erts/configure +++ b/erts/configure -@@ -24865,10 +24865,13 @@ else $as_nop +@@ -24893,10 +24893,13 @@ else $as_nop /* end confdefs.h. */ #include @@ -26,7 +26,7 @@ index 432067c52c..17c6065d06 100755 #else struct pollfd fds[1]; int fd; -@@ -24877,9 +24880,9 @@ main() +@@ -24905,9 +24908,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { @@ -39,10 +39,10 @@ index 432067c52c..17c6065d06 100755 } diff --git a/erts/configure.ac b/erts/configure.ac -index c55c9e5339..c3a2863193 100644 +index 59c4d05460..0abb11a967 100644 --- a/erts/configure.ac +++ b/erts/configure.ac -@@ -3093,10 +3093,13 @@ poll_works=no +@@ -3102,10 +3102,13 @@ poll_works=no AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include @@ -58,7 +58,7 @@ index c55c9e5339..c3a2863193 100644 #else struct pollfd fds[1]; int fd; -@@ -3105,9 +3108,9 @@ main() +@@ -3114,9 +3117,9 @@ main() fds[0].events = POLLIN; fds[0].revents = 0; if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { diff --git a/sources b/sources index 15685fc..c686d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.3.tar.gz) = 0c736e15b0ce05bff01a53666f76ac9ed95989b75661d6a2306e447fc7c647ce9d88a55ae7d75d40e75ba0fffd5ddfb12c65ed1a16d9f074729c783a39ca33a5 +SHA512 (otp-OTP-26.2.4.tar.gz) = 2fa385b5ec93810c984f31e22757fe8614087191adf0f99376702bd15a316237f8abc1b65d40a302d3919cd28afe65fb4086e39638c6c39af165c0c1ee6fb51d From 70fd44b05933f18909e113658871457fa93c3766 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 4 May 2024 19:05:46 +0200 Subject: [PATCH 313/340] Erlang ver. 26.2.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index d1830a8..dbf464c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.4 +Version: 26.2.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat May 4 2024 Peter Lemenkov - 26.2.5-1 +- Ver. 26.2.5 + * Sat Apr 13 2024 Peter Lemenkov - 26.2.4-1 - Ver. 26.2.4 diff --git a/sources b/sources index c686d83..e69e9eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.4.tar.gz) = 2fa385b5ec93810c984f31e22757fe8614087191adf0f99376702bd15a316237f8abc1b65d40a302d3919cd28afe65fb4086e39638c6c39af165c0c1ee6fb51d +SHA512 (otp-OTP-26.2.5.tar.gz) = f06d34290c0d93609aa3efbdc97206e8d3ce17aa2c3f62b6c566c7631ee3a3d45a89b61ce0ace81604b5a94610d03ad98558f27ee888ca90ecdeeeb2759c0184 From 986d3f3ba728fffccf1f3df7f0679c68ea91952f Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Fri, 31 May 2024 15:38:58 -0500 Subject: [PATCH 314/340] convert license to SPDX format --- erlang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index dbf464c..fa47211 100644 --- a/erlang.spec +++ b/erlang.spec @@ -72,7 +72,7 @@ Version: 26.2.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment -License: ASL 2.0 +License: Apache-2.0 URL: https://www.erlang.org %if ! (0%{?rhel} && 0%{?rhel} <= 6) VCS: scm:git:https://github.com/erlang/otp From 42618325e73762497d04fd973b348ee100d84621 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 26 Jun 2024 10:39:37 +0200 Subject: [PATCH 315/340] Erlang ver. 26.2.5.1 Signed-off-by: Peter Lemenkov --- erlang-configure-c99.patch | 89 -------------------------------------- erlang.spec | 5 ++- sources | 2 +- 3 files changed, 5 insertions(+), 91 deletions(-) delete mode 100644 erlang-configure-c99.patch diff --git a/erlang-configure-c99.patch b/erlang-configure-c99.patch deleted file mode 100644 index e7abc79..0000000 --- a/erlang-configure-c99.patch +++ /dev/null @@ -1,89 +0,0 @@ -Configure changes to adjust to stricter C99 compilers: Avoid -implicit function declarations, and define main as returning int. - -Submitted upstream: - -diff --git a/erts/configure b/erts/configure -index 815428caaf61c914..7d057e69ae5e3a93 100755 ---- a/erts/configure -+++ b/erts/configure -@@ -20529,6 +20529,9 @@ else $as_nop - #ifdef HAVE_MALLOC_H - # include - #endif -+#ifdef HAVE_UNISTD_H -+# include -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) -@@ -24437,10 +24440,13 @@ else $as_nop - /* end confdefs.h. */ - - #include --main() -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -24449,9 +24455,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - -diff --git a/erts/configure.ac b/erts/configure.ac -index ab2ee78acdca211e..f658b66e3c0e508a 100644 ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -2436,6 +2436,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], - #ifdef HAVE_MALLOC_H - # include - #endif -+#ifdef HAVE_UNISTD_H -+# include -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) -@@ -3033,10 +3036,13 @@ poll_works=no - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include --main() -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -3045,9 +3051,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - ]])],[poll_works=yes],[poll_works=no],[ diff --git a/erlang.spec b/erlang.spec index fa47211..b27e3d0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5 +Version: 26.2.5.1 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1969,6 +1969,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jun 26 2024 Peter Lemenkov - 26.2.5.1-1 +- Ver. 26.2.5.1 + * Sat May 4 2024 Peter Lemenkov - 26.2.5-1 - Ver. 26.2.5 diff --git a/sources b/sources index e69e9eb..58c38a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.tar.gz) = f06d34290c0d93609aa3efbdc97206e8d3ce17aa2c3f62b6c566c7631ee3a3d45a89b61ce0ace81604b5a94610d03ad98558f27ee888ca90ecdeeeb2759c0184 +SHA512 (otp-OTP-26.2.5.1.tar.gz) = fe7cf5c3a386123fa00e364c1f2e884adb46b8080cd4e84eee83c07531c4fca23c909e439516f0e0730735487c7d0384df9fd98ac68e29c6e05add6039ea18f4 From 9afd6d3c6bae0f60bf422f0751570ed6038ca6b9 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 26 Jun 2024 11:08:05 +0200 Subject: [PATCH 316/340] Fix FTBFS with recent RPM Signed-off-by: Peter Lemenkov --- erlang.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/erlang.spec b/erlang.spec index b27e3d0..ed2cc1b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -74,9 +74,7 @@ Summary: General-purpose programming language and runtime environment License: Apache-2.0 URL: https://www.erlang.org -%if ! (0%{?rhel} && 0%{?rhel} <= 6) -VCS: scm:git:https://github.com/erlang/otp -%endif +VCS: git:https://github.com/erlang/otp.git Source0: https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz Source5: epmd.service Source6: epmd.socket @@ -417,7 +415,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description examples Examples for some Erlang modules. -%endif %{__with_examples} +%endif # __with_examples %package ftp Summary: FTP client @@ -698,7 +696,7 @@ Summary: A set of programming tools including a coverage analyzer etc %if %{__with_emacs} BuildRequires: emacs BuildRequires: emacs-el -%endif %{__with_emacs} +%endif # __with_emacs Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} @@ -709,7 +707,7 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: emacs-filesystem Obsoletes: emacs-erlang Obsoletes: emacs-erlang-el -%endif %{__with_emacs} +%endif # __with_emacs %description tools @@ -805,7 +803,7 @@ cp lib/tools/emacs/*.el emacs-erlang/ pushd emacs-erlang %{_emacs_bytecompile} *.el popd -%endif %{__with_emacs} +%endif # __with_emacs %make_build @@ -835,7 +833,7 @@ for f in lib/tools/emacs/{README,*.el}; do "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" done install -m 0644 emacs-erlang/*.elc "$RPM_BUILD_ROOT%{_emacs_sitelispdir}/erlang/" -%endif %{__with_emacs} +%endif # __with_emacs make DESTDIR=$RPM_BUILD_ROOT install @@ -853,7 +851,7 @@ find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist -type d -pe %else # Remove all examples find $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ -mindepth 1 -maxdepth 2 -type d -name examples -exec rm -rf {} \; -%endif %{__with_examples} +%endif # __with_examples chmod 0755 $RPM_BUILD_ROOT%{_libdir}/erlang/bin @@ -1272,7 +1270,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{__with_wxwidgets} %{_libdir}/erlang/lib/wx-*/examples/ %endif # __with_wxwidgets -%endif %{__with_examples} +%endif # __with_examples %files ftp %dir %{_libdir}/erlang/lib/ftp-*/ @@ -1704,7 +1702,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_emacs_sitelispdir}/erlang/*.el %{_emacs_sitelispdir}/erlang/*.elc %{_emacs_sitestartdir}/erlang-init.el -%endif %{__with_emacs} +%endif # __with_emacs %if %{__with_wxwidgets} %files wx From 039ee25fc043dea1315dc225480d2a2cc62aa33d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Jul 2024 15:58:30 +0200 Subject: [PATCH 317/340] Erlang ver. 26.2.5.2 Signed-off-by: Peter Lemenkov --- erlang.spec | 11 ++++------- sources | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/erlang.spec b/erlang.spec index ed2cc1b..ed975d0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.1 +Version: 26.2.5.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -122,13 +122,11 @@ BuildRequires: erlang %endif %endif -%if ! (0%{?rhel} && 0%{?rhel} <= 6) # for BuildRequires: systemd-devel BuildRequires: systemd %{?systemd_requires} Requires: systemd -%endif BuildRequires: autoconf BuildRequires: automake #BuildRequires: erlang-rpm-macros @@ -930,12 +928,10 @@ ln -s "${jinterface_lib_dir}priv/OtpErlang.jar" "$RPM_BUILD_ROOT%{_javadir}/%{na %endif # __with_java # systemd-related stuff -%if ! (0%{?rhel} && 0%{?rhel} <= 6) install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.service install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket -%endif %if %{__with_wxwidgets} @@ -1209,12 +1205,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %endif %{_libdir}/erlang/releases/* %{_libdir}/erlang/usr/ -%if ! (0%{?rhel} && 0%{?rhel} <= 6) %{_unitdir}/epmd.service %{_unitdir}/epmd.socket %{_unitdir}/epmd@.service %{_unitdir}/epmd@.socket -%endif %if %{__with_wxwidgets} %files et @@ -1967,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 10 2024 Peter Lemenkov - 26.2.5.2-1 +- Ver. 26.2.5.2 + * Wed Jun 26 2024 Peter Lemenkov - 26.2.5.1-1 - Ver. 26.2.5.1 diff --git a/sources b/sources index 58c38a3..2b4a35d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.1.tar.gz) = fe7cf5c3a386123fa00e364c1f2e884adb46b8080cd4e84eee83c07531c4fca23c909e439516f0e0730735487c7d0384df9fd98ac68e29c6e05add6039ea18f4 +SHA512 (otp-OTP-26.2.5.2.tar.gz) = 913029b713472b300c1ce8dc8658915ab3b3f2f36f5e01b5df492829baa70acbb76951747cbc0eed07267d5afc06fa25b8444c06d7cead1ec6f796a824facebe From 1d682bab55cd7f60e0dac2f8d66abe5dc9a257dd Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Jul 2024 16:34:14 +0200 Subject: [PATCH 318/340] OpenSSL engine split off since Fedora 41 Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index ed975d0..e15dab6 100644 --- a/erlang.spec +++ b/erlang.spec @@ -242,9 +242,9 @@ A byte code compiler for Erlang which produces highly compact code. %package crypto Summary: Cryptographical support BuildRequires: pkgconfig(openssl) -# FIXME there is something wrong with OpenSSL 3.0 support in Erlang right now. -# We have to fallback to OpenSSL1 explicitly. -# BuildRequires: openssl1.1-devel +%if 0%{fedora} > 40 +BuildRequires: openssl-devel-engine +%endif Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} From 0e5c862b2a0187cc55b9b5794748c13a64a73417 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:08:38 +0000 Subject: [PATCH 319/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index e15dab6..e27af3b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1961,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 26.2.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 10 2024 Peter Lemenkov - 26.2.5.2-1 - Ver. 26.2.5.2 From d9d1e480c904192b3ab6716e04fcd76f511bf32d Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 5 Sep 2024 19:21:18 +0200 Subject: [PATCH 320/340] Erlang ver. 26.2.5.3 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index e27af3b..0f65250 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.5.2 -Release: 2%{?dist} +Version: 26.2.5.3 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1961,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Sep 5 2024 Peter Lemenkov - 26.2.5.3-1 +- Ver. 26.2.5.3 + * Wed Jul 17 2024 Fedora Release Engineering - 26.2.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 2b4a35d..bec37f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.2.tar.gz) = 913029b713472b300c1ce8dc8658915ab3b3f2f36f5e01b5df492829baa70acbb76951747cbc0eed07267d5afc06fa25b8444c06d7cead1ec6f796a824facebe +SHA512 (otp-OTP-26.2.5.3.tar.gz) = 2fc5d9209c3428eca42d35aa868aef2e58b6d6611d85de7a6b28d355f97431b39fe36428965e9d9cb28e814129c101e7c4e60ccbc2c0e59f119f5fce22e15424 From cc3d6c8a984bfabe5b9ac8d7d4841e0e3bc3d578 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 9 Oct 2024 17:36:59 +0300 Subject: [PATCH 321/340] Erlang ver. 26.2.5.4 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 0f65250..e129b92 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.3 +Version: 26.2.5.4 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index bec37f2..456d911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.3.tar.gz) = 2fc5d9209c3428eca42d35aa868aef2e58b6d6611d85de7a6b28d355f97431b39fe36428965e9d9cb28e814129c101e7c4e60ccbc2c0e59f119f5fce22e15424 +SHA512 (otp-OTP-26.2.5.4.tar.gz) = fcbd3692a6f63bd293de06e11fe4ee5054c153b1481b399260546fa845e96e37dee822ef6fd5d965350357873f0bf3e28f70dab57db3b7f98f36bf772dbdf46e From 320b3b4669fe0d8774083010dc3af77f0a1cdb2c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 1 Nov 2024 14:35:45 +0300 Subject: [PATCH 322/340] Erlang ver. 26.2.5.5 Signed-off-by: Peter Lemenkov --- erlang.spec | 8 +++++++- sources | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index e129b92..22e0f97 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.4 +Version: 26.2.5.5 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1961,6 +1961,12 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Fri Nov 1 2024 Peter Lemenkov - 26.2.5.5-1 +- Ver. 26.2.5.5 + +* Wed Oct 9 2024 Peter Lemenkov - 26.2.5.4-1 +- Ver. 26.2.5.4 + * Thu Sep 5 2024 Peter Lemenkov - 26.2.5.3-1 - Ver. 26.2.5.3 diff --git a/sources b/sources index 456d911..6c9e828 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.4.tar.gz) = fcbd3692a6f63bd293de06e11fe4ee5054c153b1481b399260546fa845e96e37dee822ef6fd5d965350357873f0bf3e28f70dab57db3b7f98f36bf772dbdf46e +SHA512 (otp-OTP-26.2.5.5.tar.gz) = af6dc4ce7999a64ec3312bca96b37d980d3d4a21f7efa9d2e8d1bba8cfa800951db3c6b5b081d4db1b90306faf21ee08b11f3ab3373c549c471b806d47043bed From 42ddc9677e4771bc663b627376e16fe1f77da348 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sat, 7 Dec 2024 16:32:02 +0100 Subject: [PATCH 323/340] Erlang ver. 26.2.5.6 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 22e0f97..93bfd48 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.5 +Version: 26.2.5.6 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1961,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Sat Dec 7 2024 Peter Lemenkov - 26.2.5.6-1 +- Ver. 26.2.5.6 + * Fri Nov 1 2024 Peter Lemenkov - 26.2.5.5-1 - Ver. 26.2.5.5 diff --git a/sources b/sources index 6c9e828..34cf8be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.5.tar.gz) = af6dc4ce7999a64ec3312bca96b37d980d3d4a21f7efa9d2e8d1bba8cfa800951db3c6b5b081d4db1b90306faf21ee08b11f3ab3373c549c471b806d47043bed +SHA512 (otp-OTP-26.2.5.6.tar.gz) = 149f047e7e814a6da76f53a6bd3215d7561556a7589c95b21eabebab7dbc76f5b421fb42495dd9e6e73a57f8f535408577c5d5b4f5300cb2a448b8ac0e0c1a01 From a41792bba819a71201e542df62f7720bf68e3ad5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 17:07:09 +0000 Subject: [PATCH 324/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 93bfd48..5472a29 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1961,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 26.2.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Dec 7 2024 Peter Lemenkov - 26.2.5.6-1 - Ver. 26.2.5.6 From a59fa7eb2f9c2a36a3c379706dfb3139b07c766c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 11 Feb 2025 13:31:57 +0100 Subject: [PATCH 325/340] Erlang ver. 26.2.5.7 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +-- ...-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch | 35 --------- ...re.ac-C99-fixes-for-poll_works-check.patch | 72 ------------------- sources | 2 +- 4 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch delete mode 100644 otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch diff --git a/erlang.spec b/erlang.spec index 5472a29..1231fbd 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.5.6 -Release: 2%{?dist} +Version: 26.2.5.7 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -106,8 +106,6 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Patch6: otp-0006-Add-extra-search-directory.patch Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch -Patch9: otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch -Patch10: otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch # end of autogenerated patch tag list BuildRequires: gcc @@ -1961,6 +1959,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Tue Feb 11 2025 Peter Lemenkov - 26.2.5.7-1 +- Ver. 26.2.5.7 + * Thu Jan 16 2025 Fedora Release Engineering - 26.2.5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch b/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch deleted file mode 100644 index 8050629..0000000 --- a/otp-0009-configure.ac-C99-fix-for-ERTS___AFTER_MORECORE_HOOK_.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Florian Weimer -Date: Thu, 24 Nov 2022 11:57:49 +0100 -Subject: [PATCH] configure.ac: C99 fix for - ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC - -#include for the sbrk function if the header is available. - -diff --git a/erts/configure b/erts/configure -index 2044690dc6..f31d7775a4 100755 ---- a/erts/configure -+++ b/erts/configure -@@ -20937,6 +20937,9 @@ else $as_nop - #ifdef HAVE_MALLOC_H - # include - #endif -+#ifdef HAVE_UNISTD_H -+# include -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) -diff --git a/erts/configure.ac b/erts/configure.ac -index f247c1e71f..59c4d05460 100644 ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -2459,6 +2459,9 @@ AC_CACHE_CHECK([if __after_morecore_hook can track malloc()s core memory use], - #ifdef HAVE_MALLOC_H - # include - #endif -+#ifdef HAVE_UNISTD_H -+# include -+#endif - #if defined(HAVE_END_SYMBOL) - extern char end; - #elif defined(HAVE__END_SYMBOL) diff --git a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch b/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch deleted file mode 100644 index 65acd3b..0000000 --- a/otp-0010-configure.ac-C99-fixes-for-poll_works-check.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Florian Weimer -Date: Thu, 24 Nov 2022 11:59:22 +0100 -Subject: [PATCH] configure.ac: C99 fixes for poll_works check - -Include if it is available for the open prototype. -Return from main instead of calling exit, so that no function -declaration is needed. - -diff --git a/erts/configure b/erts/configure -index f31d7775a4..77fb9d0d7f 100755 ---- a/erts/configure -+++ b/erts/configure -@@ -24893,10 +24893,13 @@ else $as_nop - /* end confdefs.h. */ - - #include --main() -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -24905,9 +24908,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - -diff --git a/erts/configure.ac b/erts/configure.ac -index 59c4d05460..0abb11a967 100644 ---- a/erts/configure.ac -+++ b/erts/configure.ac -@@ -3102,10 +3102,13 @@ poll_works=no - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include --main() -+#ifdef HAVE_FCNTL_H -+#include -+#endif -+int main() - { - #ifdef _POLL_EMUL_H_ -- exit(1); /* Implemented using select() -- fail */ -+ return 1; /* Implemented using select() -- fail */ - #else - struct pollfd fds[1]; - int fd; -@@ -3114,9 +3117,9 @@ main() - fds[0].events = POLLIN; - fds[0].revents = 0; - if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) { -- exit(1); /* Does not work for devices -- fail */ -+ return 1; /* Does not work for devices -- fail */ - } -- exit(0); -+ return 0; - #endif - } - ]])],[poll_works=yes],[poll_works=no],[ diff --git a/sources b/sources index 34cf8be..477853b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.6.tar.gz) = 149f047e7e814a6da76f53a6bd3215d7561556a7589c95b21eabebab7dbc76f5b421fb42495dd9e6e73a57f8f535408577c5d5b4f5300cb2a448b8ac0e0c1a01 +SHA512 (otp-OTP-26.2.5.7.tar.gz) = 210a2246fc1bb5c82fe50c797a63045d09822dbddfadff024d9a227d38a22a6f607e8f2fa146d19cc31567f3d4c6e007b845981147c87df97fc0315dd64c169e From 35769571a05f484f9776e162b903028e8cc31451 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 13 Feb 2025 19:42:45 +0100 Subject: [PATCH 326/340] Erlang ver. 26.2.5.8 Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1231fbd..e31aa7b 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.7 +Version: 26.2.5.8 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -1959,6 +1959,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Thu Feb 13 2025 Peter Lemenkov - 26.2.5.8-1 +- Ver. 26.2.5.8 + * Tue Feb 11 2025 Peter Lemenkov - 26.2.5.7-1 - Ver. 26.2.5.7 diff --git a/sources b/sources index 477853b..ed06a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.7.tar.gz) = 210a2246fc1bb5c82fe50c797a63045d09822dbddfadff024d9a227d38a22a6f607e8f2fa146d19cc31567f3d4c6e007b845981147c87df97fc0315dd64c169e +SHA512 (otp-OTP-26.2.5.8.tar.gz) = 44893d2c2f8c3e0e04ada83b77f21dbc8c72f8b95005beeb11d320208cacd2c6bbc57c4c073f1cdd401f408a651e014fc2e6d4f52e7f787e2492a8ab3f872e98 From 085b3c69e0d9c941d105451736ee14a9def074d3 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Feb 2025 17:21:51 +0100 Subject: [PATCH 327/340] Erlang ver. 26.2.5.9 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index e31aa7b..b1c5af0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.8 +Version: 26.2.5.9 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index ed06a02..e00ecbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.8.tar.gz) = 44893d2c2f8c3e0e04ada83b77f21dbc8c72f8b95005beeb11d320208cacd2c6bbc57c4c073f1cdd401f408a651e014fc2e6d4f52e7f787e2492a8ab3f872e98 +SHA512 (otp-OTP-26.2.5.9.tar.gz) = 68cdba025b7f77d1b143737a536160f65ecbb1ab681bc92a7ab037f80ae6993ebabff62399de4688f1b9de054d0823a6d093545e1c414530c165e8e14806c611 From 28be5b518144ed7fe9b700e4b8f3adb1a89d5c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:26 +0100 Subject: [PATCH 328/340] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- erlang.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/erlang.spec b/erlang.spec index b1c5af0..df03ab3 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -349,7 +349,6 @@ BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: zlib-devel # epmd user, epmd group -Requires(pre): shadow-utils Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: lksctp-tools @@ -741,6 +740,11 @@ Provides support for XML 1.0. # remove shipped zlib sources #rm -f erts/emulator/zlib/*.[ch] +# Create a sysusers.d config file +cat >erlang.sysusers.conf </dev/null || groupadd -r epmd -getent passwd epmd >/dev/null || \ -useradd -r -g epmd -d /dev/null -s /sbin/nologin \ --c "Erlang Port Mapper Daemon" epmd 2>/dev/null || : %files @@ -1207,6 +1208,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %{_unitdir}/epmd.socket %{_unitdir}/epmd@.service %{_unitdir}/epmd@.socket +%{_sysusersdir}/erlang.conf %if %{__with_wxwidgets} %files et @@ -1959,6 +1961,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Mar 10 2025 Zbigniew Jedrzejewski-Szmek - 26.2.5.9-2 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Thu Feb 13 2025 Peter Lemenkov - 26.2.5.8-1 - Ver. 26.2.5.8 From b243901f61dc8005cb89d679983fe0e07d5b5761 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 28 Mar 2025 17:13:32 +0100 Subject: [PATCH 329/340] Erlang ver. 26.2.5.10 Signed-off-by: Peter Lemenkov --- erlang.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index df03ab3..c8ab6e0 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.5.9 -Release: 2%{?dist} +Version: 26.2.5.10 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1961,6 +1961,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Fri Mar 28 2025 Peter Lemenkov - 26.2.5.10-1 +- Ver. 26.2.5.10 + * Mon Mar 10 2025 Zbigniew Jedrzejewski-Szmek - 26.2.5.9-2 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index e00ecbf..20d0566 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.9.tar.gz) = 68cdba025b7f77d1b143737a536160f65ecbb1ab681bc92a7ab037f80ae6993ebabff62399de4688f1b9de054d0823a6d093545e1c414530c165e8e14806c611 +SHA512 (otp-OTP-26.2.5.10.tar.gz) = d92a26200b28770e6030be1b0703abcd5a7da6ce85656b617f78b75b04afcf5023bee239ad274475f22d8a1ef90d35b123d042723611164497cf09fd587a0b1e From fff94550c5ddd1e2917bf5006ab701753ee62d5c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 16 Apr 2025 20:03:31 +0200 Subject: [PATCH 330/340] Erlang ver. 26.2.5.11 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index c8ab6e0..945c736 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.10 +Version: 26.2.5.11 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index 20d0566..cede25a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.10.tar.gz) = d92a26200b28770e6030be1b0703abcd5a7da6ce85656b617f78b75b04afcf5023bee239ad274475f22d8a1ef90d35b123d042723611164497cf09fd587a0b1e +SHA512 (otp-OTP-26.2.5.11.tar.gz) = 9cc04a9f807b4c0dd36bca93d52ab5ec7f022925b18dbaf3d5ce7184c20ad29c9e538caa622e65402c7e3a0c103a5d7ec025ec67853fee33fc6418ffefe9ddd6 From b2511601764e9b547581a9fe10a19439d7d40475 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 8 May 2025 18:10:48 +0200 Subject: [PATCH 331/340] Erlang ver. 26.2.5.12 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 945c736..1262a12 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.11 +Version: 26.2.5.12 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index cede25a..73f4c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.11.tar.gz) = 9cc04a9f807b4c0dd36bca93d52ab5ec7f022925b18dbaf3d5ce7184c20ad29c9e538caa622e65402c7e3a0c103a5d7ec025ec67853fee33fc6418ffefe9ddd6 +SHA512 (otp-OTP-26.2.5.12.tar.gz) = 58dcefcca96bbce4ab28518e4a5a2326cec6d2580b7316d5329553d1da7b03e8f395e2a586c9e7344426d549e450e1e3f3bb25528e3e5dc72eaa5505abe2197a From bfc9034d42bdcc49ae21f14993f9eb0758897719 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 16 Jun 2025 18:02:09 +0200 Subject: [PATCH 332/340] Erlang ver. 26.2.5.13 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index 1262a12..830d088 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.12 +Version: 26.2.5.13 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index 73f4c57..6ee0529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.12.tar.gz) = 58dcefcca96bbce4ab28518e4a5a2326cec6d2580b7316d5329553d1da7b03e8f395e2a586c9e7344426d549e450e1e3f3bb25528e3e5dc72eaa5505abe2197a +SHA512 (otp-OTP-26.2.5.13.tar.gz) = c707a4ef6a45541f0afd1eb0f75b8dc9e1750781ee1072327d43ed19c02bb721f4fc242b12c30b32cb90622f187e0a28421a8bf11dcede0c14f5b6eb5b7224ad From 84f099dbec611e23341b69e4d3b2dd268ea7fb8c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 18 Jun 2025 07:49:37 -0400 Subject: [PATCH 333/340] Rename typer (in /usr/bin) to erlang-typer; fixes RHBZ#2359567 - Add Conflicts with python3-typer-cli to erlang-dialyzer in F41/F42 - Fix a conditional that would not work on EPEL --- erlang.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/erlang.spec b/erlang.spec index 830d088..b1bca69 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -240,7 +240,7 @@ A byte code compiler for Erlang which produces highly compact code. %package crypto Summary: Cryptographical support BuildRequires: pkgconfig(openssl) -%if 0%{fedora} > 40 +%if 0%{?fedora} > 40 BuildRequires: openssl-devel-engine %endif Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -938,6 +938,19 @@ install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/epmd@.socket %if %{__with_wxwidgets} echo "No need to fix additional scripts" +# Fix file conflict w/ python3-typer-cli by renaming our typer to erlang-typer. +# We only rename the symlink in %%{_bindir}, not its direct and indirect +# targets in subdirectories of %%{_libdir}. +# +# File conflicts: /usr/bin/typer between erlang-dialyzer and python3-typer-cli +# https://bugzilla.redhat.com/show_bug.cgi?id=2359567 +mv %{buildroot}%{_bindir}/typer %{buildroot}%{_bindir}/erlang-typer +%if %{with doc} +mv %{buildroot}%{_mandir}/man1/typer.1 \ + %{buildroot}%{_mandir}/man1/erlang-typer.1 +sed -r -i 's/^(\.TH[[:blank:]]+)?(typer)\b/\1erlang-\2/' \ + %{buildroot}%{_mandir}/man1/erlang-typer.1 +%endif %else # FIXME workaround for broken Erlang install procedure echo "Removing scripts which won't work w/o wxWidgets anyway" @@ -1043,14 +1056,14 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %files dialyzer %{_bindir}/dialyzer # FIXME FIXME FIXME this must be installed properly!!!!!! -%{_bindir}/typer +%{_bindir}/erlang-typer %{_libdir}/erlang/bin/dialyzer %{_libdir}/erlang/bin/typer %{_libdir}/erlang/erts-*/bin/dialyzer %{_libdir}/erlang/erts-*/bin/typer %{_libdir}/erlang/lib/dialyzer-*/ %if %{with doc} -%{_mandir}/man1/typer.* +%{_mandir}/man1/erlang-typer.* %{_mandir}/man3/dialyzer.* %endif %endif # __with_wxwidgets @@ -1961,6 +1974,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Wed Jun 18 2025 Benjamin A. Beasley - 26.2.5.13-2 +- Rename typer (in /usr/bin) to erlang-typer; fixes RHBZ#2359567 + * Fri Mar 28 2025 Peter Lemenkov - 26.2.5.10-1 - Ver. 26.2.5.10 From c953b384903c43db17fc27659294b328076ad7c1 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 19 Jun 2025 13:25:27 +0200 Subject: [PATCH 334/340] Missed %changelog entries Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erlang.spec b/erlang.spec index b1bca69..9fa05e5 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1977,6 +1977,15 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests * Wed Jun 18 2025 Benjamin A. Beasley - 26.2.5.13-2 - Rename typer (in /usr/bin) to erlang-typer; fixes RHBZ#2359567 +* Mon Jun 16 2025 Peter Lemenkov - 26.2.5.13-1 +- Ver. 26.2.5.13 + +* Thu May 8 2025 Peter Lemenkov - 26.2.5.12-1 +- Ver. 26.2.5.12 + +* Wed Apr 16 2025 Peter Lemenkov - 26.2.5.11-1 +- Ver. 26.2.5.11 + * Fri Mar 28 2025 Peter Lemenkov - 26.2.5.10-1 - Ver. 26.2.5.10 From 083a1581a8eff56f46fcc42b1ae626e1d5f53f74 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 19 Jun 2025 13:26:04 +0200 Subject: [PATCH 335/340] Add GDB tools Signed-off-by: Peter Lemenkov --- erlang.spec | 15 ++ otp-0009-Add-GDB-tools.patch | 464 +++++++++++++++++++++++++++++++++++ 2 files changed, 479 insertions(+) create mode 100644 otp-0009-Add-GDB-tools.patch diff --git a/erlang.spec b/erlang.spec index 9fa05e5..ef2cc9c 100644 --- a/erlang.spec +++ b/erlang.spec @@ -106,10 +106,13 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch Patch6: otp-0006-Add-extra-search-directory.patch Patch7: otp-0007-Avoid-forking-sed-to-get-basename.patch Patch8: otp-0008-Load-man-pages-from-system-wide-directory.patch +Patch9: otp-0009-Add-GDB-tools.patch # end of autogenerated patch tag list BuildRequires: gcc BuildRequires: gcc-c++ +# For gdb-tools +BuildRequires: gdb BuildRequires: flex BuildRequires: make @@ -421,6 +424,13 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description ftp FTP client. +%package gdb-tools +Summary: GDB plugin +Requires: gdb + +%description gdb-tools +GDB plugin. + %package inets Summary: A set of services such as a Web server and a HTTP client etc Requires: %{name}-erts%{?_isa} = %{version}-%{release} @@ -968,6 +978,8 @@ install -d -p -m 0755 %{buildroot}%{_datadir}/erlang/lib install -m0644 -D erlang.sysusers.conf %{buildroot}%{_sysusersdir}/erlang.conf +# GDB tools +install -D -p -m 0755 ./bin/*/jit-reader.so %{buildroot}%{_libdir}/gdb/jit-reader.so %check TARGET="$(make target_configured)" @@ -1287,6 +1299,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %{_mandir}/man3/ftp.* %endif +%files gdb-tools +%{_libdir}/gdb/jit-reader.so + %files inets %dir %{_libdir}/erlang/lib/inets-*/ %{_libdir}/erlang/lib/inets-*/ebin diff --git a/otp-0009-Add-GDB-tools.patch b/otp-0009-Add-GDB-tools.patch new file mode 100644 index 0000000..462324e --- /dev/null +++ b/otp-0009-Add-GDB-tools.patch @@ -0,0 +1,464 @@ +From: Peter Lemenkov +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 + +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 ++ ++#include ++#include ++#include ++#include ++ ++/* 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 = ®free; ++ prev_rbp->defined = 1; ++ prev_rbp->size = sizeof(char*); ++ prev_rsp->free = ®free; ++ prev_rsp->defined = 1; ++ prev_rsp->size = sizeof(char*); ++ prev_rip->free = ®free; ++ 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 $@ $^ From bcf126e0f2692e318f7b168078ccbf08821662b0 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 20 Jun 2025 21:14:35 +0200 Subject: [PATCH 336/340] Bump release number Signed-off-by: Peter Lemenkov --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index ef2cc9c..f81d9be 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1989,6 +1989,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Fri Jun 20 2025 Peter Lemenkov - 26.2.5.13-3 +- Add GDB tools + * Wed Jun 18 2025 Benjamin A. Beasley - 26.2.5.13-2 - Rename typer (in /usr/bin) to erlang-typer; fixes RHBZ#2359567 From f43ad3bdaf58499158f65ea5fe5213acd56f9b5c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 17 Jul 2025 20:48:21 +0200 Subject: [PATCH 337/340] Erlang ver. 26.2.5.14 Signed-off-by: Peter Lemenkov --- erlang.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index f81d9be..879c777 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.5.13 -Release: 3%{?dist} +Version: 26.2.5.14 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -426,6 +426,7 @@ FTP client. %package gdb-tools Summary: GDB plugin +License: GPL-3.0-or-later Requires: gdb %description gdb-tools @@ -1989,6 +1990,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Thu Jul 17 2025 Peter Lemenkov - 26.2.5.14-1 +- Ver. 26.2.5.14 + * Fri Jun 20 2025 Peter Lemenkov - 26.2.5.13-3 - Add GDB tools diff --git a/sources b/sources index 6ee0529..c48157f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.13.tar.gz) = c707a4ef6a45541f0afd1eb0f75b8dc9e1750781ee1072327d43ed19c02bb721f4fc242b12c30b32cb90622f187e0a28421a8bf11dcede0c14f5b6eb5b7224ad +SHA512 (otp-OTP-26.2.5.14.tar.gz) = 49ab187d657efd45304685b2117aa8f9adc07a41864e13c1bb5c3b3893fcda4b5d3895bfe91a3dbcd5c3372f49b3aad9f4dafa6511755e6cab595ddd87c748cb From 4bc8ef38529402cc24f7c13ba4d3b06db89759ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:57:16 +0000 Subject: [PATCH 338/340] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- erlang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erlang.spec b/erlang.spec index 879c777..18490bf 100644 --- a/erlang.spec +++ b/erlang.spec @@ -69,7 +69,7 @@ Name: erlang Version: 26.2.5.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -1990,6 +1990,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 26.2.5.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Peter Lemenkov - 26.2.5.14-1 - Ver. 26.2.5.14 From 5e7cc4ec01a5bfb1a150b0805266e1e6e706ef5c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 10 Sep 2025 17:52:52 +0200 Subject: [PATCH 339/340] Erlang ver. 26.2.5.15 Signed-off-by: Peter Lemenkov --- erlang.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/erlang.spec b/erlang.spec index 18490bf..a209a55 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,8 +68,8 @@ Name: erlang -Version: 26.2.5.14 -Release: 2%{?dist} +Version: 26.2.5.15 +Release: 1%{?dist} Summary: General-purpose programming language and runtime environment License: Apache-2.0 @@ -362,6 +362,8 @@ Provides: erlang(erl_drv_version) = 3.3 #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) Provides: erlang(erl_nif_version) = 2.17 Provides: bundled(pcre) = 8.44 +# git commit 965d19506ff2aed72e039b8c650b6ef5e9446b8c +Provides: bundled(asmjit) Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-gs @@ -1990,6 +1992,9 @@ ERL_TOP=${ERL_TOP} make TARGET=${TARGET} release_tests %changelog +* Wed Sep 10 2025 Peter Lemenkov - 26.2.5.15-1 +- Ver. 26.2.5.15 + * Wed Jul 23 2025 Fedora Release Engineering - 26.2.5.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index c48157f..aa20cd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.14.tar.gz) = 49ab187d657efd45304685b2117aa8f9adc07a41864e13c1bb5c3b3893fcda4b5d3895bfe91a3dbcd5c3372f49b3aad9f4dafa6511755e6cab595ddd87c748cb +SHA512 (otp-OTP-26.2.5.15.tar.gz) = e8ba73f8e742d94e7c9180ecaca5871cab5b871f22a1357d9c50ac36e99f6e448c7d8bf93c1083b7210de688b4dbd8ecbab34e314f7732ab94ea78cde4ba6ae4 From 8d152258bbce1e386884700478d68e3bb5cdd968 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 7 Nov 2025 17:22:57 +0100 Subject: [PATCH 340/340] Erlang ver. 26.2.5.16 Signed-off-by: Peter Lemenkov --- erlang.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erlang.spec b/erlang.spec index a209a55..878fb41 100644 --- a/erlang.spec +++ b/erlang.spec @@ -68,7 +68,7 @@ Name: erlang -Version: 26.2.5.15 +Version: 26.2.5.16 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment diff --git a/sources b/sources index aa20cd0..674a546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (otp-OTP-26.2.5.15.tar.gz) = e8ba73f8e742d94e7c9180ecaca5871cab5b871f22a1357d9c50ac36e99f6e448c7d8bf93c1083b7210de688b4dbd8ecbab34e314f7732ab94ea78cde4ba6ae4 +SHA512 (otp-OTP-26.2.5.16.tar.gz) = 4e973be7e8ccad196d59759108a521535b0f046268eb0406f789a50f411fa27c9c11fcfb61a7218605bf1b32921bb52c52fc7c99917e1acfc0d3ed09437129b2