[mariadb-galera/f20] Create SSL Key in post scriptlets (RHBZ #1179630)
Haïkel Guémar
hguemar at fedoraproject.org
Fri Jan 16 12:01:34 UTC 2015
commit 87d62ee92841bfbcca9ce57358c858fae87c3580
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri Jan 16 13:01:38 2015 +0100
Create SSL Key in post scriptlets (RHBZ #1179630)
- Fix permissions on INFO_SRC and INFO_BIN
mariadb-galera.spec | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 906ea73..21c14d7 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -7,7 +7,7 @@
Name: mariadb-galera
Version: 5.5.41
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -466,8 +466,8 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
# but that's pretty wacko --- see also mariadb-file-contents.patch)
-install -p Docs/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
-install -p Docs/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mariadb
chmod 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/mariadb
@@ -688,6 +688,24 @@ fi
%{_sbindir}/update-alternatives --install %{_bindir}/mysqlbug \
mysqlbug %{_libdir}/mysql/mysqlbug %{__isa_bits}
+%define sslkey %{_sysconfdir}/pki/galera/galera.key
+%define sslcert %{_sysconfdir}/pki/galera/galera.crt
+
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+ exit 0
+fi
+
+if [ ! -f %{sslkey} ]; then
+ umask 077 && %{_bindir}/openssl genrsa -out %{sslkey} 2048 2>/dev/null
+ chown mysql:mysql %{sslkey}
+fi
+
+if [ ! -f %{sslcert} ]; then
+ umask 022 && %{_bindir}/openssl req -key %{sslkey} -out %{sslcert} \
+ -subj "/CN=$(hostname)/" -new -x509 -days 730 -extensions usr_cert 2>/dev/null
+ chown mysql:mysql %{sslcert}
+fi
+
# %post embedded -p /sbin/ldconfig
# %postun
@@ -931,6 +949,10 @@ fi
# %{_mandir}/man1/mysql_client_test.1*
%changelog
+* Fri Jan 16 2015 Haïkel Guémar <hguemar at fedoraproject.org> - 1:5.5.41-2
+- Create SSL Key in post scriptlets (RHBZ #1179630)
+- Fix permissions on INFO_SRC and INFO_BIN
+
* Fri Jan 09 2015 Honza Horak <hhorak at redhat.com> - 1:5.5.41-1
- Rebase to 5.5.41
https://kb.askmonty.org/en/mariadb-5541-changelog/
More information about the scm-commits
mailing list