diff --git a/.gitignore b/.gitignore index 77e2f76..1e9f1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /earlyoom-1.3.tar.gz /earlyoom-1.3.1.tar.gz /earlyoom-1.4.tar.gz +/earlyoom-1.5.tar.gz diff --git a/earlyoom-arguments-format.patch b/earlyoom-arguments-format.patch deleted file mode 100644 index a49d4e3..0000000 --- a/earlyoom-arguments-format.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/msg.c -+++ b/msg.c -@@ -18,9 +18,9 @@ static void color_log(FILE* f, const char* color, const char* fmt, va_list vl) - color = ""; - reset = ""; - } -- fprintf(f, color); -+ fputs(color, f); - vfprintf(f, fmt, vl); -- fprintf(f, reset); -+ fputs(reset, f); - // The `reset` control was not flushed out by the - // newline as it was sent after. Manually flush - // it now to prevent artifacts when stderr and stdout diff --git a/earlyoom-fedora-options.patch b/earlyoom-fedora-options.patch new file mode 100644 index 0000000..e00da7f --- /dev/null +++ b/earlyoom-fedora-options.patch @@ -0,0 +1,27 @@ +From 72bba7a7dac986feac2872393c927d10dafea14c Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Mon, 23 Mar 2020 11:27:29 +0100 +Subject: [PATCH] Use Fedora launch options. + +More info and discussion: +https://pagure.io/fedora-workstation/issue/119. +--- + earlyoom.default | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/earlyoom.default b/earlyoom.default +index fa8b9cc..095a140 100644 +--- a/earlyoom.default ++++ b/earlyoom.default +@@ -2,7 +2,7 @@ + # /etc/init.d/earlyoom or by systemd from earlyoom.service. + + # Options to pass to earlyoom +-EARLYOOM_ARGS="-r 3600" ++EARLYOOM_ARGS="-r 0 -m 4 -M 409600" + + # Examples: + +-- +2.25.1 + diff --git a/earlyoom.spec b/earlyoom.spec index 4292674..e7c0d1e 100644 --- a/earlyoom.spec +++ b/earlyoom.spec @@ -1,16 +1,16 @@ %global makeflags PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} SYSTEMDUNITDIR=%{_unitdir} Name: earlyoom -Version: 1.4 -Release: 2%{?dist} +Version: 1.5 +Release: 1%{?dist} License: MIT URL: https://github.com/rfjakob/%{name} Summary: Early OOM Daemon for Linux Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/rfjakob/earlyoom/commit/eb45dc863a17b27acb3381766cdd31ae625f0022 -Patch100: %{name}-arguments-format.patch +# https://pagure.io/fedora-workstation/issue/119 +Patch0: %{name}-fedora-options.patch %{?systemd_requires} BuildRequires: systemd @@ -55,6 +55,9 @@ sed -e '/systemctl/d' -i Makefile %systemd_postun_with_restart %{name}.service %changelog +* Mon Mar 23 2020 Vitaly Zaitsev - 1.5-1 +- Updated to version 1.5. + * Tue Mar 03 2020 Vitaly Zaitsev - 1.4-2 - Fixed RHBZ#1809407 and RHBZ#1809408. diff --git a/sources b/sources index be57cce..2ca6e38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (earlyoom-1.4.tar.gz) = 6f01f75004f498c782ae6cd4dc8b75b22278623430a53e1ce19b494e8add9b4c5d4d6b96c1a13e8dbe59895f51e49b2bc2a2235fd6caf2956e8a3beb04e08fd4 +SHA512 (earlyoom-1.5.tar.gz) = e6c813e184e3f88398dd0a079f992e7cc0532f0b38b587321d0bd74c68df77c182bfcbd11abd19ff4928e5a9d10ae82f16561a6b8bf4990e78b291ae1aa6f7ab