[Debian-ha-commits] [pcs] 10/14: d/patches: refresh for new version
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Thu Jun 29 01:29:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository pcs.
commit 793735f99d00cd809b1e29dab24a3d97f58c5d17
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Thu Jun 29 01:29:04 2017 +0200
d/patches: refresh for new version
---
.../0001-Remove-Gemlock.file-on-Debian.patch | 14 ++--
debian/patches/0003-Fix-spelling.patch | 25 -------
debian/patches/0005-settings.py | 2 +-
debian/patches/0006-Replace-orderedhash.patch | 4 +-
debian/patches/0007-Fix-corosync-log.patch | 2 +-
.../patches/0008-Fix-cluster-destroy-cleanup.patch | 23 ------
debian/patches/0009-Fix-testsuite.patch | 81 ++++++++++------------
debian/patches/0010-Replace-chkconfig.patch | 57 +++++++--------
debian/patches/0011-Fix-python-lxml.patch | 62 +++--------------
debian/patches/0012-CVE-2017-2661.patch | 41 -----------
debian/patches/series | 3 -
11 files changed, 88 insertions(+), 226 deletions(-)
diff --git a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
index 494679e..c9cf0a2 100644
--- a/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
+++ b/debian/patches/0001-Remove-Gemlock.file-on-Debian.patch
@@ -17,14 +17,16 @@ deleted file mode 100644
index 3140d6f..0000000
--- a/pcsd/Gemfile.lock
+++ /dev/null
-@@ -1,44 +0,0 @@
+@@ -1,48 +0,0 @@
-GEM
- remote: https://rubygems.org/
- remote: https://tojeline.fedorapeople.org/rubygems/
- specs:
- backports (3.6.8)
-- json (1.8.3)
-- multi_json (1.12.0)
+- ethon (0.10.1)
+- ffi (1.9.17)
+- json (2.0.3)
+- multi_json (1.12.1)
- open4 (1.3.4)
- orderedhash (0.0.6)
- rack (1.6.4)
@@ -33,7 +35,7 @@ index 3140d6f..0000000
- rack-test (0.6.3)
- rack (>= 1.0)
- rpam-ruby19 (1.2.1)
-- sinatra (1.4.7)
+- sinatra (1.4.8)
- rack (~> 1.4)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
@@ -44,13 +46,15 @@ index 3140d6f..0000000
- rack-test
- sinatra (~> 1.4.0)
- tilt (>= 1.3, < 3)
-- tilt (2.0.3)
+- tilt (2.0.6)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- backports
+- ethon
+- ffi
- json
- multi_json
- open4
diff --git a/debian/patches/0003-Fix-spelling.patch b/debian/patches/0003-Fix-spelling.patch
deleted file mode 100644
index b50574e..0000000
--- a/debian/patches/0003-Fix-spelling.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix spelling errors reported by lintian
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2016-11-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcs/pcs.8
-+++ b/pcs/pcs.8
-@@ -272,7 +272,7 @@
- Edit the cib in the editor specified by the $EDITOR environment variable and push out any changes upon saving. Specify scope to edit a specific section of the CIB. Valid values of the scope are: configuration, nodes, resources, constraints, crm_config, rsc_defaults, op_defaults. \fB\-\-config\fR is the same as scope=configuration. Use of \fB\-\-config\fR is recommended. Do not specify a scope if you need to edit the whole CIB or be warned in the case of outdated CIB.
- .TP
- node add <node[,node\-altaddr]> [\fB\-\-start\fR [\fB\-\-wait\fR[=<n>]]] [\fB\-\-enable\fR] [\fB\-\-watchdog\fR=<watchdog\-path>]
--Add the node to corosync.conf and corosync on all nodes in the cluster and sync the new corosync.conf to the new node. If \fB\-\-start\fR is specified also start corosync/pacemaker on the new node, if \fB\-\-wait\fR is sepcified wait up to 'n' seconds for the new node to start. If \fB\-\-enable\fR is specified enable corosync/pacemaker on new node. When using Redundant Ring Protocol (RRP) with udpu transport, specify the ring 0 address first followed by a ',' and then the ring 1 addr [...]
-+Add the node to corosync.conf and corosync on all nodes in the cluster and sync the new corosync.conf to the new node. If \fB\-\-start\fR is specified also start corosync/pacemaker on the new node, if \fB\-\-wait\fR is specified wait up to 'n' seconds for the new node to start. If \fB\-\-enable\fR is specified enable corosync/pacemaker on new node. When using Redundant Ring Protocol (RRP) with udpu transport, specify the ring 0 address first followed by a ',' and then the ring 1 addr [...]
- .TP
- node remove <node>
- Shutdown specified node and remove it from pacemaker and corosync on all other nodes in the cluster.
-@@ -520,7 +520,7 @@
- .br
- ( <expression> )
- .br
--where duration options and date spec options are: hours, monthdays, weekdays, yeardays, months, weeks, years, weekyears, moon If score is ommited it defaults to INFINITY. If id is ommited one is generated from the constraint id.
-+where duration options and date spec options are: hours, monthdays, weekdays, yeardays, months, weeks, years, weekyears, moon If score is omitted it defaults to INFINITY. If id is omitted one is generated from the constraint id.
- .TP
- rule remove <rule id>
- Remove a rule if a rule id is specified, if rule is last rule in its constraint, the constraint will be removed.
diff --git a/debian/patches/0005-settings.py b/debian/patches/0005-settings.py
index 5733222..85ac8d8 100644
--- a/debian/patches/0005-settings.py
+++ b/debian/patches/0005-settings.py
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
sbd_config = "/etc/default/sbd"
--- a/pcsd/settings.rb.debian
+++ b/pcsd/settings.rb.debian
-@@ -5,8 +5,8 @@
+@@ -6,8 +6,8 @@
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
COOKIE_FILE = PCSD_VAR_LOCATION + 'pcsd.cookiesecret'
diff --git a/debian/patches/0006-Replace-orderedhash.patch b/debian/patches/0006-Replace-orderedhash.patch
index cb6bdbb..4b70198 100644
--- a/debian/patches/0006-Replace-orderedhash.patch
+++ b/debian/patches/0006-Replace-orderedhash.patch
@@ -92,9 +92,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
perm_hash['allow'] = @allow_list.uniq.sort
--- a/pcsd/Gemfile
+++ b/pcsd/Gemfile
-@@ -15,4 +15,4 @@
+@@ -15,6 +15,6 @@
gem 'json'
gem 'multi_json'
gem 'open4'
-gem 'orderedhash'
+gem 'activesupport'
+ gem 'ffi'
+ gem 'ethon'
diff --git a/debian/patches/0007-Fix-corosync-log.patch b/debian/patches/0007-Fix-corosync-log.patch
index 35f53d4..d23ac16 100644
--- a/debian/patches/0007-Fix-corosync-log.patch
+++ b/debian/patches/0007-Fix-corosync-log.patch
@@ -5,7 +5,7 @@ Last-Update: 2016-05-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/cluster.py
+++ b/pcs/cluster.py
-@@ -729,7 +729,7 @@
+@@ -823,7 +823,7 @@
quorum_section.add_attribute("two_node", "1")
logging_section.add_attribute("to_logfile", "yes")
diff --git a/debian/patches/0008-Fix-cluster-destroy-cleanup.patch b/debian/patches/0008-Fix-cluster-destroy-cleanup.patch
deleted file mode 100644
index 5ab6af1..0000000
--- a/debian/patches/0008-Fix-cluster-destroy-cleanup.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix: "find" should run only in specific directories
- Some users reported that running find over "/var/lib" for cleanup
- purposes can take too long depending on what you have installed.
- A particular example was having "lxcfs" fuse mounted in /var/lib.
- That can make the search for cluster leftovers to take quite some
- time, making user to believe the process has hang.
-Author: Rafael David Tinoco <rafael.tinoco at canonical.com>
-Applied-Upstream: https://github.com/ClusterLabs/pcs/commit/8a2b8b337bcb0f26da593973e7b1f27bdef86449
-Reviewed-by: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2016-12-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcs/cluster.py
-+++ b/pcs/cluster.py
-@@ -1893,7 +1893,7 @@
- state_files = ["cib.xml*", "cib-*", "core.*", "hostcache", "cts.*",
- "pe*.bz2","cib.*"]
- for name in state_files:
-- os.system("find /var/lib -name '"+name+"' -exec rm -f \{\} \;")
-+ os.system("find /var/lib/pacemaker -name '"+name+"' -exec rm -f \{\} \;")
- try:
- qdevice_net.client_destroy()
- except:
diff --git a/debian/patches/0009-Fix-testsuite.patch b/debian/patches/0009-Fix-testsuite.patch
index b08c25c..7eabd33 100644
--- a/debian/patches/0009-Fix-testsuite.patch
+++ b/debian/patches/0009-Fix-testsuite.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_cluster.py
+++ b/pcs/test/test_cluster.py
-@@ -193,7 +193,7 @@
+@@ -255,7 +255,7 @@
logging {
to_logfile: yes
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
"""
-@@ -252,7 +252,7 @@
+@@ -313,7 +313,7 @@
logging {
to_logfile: yes
@@ -24,7 +24,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -399,7 +399,7 @@
+@@ -459,7 +459,7 @@
logging {
to_logfile: yes
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -444,7 +444,7 @@
+@@ -503,7 +503,7 @@
logging {
to_logfile: yes
@@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -485,7 +485,7 @@
+@@ -543,7 +543,7 @@
logging {
to_logfile: yes
@@ -51,7 +51,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -531,7 +531,7 @@
+@@ -588,7 +588,7 @@
logging {
to_logfile: yes
@@ -60,7 +60,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -573,7 +573,7 @@
+@@ -629,7 +629,7 @@
logging {
to_logfile: yes
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -608,7 +608,7 @@
+@@ -663,7 +663,7 @@
logging {
to_logfile: yes
@@ -78,7 +78,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -656,7 +656,7 @@
+@@ -710,7 +710,7 @@
logging {
to_logfile: yes
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -702,7 +702,7 @@
+@@ -755,7 +755,7 @@
logging {
to_logfile: yes
@@ -96,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -743,7 +743,7 @@
+@@ -795,7 +795,7 @@
logging {
to_logfile: yes
@@ -105,7 +105,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -793,7 +793,7 @@
+@@ -844,7 +844,7 @@
logging {
to_logfile: yes
@@ -114,7 +114,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -839,7 +839,7 @@
+@@ -889,7 +889,7 @@
logging {
to_logfile: yes
@@ -123,7 +123,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1241,7 +1241,7 @@
+@@ -1290,7 +1290,7 @@
logging {
to_logfile: yes
@@ -132,7 +132,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1363,7 +1363,7 @@
+@@ -1411,7 +1411,7 @@
logging {
to_logfile: yes
@@ -141,7 +141,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1422,7 +1422,7 @@
+@@ -1469,7 +1469,7 @@
logging {
to_logfile: yes
@@ -150,7 +150,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1481,7 +1481,7 @@
+@@ -1527,7 +1527,7 @@
logging {
to_logfile: yes
@@ -159,7 +159,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1542,7 +1542,7 @@
+@@ -1587,7 +1587,7 @@
logging {
to_logfile: yes
@@ -168,7 +168,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1608,7 +1608,7 @@
+@@ -1652,7 +1652,7 @@
logging {
to_logfile: yes
@@ -177,7 +177,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1673,7 +1673,7 @@
+@@ -1716,7 +1716,7 @@
logging {
to_logfile: yes
@@ -186,7 +186,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1738,7 +1738,7 @@
+@@ -1780,7 +1780,7 @@
logging {
to_logfile: yes
@@ -195,7 +195,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -1827,7 +1827,7 @@
+@@ -1868,7 +1868,7 @@
logging {
to_logfile: yes
@@ -204,7 +204,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2415,7 +2415,7 @@
+@@ -2455,7 +2455,7 @@
logging {
to_logfile: yes
@@ -213,7 +213,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
to_syslog: yes
}
""")
-@@ -2655,7 +2655,7 @@
+@@ -2692,7 +2692,7 @@
logging {
to_logfile: yes
@@ -262,7 +262,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcs/test/test_stonith.py
+++ b/pcs/test/test_stonith.py
-@@ -236,7 +236,7 @@
+@@ -275,7 +275,7 @@
output, returnVal = pcs(
temp_cib,
@@ -271,7 +271,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -252,7 +252,7 @@
+@@ -291,7 +291,7 @@
Resource: f3 (class=stonith type=fence_scsi)
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -280,7 +280,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Meta Attrs: provides=something
Operations: monitor interval=60s (f4-monitor-interval-60s)
""")
-@@ -285,7 +285,7 @@
+@@ -324,7 +324,7 @@
output, returnVal = pcs(
temp_cib,
@@ -289,7 +289,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
ac(output, "")
self.assertEqual(0, returnVal)
-@@ -304,7 +304,7 @@
+@@ -343,7 +343,7 @@
Attributes: key=abc
Meta Attrs: provides=unfencing
Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -300,7 +300,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
""")
--- a/pcs/test/test_resource.py
+++ b/pcs/test/test_resource.py
-@@ -2859,7 +2859,7 @@
+@@ -2471,7 +2471,7 @@
def testLSBResource(self):
output, returnVal = pcs(
temp_cib,
@@ -309,20 +309,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
assert returnVal == 0
assert output == "", [output]
---- a/pcsd/test/test_config.rb
-+++ b/pcsd/test/test_config.rb
-@@ -125,7 +125,7 @@
- assert_equal(
- [[
- 'error',
-- "Unable to parse pcs_settings file: 399: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'"
-+ "Unable to parse pcs_settings file: 409: unexpected token at '\"rh71-node2\"\n ]\n }\n ]\n}'"
- ]],
- $logger.log
- )
--- a/pcs/lib/test/test_resource_agent.py
+++ b/pcs/lib/test/test_resource_agent.py
-@@ -1040,7 +1040,7 @@
+@@ -1434,7 +1434,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -330,8 +319,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ ["/usr/lib/pacemaker/stonithd", "metadata"]
)
-
-@@ -1057,7 +1057,7 @@
+ def test_failed_to_get_xml(self):
+@@ -1450,7 +1450,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -339,8 +328,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ ["/usr/lib/pacemaker/stonithd", "metadata"]
)
-
-@@ -1074,7 +1074,7 @@
+ def test_invalid_xml(self):
+@@ -1466,7 +1466,7 @@
)
self.mock_runner.run.assert_called_once_with(
@@ -349,7 +338,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1415,7 +1415,7 @@
+@@ -1787,7 +1787,7 @@
}
),
mock.call(
diff --git a/debian/patches/0010-Replace-chkconfig.patch b/debian/patches/0010-Replace-chkconfig.patch
index 53a2140..ee5984b 100644
--- a/debian/patches/0010-Replace-chkconfig.patch
+++ b/debian/patches/0010-Replace-chkconfig.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-11-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcsd/pcs.rb
+++ b/pcsd/pcs.rb
-@@ -1968,11 +1968,22 @@
+@@ -2065,11 +2065,22 @@
def is_service_enabled?(service)
if ISSYSTEMCTL
cmd = ['systemctl', 'is-enabled', "#{service}.service"]
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
def is_service_running?(service)
-@@ -1987,12 +1998,13 @@
+@@ -2084,12 +2095,13 @@
def is_service_installed?(service)
unless ISSYSTEMCTL
@@ -49,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return true
end
}
-@@ -2019,7 +2031,7 @@
+@@ -2119,7 +2131,7 @@
cmd = ['systemctl', 'enable', "#{service}.service"]
else
# fails when the service is not installed
@@ -58,7 +58,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
return (retcode == 0)
-@@ -2034,7 +2046,7 @@
+@@ -2134,7 +2146,7 @@
if ISSYSTEMCTL
cmd = ['systemctl', 'disable', "#{service}.service"]
else
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return (retcode == 0)
--- a/pcs/lib/external.py
+++ b/pcs/lib/external.py
-@@ -145,7 +145,7 @@
+@@ -128,7 +128,7 @@
_systemctl, "disable", _get_service_name(service, instance)
])
else:
@@ -78,7 +78,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if retval != 0:
raise DisableServiceError(
service,
-@@ -169,7 +169,7 @@
+@@ -152,7 +152,7 @@
_systemctl, "enable", _get_service_name(service, instance)
])
else:
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if retval != 0:
raise EnableServiceError(
service,
-@@ -252,10 +252,17 @@
+@@ -235,10 +235,17 @@
dummy_stdout, dummy_stderr, retval = runner.run(
[_systemctl, "is-enabled", _get_service_name(service, instance)]
)
@@ -108,7 +108,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
def is_service_running(runner, service, instance=None):
-@@ -301,13 +308,13 @@
+@@ -286,13 +293,13 @@
if is_systemctl():
return []
@@ -126,17 +126,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return service_list
--- a/pcs/test/test_lib_external.py
+++ b/pcs/test/test_lib_external.py
-@@ -1082,7 +1082,7 @@
- self.mock_runner.run.return_value = ("", "", 0)
- lib.disable_service(self.mock_runner, self.service)
+@@ -1320,7 +1320,7 @@
+ self.mock_runner, self.service, None
+ )
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
+ [_chkconfig, self.service, "disable"]
)
def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
-@@ -1094,7 +1094,7 @@
- lambda: lib.disable_service(self.mock_runner, self.service)
+@@ -1335,7 +1335,7 @@
+ self.mock_runner, self.service, None
)
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
@@ -144,16 +144,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_systemctl_not_installed(
-@@ -1130,7 +1130,7 @@
- self.mock_runner.run.return_value = ("", "", 0)
- lib.disable_service(self.mock_runner, self.service, instance="test")
+@@ -1385,7 +1385,7 @@
+ self.mock_runner, self.service, instance
+ )
self.mock_runner.run.assert_called_once_with(
- [_chkconfig, self.service, "off"]
+ [_chkconfig, self.service, "disable"]
)
@mock.patch("pcs.lib.external.is_systemctl")
-@@ -1163,7 +1163,7 @@
+@@ -1418,7 +1418,7 @@
self.mock_runner.run.return_value = ("", "", 0)
lib.enable_service(self.mock_runner, self.service)
self.mock_runner.run.assert_called_once_with(
@@ -162,7 +162,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_not_systemctl_failed(self, mock_systemctl):
-@@ -1174,7 +1174,7 @@
+@@ -1429,7 +1429,7 @@
lambda: lib.enable_service(self.mock_runner, self.service)
)
self.mock_runner.run.assert_called_once_with(
@@ -171,7 +171,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
def test_instance_systemctl(self, mock_systemctl):
-@@ -1192,7 +1192,7 @@
+@@ -1447,7 +1447,7 @@
self.mock_runner.run.return_value = ("", "", 0)
lib.enable_service(self.mock_runner, self.service, instance="test")
self.mock_runner.run.assert_called_once_with(
@@ -180,7 +180,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1401,18 +1401,18 @@
+@@ -1656,18 +1656,18 @@
def test_not_systemctl_enabled(self, mock_systemctl):
mock_systemctl.return_value = False
@@ -203,19 +203,20 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
-@@ -1555,23 +1555,23 @@
- def test_success(self, mock_is_systemctl):
+@@ -1852,9 +1852,9 @@
mock_is_systemctl.return_value = False
- self.mock_runner.run.return_value = ("""\
--pcsd 0:off 1:off 2:on 3:on 4:on 5:on 6:off
--sbd 0:off 1:on 2:on 3:on 4:on 5:on 6:off
--pacemaker 0:off 1:off 2:off 3:off 4:off 5:off 6:off
+ self.mock_runner.run.return_value = (outdent(
+ """\
+- pcsd 0:off 1:off 2:on 3:on 4:on 5:on 6:off
+- sbd 0:off 1:on 2:on 3:on 4:on 5:on 6:off
+- pacemaker 0:off 1:off 2:off 3:off 4:off 5:off 6:off
+K:01:0 1 6:pcsd
+S:02:2 3 4 5:sbd
+S:02:2 3 4 5:pacemaker
- """, "", 0)
+ """
+ ), "", 0)
self.assertEqual(
- lib.get_non_systemd_services(self.mock_runner),
+@@ -1862,14 +1862,14 @@
["pcsd", "sbd", "pacemaker"]
)
self.assertEqual(mock_is_systemctl.call_count, 1)
diff --git a/debian/patches/0011-Fix-python-lxml.patch b/debian/patches/0011-Fix-python-lxml.patch
index 993c757..1f43ad0 100644
--- a/debian/patches/0011-Fix-python-lxml.patch
+++ b/debian/patches/0011-Fix-python-lxml.patch
@@ -5,56 +5,14 @@ Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Last-Update: 2017-01-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcs/lib/commands/test/test_resource_agent.py
-+++ b/pcs/lib/commands/test/test_resource_agent.py
-@@ -353,7 +353,7 @@
- report_codes.UNABLE_TO_GET_AGENT_METADATA,
- {
- "agent": "ocf:test:Dummy",
-- "reason": "Start tag expected, '<' not found, line 1, column 1",
-+ "reason": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
- }
- )
- )
---- a/pcs/lib/commands/test/test_stonith_agent.py
-+++ b/pcs/lib/commands/test/test_stonith_agent.py
-@@ -204,7 +204,7 @@
- report_codes.UNABLE_TO_GET_AGENT_METADATA,
- {
- "agent": "fence_dummy",
-- "reason": "Start tag expected, '<' not found, line 1, column 1",
-+ "reason": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
- }
- )
- )
---- a/pcs/lib/test/test_resource_agent.py
-+++ b/pcs/lib/test/test_resource_agent.py
-@@ -1069,7 +1069,7 @@
- self.agent._get_metadata,
- {
- "agent": "stonithd",
-- "message": "Start tag expected, '<' not found, line 1, column 1",
-+ "message": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
- }
- )
+--- a/pcs/test/tools/assertions.py
++++ b/pcs/test/tools/assertions.py
+@@ -19,7 +19,7 @@
+ """
+ msg = "Start tag expected, '<' not found, line 1, column 1"
+ if LXML_VERSION >= (3, 7, 0, 0):
+- msg += " (<string>, line 1)"
++ msg += " (line 1)"
+ return msg
-@@ -1196,7 +1196,7 @@
- self.agent._get_metadata,
- {
- "agent": self.agent_name,
-- "message": "Start tag expected, '<' not found, line 1, column 1",
-+ "message": "Start tag expected, '<' not found, line 1, column 1 (line 1)",
- }
- )
-
---- a/pcs/test/test_lib_cib_tools.py
-+++ b/pcs/test/test_lib_cib_tools.py
-@@ -488,7 +488,7 @@
- report_codes.CIB_UPGRADE_FAILED,
- {
- "reason":
-- "Start tag expected, '<' not found, line 1, column 1",
-+ "Start tag expected, '<' not found, line 1, column 1 (line 1)",
- }
- )
- )
+ def console_report(*lines):
diff --git a/debian/patches/0012-CVE-2017-2661.patch b/debian/patches/0012-CVE-2017-2661.patch
deleted file mode 100644
index 1beaf95..0000000
--- a/debian/patches/0012-CVE-2017-2661.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ondrej Mular <omular at redhat.com>
-Date: Sat, 4 Mar 2017 14:01:43 +0100
-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1428948
-Subject: [PATCH] web UI: fixed XSS vulnerability
-
----
- pcsd/public/js/nodes-ember.js | 4 ++--
- pcsd/public/js/pcsd.js | 2 +-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
---- a/pcsd/public/js/nodes-ember.js
-+++ b/pcsd/public/js/nodes-ember.js
-@@ -75,7 +75,7 @@
- var banned_options = ["SBD_OPTS", "SBD_WATCHDOG_DEV", "SBD_PACEMAKER"];
- $.each(this.get("sbd_config"), function(opt, val) {
- if (banned_options.indexOf(opt) == -1) {
-- out += '<tr><td>' + opt + '</td><td>' + val + '</td></tr>\n';
-+ out += '<tr><td>' + htmlEncode(opt) + '</td><td>' + htmlEncode(val) + '</td></tr>\n';
- }
- });
- return out + '</table>';
-@@ -879,7 +879,7 @@
- }.property("status_val"),
- show_status: function() {
- return '<span style="' + this.get('status_style') + '">'
-- + this.get('status') + (this.get("is_unmanaged") ? " (unmanaged)" : "")
-+ + htmlEncode(this.get('status')) + (this.get("is_unmanaged") ? " (unmanaged)" : "")
- + '</span>';
- }.property("status_style", "disabled"),
- status_class: function() {
---- a/pcsd/public/js/pcsd.js
-+++ b/pcsd/public/js/pcsd.js
-@@ -822,7 +822,7 @@
-
- dialog_obj.find('#auth_nodes_list').empty();
- unauth_nodes.forEach(function(node) {
-- dialog_obj.find('#auth_nodes_list').append("\t\t\t<tr><td>" + node + '</td><td><input type="password" name="' + node + '-pass"></td></tr>\n');
-+ dialog_obj.find('#auth_nodes_list').append("\t\t\t<tr><td>" + htmlEncode(node) + '</td><td><input type="password" name="' + htmlEncode(node) + '-pass"></td></tr>\n');
- });
-
- }
diff --git a/debian/patches/series b/debian/patches/series
index ed481e1..e99edd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,9 @@
0001-Remove-Gemlock.file-on-Debian.patch
0002-Remove-require-in-pcsd-ssl.rb.patch
-0003-Fix-spelling.patch
0004-Remove-pcsd-test-.gitignore-file.patch
0005-settings.py
0006-Replace-orderedhash.patch
0007-Fix-corosync-log.patch
-0008-Fix-cluster-destroy-cleanup.patch
0009-Fix-testsuite.patch
0010-Replace-chkconfig.patch
0011-Fix-python-lxml.patch
-0012-CVE-2017-2661.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list