diff --git a/.gitignore b/.gitignore index 15b906f..58e7955 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ corosync-1.2.7.tar.gz /corosync-3.1.4.tar.gz /corosync-3.1.5.tar.gz /corosync-3.1.6.tar.gz +/corosync-3.1.7.tar.gz diff --git a/corosync.spec b/corosync.spec index 9516414..f7e783e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -17,14 +17,12 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.1.6 -Release: 4%{?gitver}%{?dist} +Version: 3.1.7 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: logrotate-Use-copytruncate-method-by-default.patch - # Runtime bits # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} @@ -73,7 +71,6 @@ BuildRequires: make %prep %setup -q -n %{name}-%{version}%{?gittarver} -%patch0 -p1 %build %if %{with runautogen} @@ -292,6 +289,9 @@ network splits) %endif %changelog +* Tue Nov 15 2022 Jan Friesse - 3.1.7-1 +- New upstream release + * Wed Jul 20 2022 Fedora Release Engineering - 3.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/logrotate-Use-copytruncate-method-by-default.patch b/logrotate-Use-copytruncate-method-by-default.patch deleted file mode 100644 index 11d2cf3..0000000 --- a/logrotate-Use-copytruncate-method-by-default.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 04362046c4a9d7307feb5b68341d567b7d0b94d6 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Tue, 29 Mar 2022 17:09:22 +0200 -Subject: [PATCH] logrotate: Use copytruncate method by default - -The reopen lograte method has two main problems: -1. It does fail when corosync is not running (solvable by - adding "|| true") -2. If (for some reason, like SELinux) cfgtool -L fails, logrotate - fails and corosync keeps logging into old file. Added "|| true" - makes situation even worse because logrotate removes file but - corosync keeps logging into it. - -Solution is to install copytruncate logrotate snip by default (and -keep reopen config file only for reference). - -Signed-off-by: Jan Friesse -Reviewed-by: Christine Caulfield ---- - conf/logrotate/Makefile.am | 7 ------- - conf/logrotate/corosync-reopen.in | 5 +++++ - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/conf/logrotate/Makefile.am b/conf/logrotate/Makefile.am -index 4f7b7536..35efa2de 100644 ---- a/conf/logrotate/Makefile.am -+++ b/conf/logrotate/Makefile.am -@@ -34,16 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in - - EXTRA_DIST = corosync-reopen.in corosync-copytruncate.in - --if HAVE_QB_LOG_FILE_REOPEN --corosync: corosync-reopen.in -- $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ -- -e 's#@''SBINDIR@#$(sbindir)#g' \ -- $< > $@ --else - corosync: corosync-copytruncate.in - $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \ - $< > $@ --endif - - logrotatecorosyncdir = ${LOGROTATEDIR} - logrotatecorosync_DATA = corosync -diff --git a/conf/logrotate/corosync-reopen.in b/conf/logrotate/corosync-reopen.in -index 839c5dae..730fb741 100644 ---- a/conf/logrotate/corosync-reopen.in -+++ b/conf/logrotate/corosync-reopen.in -@@ -1,3 +1,8 @@ -+# This logrotate method has two main problems and it's kept only for reference: -+# 1. It does fail when corosync is not running (solvable by adding "|| true") -+# 2. If (for some reason) cfgtool -L fails, logrotate fails and corosync keeps -+# logging into old file. Added "|| true" makes situation even worse -+# because logrotate removes file but corosync keeps logging into it. - @LOGDIR@/corosync.log { - missingok - compress --- -2.33.1 - diff --git a/sources b/sources index 4a1cc64..5abef83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.1.6.tar.gz) = 8f5d12851f296e0ee9dd425d40252988f0b8485d2c2098028b25265506f846e3f34df86007a7c273d020921b2532bdbc01b52e1631f6abfae79981436230225e +SHA512 (corosync-3.1.7.tar.gz) = a4d00f18a6dda07f36e77fc48f5bddff77e12a3e6ee40d9450734e281d20479b90cd0c653e255cfc46e0e42e4a0177291a3daba671e751d027e4317e601f0cd2