rpms/pacemaker
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1.1.13-4: Adapt to follow Fedora crypto policies (rhbz#1179335)

Browse Source 
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný 2015-10-20 23:18:49 +02:00
parent dff8d9929d
commit fb1901f628
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bz1179335-system-wide-crypto-policies.patch Normal file
View File

@ -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-with-anonymous-authentication */
- 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);

7
pacemaker.spec
View File

@ -2,7 +2,7 @@
%global uname hacluster %global uname hacluster
%global pcmk_docdir %{_docdir}/%{name} %global pcmk_docdir %{_docdir}/%{name}
%global specversion 3 %global specversion 4
%global commit 44eb2ddf8d4f8fc05256aae2abc9fbf3ae4d1fbc %global commit 44eb2ddf8d4f8fc05256aae2abc9fbf3ae4d1fbc
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
%global github_owner ClusterLabs %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 Patch36: 0036-Log-crm_resource-restart-Improved-user-feedback-on-f.patch
Patch37: 0037-Fix-crm_resource-Correctly-delete-existing-meta-attr.patch Patch37: 0037-Fix-crm_resource-Correctly-delete-existing-meta-attr.patch
Patch38: 0038-Fix-crm_resource-Correctly-observe-force-when-deleti.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) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
AutoReqProv: on AutoReqProv: on
@ -580,6 +582,9 @@ exit 0
%attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/* %attr(0644,root,root) %{_datadir}/pacemaker/nagios/plugins-metadata/*
%changelog %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 * 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) - Update to Pacemaker-1.1.13 post-release + patches (sync)
- Add nagios-plugins-metadata subpackage enabling support of selected - Add nagios-plugins-metadata subpackage enabling support of selected