Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

erlang.spec Changed

@@ -1,25 +1,4 @@
-%if 0%{?opensuse_bs}
-#!BuildIgnore: systemd
-%if 0%{?rhel} > 6
-#!BuildIgnore: java-1.7.0-openjdk-devel
-%global java_devel java-1.8.0-openjdk-devel
-%else
-#!BuildIgnore: java-1.5.0-openjdk-devel
-%global java_devel java-1.6.0-openjdk-devel
-%endif
-%global java_devel_nx86 java-1.5.0-gcj-devel
-%else
-%global java_devel java-devel
-%global java_devel_nx86 java-devel
-%endif
-
-%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
-
-%global need_bootstrap_set 0
-
-%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
-
-%bcond_without doc
+%global bootstrap 1
 
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
 %global with_systemd 0
@@ -27,17 +6,25 @@
 %global with_systemd 1
 %endif
 
+%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
 %endif
 
 Name:		erlang
-Version:	17.4
-Release:	2%{?dist}
+Version:	18.3.3
+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
@@ -47,9 +34,10 @@
 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
 #
@@ -86,47 +74,29 @@
 # 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
+# Add patch to crash dump on large distribution
+Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.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
+# 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
-BuildRequires: gcc-c++
-BuildRequires:	lksctp-tools-devel
-BuildRequires:	m4
-BuildRequires:	ncurses-devel
-BuildRequires:	openssl-devel
-BuildRequires:	zlib-devel
-%if 0%{?with_systemd}
-BuildRequires: systemd-devel
-%endif
 
 %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 0%{?need_bootstrap} < 1
+%if 0%{?bootstrap} < 1
 # Required for building docs (escript)
 BuildRequires:	erlang
 %endif
 %endif
 
-BuildRequires:	emacs
-BuildRequires:	emacs-el
-BuildRequires:	erlang-rpm-macros
-BuildRequires:	xemacs
-BuildRequires:	xemacs-packages-extra-el
-
 %if 0%{?with_systemd}
 %if 0%{?suse_version}
 Requires(post): systemd
 Requires(postun): systemd
 Requires(preun): systemd
 %else
+BuildRequires: systemd-devel
 Requires(post): systemd-units
 Requires(postun): systemd-units
 Requires(preun): coreutils
@@ -140,6 +110,11 @@
 Requires(preun): initscripts
 %endif
 
+
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	erlang-rpm-macros
+
 Requires: %{name}-asn1%{?_isa} = %{version}-%{release}
 Requires: %{name}-common_test%{?_isa} = %{version}-%{release}
 Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
@@ -199,9 +174,32 @@
 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
+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).
+
 %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}
@@ -210,14 +208,15 @@
 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}
@@ -225,15 +224,14 @@
 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

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

@@ -6,10 +6,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 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 @@
 	$(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

otp-0002-Remove-rpath.patch Changed

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

@@ -14,10 +14,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 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 @@
 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 @@
 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 @@
 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 @@
 	$(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 @@
 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 @@
 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 @@
 	$(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 @@
 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

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

@@ -5,10 +5,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
-index 273614e..5b1fb57 100644
+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 @@
 	$(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

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

@@ -6,10 +6,10 @@
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index 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 @@
 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 @@
 
 INCLUDE=../include
 CSRC=../c_src
-@@ -78,7 +83,11 @@ docs:
+@@ -79,7 +84,11 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk

otp-0006-Do-not-install-erlang-sources.patch Changed

@@ -8,10 +8,10 @@
 Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
 
 diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
-index 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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 
 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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 	$(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 @@
 release_docs_spec:
 
 diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index 2e1110e..b7f9b09 100644

otp-0007-Split-off-webtool-dependency-from-tools.patch Changed

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

@@ -0,0 +1,30 @@
+From: John Eckersberg <jeckersb@redhat.com>
+Date: Wed, 16 Dec 2015 11:03:42 -0500
+Subject: PATCH Add patch to crash dump on large distribution
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1291822
+https://bugzilla.redhat.com/show_bug.cgi?id=1291855
+https://bugzilla.redhat.com/show_bug.cgi?id=1291856
+https://bugzilla.redhat.com/show_bug.cgi?id=1291857
+
+diff -ur otp-OTP-18.3.3.orig/erts/emulator/beam/dist.c otp-OTP-18.3.3/erts/emulator/beam/dist.c
+--- otp-OTP-18.3.3.orig/erts/emulator/beam/dist.c	2016-05-03 10:11:12.000000000 +0200
++++ otp-OTP-18.3.3/erts/emulator/beam/dist.c	2016-05-29 12:35:03.801225329 +0200
+@@ -1980,7 +1980,7 @@
+ 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 @@
+ 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);

otp-0008-Introduce-os-getenv-2.patch Deleted

@@ -1,63 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sat, 8 Nov 2014 15:11:04 +0300
-Subject: PATCH Introduce os:getenv/2
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
-index 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</code>
- </desc>
- </func>
- <func>
-+ <name name="getenv" arity="2"/>
-+ <fsummary>Get the value of an environment variable</fsummary>
-+ <desc>
-+ Returns the <c><anno>Value</anno></c> of the environment variable
-+ <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the environment variable
-+ is undefined.
-+	If Unicode file name encoding is in effect (see the <seealso
-+	marker="erts:erl#file_name_encoding">erl manual
-+	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
-+	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.
-+ </desc>
-+ </func>
-+ <func>
- <name name="getpid" arity="0"/>
- <fsummary>Return the process identifier of the emulator process</fsummary>
- <desc>
-diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
-index 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().
-

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

@@ -1,100 +0,0 @@
-From: Sergei Golovan <sgolovan@debian.org>
-Date: Sun, 30 Nov 2014 20:20:41 +0300
-Subject: PATCH Patch removes support for SSLv3 protocol because it is proved
- to be insecure and nobody should use it anymore.
-
-
-diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
-index b53344e..b245621 100644
---- a/lib/ssl/doc/src/ssl.xml
-+++ b/lib/ssl/doc/src/ssl.xml
-@@ -123,7 +123,7 @@
- 
- <c>sslsocket() - opaque to the user. </c>
- 
-- <c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c>
-+ <c>protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c>
- 
- <c>ciphers() = ciphersuite() | string() (according to old API)</c>
- 
-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,
-- <c>erl ... -ssl protocol_version 'sslv3, tlsv1' ...</c>.
-+ <c>erl ... -ssl protocol_version 'tlsv1.1, tlsv1' ...</c>.
- 
- <taglist>
-- <tag><c><!CDATAprotocol_version = sslv3|tlsv1 <optional>></c>.</tag>
-+ <tag><c><!CDATAprotocol_version = tlsv1|tlsv1.1|tlsv1.2 <optional>></c>.</tag>
- <item>
- 	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.
-+	
- </item>
- 
- <tag><c><!CDATAsession_lifetime = integer() <optional>></c></tag>
-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.

otp-0010-Quickfix-for-cmpxchg8b-inline-asm-when-pic-and-gcc-5.patch Added

otp-OTP-17.4.tar.gz -> otp-OTP-18.3.3.tar.gz Changed

otp-make-subpackages.py Added

@@ -0,0 +1,180 @@
+import glob
+import os
+import re
+import rpm
+import sys
+
+ts = rpm.TransactionSet()
+
+packages = 
+for arg in sys.argv1::
+	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 (lksctp-tools) is dlopened so it can't be picked
+		# up automatically by the RPM dependency checker
+		"erlang-erts": "lksctp-tools",
+		"erlang-gs": "tk",
+		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
+		"erlang-ic": "jpackage-utils",
+		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
+		"erlang-jinterface": "%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils",
+		"erlang-wx": "mesa-libGL", "mesa-libGLU",
+		"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 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",
+		}
+
+##
+## Custom tweaks ends here
+##
+
+# To match 'erlang(asn1ct_eval_ext:transform_to_EXTERNAL1994/1)'
+prog = re.compile("^erlang(.*:.*/\d+)")
+rpmmask = re.compile(".*\.rpm")
+
+# iterate over all rpms
+for package in sorted(p for p in packages if rpmmask.match(p)):
+
+	# A tricky part. We are processing packages, rebuilt with
+	# %{__erlang_provides_requires}. Otherwise we won't get information
+	# about imports/exports (until we learn how to parse Erlang BEAM file
+	# headers with Python.
+	fd = os.open(package, os.O_RDONLY)
+	h = ts.hdrFromFdno(fd)
+	os.close(fd)
+
+	rpm_name = hrpm.RPMTAG_NAME
+
+	# Let's calculate provides
+	# We'll create dictionary to speedup future use
+	# FIXME duplicate provides
+	local_provides = p for p in hrpm.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 hrpm.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_headersname
+
+	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" % hrpm.RPMTAG_SUMMARY
+	print "Group: %s" % hrpm.RPMTAG_GROUP
+
+	rawdeps = erlang_provides.get(r, "Error: missing requires: %s" % r) for r in erlang_requiresname
+
+	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" % hrpm.RPMTAG_DESCRIPTION
+
+	if name == "erlang-doc":
+		# Additional ifdef just for this sub-package (see above)
+		print "%endif"
+
+	print ""
+
+print "### END OF AUTOGENERATED LIST ###"