2.99.3-3 - Rebuild again, since the previous one was so unfortunate...

...it got affected with binutils (2.31.1-3.fc29) producing
non-monotonically increasing section offsets causing unprepared
eu-strip to damage the binary (related: rhbz#1609577)

Apply patch to drop prevent redundancy in systemd journal

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch

@@ -0,0 +1,43 @@
+From c34208ad402b45f52b5d3ee8d2a08df0779ec9aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
+Date: Tue, 14 Aug 2018 01:18:47 +0200
+Subject: [PATCH] systemd: prevent redundancy in journal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originating from a dual sink (stderr and syslog).
+
+Annotated example from "journalctl -b --no-hostname -u corosync":
+
+Aug 14 00:27:45 corosync[5203]:  [MAIN  ] Corosync Cluster
+Engine ('2.99.3'): started and ready to provide service.
+  ^ from syslog source
+Aug 14 00:27:45 corosync[5203]: notice  [MAIN  ] Corosync Cluster
+Engine ('2.99.3'): started and ready to provide service.
+  ^ from stderr source
+
+Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
+Reviewed-by: Jan Friesse <jfriesse@redhat.com>
+---
+ init/corosync.service.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/init/corosync.service.in b/init/corosync.service.in
+index 8c57652d4..654e41fc2 100644
+--- a/init/corosync.service.in
++++ b/init/corosync.service.in
+@@ -10,6 +10,13 @@ EnvironmentFile=-@INITCONFIGDIR@/corosync
+ ExecStart=@SBINDIR@/corosync -f $COROSYNC_OPTIONS
+ Type=notify
+ 
++# In typical systemd deployments, both standard outputs are forwarded to
++# journal (stderr is what's relevant in the pristine corosync configuration),
++# which hazards a message redundancy since the syslog stream usually ends there
++# as well; before editing this line, you may want to check DefaultStandardError
++# in systemd-system.conf(5) and whether /dev/log is a systemd related symlink.
++StandardError=null
++
+ # The following config is for corosync with enabled watchdog service.
+ #
+ #  When corosync watchdog service is being enabled and using with

corosync.spec

@@ -17,10 +17,11 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 2.99.3
-Release: 2%{?gitver}%{?dist}
+Release: 3%{?gitver}%{?dist}
 License: BSD
 URL: http://corosync.github.io/corosync/
 Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
+Patch0: https://github.com/corosync/corosync/commit/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch
 
 # Runtime bits
 # The automatic dependency overridden in favor of explicit version lock
@@ -60,8 +61,14 @@ Requires: libxslt
 BuildRequires: libcgroup-devel
 %endif
 
+# git-style patch application
+BuildRequires: git
+
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
+%global __scm git_am
+%__scm_setup_git
+%autopatch -p1
 
 %build
 %if %{with runautogen}
@@ -291,6 +298,13 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man3/cmap_*3*
 
 %changelog
+* Thu Aug 16 2018 Jan Pokorný <jpokorny+rpm-corosync@redhat.com> - 2.99.3-3
+- Rebuild again, since the previous one was so unfortunate it got affected
+  with binutils (2.31.1-3.fc29) producing non-monotonically increasing
+  section offsets causing unprepared eu-strip to damage the binary
+  (related: rhbz#1609577)
+- Apply patch to drop prevent redundancy in systemd journal
+
 * Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 2.99.3-2
 - Rebuild for new net-snmp