Update to version 25.3.10

This commit is contained in:
Ryan O'Hara 2015-07-06 11:16:39 -05:00
parent cf87c0df2a
commit 845eea43e8
5 changed files with 12 additions and 54 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/galera-25.3.5-src.tar.gz /galera-25.3.5-src.tar.gz
/galera-3-25.3.10.tar.gz

View File

@ -1,14 +0,0 @@
--- galera-25.3.5-src.old/chromium/build_config.h 2014-03-27 15:49:30.000000000 +0000
+++ galera-25.3.5-src/chromium/build_config.h 2014-11-27 21:57:59.377756193 +0000
@@ -106,6 +106,11 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define ARCH_CPU_LITTLE_ENDIAN 1
+#elif defined(__aarch64__)
+#define ARCH_CPU_ARM_FAMILY 1
+#define ARCH_CPU_ARMEL 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
#elif defined(__pnacl__)
#define ARCH_CPU_32_BITS 1
#elif defined(__MIPSEL__)

View File

@ -1,26 +0,0 @@
diff -up galera-25.3.5-src/galera/src/ist.cpp.verify galera-25.3.5-src/galera/src/ist.cpp
--- galera-25.3.5-src/galera/src/ist.cpp.verify 2014-04-23 20:26:54.965034827 +0200
+++ galera-25.3.5-src/galera/src/ist.cpp 2014-04-23 20:27:35.397161536 +0200
@@ -93,7 +93,8 @@ namespace
{
// Here we blindly assume that ssl globals have been initialized
// by gcomm.
- ctx.set_verify_mode(asio::ssl::context::verify_peer);
+ ctx.set_verify_mode(asio::ssl::context::verify_peer
+ | asio::ssl::context::verify_fail_if_no_peer_cert);
SSLPasswordCallback cb(conf);
ctx.set_password_callback(
boost::bind(&SSLPasswordCallback::get_password, &cb));
diff -up galera-25.3.5-src/gcomm/src/asio_protonet.cpp.verify galera-25.3.5-src/gcomm/src/asio_protonet.cpp
--- galera-25.3.5-src/gcomm/src/asio_protonet.cpp.verify 2014-04-23 20:27:02.436058241 +0200
+++ galera-25.3.5-src/gcomm/src/asio_protonet.cpp 2014-04-23 20:28:15.762287927 +0200
@@ -118,7 +118,8 @@ gcomm::AsioProtonet::AsioProtonet(gu::Co
log_info << "initializing ssl context";
set_compression(conf_);
set_cipher_list(ssl_context_.impl(), conf_);
- ssl_context_.set_verify_mode(asio::ssl::context::verify_peer);
+ ssl_context_.set_verify_mode(asio::ssl::context::verify_peer
+ | asio::ssl::context::verify_fail_if_no_peer_cert);
ssl_context_.set_password_callback(
boost::bind(&gcomm::AsioProtonet::get_ssl_password, this));

View File

@ -1,18 +1,15 @@
Name: galera Name: galera
Version: 25.3.5 Version: 25.3.10
Release: 11%{?dist} Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
URL: http://www.codership.com/ URL: http://www.http://galeracluster.com/
Source0: https://launchpad.net/%{name}/3.x/%{version}/+download/%{name}-%{version}-src.tar.gz Source0: http://releases.galeracluster.com/source/%{name}-3-%{version}.tar.gz
Source1: garbd.service Source1: garbd.service
Source2: garbd-wrapper Source2: garbd-wrapper
Patch1: galera-verify.patch
# Add aarch64 support. Sent upstream 2014-11-27.
Patch2: galera-add-aarch64-support.patch
BuildRequires: boost-devel check-devel openssl-devel scons systemd BuildRequires: boost-devel check-devel openssl-devel scons systemd
Requires: nmap-ncat Requires: nmap-ncat
@ -33,10 +30,7 @@ replication engine see http://www.codership.com.
%prep %prep
%setup -q -n %{name}-%{version}-src %setup -q -n %{name}-3-%{version}
%patch1 -p1
%patch2 -p1
%build %build
@ -90,6 +84,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Mon Jul 06 2015 Ryan O'Hara <rohara@redhat.com> - 25.3.10-1
- Update to version 25.3.10
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 25.3.5-11 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 25.3.5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
@ -113,7 +110,7 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
* Thu Apr 24 2014 Ryan O'Hara <rohara@redhat.com> - 25.3.5-4 * Thu Apr 24 2014 Ryan O'Hara <rohara@redhat.com> - 25.3.5-4
- Use strict_build_flags=0 to avoid -Werror - Use strict_build_flags=0 to avoid -Werror
- Remove unnecessary %clean section - Remove unnecessary clean section
* Thu Apr 24 2014 Ryan O'Hara <rohara@redhat.com> - 25.3.5-3 * Thu Apr 24 2014 Ryan O'Hara <rohara@redhat.com> - 25.3.5-3
- Include galera directories in file list - Include galera directories in file list

View File

@ -1 +1 @@
173e91a48fc13bd341e90d67375aeed8 galera-25.3.5-src.tar.gz 0a5083a7fb12b220405064ee5a792035 galera-3-25.3.10.tar.gz