From 9bd594e9e7efe0fc50e2378dd850e9a0c061ff2a Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 20 Nov 2018 16:06:56 +0100 Subject: [PATCH 1/6] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + ...08ad402b45f52b5d3ee8d2a08df0779ec9aa.patch | 43 -------------- corosync.spec | 58 ++----------------- sources | 2 +- 4 files changed, 7 insertions(+), 97 deletions(-) delete mode 100644 c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch diff --git a/.gitignore b/.gitignore index 0d4c0be..a0b50ac 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch b/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch deleted file mode 100644 index 77da7f8..0000000 --- a/c34208ad402b45f52b5d3ee8d2a08df0779ec9aa.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c34208ad402b45f52b5d3ee8d2a08df0779ec9aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= -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ý -Reviewed-by: Jan Friesse ---- - 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 diff --git a/corosync.spec b/corosync.spec index bbd3b7b..0fa3ea0 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,6 @@ # Conditionals # Invoke "rpmbuild --without " or "rpmbuild --with " # 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 - 2.99.4-1 +- New upstream release + * Thu Aug 16 2018 Jan Pokorný - 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 diff --git a/sources b/sources index fc569dc..af8e88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.3.tar.gz) = 32a5ac4ba1c4eefd52c27b9fc42932be3731548652cb4bafb82acb04527c75d49f0659378340e8a0b73d195a571aea83e57e4ae321e2a1cd67c8f2c03e5b85ac +SHA512 (corosync-2.99.4.tar.gz) = 3475441d23d2218f70e93674ea61ba2bca40202a93a17fbfa086acb7654a38f7e248463035fb8e904479170c93b057ae00ad7203b6a0f1db2da388b7ad07072b From 2c45f082afa5dda1a1011987183ab5cecde9fa7c Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 4 Dec 2018 18:21:03 +0100 Subject: [PATCH 2/6] Add libknet1-crypto-nss-plugin dependency Signed-off-by: Jan Friesse --- corosync.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index 0fa3ea0..bde8a87 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,7 +15,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 2.99.4 -Release: 1%{?gitver}%{?dist} +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -24,6 +24,9 @@ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?git # The automatic dependency overridden in favor of explicit version lock Requires: corosynclib%{?_isa} = %{version}-%{release} +# NSS crypto plugin should be always installed +Requires: libknet1-crypto-nss-plugin + # Build bits BuildRequires: gcc BuildRequires: groff @@ -247,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Dec 4 2018 Jan Friesse - 2.99.4-2 +- Add libknet1-crypto-nss-plugin dependency + * Tue Nov 20 2018 Jan Friesse - 2.99.4-1 - New upstream release From 58e0d524e36854ad0f359520fd2caf94bab88c8e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 7 Dec 2018 17:15:26 +0100 Subject: [PATCH 3/6] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a0b50ac..bba8cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.2.tar.gz /corosync-2.99.3.tar.gz /corosync-2.99.4.tar.gz +/corosync-2.99.5.tar.gz diff --git a/corosync.spec b/corosync.spec index bde8a87..f7c879e 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,8 +14,8 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.4 -Release: 2%{?gitver}%{?dist} +Version: 2.99.5 +Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Fri Dec 7 2018 Jan Friesse - 2.99.5-1 +- New upstream release + * Tue Dec 4 2018 Jan Friesse - 2.99.4-2 - Add libknet1-crypto-nss-plugin dependency diff --git a/sources b/sources index af8e88d..5ed0193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.4.tar.gz) = 3475441d23d2218f70e93674ea61ba2bca40202a93a17fbfa086acb7654a38f7e248463035fb8e904479170c93b057ae00ad7203b6a0f1db2da388b7ad07072b +SHA512 (corosync-2.99.5.tar.gz) = b8433f23d55993a8bba754ed3926fea0c7d7e3a9a3e1c03f0d0a34be1fce58007b81cb3da0bc991035250fc67a16351312c5225763303b7e3034de8cac4b582b From 9860a44b1c8ffa2a5cc63732f17e9a2407f8691e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 14 Dec 2018 14:11:29 +0100 Subject: [PATCH 4/6] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bba8cc3..82b1cf3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.3.tar.gz /corosync-2.99.4.tar.gz /corosync-2.99.5.tar.gz +/corosync-3.0.0.tar.gz diff --git a/corosync.spec b/corosync.spec index f7c879e..d6d370b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,7 +14,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 2.99.5 +Version: 3.0.0 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Fri Dec 14 2018 Jan Friesse - 3.0.0-1 +- New upstream release + * Fri Dec 7 2018 Jan Friesse - 2.99.5-1 - New upstream release diff --git a/sources b/sources index 5ed0193..b7a07d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-2.99.5.tar.gz) = b8433f23d55993a8bba754ed3926fea0c7d7e3a9a3e1c03f0d0a34be1fce58007b81cb3da0bc991035250fc67a16351312c5225763303b7e3034de8cac4b582b +SHA512 (corosync-3.0.0.tar.gz) = 2e4f8216ee9b09654cf00fd26d116e00afd5330965203889e49b8fcef7c68fe65fd007402247a5a3df1c15b246c0d6de9aeb236a46c59ee91408a584b91269c9 From d40b3b5896d8cbc54e88324cb6f01ce950df7518 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 15 Jan 2019 14:31:27 +0100 Subject: [PATCH 5/6] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 82b1cf3..3567e84 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.4.tar.gz /corosync-2.99.5.tar.gz /corosync-3.0.0.tar.gz +/corosync-3.0.1.tar.gz diff --git a/corosync.spec b/corosync.spec index d6d370b..4bcce2c 100644 --- a/corosync.spec +++ b/corosync.spec @@ -14,7 +14,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -250,6 +250,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/cmap_*3* %changelog +* Tue Jan 15 2019 Jan Friesse - 3.0.1-1 +- New upstream release + * Fri Dec 14 2018 Jan Friesse - 3.0.0-1 - New upstream release diff --git a/sources b/sources index b7a07d5..3d585e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.0.tar.gz) = 2e4f8216ee9b09654cf00fd26d116e00afd5330965203889e49b8fcef7c68fe65fd007402247a5a3df1c15b246c0d6de9aeb236a46c59ee91408a584b91269c9 +SHA512 (corosync-3.0.1.tar.gz) = 9e70aadb331ffb3ef86b4c7dff8608ef3723810b3065e9aa2dc8a7abe84a26c34445c7a6d872339e19e77247aac1be7297c97d2012fe64502372eeb3e2aa19b7 From ef2e78910f57c8f38bee21d64587e1f3e040071f Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 12 Jun 2019 17:48:32 +0200 Subject: [PATCH 6/6] New upstream release Signed-off-by: Jan Friesse --- .gitignore | 1 + corosync.spec | 42 +++++++++++++++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3567e84..7567368 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ corosync-1.2.7.tar.gz /corosync-2.99.5.tar.gz /corosync-3.0.0.tar.gz /corosync-3.0.1.tar.gz +/corosync-3.0.2.tar.gz diff --git a/corosync.spec b/corosync.spec index 4bcce2c..ea0892b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -7,14 +7,17 @@ %bcond_without dbus %bcond_without systemd %bcond_without xmlconf +%bcond_without nozzle +%bcond_without vqsim %bcond_without runautogen +%bcond_without userflags %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: 3.0.1 +Version: 3.0.2 Release: 1%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ @@ -45,6 +48,9 @@ BuildRequires: net-snmp-devel %if %{with dbus} BuildRequires: dbus-devel %endif +%if %{with nozzle} +BuildRequires: libnozzle1-devel +%endif %if %{with systemd} %{?systemd_requires} BuildRequires: systemd @@ -56,6 +62,9 @@ Requires(preun): /sbin/chkconfig %if %{with xmlconf} Requires: libxslt %endif +%if %{with vqsim} +BuildRequires: readline-devel +%endif %prep %setup -q -n %{name}-%{version}%{?gittarver} @@ -83,6 +92,15 @@ Requires: libxslt %endif %if %{with xmlconf} --enable-xmlconf \ +%endif +%if %{with nozzle} + --enable-nozzle \ +%endif +%if %{with vqsim} + --enable-vqsim \ +%endif +%if %{with userflags} + --enable-user-flags \ %endif --with-initddir=%{_initrddir} \ --with-systemddir=%{_unitdir} \ @@ -249,7 +267,29 @@ The Corosync Cluster Engine APIs. %{_mandir}/man3/sam_*3* %{_mandir}/man3/cmap_*3* +%if %{with vqsim} +%package -n corosync-vqsim +Summary: The Corosync Cluster Engine - Votequorum Simulator +Requires: corosynclib%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description -n corosync-vqsim +A command-line simulator for the corosync votequorum subsystem. +It uses the same code as the corosync quorum system but forks +them into subprocesses to simulate nodes. +Nodes can be added and removed as well as partitioned (to simulate +network splits) + +%files -n corosync-vqsim +%doc LICENSE +%{_bindir}/corosync-vqsim +%{_mandir}/man8/corosync-vqsim.8* +%endif + %changelog +* Wed Jun 12 2019 Jan Friesse - 3.0.2-1 +- New upstream release + * Tue Jan 15 2019 Jan Friesse - 3.0.1-1 - New upstream release diff --git a/sources b/sources index 3d585e7..c31c546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (corosync-3.0.1.tar.gz) = 9e70aadb331ffb3ef86b4c7dff8608ef3723810b3065e9aa2dc8a7abe84a26c34445c7a6d872339e19e77247aac1be7297c97d2012fe64502372eeb3e2aa19b7 +SHA512 (corosync-3.0.2.tar.gz) = be2d5caf41fea9dc337a317ee4f2f90ad6587b2ad2ff09b62e376e0d9273fb8ac6b71a4c1b0ac8e263f1eef2fbc2fb7c0558f1c78cd71f1242a57c58b6d137ca