rpms/pcs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import pcs-0.10.12-6.el8_6.2

Browse Source
This commit is contained in:
CentOS Sources 2022-09-01 11:02:16 -04:00 committed by Stepan Oksanichenko
parent edee66c780
commit 8f0d21c4aa
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
SOURCES/bz2116837-01-fix-ruby-socket-permissions.patch Normal file
View File

@ -0,0 +1,46 @@
From ed61fee104f6f5a16917004f12b773a49f52ca60 Mon Sep 17 00:00:00 2001
From: Tomas Jelinek <tojeline@redhat.com>
Date: Wed, 10 Aug 2022 14:47:53 +0200
Subject: [PATCH] fix ruby socket permissions
---
pcsd/rserver.rb | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/pcsd/rserver.rb b/pcsd/rserver.rb
index c37f9df4..a54509fe 100644
--- a/pcsd/rserver.rb
+++ b/pcsd/rserver.rb
@@ -7,6 +7,29 @@ require 'thin'
require 'settings.rb'
+# Replace Thin::Backends::UnixServer:connect
+# The only change is 'File.umask(0o777)' instead of 'File.umask(0)' to properly
+# set python-ruby socket permissions
+module Thin
+ module Backends
+ class UnixServer < Base
+ def connect
+ at_exit { remove_socket_file } # In case it crashes
+ old_umask = File.umask(0o077)
+ begin
+ EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+ # HACK EventMachine.start_unix_domain_server doesn't return the connection signature
+ # so we have to go in the internal stuff to find it.
+ @signature = EventMachine.instance_eval{@acceptors.keys.first}
+ ensure
+ File.umask(old_umask)
+ end
+ end
+ end
+ end
+end
+
+
def pack_response(response)
return [200, {}, [response.to_json.to_str]]
end
--
2.37.1

12
SPECS/pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.10.12 Version: 0.10.12
Release: 6%{?dist}.1 Release: 6%{?dist}.2
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPLv2: pcs # GPLv2: pcs
@ -131,6 +131,7 @@ Patch9: bz2050274-02-relax-OCF-1.0-parser.patch
# Downstream patches do not come from upstream. They adapt pcs for specific # Downstream patches do not come from upstream. They adapt pcs for specific
# RHEL needs. # RHEL needs.
Patch101: do-not-support-cluster-setup-with-udp-u-transport.patch Patch101: do-not-support-cluster-setup-with-udp-u-transport.patch
Patch102: bz2116837-01-fix-ruby-socket-permissions.patch
# ui patches: >200 # ui patches: >200
Patch201: simplify-ternar-expression.patch Patch201: simplify-ternar-expression.patch
@ -339,6 +340,7 @@ update_times_patch %{PATCH7}
update_times_patch %{PATCH8} update_times_patch %{PATCH8}
update_times_patch %{PATCH9} update_times_patch %{PATCH9}
update_times_patch %{PATCH101} update_times_patch %{PATCH101}
update_times_patch %{PATCH102}
cp -f %SOURCE1 %{pcsd_public_dir}/images cp -f %SOURCE1 %{pcsd_public_dir}/images
@ -587,10 +589,18 @@ remove_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Thu Aug 11 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-6.el8_6.2
- Fixed ruby socket permissions
- Resolves: rhbz#2116837
* Mon May 16 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-6.el8_6.1 * Mon May 16 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-6.el8_6.1
- Updated bundled rubygems: sinatra, rack-protection - Updated bundled rubygems: sinatra, rack-protection
- Resolves: rhbz#2081331 - Resolves: rhbz#2081331
* Fri Feb 11 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-6
- Fixed processing agents not conforming to OCF schema
- Resolves: rhbz#2050274
* Tue Feb 01 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-5 * Tue Feb 01 2022 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-5
- Fixed snmp client - Fixed snmp client
- Resolves: rhbz#2047983 - Resolves: rhbz#2047983