forked from erlang/erlang
Accepting request 211935 from home:matwey:branches:devel:languages:erlang:Factory
fix crypo.c compiling OBS-URL: https://build.opensuse.org/request/show/211935 OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang:Factory/erlang?expand=0&rev=8
This commit is contained in:
Git OBS Bridge
21
crypto.patch
Normal file
21
crypto.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
commit d485136c670954ea8d933b332f39f9265727c745
|
||||
Author: Matwey V. Kornilov <matwey.kornilov@gmail.com>
|
||||
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
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
Description=Erlang Port Mapper Daemon
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/epmd
|
||||
ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS
|
||||
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
|
||||
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 21 11:05:07 UTC 2013 - matwey.kornilov@gmail.com
|
||||
|
||||
- Add crypto.patch: fix compilation with openssl having EC disabled
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 20 19:51:06 UTC 2013 - matwey.kornilov@gmail.com
|
||||
|
||||
- Fixing systemd.
|
||||
- Warning: variables in /etc/sysconfig/erlang must be set and filled.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 20 14:51:25 UTC 2013 - kruber@zib.de
|
||||
|
||||
|
||||
29
erlang.spec
29
erlang.spec
@@ -43,6 +43,8 @@ Patch1: erlang-ppc.patch
|
||||
Patch3: fix-armv7hl.patch
|
||||
# PATCH-FIX-OPENSUSE erlang-not-install-misc.patch - matwey.kornilov@gmail.com -- patch from Fedora, this removes unneeded magic
|
||||
Patch4: erlang-not-install-misc.patch
|
||||
# PATCH-FIX-UPSTREAM crypto.patch - matwey.kornilov@gmail.com -- fix compilation with disabled EC in openssl
|
||||
Patch5: crypto.patch
|
||||
# autoconf is required only by fix-armv7hl.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: gcc-c++
|
||||
@@ -71,6 +73,7 @@ BuildRequires: wxGTK-devel >= 2.8
|
||||
%if 0%{?suse_version} >=1230
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%{?systemd_requires}
|
||||
%define have_systemd 1
|
||||
%endif
|
||||
|
||||
%define epmd_home %{_var}/lib/epmd
|
||||
@@ -290,6 +293,7 @@ A Graphics System used to write platform independent user interfaces.
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
chmod -R u+w .
|
||||
# enable dynamic linking for ssl
|
||||
@@ -387,14 +391,14 @@ find . -name "start_erl*" | xargs chmod 755
|
||||
|
||||
install -d -m 0750 %{buildroot}%{epmd_home}
|
||||
install -d -m 0755 %{buildroot}%{_sbindir}
|
||||
%if 0%{?suse_version} >=1230
|
||||
install -D -m 0755 %{S:7} %{buildroot}%{_unitdir}/%{name}.service
|
||||
install -D -m 0755 %{S:8} %{buildroot}%{_unitdir}/%{name}.socket
|
||||
ln -s %{_unitdir}/%{name}.service %{buildroot}%{_sbindir}/rcepmd
|
||||
%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
|
||||
install -D -m 0755 %{S:4} %{buildroot}/etc/init.d/epmd
|
||||
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
|
||||
|
||||
@@ -407,19 +411,17 @@ install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
|
||||
%fillup_only erlang
|
||||
|
||||
%preun
|
||||
%if 0%{?suse_version} >=1230
|
||||
%if 0%{?have_systemd}
|
||||
%service_del_preun %{name}.service %{name}.socket
|
||||
%else
|
||||
%stop_on_removal epmd
|
||||
%endif
|
||||
%stop_on_removal epmd
|
||||
|
||||
%postun
|
||||
%if 0%{?suse_version} >=1230
|
||||
%if 0%{?have_systemd}
|
||||
%service_del_postun %{name}.service %{name}.socket
|
||||
%else
|
||||
%endif
|
||||
%restart_on_update epmd
|
||||
%{insserv_cleanup}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@@ -489,12 +491,11 @@ install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/rpm/macros.erlang
|
||||
%{_libdir}/erlang/Install
|
||||
%{_datadir}/emacs/site-lisp/erlang.el
|
||||
%dir %attr(-,epmd,epmd) %{epmd_home}
|
||||
%if 0%{?suse_version} >=1230
|
||||
%if 0%{?have_systemd}
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_unitdir}/%{name}.socket
|
||||
%else
|
||||
/etc/init.d/epmd
|
||||
%endif
|
||||
/etc/init.d/epmd
|
||||
%{_sbindir}/rcepmd
|
||||
/var/adm/fillup-templates/sysconfig.erlang
|
||||
%config %{_sysconfdir}/rpm/macros.erlang
|
||||
|
||||
@@ -15,6 +15,6 @@ EPMD_ADDRESSES="127.0.0.1"
|
||||
## Default: "4369"
|
||||
## ServiceRestart: epmd
|
||||
#
|
||||
# Options for sshd
|
||||
# Port that EPMD should listen on.
|
||||
#
|
||||
EPMD_PORT=""
|
||||
EPMD_PORT="4369"
|
||||
|
||||
Reference in New Issue
Block a user