From fb1901f62830b444f9d6b5908d3ae342fee74f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= jpokorny@redhat.com Date: Tue, 20 Oct 2015 23:18:49 +0200 Subject: 1.1.13-4: Adapt to follow Fedora crypto policies (rhbz#1179335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Signed-off-by: Jan Pokorný jpokorny@redhat.com --- bz1179335-system-wide-crypto-policies.patch | 14 ++++++++++++++ pacemaker.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 bz1179335-system-wide-crypto-policies.patch
diff --git a/bz1179335-system-wide-crypto-policies.patch b/bz1179335-system-wide-crypto-policies.patch new file mode 100644 index 0000000..bf90277 --- /dev/null +++ b/bz1179335-system-wide-crypto-policies.patch @@ -0,0 +1,14 @@ +--- a/lib/common/remote.c.orig 2015-10-20 23:05:53.601054078 +0200 ++++ b/lib/common/remote.c 2015-10-20 23:08:06.128302567 +0200 +@@ -173,8 +173,10 @@ + + gnutls_init(session, type); + # ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT ++/* https://fedoraproject.org/wiki/Packaging:CryptoPolicies */ ++ gnutls_priority_set_direct(*session, "@SYSTEM", NULL); + /* http://www.manpagez.com/info/gnutls/gnutls-2.10.4/gnutls_81.php#Echo-Server-... */ +- gnutls_priority_set_direct(*session, "NORMAL:+ANON-DH", NULL); ++/* gnutls_priority_set_direct(*session, "NORMAL:+ANON-DH", NULL); */ + /* gnutls_priority_set_direct (*session, "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL); */ + # else + gnutls_set_default_priority(*session); diff --git a/pacemaker.spec b/pacemaker.spec index f0fefd5..94feba0 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -2,7 +2,7 @@ %global uname hacluster %global pcmk_docdir %{_docdir}/%{name}
-%global specversion 3 +%global specversion 4 %global commit 44eb2ddf8d4f8fc05256aae2abc9fbf3ae4d1fbc %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global github_owner ClusterLabs @@ -103,6 +103,8 @@ Patch35: 0035-Fix-crm_resource-Correctly-update-existing-meta-attr.patch Patch36: 0036-Log-crm_resource-restart-Improved-user-feedback-on-f.patch Patch37: 0037-Fix-crm_resource-Correctly-delete-existing-meta-attr.patch Patch38: 0038-Fix-crm_resource-Correctly-observe-force-when-deleti.patch +# --- +Patch100: bz1179335-system-wide-crypto-policies.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) AutoReqProv: on @@ -580,6 +582,9 @@ exit 0 %attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
%changelog +* Tue Oct 20 2015 Jan Pokorný jpokorny+rpm-pacemaker@redhat.com - 1.1.13-4 +- Adapt to follow Fedora crypto policies (rhbz#1179335) + * Wed Oct 14 2015 Jan Pokorný jpokorny+rpm-pacemaker@redhat.com - 1.1.13-3 - Update to Pacemaker-1.1.13 post-release + patches (sync) - Add nagios-plugins-metadata subpackage enabling support of selected
scm-commits@lists.fedoraproject.org