- new upstream release

fence-agents.spec

@@ -15,13 +15,12 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 4.2.0
+Version: 4.2.1
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
-Patch0: fence_scsi-fix-python3-encoding-error.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global testagents zvm virsh raritan rcd_serial
@@ -883,6 +882,9 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
 %{_mandir}/man8/fence_zvmip.8*
 
 %changelog
+* Thu May 31 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-1
+- new upstream release
+
 * Fri May 25 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.0-2
 - fence_scsi: fix Python 3 encoding issue
 

fence_scsi-fix-python3-encoding-error.patch

@@ -1,33 +0,0 @@
-From 335aca4e54e4ec46b9b5d86ef30a7d9348e6a216 Mon Sep 17 00:00:00 2001
-From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
-Date: Wed, 23 May 2018 14:51:23 +0200
-Subject: [PATCH] fence_scsi: fix python3 encoding error #206
-
-File "/usr/sbin/fence_scsi", line 184, in get_cluster_id
-  return hashlib.md5(match.group(1)).hexdigest()
-TypeError: Unicode-objects must be encoded before hashing
----
- agents/scsi/fence_scsi.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/agents/scsi/fence_scsi.py b/agents/scsi/fence_scsi.py
-index 119dbb85..2180d0c9 100644
---- a/agents/scsi/fence_scsi.py
-+++ b/agents/scsi/fence_scsi.py
-@@ -181,11 +181,11 @@ def get_cluster_id(options):
- 		fail_usage("Failed: cannot get cluster name")
- 
- 	try:
--		return hashlib.md5(match.group(1)).hexdigest()
-+		return hashlib.md5(match.group(1).encode('ascii')).hexdigest()
- 	except ValueError:
- 		# FIPS requires usedforsecurity=False and might not be
- 		# available on all distros: https://bugs.python.org/issue9216
--		return hashlib.md5(match.group(1), usedforsecurity=False).hexdigest()
-+		return hashlib.md5(match.group(1).encode('ascii'), usedforsecurity=False).hexdigest()
- 
- 
- def get_node_id(options):
--- 
-2.17.0
-

sources

@@ -1 +1 @@
-SHA512 (fence-agents-4.2.0.tar.xz) = 13b6f0430946095f07543d23ff558d77f0d3162b7b84e34c8f52007f4cede3bc289437115dca415d9a2266f6a17b07318b80c1c00f31dab9cf982133aa3ba72e
+SHA512 (fence-agents-4.2.1.tar.xz) = a48f3162c04852f6a4c4f97e344e93a67ebee3743423a47d954fdeafccb11a71d1878a6d1df1655b0023f97be992e7c8cad1d9dc60d129ea49190c0206d53493