- Update to version 3.1.9:
* rust: Update to latest standards * totemsrp: Fix orf_token stats * totem: Use uint64_t type and QB_TIME_NS_IN_MSEC * totem: Use proper timestamp type for token warning * stats: Store token rx and tx timestamps as 64-bit * rust: fix clippy warning in rust 1.81 * coroparse: Free kv_item key and value on failure * icmap: Free memory if qb_map_notify_add fails * cfg: Free new_config interfaces on failure * main: support lock pid file arg * man: fix a typo in cpg_model_initialize * man: Improve quorum provider formatting * rust: tests return errors and don't hang * rust: Improve Rust bindings * Move corosync-notifyd policy file into $(datadir)/dbus-1/system.d * man: corosync.conf: Multi improvements * totem: Fix reference links * Report crypto errors back to cfg reload * Fix up the library .versions files * configure: Fix building of rust for release * License: Fix year (mainly to fix rust building) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=202
This commit is contained in:
Nicholas Yang
Git OBS Bridge
commit
5bea13db12
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
53
0001-harden-services-with-systemd-sandboxing.patch
Normal file
53
0001-harden-services-with-systemd-sandboxing.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From 6d977c3f286a39b7e35c46ad3642a34617bdd833 Mon Sep 17 00:00:00 2001
|
||||
From: nicholasyang <nicholas.yang@suse.com>
|
||||
Date: Wed, 13 Nov 2024 14:28:53 +0800
|
||||
Subject: [PATCH] harden services with systemd sandboxing
|
||||
|
||||
---
|
||||
init/corosync-notifyd.service.in | 10 ++++++++++
|
||||
init/corosync.service.in | 10 ++++++++++
|
||||
2 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/init/corosync-notifyd.service.in b/init/corosync-notifyd.service.in
|
||||
index 410a6837..604a2a47 100644
|
||||
--- a/init/corosync-notifyd.service.in
|
||||
+++ b/init/corosync-notifyd.service.in
|
||||
@@ -10,5 +10,15 @@ ExecStart=@SBINDIR@/corosync-notifyd -f $OPTIONS
|
||||
Type=notify
|
||||
Restart=on-failure
|
||||
|
||||
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||
+ProtectSystem=full
|
||||
+ProtectHome=true
|
||||
+PrivateDevices=true
|
||||
+ProtectHostname=true
|
||||
+ProtectClock=true
|
||||
+ProtectKernelTunables=true
|
||||
+ProtectKernelModules=true
|
||||
+ProtectKernelLogs=true
|
||||
+
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
diff --git a/init/corosync.service.in b/init/corosync.service.in
|
||||
index bd2a48a9..63381f47 100644
|
||||
--- a/init/corosync.service.in
|
||||
+++ b/init/corosync.service.in
|
||||
@@ -30,5 +30,15 @@ StandardError=null
|
||||
# rewrite according to environment.
|
||||
#ExecStartPre=/sbin/modprobe softdog
|
||||
|
||||
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||
+ProtectSystem=full
|
||||
+ProtectHome=true
|
||||
+PrivateDevices=true
|
||||
+ProtectHostname=true
|
||||
+ProtectClock=true
|
||||
+ProtectKernelTunables=true
|
||||
+ProtectKernelModules=true
|
||||
+ProtectKernelLogs=true
|
||||
+
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
--
|
||||
2.47.0
|
||||
|
||||
19
_service
Normal file
19
_service
Normal file
@ -0,0 +1,19 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="url">https://github.com/corosync/corosync.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">corosync</param>
|
||||
<param name="versionformat">3.1.9</param>
|
||||
<param name="revision">v3.1.9</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
|
||||
<service name="recompress" mode="manual">
|
||||
<param name="file">corosync*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
|
||||
<service name="set_version" mode="manual">
|
||||
<param name="basename">corosync</param>
|
||||
</service>
|
||||
</services>
|
||||
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/corosync/corosync.git</param>
|
||||
<param name="changesrevision">4e683699b97740562db11f60c744b0f7f61916dd</param></service></servicedata>
|
||||
BIN
corosync-3.1.8.tar.gz
(Stored with Git LFS)
Normal file
BIN
corosync-3.1.8.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
corosync-3.1.9.tar.gz
(Stored with Git LFS)
Normal file
BIN
corosync-3.1.9.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
1895
corosync.changes
Normal file
1895
corosync.changes
Normal file
File diff suppressed because it is too large
Load Diff
361
corosync.spec
Normal file
361
corosync.spec
Normal file
@ -0,0 +1,361 @@
|
||||
#
|
||||
# spec file for package corosync
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
# Conditionals
|
||||
# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
|
||||
# to disable or enable specific features
|
||||
%bcond_with watchdog
|
||||
%bcond_with monitoring
|
||||
%bcond_with snmp
|
||||
%bcond_with nozzle
|
||||
%bcond_with dbus
|
||||
%bcond_with xmlconf
|
||||
%bcond_with vqsim
|
||||
%bcond_without runautogen
|
||||
%bcond_without systemd
|
||||
%bcond_with userflags
|
||||
|
||||
%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
|
||||
%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
|
||||
|
||||
%if 0%{?sles_version} == 12
|
||||
%ifnarch s390 s390x
|
||||
%define buildib 1
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%define _libexecdir %{_libdir}
|
||||
%endif
|
||||
|
||||
Name: corosync
|
||||
Summary: The Corosync Cluster Engine and Application Programming Interfaces
|
||||
License: BSD-3-Clause
|
||||
Group: Productivity/Clustering/HA
|
||||
Version: 3.1.9
|
||||
Release: 0
|
||||
URL: http://corosync.github.io/corosync/
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch0: 0001-harden-services-with-systemd-sandboxing.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# provide openais on purpose, the package has been deleted.
|
||||
|
||||
# Runtime bits
|
||||
# The automatic dependency overridden in favor of explicit version lock
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
# Support crypto reload
|
||||
Requires: libknet1 >= 1.28
|
||||
# NSS crypto plugin should be always installed
|
||||
Requires: libknet1-crypto-nss-plugin >= 1.28
|
||||
|
||||
# Build bits
|
||||
BuildRequires: gcc
|
||||
|
||||
BuildRequires: groff-full
|
||||
BuildRequires: libknet-devel >= 1.28
|
||||
BuildRequires: libqb-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %{with runautogen}
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
%endif
|
||||
%if %{with monitoring}
|
||||
BuildRequires: libstatgrab-devel
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
BuildRequires: net-snmp-devel
|
||||
%endif
|
||||
%if %{with dbus}
|
||||
BuildRequires: dbus-1-devel
|
||||
%endif
|
||||
%if %{with nozzle}
|
||||
BuildRequires: libnozzle-devel
|
||||
%endif
|
||||
%if %{with systemd}
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
%endif
|
||||
%if %{with xmlconf}
|
||||
Requires: libxslt
|
||||
%endif
|
||||
%if %{with vqsim}
|
||||
BuildRequires: readline-devel
|
||||
%endif
|
||||
Obsoletes: libcfg6
|
||||
Obsoletes: libcmap4
|
||||
Obsoletes: libcorosync_common4
|
||||
Obsoletes: libcpg4
|
||||
Obsoletes: libquorum5
|
||||
Obsoletes: libsam4
|
||||
Obsoletes: libtotem_pg5
|
||||
Obsoletes: libvotequorum8
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
rm -f .git*
|
||||
echo %{version} > .tarball-version
|
||||
echo %{version} > .version
|
||||
|
||||
%build
|
||||
%if %{with runautogen}
|
||||
./autogen.sh
|
||||
%endif
|
||||
|
||||
%{configure} \
|
||||
%if %{with watchdog}
|
||||
--enable-watchdog \
|
||||
%endif
|
||||
%if %{with monitoring}
|
||||
--enable-monitoring \
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
--enable-snmp \
|
||||
%endif
|
||||
%if %{with dbus}
|
||||
--enable-dbus \
|
||||
%endif
|
||||
%if %{with systemd}
|
||||
--enable-systemd \
|
||||
%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}
|
||||
|
||||
make %{_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
%if %{with dbus}
|
||||
mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
|
||||
install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
|
||||
%endif
|
||||
%if %{with systemd}
|
||||
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync
|
||||
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync-notifyd
|
||||
%endif
|
||||
|
||||
## tree fixup
|
||||
# drop static libs
|
||||
rm -f %{buildroot}%{_libdir}/*.a
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
# drop docs and html docs for now
|
||||
rm -rf %{buildroot}%{_docdir}/*
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
||||
mkdir -p %{buildroot}/usr/share/doc/packages/corosync/
|
||||
mkdir -p %{buildroot}%{_fillupdir}/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/init.d/
|
||||
# /etc/sysconfig/corosync-notifyd
|
||||
install -m 644 tools/corosync-notifyd.sysconfig.example \
|
||||
%{buildroot}%{_fillupdir}/sysconfig.corosync-notifyd
|
||||
install -m 0644 conf/corosync.conf.example* %{buildroot}/usr/share/doc/packages/corosync/
|
||||
mkdir -p %{buildroot}/usr/lib/corosync
|
||||
rm -rf %{buildroot}/etc/corosync/corosync.conf.example*
|
||||
rm -rf %{buildroot}/etc/logrotate.d/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
||||
install -m 644 init/corosync.sysconfig.example \
|
||||
%{buildroot}%{_fillupdir}/sysconfig.corosync
|
||||
rm -rf %{buildroot}%{localstatedir}/run/
|
||||
|
||||
%description
|
||||
This package contains the Corosync Cluster Engine Executive, several default
|
||||
APIs and libraries, default configuration files, and an init script.
|
||||
|
||||
%pre
|
||||
%service_add_pre corosync.service corosync-notifyd.service
|
||||
|
||||
%post
|
||||
%{fillup_and_insserv -n corosync}
|
||||
%{fillup_and_insserv -n corosync-notifyd}
|
||||
%service_add_post corosync.service corosync-notifyd.service
|
||||
|
||||
rm -rf %{_sysconfdir}/corosync/corosync.conf.example %{_sysconfdir}/corosync/corosync.conf.example.unicast
|
||||
ln -s /usr/share/doc/packages/corosync/corosync.conf.example %{_sysconfdir}/corosync/
|
||||
|
||||
%preun
|
||||
%service_del_preun corosync.service corosync-notifyd.service
|
||||
|
||||
%postun
|
||||
if [ -f /etc/sysconfig/corosync ]; then
|
||||
rm /etc/sysconfig/corosync
|
||||
fi
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE
|
||||
%{_sbindir}/corosync
|
||||
%{_sbindir}/corosync-keygen
|
||||
%{_sbindir}/corosync-cmapctl
|
||||
%{_sbindir}/corosync-cfgtool
|
||||
%{_sbindir}/corosync-cpgtool
|
||||
%{_sbindir}/corosync-quorumtool
|
||||
%{_sbindir}/corosync-notifyd
|
||||
%if %{with systemd}
|
||||
%{_sbindir}/rccorosync
|
||||
%{_sbindir}/rccorosync-notifyd
|
||||
%endif
|
||||
%{_bindir}/corosync-blackbox
|
||||
%if %{with xmlconf}
|
||||
%{_bindir}/corosync-xmlproc
|
||||
%dir %{_datadir}/corosync
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
|
||||
%{_datadir}/corosync/xml2conf.xsl
|
||||
%{_mandir}/man8/corosync-xmlproc.8*
|
||||
%{_mandir}/man5/corosync.xml.5*
|
||||
%endif
|
||||
%dir %{_sysconfdir}/corosync
|
||||
%dir %{_sysconfdir}/corosync/uidgid.d
|
||||
%dir %{_datadir}/doc/corosync/
|
||||
%dir /usr/lib/corosync/
|
||||
%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
|
||||
%config(noreplace) %{_fillupdir}/sysconfig.corosync-notifyd
|
||||
%config(noreplace) %{_fillupdir}/sysconfig.corosync
|
||||
|
||||
%if %{with dbus}
|
||||
%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
|
||||
%endif
|
||||
%if %{with snmp}
|
||||
%{_datadir}/snmp/mibs/COROSYNC-MIB.txt
|
||||
%endif
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/corosync.service
|
||||
%{_unitdir}/corosync-notifyd.service
|
||||
%else
|
||||
%dir %{_datadir}/corosync
|
||||
%{_datadir}/corosync/corosync
|
||||
%{_datadir}/corosync/corosync-notifyd
|
||||
%endif
|
||||
%dir %{_localstatedir}/lib/corosync
|
||||
%dir %{_localstatedir}/log/cluster
|
||||
%{_mandir}/man7/corosync_overview.7*
|
||||
%{_mandir}/man8/corosync.8*
|
||||
%{_mandir}/man8/corosync-blackbox.8*
|
||||
%{_mandir}/man8/corosync-cmapctl.8*
|
||||
%{_mandir}/man8/corosync-keygen.8*
|
||||
%{_mandir}/man8/corosync-cfgtool.8*
|
||||
%{_mandir}/man8/corosync-cpgtool.8*
|
||||
%{_mandir}/man8/corosync-notifyd.8*
|
||||
%{_mandir}/man8/corosync-quorumtool.8*
|
||||
%{_mandir}/man5/corosync.conf.5*
|
||||
%{_mandir}/man5/votequorum.5*
|
||||
%{_mandir}/man7/cmap_keys.7*
|
||||
%{_datadir}/doc/corosync/*
|
||||
|
||||
#library
|
||||
#
|
||||
%package libs
|
||||
Summary: The corosync Cluster Engine Libraries
|
||||
|
||||
%description libs
|
||||
This package contains corosync libraries.
|
||||
|
||||
%files libs
|
||||
%doc LICENSE
|
||||
%{_libdir}/libcfg.so.*
|
||||
%{_libdir}/libcpg.so.*
|
||||
%{_libdir}/libcmap.so.*
|
||||
%{_libdir}/libquorum.so.*
|
||||
%{_libdir}/libvotequorum.so.*
|
||||
%{_libdir}/libsam.so.*
|
||||
%{_libdir}/libcorosync_common.so.*
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%package devel
|
||||
Summary: The Corosync Cluster Engine Development Kit
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Provides: %{name}-devel = %{version}
|
||||
|
||||
%description devel
|
||||
This package contains include files and man pages used to develop using
|
||||
The Corosync Cluster Engine APIs.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE
|
||||
%dir %{_includedir}/corosync/
|
||||
%{_includedir}/corosync/corodefs.h
|
||||
%{_includedir}/corosync/cfg.h
|
||||
%{_includedir}/corosync/cmap.h
|
||||
%{_includedir}/corosync/corotypes.h
|
||||
%{_includedir}/corosync/cpg.h
|
||||
%{_includedir}/corosync/hdb.h
|
||||
%{_includedir}/corosync/sam.h
|
||||
%{_includedir}/corosync/quorum.h
|
||||
%{_includedir}/corosync/votequorum.h
|
||||
%{_libdir}/libcfg.so
|
||||
%{_libdir}/libcpg.so
|
||||
%{_libdir}/libcmap.so
|
||||
%{_libdir}/libquorum.so
|
||||
%{_libdir}/libvotequorum.so
|
||||
%{_libdir}/libsam.so
|
||||
%{_libdir}/libcorosync_common.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_mandir}/man3/cpg_*3*
|
||||
%{_mandir}/man3/quorum_*3*
|
||||
%{_mandir}/man3/votequorum_*3*
|
||||
%{_mandir}/man3/sam_*3*
|
||||
%{_mandir}/man3/cmap_*3*
|
||||
|
||||
%if %{with vqsim}
|
||||
%package vqsim
|
||||
Summary: The Corosync Cluster Engine - Votequorum Simulator
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description 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 vqsim
|
||||
%doc LICENSE
|
||||
%{_bindir}/corosync-vqsim
|
||||
%{_mandir}/man8/corosync-vqsim.8*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
Loading…
Reference in New Issue
Block a user