New upstream release
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
This commit is contained in:
Jan Friesse
parent
0b6b7e10ef
commit
da8712b002
1
.gitignore
vendored
1
.gitignore
vendored
@ -34,3 +34,4 @@ corosync-1.2.7.tar.gz
|
||||
/corosync-2.99.1.tar.gz
|
||||
/corosync-2.99.2.tar.gz
|
||||
/corosync-2.99.3.tar.gz
|
||||
/corosync-2.99.4.tar.gz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
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
|
||||
@ -1,7 +1,6 @@
|
||||
# Conditionals
|
||||
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
|
||||
# to disable or enable specific features
|
||||
%bcond_with testagents
|
||||
%bcond_with watchdog
|
||||
%bcond_with monitoring
|
||||
%bcond_without snmp
|
||||
@ -9,19 +8,17 @@
|
||||
%bcond_without systemd
|
||||
%bcond_without xmlconf
|
||||
%bcond_without runautogen
|
||||
%bcond_without libcgroup
|
||||
|
||||
%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
|
||||
%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
|
||||
|
||||
Name: corosync
|
||||
Summary: The Corosync Cluster Engine and Application Programming Interfaces
|
||||
Version: 2.99.3
|
||||
Release: 3%{?gitver}%{?dist}
|
||||
Version: 2.99.4
|
||||
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: https://github.com/corosync/corosync/commit/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch
|
||||
|
||||
# Runtime bits
|
||||
# The automatic dependency overridden in favor of explicit version lock
|
||||
@ -31,7 +28,6 @@ Requires: corosynclib%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: gcc
|
||||
BuildRequires: groff
|
||||
BuildRequires: libqb-devel
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: libknet1-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %{with runautogen}
|
||||
@ -57,18 +53,9 @@ Requires(preun): /sbin/chkconfig
|
||||
%if %{with xmlconf}
|
||||
Requires: libxslt
|
||||
%endif
|
||||
%if %{with libcgroup}
|
||||
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}
|
||||
@ -76,9 +63,6 @@ BuildRequires: git
|
||||
%endif
|
||||
|
||||
%{configure} \
|
||||
%if %{with testagents}
|
||||
--enable-testagents \
|
||||
%endif
|
||||
%if %{with watchdog}
|
||||
--enable-watchdog \
|
||||
%endif
|
||||
@ -96,9 +80,6 @@ BuildRequires: git
|
||||
%endif
|
||||
%if %{with xmlconf}
|
||||
--enable-xmlconf \
|
||||
%endif
|
||||
%if %{with libcgroup}
|
||||
--enable-libcgroup \
|
||||
%endif
|
||||
--with-initddir=%{_initrddir} \
|
||||
--with-systemddir=%{_unitdir} \
|
||||
@ -168,7 +149,6 @@ fi
|
||||
%{_bindir}/corosync-blackbox
|
||||
%if %{with xmlconf}
|
||||
%{_bindir}/corosync-xmlproc
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
|
||||
%dir %{_datadir}/corosync
|
||||
%{_datadir}/corosync/xml2conf.xsl
|
||||
%{_mandir}/man8/corosync-xmlproc.8*
|
||||
@ -177,7 +157,6 @@ fi
|
||||
%dir %{_sysconfdir}/corosync
|
||||
%dir %{_sysconfdir}/corosync/uidgid.d
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/corosync
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/corosync
|
||||
@ -209,29 +188,6 @@ fi
|
||||
%{_mandir}/man5/votequorum.5*
|
||||
%{_mandir}/man8/cmap_keys.8*
|
||||
|
||||
# optional testagent rpm
|
||||
#
|
||||
%if %{with testagents}
|
||||
|
||||
%package -n corosync-testagents
|
||||
Summary: The Corosync Cluster Engine Test Agents
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description -n corosync-testagents
|
||||
This package contains corosync test agents.
|
||||
|
||||
%files -n corosync-testagents
|
||||
%defattr(755,root,root,-)
|
||||
%{_datadir}/corosync/tests/mem_leak_test.sh
|
||||
%{_datadir}/corosync/tests/net_breaker.sh
|
||||
%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh
|
||||
%{_datadir}/corosync/tests/shm_leak_audit.sh
|
||||
%{_bindir}/cpg_test_agent
|
||||
%{_bindir}/sam_test_agent
|
||||
%{_bindir}/votequorum_test_agent
|
||||
|
||||
%endif
|
||||
|
||||
# library
|
||||
#
|
||||
%package -n corosynclib
|
||||
@ -245,7 +201,6 @@ This package contains corosync libraries.
|
||||
%{_libdir}/libcfg.so.*
|
||||
%{_libdir}/libcpg.so.*
|
||||
%{_libdir}/libcmap.so.*
|
||||
%{_libdir}/libtotem_pg.so.*
|
||||
%{_libdir}/libquorum.so.*
|
||||
%{_libdir}/libvotequorum.so.*
|
||||
%{_libdir}/libsam.so.*
|
||||
@ -277,15 +232,9 @@ The Corosync Cluster Engine APIs.
|
||||
%{_includedir}/corosync/sam.h
|
||||
%{_includedir}/corosync/quorum.h
|
||||
%{_includedir}/corosync/votequorum.h
|
||||
%dir %{_includedir}/corosync/totem/
|
||||
%{_includedir}/corosync/totem/totem.h
|
||||
%{_includedir}/corosync/totem/totemip.h
|
||||
%{_includedir}/corosync/totem/totempg.h
|
||||
%{_includedir}/corosync/totem/totemstats.h
|
||||
%{_libdir}/libcfg.so
|
||||
%{_libdir}/libcpg.so
|
||||
%{_libdir}/libcmap.so
|
||||
%{_libdir}/libtotem_pg.so
|
||||
%{_libdir}/libquorum.so
|
||||
%{_libdir}/libvotequorum.so
|
||||
%{_libdir}/libsam.so
|
||||
@ -298,6 +247,9 @@ The Corosync Cluster Engine APIs.
|
||||
%{_mandir}/man3/cmap_*3*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 20 2018 Jan Friesse <jfriesse@redhat.com> - 2.99.4-1
|
||||
- New upstream release
|
||||
|
||||
* 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
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (corosync-2.99.3.tar.gz) = 32a5ac4ba1c4eefd52c27b9fc42932be3731548652cb4bafb82acb04527c75d49f0659378340e8a0b73d195a571aea83e57e4ae321e2a1cd67c8f2c03e5b85ac
|
||||
SHA512 (corosync-2.99.4.tar.gz) = 3475441d23d2218f70e93674ea61ba2bca40202a93a17fbfa086acb7654a38f7e248463035fb8e904479170c93b057ae00ad7203b6a0f1db2da388b7ad07072b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user