Hello community,
here is the log from the commit of package erlang for openSUSE:Factory checked in at 2014-03-31 20:42:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-03-25 13:20:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.erlang.new/erlang.changes 2014-03-31 20:42:45.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Mar 27 18:09:29 UTC 2014 - matwey.kornilov(a)gmail.com
+
+- Invoking ./Install is not required.
+
+-------------------------------------------------------------------
+Thu Mar 27 17:17:49 UTC 2014 - matwey.kornilov(a)gmail.com
+
+- Split EPMd to separate package in order to make it possible to
+ use alternative implementations of EPMd.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ erlang.spec ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package erlang
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -61,10 +61,11 @@
BuildRequires: unixODBC-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
+BuildRequires: fdupes
BuildRequires: java-devel >= 1.6.0
BuildRequires: krb5-devel
BuildRequires: update-alternatives
-BuildRequires: fdupes
+Requires: erlang-epmd
%if 0%{?suse_version} >= 1140
BuildRequires: wxWidgets
@@ -118,6 +119,14 @@
%description doc
Documentation for Erlang.
+%package epmd
+Summary: Erlang Port Mapper daemon
+Group: Development/Languages/Other
+Requires: %{name} = %{version}
+
+%description epmd
+The Erlang Port Mapper daemon acts as a name server on all hosts involved in distributed Erlang computations.
+
%package et
Summary: An event tracer for Erlang programs
Group: Development/Languages/Other
@@ -431,27 +440,26 @@
install -D -m 0644 %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.erlang
install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
-%pre
+%pre epmd
/usr/sbin/groupadd -r epmd &>/dev/null || :
/usr/sbin/useradd -g epmd -s /bin/false -r -c "Erlang Port Mapper Daemon" -d %{epmd_home} epmd &>/dev/null || :
%if 0%{?have_systemd}
%service_add_pre epmd.service epmd.socket
%endif
-%post
-%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
+%post epmd
%fillup_only erlang
%if 0%{?have_systemd}
%service_add_post epmd.service epmd.socket
%endif
-%preun
+%preun epmd
%if 0%{?have_systemd}
%service_del_preun epmd.service epmd.socket
%endif
%stop_on_removal epmd
-%postun
+%postun epmd
%if 0%{?have_systemd}
%service_del_postun epmd.service epmd.socket
%endif
@@ -469,6 +477,7 @@
%doc %{_libdir}/erlang/COPYRIGHT
%{_bindir}/*
%exclude %{_bindir}/dialyzer
+%exclude %{_bindir}/epmd
%dir %{_libdir}/erlang
%dir %{_libdir}/erlang/lib/
%exclude %{_libdir}/erlang/lib/*/src
@@ -476,7 +485,10 @@
%exclude %{_libdir}/erlang/lib/*/java_src
%{_libdir}/erlang/bin/
%exclude %{_libdir}/erlang/bin/dialyzer
+%exclude %{_libdir}/erlang/bin/epmd
%{_libdir}/erlang/erts-*/
+%exclude %{_libdir}/erlang/erts-*/bin/dialyzer
+%exclude %{_libdir}/erlang/erts-*/bin/epmd
%{_libdir}/erlang/lib/appmon-*/
%{_libdir}/erlang/lib/asn1-*/
%{_libdir}/erlang/lib/common_test-*/
@@ -527,14 +539,6 @@
%{_libdir}/erlang/usr/
%{_libdir}/erlang/Install
%{_datadir}/emacs/site-lisp/erlang.el
-%dir %attr(-,epmd,epmd) %{epmd_home}
-%if 0%{?have_systemd}
-%{_unitdir}/epmd.service
-%{_unitdir}/epmd.socket
-%endif
-/etc/init.d/epmd
-%{_sbindir}/rcepmd
-/var/adm/fillup-templates/sysconfig.erlang
%config %{_sysconfdir}/rpm/macros.erlang
%files debugger
@@ -548,6 +552,7 @@
%exclude %{_libdir}/erlang/lib/dialyzer-*/src
%{_bindir}/dialyzer
%{_libdir}/erlang/bin/dialyzer
+%{_libdir}/erlang/erts-*/bin/dialyzer
%files doc
%defattr(0644,root,root,0755)
@@ -558,6 +563,20 @@
%{_libdir}/erlang/lib/et-*/
%exclude %{_libdir}/erlang/lib/et-*/src
+%files epmd
+%defattr(-,root,root)
+%{_bindir}/epmd
+%{_libdir}/erlang/bin/epmd
+%{_libdir}/erlang/erts-*/bin/epmd
+%dir %attr(-,epmd,epmd) %{epmd_home}
+%if 0%{?have_systemd}
+%{_unitdir}/epmd.service
+%{_unitdir}/epmd.socket
+%endif
+/etc/init.d/epmd
+%{_sbindir}/rcepmd
+/var/adm/fillup-templates/sysconfig.erlang
+
%files gs
%defattr(-,root,root)
%{_libdir}/erlang/lib/gs-*/
++++++ 0001-Add-systemd-option-to-empd.-Check-for-include-system.patch ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -10,11 +10,11 @@
erts/epmd/src/epmd_int.h | 3 +++
3 files changed, 19 insertions(+), 2 deletions(-)
-diff --git a/erts/configure.in b/erts/configure.in
-index bad748d..6ba4c91 100644
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -1563,6 +1563,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enaddr], [], [],
+Index: otp_src_R16B03/erts/configure.in
+===================================================================
+--- otp_src_R16B03.orig/erts/configure.in
++++ otp_src_R16B03/erts/configure.in
+@@ -1565,6 +1565,8 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_enadd
#endif
])
@@ -23,10 +23,10 @@
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
+Index: otp_src_R16B03/erts/epmd/src/epmd.c
+===================================================================
+--- otp_src_R16B03.orig/erts/epmd/src/epmd.c
++++ otp_src_R16B03/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;
@@ -64,10 +64,10 @@
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
+Index: otp_src_R16B03/erts/epmd/src/epmd_int.h
+===================================================================
+--- otp_src_R16B03.orig/erts/epmd/src/epmd_int.h
++++ otp_src_R16B03/erts/epmd/src/epmd_int.h
@@ -321,6 +321,9 @@ typedef struct {
int listenfd[MAX_LISTEN_SOCKETS];
char *addresses;
@@ -78,6 +78,3 @@
} EpmdVars;
void dbg_printf(EpmdVars*,int,const char*,...);
---
-1.8.1.4
-
++++++ 0002-Add-systemd-support-to-epmd.patch ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -9,11 +9,11 @@
erts/epmd/src/epmd_srv.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)
-diff --git a/erts/configure.in b/erts/configure.in
-index 6ba4c91..3ed1238 100644
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -967,6 +967,8 @@ AC_CHECK_LIB(dl, dlopen)
+Index: otp_src_R16B03/erts/configure.in
+===================================================================
+--- otp_src_R16B03.orig/erts/configure.in
++++ otp_src_R16B03/erts/configure.in
+@@ -969,6 +969,8 @@ AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(inet, main)
AC_CHECK_LIB(util, openpty)
@@ -22,10 +22,10 @@
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
+Index: otp_src_R16B03/erts/epmd/src/epmd_int.h
+===================================================================
+--- otp_src_R16B03.orig/erts/epmd/src/epmd_int.h
++++ otp_src_R16B03/erts/epmd/src/epmd_int.h
@@ -110,6 +110,10 @@
#include <stdarg.h>
@@ -37,10 +37,10 @@
/* ************************************************************************ */
/* 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
+Index: otp_src_R16B03/erts/epmd/src/epmd_srv.c
+===================================================================
+--- otp_src_R16B03.orig/erts/epmd/src/epmd_srv.c
++++ otp_src_R16B03/erts/epmd/src/epmd_srv.c
@@ -208,6 +208,39 @@ void run(EpmdVars *g)
node_init(g);
g->conn = conn_init(g);
@@ -115,6 +115,3 @@
dbg_tty_printf(g,2,"entering the main select() loop");
---
-1.8.1.4
-
++++++ README.SUSE ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -8,3 +8,18 @@
### Upgrading from sysvinit
```/etc/sysconfig/erlang``` has no effect now, to configure EPMd use systemd capabilities instead.
+### Example 1: change port
+Create ```/etc/systemd/system/epmd.socket.d/port.conf``` with following content:
+```
+[Socket]
+ListenStream=
+ListenStream=127.0.0.1:4444
+```
+The first line is to discard vendor configuration. The second line will change the port number to listen on to 4444.
+
+### Example 2: enable external interface
+To enable accepting external connections to EPMd, create ```/etc/systemd/system/epmd.socket.d/port.conf``` with following content:
+```
+[Socket]
+ListenStream=0.0.0.0:4369
+```
++++++ crypto.patch ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -5,10 +5,10 @@
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
+Index: otp_src_R16B03/lib/crypto/c_src/crypto.c
+===================================================================
+--- otp_src_R16B03.orig/lib/crypto/c_src/crypto.c
++++ otp_src_R16B03/lib/crypto/c_src/crypto.c
@@ -77,7 +77,8 @@
#if OPENSSL_VERSION_NUMBER >= 0x009080ffL \
&& !defined(OPENSSL_NO_EC) \
++++++ erlang-not-install-misc.patch ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -9,10 +9,10 @@
erts/etc/unix/Install.src | 10 ----------
2 files changed, 14 deletions(-)
-Index: otp_src_R16B02/erts/etc/common/Makefile.in
+Index: otp_src_R16B03/erts/etc/common/Makefile.in
===================================================================
---- otp_src_R16B02.orig/erts/etc/common/Makefile.in
-+++ otp_src_R16B02/erts/etc/common/Makefile.in
+--- otp_src_R16B03.orig/erts/etc/common/Makefile.in
++++ otp_src_R16B03/erts/etc/common/Makefile.in
@@ -474,10 +474,6 @@ endif
ifneq ($(INSTALL_TOP_BIN),)
$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
@@ -24,10 +24,10 @@
ifneq ($(INSTALL_ERL_OSE),)
$(INSTALL_DIR) "$(RELEASE_PATH)/build_erl_ose"
cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
-Index: otp_src_R16B02/erts/etc/unix/Install.src
+Index: otp_src_R16B03/erts/etc/unix/Install.src
===================================================================
---- otp_src_R16B02.orig/erts/etc/unix/Install.src
-+++ otp_src_R16B02/erts/etc/unix/Install.src
+--- otp_src_R16B03.orig/erts/etc/unix/Install.src
++++ otp_src_R16B03/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
++++++ otp-R16B-rpath.patch ++++++
--- /var/tmp/diff_new_pack.HbvpnN/_old 2014-03-31 20:42:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HbvpnN/_new 2014-03-31 20:42:48.000000000 +0200
@@ -1,7 +1,7 @@
-Index: otp_src_R16B02/lib/crypto/c_src/Makefile.in
+Index: otp_src_R16B03/lib/crypto/c_src/Makefile.in
===================================================================
---- otp_src_R16B02.orig/lib/crypto/c_src/Makefile.in
-+++ otp_src_R16B02/lib/crypto/c_src/Makefile.in
+--- otp_src_R16B03.orig/lib/crypto/c_src/Makefile.in
++++ otp_src_R16B03/lib/crypto/c_src/Makefile.in
@@ -85,7 +85,7 @@ endif
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
@@ -11,10 +11,10 @@
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else
-Index: otp_src_R16B02/lib/crypto/priv/Makefile
+Index: otp_src_R16B03/lib/crypto/priv/Makefile
===================================================================
---- otp_src_R16B02.orig/lib/crypto/priv/Makefile
-+++ otp_src_R16B02/lib/crypto/priv/Makefile
+--- otp_src_R16B03.orig/lib/crypto/priv/Makefile
++++ otp_src_R16B03/lib/crypto/priv/Makefile
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
@@ -24,10 +24,10 @@
-o $@ $^ -lcrypto
$(DLL_NIFLIB): $(OBJS)
-Index: otp_src_R16B02/lib/odbc/c_src/odbcserver.c
+Index: otp_src_R16B03/lib/odbc/c_src/odbcserver.c
===================================================================
---- otp_src_R16B02.orig/lib/odbc/c_src/odbcserver.c
-+++ otp_src_R16B02/lib/odbc/c_src/odbcserver.c
+--- otp_src_R16B03.orig/lib/odbc/c_src/odbcserver.c
++++ otp_src_R16B03/lib/odbc/c_src/odbcserver.c
@@ -105,6 +105,8 @@
#ifdef UNIX
#include <unistd.h>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
