rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 357519 from server:database

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/357519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2016-02-11 11:32:19 +00:00 committed by Git OBS Bridge
commit b83fb0f4eb
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:77fca575a40f9e6c846e190b833784db778f188eb36ac01baec17aeb4cff3cba oid sha256:1fc4c61b0177a5dcd5da60fff07cbd7efd7259498edacf3a46461d7cdbaa2e6d
size 316 size 317

6
mariadb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 2 13:13:35 UTC 2016 - kstreitova@suse.com
- fix information leak via mysql-systemd-helper script
[CVE-2015-5969], [bnc#957174]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 30 11:38:12 UTC 2015 - kstreitova@suse.com Mon Nov 30 11:38:12 UTC 2015 - kstreitova@suse.com

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1a5c5d9b7fc4f4b9e2cff38abb0dd8123aeae43b28c52ebdd0ad0e142da449f6 oid sha256:919be0b46bad078177bfdd8b377d3226dd3bcba171b68dc6237a12ddef040a57
size 13972 size 13956

8
mysql-systemd-helper
View File

@ -22,9 +22,11 @@ read_config() {
if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then
opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE")" opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi "$INSTANCE")"
tmp_opts="$opts" tmp_opts="$opts"
config="/etc/my${INSTANCE}.cnf"
else else
opts="$(/usr/bin/my_print_defaults mysqld)" opts="$(/usr/bin/my_print_defaults mysqld)"
tmp_opts="$opts" tmp_opts="$opts"
config="/etc/my.cnf"
fi fi
# Update local variables according to the settings from config # Update local variables according to the settings from config
@ -87,8 +89,8 @@ mysql_upgrade() {
# Run protected MySQL accessible only though socket in our directory # Run protected MySQL accessible only though socket in our directory
echo "Running protected MySQL... " echo "Running protected MySQL... "
/usr/sbin/mysqld \ /usr/sbin/mysqld \
--defaults-file="$config" \
--user="$mysql_daemon_user" \ --user="$mysql_daemon_user" \
$opts \
--skip-networking \ --skip-networking \
--skip-grant-tables \ --skip-grant-tables \
--log-error="$protected/log_upgrade_run" \ --log-error="$protected/log_upgrade_run" \
@ -144,7 +146,9 @@ mysql_wait() {
} }
mysql_start() { mysql_start() {
exec /usr/sbin/mysqld --user="$mysql_daemon_user" $opts exec /usr/sbin/mysqld \
--defaults-file="$config" \
--user="$mysql_daemon_user"
} }
# We rely on output in english at some points # We rely on output in english at some points