Resolves: rhbz#1881064
- Rebuild with fixed gaiting tests - Stopped bundling rubygem-json (use distribution package instead) - Fixed patches
This commit is contained in:
Miroslav Lisik
parent
8e21815087
commit
3498f0e2da
@ -1,11 +1,10 @@
|
||||
From 4aa1ca8221e660b21d8afcc6c5acebf48d51d628 Mon Sep 17 00:00:00 2001
|
||||
From ce297f2852fc1b67ac37d4074c1d2a646d7e8bd1 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Jelinek <tojeline@redhat.com>
|
||||
Date: Mon, 14 Jun 2021 11:39:14 +0200
|
||||
Subject: [PATCH 2/3] remove clufter commands
|
||||
Subject: [PATCH 1/2] remove clufter commands
|
||||
|
||||
---
|
||||
.gitlab-ci.yml | 1 -
|
||||
CHANGELOG.md | 13 +
|
||||
Makefile.am | 4 +-
|
||||
README.md | 2 -
|
||||
configure.ac | 5 -
|
||||
@ -21,7 +20,7 @@ Subject: [PATCH 2/3] remove clufter commands
|
||||
pcsd/Makefile.am | 1 -
|
||||
pcsd/test/cluster.conf | 27 --
|
||||
rpm/pcs.spec.in | 15 -
|
||||
17 files changed, 14 insertions(+), 490 deletions(-)
|
||||
16 files changed, 1 insertion(+), 490 deletions(-)
|
||||
delete mode 100644 pcs_test/resources/cluster.conf
|
||||
delete mode 100644 pcsd/test/cluster.conf
|
||||
|
||||
@ -37,36 +36,6 @@ index 8a36b509..6602ea46 100644
|
||||
python3-lxml
|
||||
python3-pip
|
||||
python3-pycurl
|
||||
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
||||
index 9a7f4315..75d148a4 100644
|
||||
--- a/CHANGELOG.md
|
||||
+++ b/CHANGELOG.md
|
||||
@@ -1,5 +1,17 @@
|
||||
# Change Log
|
||||
|
||||
+## [0.11.0]
|
||||
+
|
||||
+### Changed
|
||||
+- Pcs no longer depends on python3-distro package
|
||||
+
|
||||
+### Removed
|
||||
+- Deprecated obsolete commands `pcs config import-cman` and `pcs config export
|
||||
+ pcs-commands|pcs-commands-verbose` have been removed ([rhbz#1881064])
|
||||
+
|
||||
+[rhbz#1881064]: https://bugzilla.redhat.com/show_bug.cgi?id=1881064
|
||||
+
|
||||
+
|
||||
## [Unreleased]
|
||||
|
||||
### Added
|
||||
@@ -29,6 +41,7 @@
|
||||
[rhbz#1927404]: https://bugzilla.redhat.com/show_bug.cgi?id=1927404
|
||||
[rhbz#1930886]: https://bugzilla.redhat.com/show_bug.cgi?id=1930886
|
||||
|
||||
+
|
||||
## [0.10.8] - 2021-02-01
|
||||
|
||||
### Added
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 6a7cc553..cba77d8d 100644
|
||||
--- a/Makefile.am
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
From 6f005e31d7ad18ac15b5b4b067e7a4561bc7251d Mon Sep 17 00:00:00 2001
|
||||
From 720dc101a5038870b47492f2f6735e93ba2b20fb Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Devat <idevat@redhat.com>
|
||||
Date: Tue, 20 Nov 2018 15:03:56 +0100
|
||||
Subject: [PATCH 3/3] do not support cluster setup with udp(u) transport
|
||||
Subject: [PATCH 2/2] do not support cluster setup with udp(u) transport in
|
||||
RHEL9
|
||||
|
||||
---
|
||||
pcs/pcs.8.in | 2 ++
|
||||
@ -10,27 +11,27 @@ Subject: [PATCH 3/3] do not support cluster setup with udp(u) transport
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
|
||||
index b72c2197..841453fa 100644
|
||||
index b72c2197..020d669c 100644
|
||||
--- a/pcs/pcs.8.in
|
||||
+++ b/pcs/pcs.8.in
|
||||
@@ -420,6 +420,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
|
||||
|
||||
Transports udp and udpu:
|
||||
.br
|
||||
+WARNING: These transports are not supported in RHEL 8.
|
||||
+WARNING: These transports are not supported in RHEL 9.
|
||||
+.br
|
||||
These transports are limited to one address per node. They do not support traffic encryption nor compression.
|
||||
.br
|
||||
Transport options are: ip_version, netmtu
|
||||
diff --git a/pcs/usage.py b/pcs/usage.py
|
||||
index cec99ef2..30515ebb 100644
|
||||
index cec99ef2..45e0ebed 100644
|
||||
--- a/pcs/usage.py
|
||||
+++ b/pcs/usage.py
|
||||
@@ -853,6 +853,7 @@ Commands:
|
||||
hash=sha256. To disable encryption, set cipher=none and hash=none.
|
||||
|
||||
Transports udp and udpu:
|
||||
+ WARNING: These transports are not supported in RHEL 8.
|
||||
+ WARNING: These transports are not supported in RHEL 9.
|
||||
These transports are limited to one address per node. They do not
|
||||
support traffic encryption nor compression.
|
||||
Transport options are:
|
||||
|
||||
23
pcs.spec
23
pcs.spec
@ -1,13 +1,13 @@
|
||||
Name: pcs
|
||||
Version: 0.10.8
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
|
||||
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
||||
# GPLv2: pcs
|
||||
# ASL 2.0: tornado
|
||||
# MIT: backports, dacite, daemons, ember, ethon, handlebars, jquery, jquery-ui,
|
||||
# mustermann, rack, rack-protection, rack-test, sinatra, tilt
|
||||
# GPLv2 or Ruby: eventmachne, json
|
||||
# GPLv2 or Ruby: eventmachne
|
||||
# (GPLv2 or Ruby) and BSD: thin
|
||||
# BSD or Ruby: open4, rexml, ruby2_keywords, webrick
|
||||
# BSD and MIT: ffi
|
||||
@ -38,7 +38,6 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
|
||||
%global version_rubygem_ethon 0.12.0
|
||||
%global version_rubygem_eventmachine 1.2.7
|
||||
%global version_rubygem_ffi 1.13.1
|
||||
%global version_rubygem_json 2.3.0
|
||||
%global version_rubygem_mustermann 1.1.1
|
||||
%global version_rubygem_open4 1.3.4
|
||||
%global version_rubygem_rack 2.2.3
|
||||
@ -87,7 +86,6 @@ Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacit
|
||||
Source81: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
|
||||
Source82: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
|
||||
Source83: https://rubygems.org/downloads/ffi-%{version_rubygem_ffi}.gem
|
||||
Source84: https://rubygems.org/downloads/json-%{version_rubygem_json}.gem
|
||||
Source85: https://rubygems.org/downloads/rexml-%{version_rubygem_rexml}.gem
|
||||
Source86: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem
|
||||
# We needed to re-upload open4 rubygem because of issues with sources in gating.
|
||||
@ -148,6 +146,7 @@ BuildRequires: ruby-devel
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: rubygem-bundler
|
||||
# ruby libraries for tests
|
||||
BuildRequires: rubygem-json
|
||||
BuildRequires: rubygem-test-unit
|
||||
# for touching patch files (sanitization function)
|
||||
BuildRequires: diffstat
|
||||
@ -185,6 +184,7 @@ Requires: python3-cryptography
|
||||
# ruby and gems for pcsd
|
||||
Requires: ruby >= 2.2.0
|
||||
Requires: rubygems
|
||||
Requires: rubygem-json
|
||||
# for killall
|
||||
Requires: psmisc
|
||||
# cluster stack and related packages
|
||||
@ -216,7 +216,6 @@ Provides: bundled(daemons) = %{version_rubygem_daemons}
|
||||
Provides: bundled(ethon) = %{version_rubygem_ethon}
|
||||
Provides: bundled(eventmachine) = %{version_rubygem_eventmachine}
|
||||
Provides: bundled(ffi) = %{version_rubygem_ffi}
|
||||
Provides: bundled(json) = %{version_rubygem_json}
|
||||
Provides: bundled(mustermann) = %{version_rubygem_mustermann}
|
||||
Provides: bundled(open4) = %{version_rubygem_open4}
|
||||
Provides: bundled(rack) = %{version_rubygem_rack}
|
||||
@ -321,7 +320,6 @@ mkdir -p %{rubygem_cache_dir}
|
||||
cp -f %SOURCE81 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE82 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE83 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE84 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE85 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE86 %{rubygem_cache_dir}
|
||||
# For reason why we are renaming open4 rubygem, see comment of source
|
||||
@ -373,7 +371,6 @@ mv %{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/GNU e
|
||||
mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/COPYING ffi_COPYING
|
||||
mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/LICENSE ffi_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/LICENSE.SPECS ffi_LICENSE.SPECS
|
||||
mv %{rubygem_bundle_dir}/gems/json-%{version_rubygem_json}/LICENSE json_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/mustermann-%{version_rubygem_mustermann}/LICENSE mustermann_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/open4-%{version_rubygem_open4}/LICENSE open4_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE
|
||||
@ -413,7 +410,6 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/src/debug
|
||||
# We can remove files required for gem compilation
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/eventmachine-%{version_rubygem_eventmachine}/ext
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/ext
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/json-%{version_rubygem_json}/ext
|
||||
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext
|
||||
|
||||
%check
|
||||
@ -511,7 +507,6 @@ remove_all_tests
|
||||
%license ffi_COPYING
|
||||
%license ffi_LICENSE
|
||||
%license ffi_LICENSE.SPECS
|
||||
%license json_LICENSE
|
||||
%license mustermann_LICENSE
|
||||
%license open4_LICENSE
|
||||
%license rack_MIT-LICENSE
|
||||
@ -561,12 +556,18 @@ remove_all_tests
|
||||
%license pyagentx_LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Tue Jun 15 2021 Miroslava Lisik <mlisik@redhat.com> - 0.10.8-7
|
||||
* Wed Jun 16 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-8
|
||||
- Rebuild with fixed gaiting tests
|
||||
- Stopped bundling rubygem-json (use distribution package instead)
|
||||
- Fixed patches
|
||||
- Resolves: rhbz#1881064
|
||||
|
||||
* Tue Jun 15 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-7
|
||||
- Fixed License tag
|
||||
- Rebuild with fixed dependency for gating tier0 tests
|
||||
- Resolves: rhbz#1881064
|
||||
|
||||
* Thu Jun 10 2021 Miroslava Lisik <mlisik@redhat.com> - 0.10.8-6
|
||||
* Thu Jun 10 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-6
|
||||
- Rebased to latest upstream sources (see CHANGELOG.md)
|
||||
- Removed clufter related commands
|
||||
- Resolves: rhbz#1881064
|
||||
|
||||
1
sources
1
sources
@ -7,7 +7,6 @@ SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49c
|
||||
SHA512 (thin-1.7.2.gem) = e9e0ad3dab77a1c6f3e413ce7ed1598da0db5fa62355a1fbbc73153d2fd810d82d5bf2e6a434429912eb885c263c674364a5dec7d878960e2dbef37ccbe1472b
|
||||
SHA512 (ethon-0.12.0.gem) = 5fea666efdd5e2d568d0e074f205525656e202ecea3bb5ff8a8ab838a596cab349b869baffb7926227d6cfdae5b9c1cb86bb201b4c9585056c6671ab4feee596
|
||||
SHA512 (ffi-1.13.1.gem) = 4c0b5086463c5abedc440c44fb12c62612627a2aaad60b1959ea8831d4ec2bbe3217fec0b63612730bb219748fd2bd2252dd615ca0305fb7f0e8456c63c31fbd
|
||||
SHA512 (json-2.3.0.gem) = 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
|
||||
SHA512 (mustermann-1.1.1.gem) = 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
|
||||
SHA512 (rack-protection-2.0.8.1.gem) = 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562
|
||||
SHA512 (rack-test-1.1.0.gem) = 16e291fa5a88b6866e8057b4bf1aae4ffe17dd9b0300c1ee36632c5b21ff2075cb4356f6f78437dd84ea76047a5d3abe3dda087a2c154f5e5712e62d7e57fdc9
|
||||
|
||||
@ -37,12 +37,14 @@
|
||||
- fence-agents-ipmilan
|
||||
- fence-agents-scsi
|
||||
- fence-virt
|
||||
- fontconfig
|
||||
- openssl
|
||||
- pcs
|
||||
- pcs-snmp
|
||||
- python3-pip
|
||||
- python3-setuptools_scm
|
||||
- python3-wheel
|
||||
- rubygem-json
|
||||
- rubygem-test-unit
|
||||
- wget
|
||||
required_services:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user