pcs-0.11.7-5
- Rebased to the latest sources (see CHANGELOG.md) Resolves: RHEL-34783, RHEL-34792, RHEL-35428, RHEL-35670, RHEL-36612, RHEL-38478, RHEL-38479, RHEL-38481, RHEL-38487, RHEL-38489, RHEL-38491 - Updated pcs-web-ui to 0.1.19 Resolves: RHEL-38493, RHEL-38494, RHEL-38495, RHEL-38496 - “Added” the Cockpit application cockpit-ha-cluster as a web interface for HA cluster management (this was already present because of package sync from Fedora 40) Resolves: RHEL-23048 - Updated bundled rubygems: backports, childprocess, nio4r, puma, rack, rack-protection, sinatra - Bundled new rubygems: base64, rack-session, rackup, webrick - Started bundling webrick again as a dependency of rackup - we no longer use it but rackup requires webrick
This commit is contained in:
Michal Pospisil
parent
72da5ce3c7
commit
16034a47b3
15
.gitignore
vendored
15
.gitignore
vendored
@ -18,3 +18,18 @@
|
||||
/sinatra-3.1.0.gem
|
||||
/tilt-2.3.0.gem
|
||||
/tornado-6.3.3.tar.gz
|
||||
/backports-3.25.0.gem
|
||||
/base64-0.2.0.gem
|
||||
/childprocess-5.0.0.gem
|
||||
/nio4r-2.7.3.gem
|
||||
/puma-6.4.2.gem
|
||||
/rack-3.0.11.gem
|
||||
/rack-protection-4.0.0.gem
|
||||
/rack-session-2.0.0.gem
|
||||
/rackup-2.1.0.gem
|
||||
/sinatra-4.0.0.gem
|
||||
/webrick-1.8.1.gem
|
||||
/tornado-6.4.0.tar.gz
|
||||
/pcs-web-ui-0.1.19.tar.gz
|
||||
/pcs-web-ui-node-modules-0.1.19.tar.xz
|
||||
/pcs-5b7d498915e0cc876b29fe9ebd709c061ac754db.tar.gz
|
||||
|
||||
39
do-not-support-cluster-setup-with-udp-u-transport.patch
Normal file
39
do-not-support-cluster-setup-with-udp-u-transport.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 83a69bddcafcbfb945734621cb3cddc479e5e132 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Pospisil <mpospisi@redhat.com>
|
||||
Date: Thu, 23 May 2024 17:22:12 +0200
|
||||
Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in
|
||||
RHEL10
|
||||
|
||||
---
|
||||
pcs/pcs.8.in | 2 ++
|
||||
pcs/usage.py | 1 +
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
|
||||
index 0bc1a4e5..4dea3582 100644
|
||||
--- a/pcs/pcs.8.in
|
||||
+++ b/pcs/pcs.8.in
|
||||
@@ -479,6 +479,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 10.
|
||||
+.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 26204c59..31eba549 100644
|
||||
--- a/pcs/usage.py
|
||||
+++ b/pcs/usage.py
|
||||
@@ -1496,6 +1496,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 10.
|
||||
These transports are limited to one address per node. They do not
|
||||
support traffic encryption nor compression.
|
||||
Transport options are:
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From b27e513fb6e17016c82b551e3a966bebc7ab327c Mon Sep 17 00:00:00 2001
|
||||
From: Michal Pospisil <mpospisi@redhat.com>
|
||||
Date: Thu, 11 Apr 2024 11:01:19 +0200
|
||||
Subject: [PATCH] fix dependency checking
|
||||
|
||||
Bundling pycurl was not allowed and the check was failing during builds.
|
||||
The check for setuptools_scm was also removed as we no longer bundle
|
||||
dateutil anywhere with pcs-0.11.
|
||||
---
|
||||
configure.ac | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5d3e28cf..5881c048 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -334,13 +334,11 @@ AM_CONDITIONAL([PIP_HAS_ISOLATION], [test "x$have_isolation" = xyes])
|
||||
|
||||
if test "x$tests_only" != "xyes"; then
|
||||
PCS_CHECK_PYMOD([setuptools])
|
||||
- PCS_CHECK_PYMOD([setuptools-scm])
|
||||
if test "x$local_build" = "xyes"; then
|
||||
PCS_CHECK_PYMOD([wheel])
|
||||
fi
|
||||
PCS_CHECK_PYMOD([cryptography])
|
||||
PCS_CHECK_PYMOD([lxml])
|
||||
- PCS_CHECK_PYMOD([pycurl])
|
||||
PCS_CHECK_PYMOD([pyparsing])
|
||||
|
||||
# those are kind of problematic.
|
||||
@@ -348,6 +346,7 @@ if test "x$tests_only" != "xyes"; then
|
||||
PCS_CHECK_PYMOD([dacite], [], [yes])
|
||||
PCS_CHECK_PYMOD([tornado], [>= 6.0.0], [yes])
|
||||
PCS_CHECK_PYMOD([python-dateutil], [>= 2.7.0], [yes])
|
||||
+ PCS_CHECK_PYMOD([pycurl], [], [yes])
|
||||
|
||||
# special case, because we need to download from github
|
||||
AC_PIP_MODULE([pyagentx])
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
From 9923d48095ac7a1376b108a0a3e722d3090fcea6 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Pospisil <mpospisi@redhat.com>
|
||||
Date: Thu, 18 Jan 2024 16:52:59 +0100
|
||||
Subject: [PATCH] make AppStream metainfo more descriptive
|
||||
|
||||
---
|
||||
...g.clusterlabs.cockpit_pcs_web_ui.metainfo.xml | 16 ++++++++++++++++
|
||||
.../app/org.clusterlabs.pcs_web_ui.metainfo.xml | 16 ----------------
|
||||
packages/app/package-lock.json | 4 ++--
|
||||
3 files changed, 18 insertions(+), 18 deletions(-)
|
||||
create mode 100644 packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
delete mode 100644 packages/app/org.clusterlabs.pcs_web_ui.metainfo.xml
|
||||
|
||||
diff --git a/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml b/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
new file mode 100644
|
||||
index 00000000..a27525a9
|
||||
--- /dev/null
|
||||
+++ b/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
@@ -0,0 +1,16 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<component type="addon">
|
||||
+ <id>org.clusterlabs.cockpit_pcs_web_ui</id>
|
||||
+ <metadata_license>CC0-1.0</metadata_license>
|
||||
+ <name>HA Cluster Management</name>
|
||||
+ <summary>Manage Pacemaker based clusters</summary>
|
||||
+ <description>
|
||||
+ <p>
|
||||
+ Application for managing Pacemaker based clusters. Uses Pacemaker/Corosync
|
||||
+ Configuration System (pcs) in the background.
|
||||
+ </p>
|
||||
+ </description>
|
||||
+ <extends>cockpit.desktop</extends>
|
||||
+ <launchable type="cockpit-manifest">ha-cluster</launchable>
|
||||
+ <url type="homepage">https://github.com/ClusterLabs/pcs-web-ui</url>
|
||||
+</component>
|
||||
diff --git a/packages/app/org.clusterlabs.pcs_web_ui.metainfo.xml b/packages/app/org.clusterlabs.pcs_web_ui.metainfo.xml
|
||||
deleted file mode 100644
|
||||
index 83add879..00000000
|
||||
--- a/packages/app/org.clusterlabs.pcs_web_ui.metainfo.xml
|
||||
+++ /dev/null
|
||||
@@ -1,16 +0,0 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<component type="addon">
|
||||
- <id>org.clusterlabs.pcs_web_ui</id>
|
||||
- <metadata_license>CC0-1.0</metadata_license>
|
||||
- <name>Pcs Web UI</name>
|
||||
- <summary>Manage pacemaker based clusters.</summary>
|
||||
- <description>
|
||||
- <p>
|
||||
- Pcs Web UI is an application that allows you to easily view, modify and
|
||||
- create pacemaker based clusters.
|
||||
- </p>
|
||||
- </description>
|
||||
- <extends>cockpit.desktop</extends>
|
||||
- <launchable type="cockpit-manifest">ha-cluster</launchable>
|
||||
-</component>
|
||||
-
|
||||
diff --git a/packages/app/package-lock.json b/packages/app/package-lock.json
|
||||
index 4bf1e89e..2f4049a5 100644
|
||||
--- a/packages/app/package-lock.json
|
||||
+++ b/packages/app/package-lock.json
|
||||
@@ -3830,7 +3830,7 @@
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001563",
|
||||
- "resolved": "https://repository.engineering.redhat.com/nexus/repository/registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
|
||||
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
|
||||
"integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
@@ -12590,7 +12590,7 @@
|
||||
},
|
||||
"caniuse-lite": {
|
||||
"version": "1.0.30001563",
|
||||
- "resolved": "https://repository.engineering.redhat.com/nexus/repository/registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
|
||||
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz",
|
||||
"integrity": "sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==",
|
||||
"dev": true
|
||||
},
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From c55cac8220da78b87b7c84c4049280bc05bf1753 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Pospisil <mpospisi@redhat.com>
|
||||
Date: Fri, 2 Feb 2024 18:47:54 +0100
|
||||
Subject: [PATCH] metainfo: fix outdated extends id
|
||||
|
||||
---
|
||||
packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml b/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
index a27525a9..0924545c 100644
|
||||
--- a/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
+++ b/packages/app/org.clusterlabs.cockpit_pcs_web_ui.metainfo.xml
|
||||
@@ -10,7 +10,7 @@
|
||||
Configuration System (pcs) in the background.
|
||||
</p>
|
||||
</description>
|
||||
- <extends>cockpit.desktop</extends>
|
||||
+ <extends>org.cockpit_project.cockpit</extends>
|
||||
<launchable type="cockpit-manifest">ha-cluster</launchable>
|
||||
<url type="homepage">https://github.com/ClusterLabs/pcs-web-ui</url>
|
||||
</component>
|
||||
--
|
||||
2.43.0
|
||||
|
||||
100
pcs.spec
100
pcs.spec
@ -1,14 +1,14 @@
|
||||
Name: pcs
|
||||
Version: 0.11.7
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
|
||||
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
||||
# GPL-2.0-only: pcs
|
||||
# Apache-2.0: tornado
|
||||
# MIT: backports, childprocess, dacite, ethon, mustermann, rack,
|
||||
# rack-protection, rack-test, sinatra, tilt
|
||||
# rack-protection, rack-session, rack-test, rackup, sinatra, tilt
|
||||
# MIT and (BSD-2-Clause or GPL-2.0-or-later): nio4r
|
||||
# BSD-2-Clause or Ruby: ruby2_keywords
|
||||
# BSD-2-Clause or Ruby: base64, ruby2_keywords, webrick
|
||||
# BSD-3-Clause: puma
|
||||
# BSD-3-Clause and MIT: ffi
|
||||
# curl OR LGPL-2.1-or-later: python-pycurl
|
||||
@ -20,22 +20,20 @@ Summary: Pacemaker/Corosync Configuration System
|
||||
ExclusiveArch: x86_64 s390x ppc64le aarch64
|
||||
|
||||
# When specifying a commit, use its long hash
|
||||
%global version_or_commit %{version}
|
||||
# %%global version_or_commit 10069ca47e5c9f4ac1abd8bc4cd99281ead047b7
|
||||
# %%global version_or_commit %%{version}
|
||||
%global version_or_commit 5b7d498915e0cc876b29fe9ebd709c061ac754db
|
||||
%global pcs_source_name %{name}-%{version_or_commit}
|
||||
|
||||
# ui_commit can be determined by hash, tag or branch
|
||||
%global ui_commit 0.1.18
|
||||
%global ui_modules_version 0.1.18
|
||||
%global ui_commit 0.1.19
|
||||
%global ui_modules_version 0.1.19
|
||||
%global ui_src_name pcs-web-ui-%{ui_commit}
|
||||
|
||||
%global dacite_version 1.8.1
|
||||
%global pyagentx_version 0.4.pcs.2
|
||||
%global tornado_version 6.3.3
|
||||
%global tornado_version 6.4.0
|
||||
|
||||
%global pycurl_version 7.45.3
|
||||
# we always need to get an URL from the PyPi
|
||||
%global pycurl_src_url_prefix https://files.pythonhosted.org/packages/c9/5a/e68b8abbc1102113b7839e708ba04ef4c4b8b8a6da392832bb166d09ea72
|
||||
# During its initialization, PycURL checks that the actual libcurl version
|
||||
# is not lower than the one used when PycURL was built.
|
||||
# Yes, that should be handled by library versioning (which would then get
|
||||
@ -45,19 +43,23 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64
|
||||
%global curlver_h /usr/include/curl/curlver.h
|
||||
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
|
||||
|
||||
%global version_rubygem_backports 3.24.1
|
||||
%global version_rubygem_childprocess 4.1.0
|
||||
%global version_rubygem_backports 3.25.0
|
||||
%global version_rubygem_base64 0.2.0
|
||||
%global version_rubygem_childprocess 5.0.0
|
||||
%global version_rubygem_ethon 0.16.0
|
||||
%global version_rubygem_ffi 1.16.3
|
||||
%global version_rubygem_mustermann 3.0.0
|
||||
%global version_rubygem_nio4r 2.5.9
|
||||
%global version_rubygem_puma 6.4.0
|
||||
%global version_rubygem_rack 2.2.8.1
|
||||
%global version_rubygem_rack_protection 3.1.0
|
||||
%global version_rubygem_nio4r 2.7.3
|
||||
%global version_rubygem_puma 6.4.2
|
||||
%global version_rubygem_rack 3.0.11
|
||||
%global version_rubygem_rack_protection 4.0.0
|
||||
%global version_rubygem_rack_session 2.0.0
|
||||
%global version_rubygem_rack_test 2.1.0
|
||||
%global version_rubygem_rackup 2.1.0
|
||||
%global version_rubygem_ruby2_keywords 0.0.5
|
||||
%global version_rubygem_sinatra 3.1.0
|
||||
%global version_rubygem_sinatra 4.0.0
|
||||
%global version_rubygem_tilt 2.3.0
|
||||
%global version_rubygem_webrick 1.8.1
|
||||
|
||||
%global required_pacemaker_version 2.1.0
|
||||
|
||||
@ -85,22 +87,26 @@ Source0: %{url}/archive/%{?v_prefix}%{version_or_commit}/%{pcs_source_name}.tar.
|
||||
|
||||
Source21: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz
|
||||
Source22: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz
|
||||
Source23: %{pycurl_src_url_prefix}/pycurl-%{pycurl_version}.tar.gz
|
||||
Source23: https://pypi.python.org/packages/source/p/pycurl/pycurl-%{pycurl_version}.tar.gz
|
||||
Source24: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz
|
||||
|
||||
Source61: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
|
||||
Source62: https://rubygems.org/downloads/childprocess-%{version_rubygem_childprocess}.gem
|
||||
Source63: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
|
||||
Source64: https://rubygems.org/downloads/ffi-%{version_rubygem_ffi}.gem
|
||||
Source65: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem
|
||||
Source66: https://rubygems.org/downloads/nio4r-%{version_rubygem_nio4r}.gem
|
||||
Source67: https://rubygems.org/downloads/puma-%{version_rubygem_puma}.gem
|
||||
Source68: https://rubygems.org/downloads/rack-%{version_rubygem_rack}.gem
|
||||
Source69: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_protection}.gem
|
||||
Source70: https://rubygems.org/downloads/rack-test-%{version_rubygem_rack_test}.gem
|
||||
Source71: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem
|
||||
Source72: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem
|
||||
Source73: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem
|
||||
Source62: https://rubygems.org/downloads/base64-%{version_rubygem_base64}.gem
|
||||
Source63: https://rubygems.org/downloads/childprocess-%{version_rubygem_childprocess}.gem
|
||||
Source64: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
|
||||
Source65: https://rubygems.org/downloads/ffi-%{version_rubygem_ffi}.gem
|
||||
Source66: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem
|
||||
Source67: https://rubygems.org/downloads/nio4r-%{version_rubygem_nio4r}.gem
|
||||
Source68: https://rubygems.org/downloads/puma-%{version_rubygem_puma}.gem
|
||||
Source69: https://rubygems.org/downloads/rack-%{version_rubygem_rack}.gem
|
||||
Source70: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_protection}.gem
|
||||
Source71: https://rubygems.org/downloads/rack-session-%{version_rubygem_rack_session}.gem
|
||||
Source72: https://rubygems.org/downloads/rack-test-%{version_rubygem_rack_test}.gem
|
||||
Source73: https://rubygems.org/downloads/rackup-%{version_rubygem_rackup}.gem
|
||||
Source74: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem
|
||||
Source75: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem
|
||||
Source76: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem
|
||||
Source77: https://rubygems.org/downloads/webrick-%{version_rubygem_webrick}.gem
|
||||
|
||||
Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
|
||||
Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz
|
||||
@ -108,12 +114,11 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm
|
||||
|
||||
# pcs patches: <= 200
|
||||
# Patch1: name.patch
|
||||
Patch1: fix-dependency-checking.patch
|
||||
Patch1: do-not-support-cluster-setup-with-udp-u-transport.patch
|
||||
Patch2: support-bundling-pycurl.patch
|
||||
|
||||
# ui patches: >200
|
||||
# Patch201: name-web-ui.patch
|
||||
Patch201: make-AppStream-metainfo-more-descriptive.patch
|
||||
Patch202: metainfo-fix-outdated-extends-id.patch
|
||||
|
||||
|
||||
# git for patches
|
||||
@ -212,6 +217,7 @@ Provides: bundled(pycurl) = %{pycurl_version}
|
||||
Provides: bundled(tornado) = %{tornado_version}
|
||||
|
||||
Provides: bundled(backports) = %{version_rubygem_backports}
|
||||
Provides: bundled(base64) = %{version_rubygem_base64}
|
||||
Provides: bundled(childprocess) = %{version_rubygem_childprocess}
|
||||
Provides: bundled(ethon) = %{version_rubygem_ethon}
|
||||
Provides: bundled(ffi) = %{version_rubygem_ffi}
|
||||
@ -220,10 +226,13 @@ Provides: bundled(nio4r) = %{version_rubygem_nio4r}
|
||||
Provides: bundled(puma) = %{version_rubygem_puma}
|
||||
Provides: bundled(rack) = %{version_rubygem_rack}
|
||||
Provides: bundled(rack_protection) = %{version_rubygem_rack_protection}
|
||||
Provides: bundled(rack_session) = %{version_rubygem_rack_session}
|
||||
Provides: bundled(rack_test) = %{version_rubygem_rack_test}
|
||||
Provides: bundled(rackup) = %{version_rubygem_rackup}
|
||||
Provides: bundled(ruby2_keywords) = %{version_rubygem_ruby2_keywords}
|
||||
Provides: bundled(sinatra) = %{version_rubygem_sinatra}
|
||||
Provides: bundled(tilt) = %{version_rubygem_tilt}
|
||||
Provides: bundled(webrick) = %{version_rubygem_webrick}
|
||||
|
||||
|
||||
# pcs-snmp subpackage definition
|
||||
@ -320,14 +329,13 @@ update_times_patch(){
|
||||
%autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N
|
||||
%autopatch -p1 -m 201
|
||||
# update_times_patch %%{PATCH201}
|
||||
update_times_patch %%{PATCH201}
|
||||
update_times_patch %%{PATCH202}
|
||||
|
||||
# patch pcs sources
|
||||
%autosetup -S git -n %{pcs_source_name} -N
|
||||
%autopatch -p1 -M 200
|
||||
# update_times_patch %%{PATCH1}
|
||||
update_times_patch %{PATCH1}
|
||||
update_times_patch %{PATCH2}
|
||||
|
||||
# generate .tarball-version if building from an untagged commit, not a released version
|
||||
# autogen uses git-version-gen which uses .tarball-version for generating version number
|
||||
@ -353,6 +361,10 @@ cp -f %SOURCE70 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE71 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE72 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE73 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE74 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE75 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE76 %{rubygem_cache_dir}
|
||||
cp -f %SOURCE77 %{rubygem_cache_dir}
|
||||
|
||||
|
||||
# 2) prepare python bundles
|
||||
@ -411,6 +423,7 @@ cp -r %{_builddir}/%{ui_src_name}/packages/app/%{ui_appstream_metainfo} \
|
||||
|
||||
# prepare license files
|
||||
mv %{rubygem_bundle_dir}/gems/backports-%{version_rubygem_backports}/LICENSE.txt backports_LICENSE.txt
|
||||
mv %{rubygem_bundle_dir}/gems/base64-%{version_rubygem_base64}/LICENSE.txt base64_LICENSE.txt
|
||||
mv %{rubygem_bundle_dir}/gems/childprocess-%{version_rubygem_childprocess}/LICENSE childprocess_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/ethon-%{version_rubygem_ethon}/LICENSE ethon_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/COPYING ffi_COPYING
|
||||
@ -422,10 +435,13 @@ mv %{rubygem_bundle_dir}/gems/nio4r-%{version_rubygem_nio4r}/ext/libev/LICENSE n
|
||||
mv %{rubygem_bundle_dir}/gems/puma-%{version_rubygem_puma}/LICENSE puma_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/rack-protection-%{version_rubygem_rack_protection}/License rack-protection_License
|
||||
mv %{rubygem_bundle_dir}/gems/rack-session-%{version_rubygem_rack_session}/license.md rack-session_license.md
|
||||
mv %{rubygem_bundle_dir}/gems/rack-test-%{version_rubygem_rack_test}/MIT-LICENSE.txt rack-test_MIT-LICENSE.txt
|
||||
mv %{rubygem_bundle_dir}/gems/rackup-%{version_rubygem_rackup}/license.md rackup_license.md
|
||||
mv %{rubygem_bundle_dir}/gems/ruby2_keywords-%{version_rubygem_ruby2_keywords}/LICENSE ruby2_keywords_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra_LICENSE
|
||||
mv %{rubygem_bundle_dir}/gems/tilt-%{version_rubygem_tilt}/COPYING tilt_COPYING
|
||||
mv %{rubygem_bundle_dir}/gems/webrick-%{version_rubygem_webrick}/LICENSE.txt webrick_LICENSE.txt
|
||||
|
||||
cp %{pcs_bundled_dir}/src/dacite-*/LICENSE dacite_LICENSE
|
||||
cp %{pcs_bundled_dir}/src/dacite-*/README.md dacite_README.md
|
||||
@ -545,6 +561,7 @@ run_all_tests
|
||||
%license pycurl_COPYING-MIT
|
||||
# rubygem licenses
|
||||
%license backports_LICENSE.txt
|
||||
%license base64_LICENSE.txt
|
||||
%license childprocess_LICENSE
|
||||
%license ethon_LICENSE
|
||||
%license ffi_COPYING
|
||||
@ -556,10 +573,13 @@ run_all_tests
|
||||
%license puma_LICENSE
|
||||
%license rack_MIT-LICENSE
|
||||
%license rack-protection_License
|
||||
%license rack-session_license.md
|
||||
%license rack-test_MIT-LICENSE.txt
|
||||
%license rackup_license.md
|
||||
%license ruby2_keywords_LICENSE
|
||||
%license sinatra_LICENSE
|
||||
%license tilt_COPYING
|
||||
%license webrick_LICENSE.txt
|
||||
%{python3_sitelib}/*
|
||||
%{_sbindir}/pcs
|
||||
%{_sbindir}/pcsd
|
||||
@ -606,6 +626,16 @@ run_all_tests
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 23 2024 Michal Pospíšil <mpospisi@redhat.com> - 0.11.7-5
|
||||
- Rebased to the latest sources (see CHANGELOG.md)
|
||||
Resolves: RHEL-34783, RHEL-34792, RHEL-35428, RHEL-35670, RHEL-36612, RHEL-38478, RHEL-38479, RHEL-38481, RHEL-38487, RHEL-38489, RHEL-38491
|
||||
- Updated pcs-web-ui to 0.1.19
|
||||
Resolves: RHEL-38493, RHEL-38494, RHEL-38495, RHEL-38496
|
||||
- “Added” the Cockpit application cockpit-ha-cluster as a web interface for HA cluster management (this was already present because of package sync from Fedora 40)
|
||||
Resolves: RHEL-23048
|
||||
- Updated bundled rubygems: backports, childprocess, nio4r, puma, rack, rack-protection, sinatra
|
||||
- Bundled new rubygems: base64, rack-session, rackup, webrick
|
||||
|
||||
* Wed Apr 10 2024 Michal Pospíšil <mpospisi@redhat.com> - 0.11.7-4
|
||||
- Bundled Python dependencies: dacite, pyagentx, pycurl, tornado
|
||||
Resolves: RHEL-26339
|
||||
|
||||
26
sources
26
sources
@ -1,20 +1,24 @@
|
||||
SHA512 (backports-3.24.1.gem) = b2eeb76ebf8ddfc7e349e125c6b9cffcabe3d184533579dbf2abb5f663ce85f4a6f8b01b67be4030c98f4782c63511046a1a1efa4d573a9aeb700dcbb9f9f566
|
||||
SHA512 (childprocess-4.1.0.gem) = e635c3acfa5ad85891c3879f240c7e96d47d7d5ec3f472f4ce6661552b0fb7bd72c5e3b9fb73f4f9312b749fbe554b4be388e56a31a3c63c39743d055d774def
|
||||
SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1
|
||||
SHA512 (ethon-0.16.0.gem) = 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905
|
||||
SHA512 (ffi-1.16.3.gem) = b3d823a03055412a85ae3dbc10c3b50615614f0b66830e144ca47610b1f93f588ff693a95d364b4f686968b79bba91f9f9fa60b932479c6bf9ceb10e15575b98
|
||||
SHA512 (mustermann-3.0.0.gem) = c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
|
||||
SHA512 (nio4r-2.5.9.gem) = d1c52896f186d19eb089a94d74ccadb427e64c204af149aa83a5a4dda3f0edd1bd2bae94afd21fcd58e3c2b9e2c17278a18717c0905de80e45540d13eeefd9e5
|
||||
SHA512 (pcs-0.11.7.tar.gz) = cbe81acb14680948cfe642930012c896e617d976b33ebbb5c202f85d02ec1c0e22f901e73766628926caef2d5568fc6c36d7f9cf4091714f207911b7d4d1c1ef
|
||||
SHA512 (pcs-web-ui-0.1.18.tar.gz) = edbe88d113e967b2d3f345e74e8c4409b013fb8474fe70a8813a1aba5ea8b4deb61a3bb8c4cd4b4d1a9dc9e67216e518ee5bf832a25188e95173317533d7bf69
|
||||
SHA512 (pcs-web-ui-node-modules-0.1.18.tar.xz) = 237ff976d67a7bf881e45334261af1da32c6330fbf9e7436dcf33e63c9373f85f36db52622676f77e27bb6a853c046223cfe0cca25de68bd004c6535aa077fd7
|
||||
SHA512 (puma-6.4.0.gem) = 3f481bd2bd34ed0d66d86f61d7522a48b4d8bfd36b807a1c47bb3b640bc6050a72f4f710fd4fad16260b560f98050e34faad044a54cb759c7ffe8371c3548c18
|
||||
SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
|
||||
SHA512 (pycurl-7.45.3.tar.gz) = 12a55070602a1fd22b160ad582a4001bdd28531d2b2ccd365ff0136bc13dd23af80b19488bdbbc60a902a3a362b64383b9ae6acce6ed328c74dcffc8a6a3f4ad
|
||||
SHA512 (rack-2.2.8.1.gem) = 98a92950a4ca81c51313bca88cdb2a299aa570c3818e8372014b521ef0f6d2347594d456a7ad30eaa972b0bae864d3eb324263870cdcb8f2ffdc5ba08594aada
|
||||
SHA512 (rack-protection-3.1.0.gem) = 18a5ffe614a906ca876926bff3e4d1657f0b6963005ee32de80d0ab987b9465f603b30d69f07fd8d8a1ebf4fa85eb89bfd0b607d72387b360d13bea113a63ef7
|
||||
SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f
|
||||
SHA512 (ruby2_keywords-0.0.5.gem) = f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
|
||||
SHA512 (sinatra-3.1.0.gem) = e2b1f72f6ac57ce56006b6c39c72bec8135a448b2b235d6fd061fe3d02bd32b6bd8521c8083975e2ec758b8ba9634d6bc2e90b0f5ffae954437ffb26f808b50b
|
||||
SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3
|
||||
SHA512 (tornado-6.3.3.tar.gz) = d4813de111139da2f5bd390bdd8d456797a48ba2ebe730946aabd66d9269ce4425d9b70ce62aa443ea5590d667b9056766841d99dcb0f383b2c9acd409474c8d
|
||||
SHA512 (backports-3.25.0.gem) = 47a2ffb83030cb317e85a4f72a1c4a76a90324b8928ac73e1aa3404a22136661e9ce718bfdd937fbe07b9e05a338fcbd717bb505fb1dd91cfee570bbff9e3f72
|
||||
SHA512 (base64-0.2.0.gem) = ee5cdc30e73e625c15cb674cdd16a839ad44ffb0a27d1363f94491b48d95da37a2976c34f6f616b722a35750a067eb2245c4746d7d36f8e9a9ecee68ff5540fb
|
||||
SHA512 (childprocess-5.0.0.gem) = 9ec340c86f4fd978b7a9925bcf90811ff3443f014469e4ff121e2c4758a4068823029ab413d1a57eb9de4a864435505b1edfa60a611709f2a5f99aaf08da422d
|
||||
SHA512 (nio4r-2.7.3.gem) = 88c8f74fd5e7d4b3f037d04d7538940f2b3def76e0f86103bf9c585b9d97bad6ef8381d5b4c1eea7c06d20c0659d4d89d1a781a48a2754e32f81cfff810f443a
|
||||
SHA512 (puma-6.4.2.gem) = 32bde41a8dbeaf998dc1cc11390ca393e96f12c8d253c023e04304cc1d631bf24a153e2d4183b6a20ae73a9b1daed9acec7f3c8fbb40090a42ca3f5f08f24aeb
|
||||
SHA512 (rack-3.0.11.gem) = 77ea51d2a1584f58396cb864f9895ec47f36febaaf9bb806ebdb52d105ace8cac1a93144ac9769efbe1fff66f5bac555c7b949f62627cb80984d2ea31704d995
|
||||
SHA512 (rack-protection-4.0.0.gem) = 5eb33e4829e5e0d320a14d169fd007111641e388f2b6e5f8de98d45dfd1e6705cdb4e1ce29524ebb6fb5afe14079b8e5370c9c389cb2befca4ca508da73165b3
|
||||
SHA512 (rack-session-2.0.0.gem) = 827cd1acf20eb814adda7663f61755febd2e6acec6ee085dbc393b614a621f845dffa8f759e434055dbf029be370afeb921c8759c9e9e1fee17119830d9b2899
|
||||
SHA512 (rackup-2.1.0.gem) = f2b66902b04ddce5ca9389822118244c591b5c83766a55aee88550717c8e736b1eff967927b2c6c611205dde25bf5a862edfc587fda9cb88f31cc902171f85b1
|
||||
SHA512 (sinatra-4.0.0.gem) = 1eb8c6e8966461d3fa463b5c87e8bc3cd58243fc997a104671e252b866bb653dfc16d7b9f677e016ae91cb30998d72f8778eb2b2254ce27cf304944a6bfa8c05
|
||||
SHA512 (webrick-1.8.1.gem) = 3bf45e3a52190dccaa6e883923448b745a420eff2a1533eacdd2aed0e4c67f5c6d813c85606f8fc12952c004e4984fd97ebc3c361a42b49cebe5b84c8fc6e99d
|
||||
SHA512 (tornado-6.4.0.tar.gz) = dc584acc14d93c7109e4744b690641ae318ee9ad2c42a4c3560c315fa8654de3a64574c7187f5afdbde2906b7cccf5725f45462e710effb6f025e5ec1a3810d4
|
||||
SHA512 (pcs-web-ui-0.1.19.tar.gz) = 3aa407f2e90f236324949d33f6ee4701c1d4898deeed2fa0d3367f9a1a0d0687e44b966c106ff772e450c51be36abd3f17656432b5da4d0c9f1a80e6f80866c6
|
||||
SHA512 (pcs-web-ui-node-modules-0.1.19.tar.xz) = 206658b964a3b1a6c7c4b171d6686ef9097ee7c36720088cdc220c50e44d09d58fb4d1aac8e2eb7bb44267f581b666d38b3148352f2f235b477e8a7ab7ee8551
|
||||
SHA512 (pcs-5b7d498915e0cc876b29fe9ebd709c061ac754db.tar.gz) = dfb891b3c0e635e6f87fe9d7fec2ee1b10c3fee9fd683dfd8e52fd5b53de1c328c2a4c056ccf2bb0d8c6bc6ebd522dd95304b6bbbbc671302ad34e4df48b37cd
|
||||
|
||||
32
support-bundling-pycurl.patch
Normal file
32
support-bundling-pycurl.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 9585ee5285201828a67ffb15e4609d7523255c35 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Pospisil <mpospisi@redhat.com>
|
||||
Date: Thu, 23 May 2024 17:23:57 +0200
|
||||
Subject: [PATCH 2/2] support bundling pycurl
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b4ef2682..0f0ed255 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -339,7 +339,6 @@ if test "x$tests_only" != "xyes"; then
|
||||
fi
|
||||
PCS_CHECK_PYMOD([cryptography])
|
||||
PCS_CHECK_PYMOD([lxml])
|
||||
- PCS_CHECK_PYMOD([pycurl])
|
||||
PCS_CHECK_PYMOD([pyparsing])
|
||||
|
||||
# those are kind of problematic.
|
||||
@@ -352,6 +351,7 @@ if test "x$tests_only" != "xyes"; then
|
||||
if test "x$bundle_module" = "xyes" && test "x$cache_only" = "xyes"; then
|
||||
PCS_CHECK_PYMOD([setuptools-scm])
|
||||
fi
|
||||
+ PCS_CHECK_PYMOD([pycurl], [], [yes])
|
||||
|
||||
# special case, because we need to download from github
|
||||
AC_PIP_MODULE([pyagentx])
|
||||
--
|
||||
2.45.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user