- up to 17.4

diff --git a/erlang.spec b/erlang.spec
index 6c4ca1af1cf26610730883917d3419cb34d7bf19..3efb0fff1388429b47b31d283c1255541742cc0b 100644 (file)
--- a/erlang.spec
+++ b/erlang.spec
@@ -14,22 +14,21 @@
 Summary:       OpenSource Erlang/OTP
 Summary(pl.UTF-8):     Erlang/OTP z otwartymi źródłami
 Name:          erlang
-Version:       17.3
+Version:       17.4
 Release:       1
 Epoch:         2
 %define                _version        %(echo %{version} | tr _ -)
 License:       distributable
 Group:         Development/Languages
 Source0:       http://www.erlang.org/download/otp_src_%{_version}.tar.gz
-# Source0-md5: 1d0bb2d54dfe1bb6844756b99902ba20
+# Source0-md5: 3d33c4c6bd7950240dcd7479edd9c7d8
 Source1:       http://www.erlang.org/download/otp_doc_man_%{_version}.tar.gz
-# Source1-md5: 6aa12c96d8d58ecc7be855c99286fc61
+# Source1-md5: 9dfbf1d6b4a33f276fc75fc7d8c1cd93
 Source2:       epmd.service
 Source3:       epmd.socket
 Source4:       epmd@.service
 Source5:       epmd@.socket
 Patch0:                %{name}-fPIC.patch
-Patch1:                otp-0007-Added-systemd-notify-support-to-EPMD.patch
 URL:           http://www.erlang.org/
 %{?with_java:BuildRequires:    /usr/bin/jar}
 BuildRequires: autoconf
@@ -66,7 +65,6 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 %setup -q -n otp_src_%{_version}
 %{__tar} xzf %{SOURCE1} man/ COPYRIGHT
 #%patch0 -p1
-%patch1 -p1
 
 %build
 find . -name config.sub | xargs -n 1 cp -f /usr/share/automake/config.sub
@@ -153,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/bin/erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/erlc
 %attr(755,root,root) %{_libdir}/%{name}/bin/escript
+%attr(755,root,root) %{_libdir}/%{name}/bin/no_dot_erlang.boot
 %attr(755,root,root) %{_libdir}/%{name}/bin/run_erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/start
 %attr(755,root,root) %{_libdir}/%{name}/bin/start_erl

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 (file)
index dd4ddcd..0000000
--- a/otp-0007-Added-systemd-notify-support-to-EPMD.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Fri, 6 Jun 2014 15:29:49 +0400
-Subject: [PATCH] Added systemd notify support to EPMD
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-Conflicts:
-       erts/configure.in
-
-diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
-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)
-       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");