Rebase on upstream 2.1.7-rc4 release
- Use systemd-sysusers to create user/group - Pacemaker Remote nodes can validate against later schema versions - Related: RHEL-17225 - Resolves: RHEL-7665
This commit is contained in:
Chris Lumens
parent
63ab56a636
commit
bee6fa1a1f
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -36,10 +36,10 @@
|
|||
## can be incremented to build packages reliably considered "newer"
|
||||
## than previously built packages with the same pcmkversion)
|
||||
%global pcmkversion 2.1.7
|
||||
%global specversion 1
|
||||
%global specversion 2
|
||||
|
||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||
%global commit 7534cc50aefbf3c161c7ed258daa1019a94d5079
|
||||
%global commit c858c13cb79431b5c8e5dda3ca44dd305fce946c
|
||||
|
||||
## Since git v2.11, the extent of abbreviation is autoscaled by default
|
||||
## (used to be constant of 7), so we need to convey it for non-tags, too.
|
||||
|
|
@ -153,7 +153,6 @@
|
|||
%global pkgname_procps procps
|
||||
%global pkgname_glue_libs libglue
|
||||
%global pkgname_pcmk_libs lib%{name}3
|
||||
%global hacluster_id 90
|
||||
%else
|
||||
%global pkgname_libtool_devel libtool-ltdl-devel
|
||||
%global pkgname_libtool_devel_arch libtool-ltdl-devel%{?_isa}
|
||||
|
|
@ -165,7 +164,6 @@
|
|||
%global pkgname_procps procps-ng
|
||||
%global pkgname_glue_libs cluster-glue-libs
|
||||
%global pkgname_pcmk_libs %{name}-libs
|
||||
%global hacluster_id 189
|
||||
%endif
|
||||
|
||||
## Distro-specific configuration choices
|
||||
|
|
@ -246,9 +244,11 @@ Url: https://www.clusterlabs.org/
|
|||
# You can use "spectool -s 0 pacemaker.spec" (rpmdevtools) to show final URL.
|
||||
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
||||
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
||||
Source2: pacemaker.sysusers
|
||||
|
||||
# upstream commits
|
||||
#Patch001: 001-xxxx.patch
|
||||
Patch001: 001-schema-glib.patch
|
||||
Patch002: 002-schema-transfer.patch
|
||||
|
||||
Requires: resource-agents
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -331,6 +331,10 @@ BuildRequires: inkscape
|
|||
BuildRequires: %{python_name}-sphinx
|
||||
%endif
|
||||
|
||||
# Creation of Users / Groups
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%{?sysusers_requires_compat}
|
||||
|
||||
# Booth requires this
|
||||
Provides: pacemaker-ticket-support = 2.0
|
||||
|
||||
|
|
@ -616,6 +620,8 @@ find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
|
|||
rm -f %{buildroot}/%{_sbindir}/fence_legacy
|
||||
rm -f %{buildroot}/%{_mandir}/man8/fence_legacy.*
|
||||
|
||||
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/pacemaker.conf
|
||||
|
||||
# For now, don't package the servicelog-related binaries built only for
|
||||
# ppc64le when certain dependencies are installed. If they get more exercise by
|
||||
# advanced users, we can reconsider.
|
||||
|
|
@ -691,10 +697,7 @@ fi
|
|||
%systemd_postun_with_restart crm_mon.service
|
||||
|
||||
%pre -n %{pkgname_pcmk_libs}
|
||||
# @TODO Use sysusers.d:
|
||||
# https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format
|
||||
getent group %{gname} >/dev/null || groupadd -r %{gname} -g %{hacluster_id}
|
||||
getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u %{hacluster_id} -s /sbin/nologin -c "cluster user" %{uname}
|
||||
%sysusers_create_compat %{SOURCE2}
|
||||
exit 0
|
||||
|
||||
%ldconfig_scriptlets -n %{pkgname_pcmk_libs}
|
||||
|
|
@ -815,6 +818,7 @@ exit 0
|
|||
%dir %attr (770, %{uname}, %{gname}) %{_var}/log/pacemaker/bundles
|
||||
|
||||
%files -n %{pkgname_pcmk_libs} %{?with_nls:-f %{name}.lang}
|
||||
%{_sysusersdir}/pacemaker.conf
|
||||
%{_libdir}/libcib.so.*
|
||||
%{_libdir}/liblrmd.so.*
|
||||
%{_libdir}/libcrmservice.so.*
|
||||
|
|
@ -903,6 +907,13 @@ exit 0
|
|||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Wed Dec 13 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-2
|
||||
- Rebase on upstream 2.1.7-rc4 release
|
||||
- Use systemd-sysusers to create user/group
|
||||
- Pacemaker Remote nodes can validate against later schema versions
|
||||
- Related: RHEL-17225
|
||||
- Resolves: RHEL-7665
|
||||
|
||||
* Wed Nov 22 2023 Chris Lumens <clumens@redhat.com> - 2.1.7-1
|
||||
- Rebase on upstream 2.1.7-rc2 release
|
||||
- Resolves: RHEL-7682
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
#Type Name ID GECOS Home directory Shell
|
||||
g haclient 189
|
||||
u hacluster 189:haclient "cluster user" /var/lib/pacemaker /sbin/nologin
|
||||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
|
||||
SHA512 (pacemaker-7534cc50a.tar.gz) = 70703c68e3249a2fcc4d88d53b78a2a990163ec59b32fb4c5c6993cb53943900279017f529f9bf29a06e59fd67bb2d631719ed5a41848b01a54497caf90e0b20
|
||||
SHA512 (pacemaker-c858c13cb.tar.gz) = 67a6669bb42dd7adcde2a99155086746a95a37262a14b6ca2c4f8f2706ba572ef2a3715cc40bbeb6988ae6a8979ed8ce208c890934ea0eb5d8448d84510cf3ce
|
||||
|
|
|
|||
Loading…
Reference in New Issue