Hello community, here is the log from the commit of package erlang for openSUSE:Factory checked in at 2013-12-30 09:51:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang (Old) and /work/SRC/openSUSE:Factory/.erlang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang/erlang.changes 2013-09-25 17:12:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2013-12-30 09:51:54.000000000 +0100 @@ -1,0 +2,34 @@ +Sat Dec 21 11:05:07 UTC 2013 - [email protected] + +- Add crypto.patch: fix compilation with openssl having EC disabled + +------------------------------------------------------------------- +Fri Dec 20 19:51:06 UTC 2013 - [email protected] + +- Fixing systemd. +- Warning: variables in /etc/sysconfig/erlang must be set and filled. + +------------------------------------------------------------------- +Fri Dec 20 14:51:25 UTC 2013 - [email protected] + +- update to R16B03 release: + + A new memory allocation feature called "super carrier" has + been introduced. It can for example be used for pre-allocation + of all memory that the runtime system should be able to use. + It is enabled by passing the +MMscs (size in MB) 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. + + The ldap client eldap now supports the start_tls operation. + This upgrades an existing tcp connection to encryption using + tls, see eldap:start_tls/2 and /3. + + The ftp client (inets application) now supports ftp over tls + (ftps). +- adapt patch erlang-not-install-misc.patch + +------------------------------------------------------------------- +Sun Oct 27 17:07:46 UTC 2013 - [email protected] + +- Add systemd support for openSUSE >= 12.3 + +------------------------------------------------------------------- Old: ---- otp_doc_html_R16B02.tar.gz otp_doc_man_R16B02.tar.gz otp_src_R16B02.tar.gz New: ---- crypto.patch epmd.service epmd.socket otp_doc_html_R16B03.tar.gz otp_doc_man_R16B03.tar.gz otp_src_R16B03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang.spec ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: erlang -Version: R16B02 +Version: R16B03 Release: 0 Summary: General-purpose programming language and runtime environment License: ErlPL-1.1 @@ -33,6 +33,8 @@ Source4: epmd.init Source5: erlang.sysconfig Source6: macros.erlang +Source7: epmd.service +Source8: epmd.socket # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: otp-R16B-rpath.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -41,6 +43,8 @@ Patch3: fix-armv7hl.patch # PATCH-FIX-OPENSUSE erlang-not-install-misc.patch - [email protected] -- patch from Fedora, this removes unneeded magic Patch4: erlang-not-install-misc.patch +# PATCH-FIX-UPSTREAM crypto.patch - [email protected] -- fix compilation with disabled EC in openssl +Patch5: crypto.patch # autoconf is required only by fix-armv7hl.patch BuildRequires: autoconf BuildRequires: gcc-c++ @@ -54,12 +58,8 @@ BuildRequires: Mesa-devel BuildRequires: java-devel >= 1.6.0 BuildRequires: krb5-devel -%if 0%{?sles_version} >= 10 BuildRequires: update-alternatives -%endif -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif %if 0%{?suse_version} >= 1140 BuildRequires: wxWidgets @@ -70,6 +70,12 @@ BuildRequires: wxGTK-devel >= 2.8 %endif +%if 0%{?suse_version} >=1230 +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} +%define have_systemd 1 +%endif + %define epmd_home %{_var}/lib/epmd %description @@ -287,6 +293,7 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 chmod -R u+w . # enable dynamic linking for ssl @@ -383,11 +390,17 @@ %endif install -d -m 0750 %{buildroot}%{epmd_home} +install -d -m 0755 %{buildroot}%{_sbindir} +%if 0%{?have_systemd} +install -D -m 0644 %{S:7} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 0644 %{S:8} %{buildroot}%{_unitdir}/%{name}.socket +ln -s /sbin/service %{buildroot}%{_sbindir}/rcepmd +%else +ln -s /etc/init.d/epmd %{buildroot}%{_sbindir}/rcepmd +%endif install -D -m 0755 %{S:4} %{buildroot}/etc/init.d/epmd install -D -m 0644 %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.erlang install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang -install -d -m 0755 %{buildroot}%{_sbindir} -ln -s /etc/init.d/epmd %{buildroot}%{_sbindir}/rcepmd %pre /usr/sbin/groupadd -r epmd &>/dev/null || : @@ -398,9 +411,15 @@ %fillup_only erlang %preun +%if 0%{?have_systemd} +%service_del_preun %{name}.service %{name}.socket +%endif %stop_on_removal epmd %postun +%if 0%{?have_systemd} +%service_del_postun %{name}.service %{name}.socket +%endif %restart_on_update epmd %{insserv_cleanup} @@ -472,6 +491,10 @@ %{_libdir}/erlang/Install %{_datadir}/emacs/site-lisp/erlang.el %dir %attr(-,epmd,epmd) %{epmd_home} +%if 0%{?have_systemd} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket +%endif /etc/init.d/epmd %{_sbindir}/rcepmd /var/adm/fillup-templates/sysconfig.erlang ++++++ crypto.patch ++++++ commit d485136c670954ea8d933b332f39f9265727c745 Author: Matwey V. Kornilov <[email protected]> Date: Sat Dec 21 00:13:35 2013 +0400 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 42fb172..421d643 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -77,7 +77,8 @@ #if OPENSSL_VERSION_NUMBER >= 0x009080ffL \ && !defined(OPENSSL_NO_EC) \ && !defined(OPENSSL_NO_ECDH) \ - && !defined(OPENSSL_NO_ECDSA) + && !defined(OPENSSL_NO_ECDSA) \ + && !defined(OPENSSL_NO_EC2M) # define HAVE_EC #endif ++++++ epmd.service ++++++ [Unit] Description=Erlang Port Mapper Daemon [Service] EnvironmentFile=/etc/sysconfig/erlang ExecStart=/usr/bin/epmd -daemon -address ${EPMD_ADDRESSES} -port ${EPMD_PORT} ExecStop=/usr/bin/epmd -kill Type=forking [Install] WantedBy=multi-user.target ++++++ epmd.socket ++++++ [Unit] Conflicts=epmd.service [Socket] ListenStream=4369 Accept=no [Install] WantedBy=sockets.target ++++++ erlang-not-install-misc.patch ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -29,9 +29,9 @@ --- otp_src_R16B02.orig/erts/etc/unix/Install.src +++ otp_src_R16B02/erts/etc/unix/Install.src @@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_* + 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 -# ++++++ erlang.sysconfig ++++++ --- /var/tmp/diff_new_pack.w9SaQ5/_old 2013-12-30 09:51:59.000000000 +0100 +++ /var/tmp/diff_new_pack.w9SaQ5/_new 2013-12-30 09:51:59.000000000 +0100 @@ -15,6 +15,6 @@ ## Default: "4369" ## ServiceRestart: epmd # -# Options for sshd +# Port that EPMD should listen on. # -EPMD_PORT="" +EPMD_PORT="4369" ++++++ otp_doc_html_R16B02.tar.gz -> otp_doc_html_R16B03.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_doc_html_R16B02.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_doc_html_R16B03.tar.gz differ: char 5, line 1 ++++++ otp_doc_man_R16B02.tar.gz -> otp_doc_man_R16B03.tar.gz ++++++ ++++ 6747 lines of diff (skipped) ++++++ otp_src_R16B02.tar.gz -> otp_src_R16B03.tar.gz ++++++ /work/SRC/openSUSE:Factory/erlang/otp_src_R16B02.tar.gz /work/SRC/openSUSE:Factory/.erlang.new/otp_src_R16B03.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
