Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07f9520591 |
4 changed files with 18 additions and 14 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -49,3 +49,4 @@
|
|||
/pyagentx-0.4.pcs.2.tar.gz
|
||||
/sinatra-contrib-2.0.0.gem
|
||||
/pcs-0.9.164.tar.gz
|
||||
/pcs-0.9.166.tar.gz
|
||||
|
|
|
|||
24
fedfix.patch
24
fedfix.patch
|
|
@ -1,4 +1,4 @@
|
|||
From f7b706961ce0f51beebe24bdce1d56eb38ec8fca Mon Sep 17 00:00:00 2001
|
||||
From ecdf30a8e657bd40ec901d6ab01d3b2a8d4cdbd4 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Devat <idevat@redhat.com>
|
||||
Date: Mon, 19 Feb 2018 17:54:35 +0100
|
||||
Subject: [PATCH] fedfix
|
||||
|
|
@ -37,11 +37,11 @@ index 809596bc..98c5a268 100755
|
|||
absolute_import,
|
||||
division,
|
||||
diff --git a/pcsd/Makefile b/pcsd/Makefile
|
||||
index d7d98f60..c83bd958 100644
|
||||
index 21550c5a..c83bd958 100644
|
||||
--- a/pcsd/Makefile
|
||||
+++ b/pcsd/Makefile
|
||||
@@ -1,33 +1,13 @@
|
||||
-FFI_VERSION="1.9.18"
|
||||
-FFI_VERSION="1.9.25"
|
||||
-FFI_C_DIR=vendor/bundle/ruby/gems/ffi-${FFI_VERSION}/ext/ffi_c
|
||||
-
|
||||
-build_gems: get_gems
|
||||
|
|
@ -63,13 +63,13 @@ index d7d98f60..c83bd958 100644
|
|||
+build_gems:
|
||||
mkdir -p vendor/bundle/ruby
|
||||
- gem install --verbose --no-rdoc --no-ri -l --ignore-dependencies -i vendor/bundle/ruby \
|
||||
- vendor/cache/backports-3.9.1.gem \
|
||||
- vendor/cache/ethon-0.10.1.gem \
|
||||
- vendor/cache/backports-3.11.3.gem \
|
||||
- vendor/cache/ethon-0.11.0.gem \
|
||||
- vendor/cache/ffi-${FFI_VERSION}.gem \
|
||||
- vendor/cache/json-2.1.0.gem \
|
||||
- vendor/cache/multi_json-1.12.2.gem \
|
||||
- vendor/cache/multi_json-1.13.1.gem \
|
||||
- vendor/cache/open4-1.3.4.gem \
|
||||
- vendor/cache/rack-1.6.4.gem \
|
||||
- vendor/cache/rack-1.6.10.gem \
|
||||
- vendor/cache/rack-protection-1.5.5.gem \
|
||||
- vendor/cache/rack-test-0.7.0.gem \
|
||||
+ gem install --force --verbose --no-rdoc --no-ri -l --no-user-install -i vendor/bundle/ruby \
|
||||
|
|
@ -83,10 +83,10 @@ index d7d98f60..c83bd958 100644
|
|||
|
||||
get_gems:
|
||||
diff --git a/pcsd/pcsd.rb b/pcsd/pcsd.rb
|
||||
index 61b28044..39c69608 100644
|
||||
index 9f9bd091..712505a8 100644
|
||||
--- a/pcsd/pcsd.rb
|
||||
+++ b/pcsd/pcsd.rb
|
||||
@@ -83,6 +83,11 @@ before do
|
||||
@@ -86,6 +86,11 @@ before do
|
||||
$session_storage = env[:__session_storage]
|
||||
$session_storage_env = env
|
||||
end
|
||||
|
|
@ -98,7 +98,7 @@ index 61b28044..39c69608 100644
|
|||
|
||||
# urls which are accesible for everybody including not logged in users
|
||||
always_accessible = [
|
||||
@@ -156,19 +161,6 @@ $thread_cfgsync = Thread.new {
|
||||
@@ -162,19 +167,6 @@ $thread_cfgsync = Thread.new {
|
||||
end
|
||||
}
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ index 8b09ed82..f42bf73e 100644
|
|||
@pool_timestamp.delete(sid)
|
||||
end
|
||||
diff --git a/pcsd/ssl.rb b/pcsd/ssl.rb
|
||||
index eaf2cbf1..2668c958 100644
|
||||
index b834228e..a7d5c0bf 100644
|
||||
--- a/pcsd/ssl.rb
|
||||
+++ b/pcsd/ssl.rb
|
||||
@@ -2,7 +2,6 @@ require 'rubygems'
|
||||
|
|
@ -307,5 +307,5 @@ index e72bf012..c212b1a0 100644
|
|||
|
||||
end
|
||||
--
|
||||
2.13.6
|
||||
2.18.0
|
||||
|
||||
|
|
|
|||
5
pcs.spec
5
pcs.spec
|
|
@ -1,5 +1,5 @@
|
|||
Name: pcs
|
||||
Version: 0.9.164
|
||||
Version: 0.9.166
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
URL: https://github.com/ClusterLabs/pcs
|
||||
|
|
@ -418,6 +418,9 @@ end
|
|||
%doc pyagentx_README.md
|
||||
|
||||
%changelog
|
||||
* Fri Oct 05 2018 Ondrej Mular <omular@redhat.com> - 0.9.166-1
|
||||
- Rebased to latest upstream sources (see CHANGELOG.md)
|
||||
|
||||
* Mon Apr 09 2018 Ondrej Mular <omular@redhat.com> - 0.9.164-1
|
||||
- Rebased to latest upstream sources (see CHANGELOG.md)
|
||||
- Fixed: CVE-2018-1086, CVE-2018-1079
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -3,4 +3,4 @@ SHA512 (orderedhash-0.0.6.gem) = b2dae648187437ea7d9d9be47b9ff8d0e1a96bc2ff9e501
|
|||
SHA512 (rpam-ruby19-1.2.1.gem) = b403964295e96a6247289518ff46e59bbae6c78bcfb647e12b7dbb247698642b4a1ee04492521b782fb3c594c2ede8143c765819fecde087e2ec850e3aea3503
|
||||
SHA512 (sinatra-contrib-2.0.0.gem) = 2e9c1fccfee050af8ef93ce0fe92504930ee41db3ff5aec3c2260ab49f334474386787057011adcb6cfa7de62f9e24ea228944d25bdf8af316b0b7614008ce03
|
||||
SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
|
||||
SHA512 (pcs-0.9.164.tar.gz) = f5c26e470ace01e961f50ec6883d78e3556a572c274b7093005d496baed4fc33d38409169b06b67722b2fed32d5fd42cf8eb2b6832fe8e55027bf12a37dd5dc4
|
||||
SHA512 (pcs-0.9.166.tar.gz) = afb1f6e95154fc0b20515d1317d07738c1fff4c90e32c3baa2b710ee0ba6aa1d01be477eb631bfbc740e2bdfff1535e6048c022ba3333395bc0f23d7d818334b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue