rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 10.4.7

Browse Source
This commit is contained in:
Michal Schorm 2019-08-22 16:31:37 +02:00
parent 1ed43fdb08
commit 38920fe23b
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mariadb-auth_pam_tool_dir.patch
View File

@ -5,25 +5,24 @@ Thus "chown 0" will always fail
Never parse 'ls' output! Never parse 'ls' output!
http://mywiki.wooledge.org/BashFAQ/087 http://mywiki.wooledge.org/BashFAQ/087
--- mariadb-10.4.6/scripts/mysql_install_db.sh 2019-06-18 00:00:32.000000000 +0200 --- mariadb-10.4.7/scripts/mysql_install_db.sh 2019-07-30 13:32:16.000000000 +0200
+++ mariadb-10.4.6/scripts/mysql_install_db.sh_patched 2019-06-20 01:41:43.250208187 +0200 +++ mariadb-10.4.7/scripts/mysql_install_db.sh_patched 2019-08-22 16:29:28.341484925 +0200
@@ -476,12 +476,15 @@ then @@ -490,13 +490,16 @@ then
fi fi
if test -z "$srcdir" if test -z "$srcdir"
then then
- chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" - chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
- chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
- if test $? -ne 0 - if test $? -ne 0
+ if [ `stat "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" -c %u` -ne 0 ] + if [ `stat "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" -c %u` -ne 0 ]
then then
- echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'." + chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
- echo " It must be root, the PAM authentication plugin doesn't work otherwise.." + chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
- echo
+ chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
+ if test $? -ne 0 + if test $? -ne 0
+ then + then
+ echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'." echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
+ echo " It must be root, the PAM authentication plugin doesn't work otherwise.." echo " It must be root, the PAM authentication plugin doesn't work otherwise.."
+ echo echo
+ fi + fi
fi fi
fi fi

9
mariadb.spec
View File

@ -115,7 +115,7 @@
%bcond_without unbundled_pcre %bcond_without unbundled_pcre
%else %else
%bcond_with unbundled_pcre %bcond_with unbundled_pcre
%global pcre_bundled_version 8.42 %global pcre_bundled_version 8.43
%endif %endif
# Use main python interpretter version # Use main python interpretter version
@ -157,8 +157,8 @@
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
Name: mariadb Name: mariadb
Version: 10.4.6 Version: 10.4.7
Release: 2%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -1598,6 +1598,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 22 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.7-1
- Rebase to 10.4.7
* Fri Jun 21 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-2 * Fri Jun 21 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.6-2
- Apply critical patch for Spider SE on Armv7hl architecture - Apply critical patch for Spider SE on Armv7hl architecture

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-10.4.6.tar.gz) = b04c47f72de2473d7b5edd04b4785a1d7179bb1f429f30ba53ae6cfbbb413200d9803eff1072949b2e81fd7d2164ea34c68620d621d4181b913daa2293ae140c SHA512 (mariadb-10.4.7.tar.gz) = cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce