a90561a90b
Highlights: - Bump from 10.2.26 to 10.4.10 - auth_pam got replaced with never version, old one still available as auth_pam_v1 - semisync plugins were merged into the core - Upstream now installs symlinks for binaries with mariadb prefix. To accommodate that this commit updates Package/mariadb/install/bin accordingly. - Patches are updated with new ones from Debian and Arch (thanks!) - libedit patch dropped because it's upstream now. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
--- a/scripts/mysql_install_db.sh
|
|
+++ b/scripts/mysql_install_db.sh
|
|
@@ -359,6 +359,14 @@ then
|
|
exit 1
|
|
fi
|
|
plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
|
|
+ # Upstream assumes all plugins will be always installed, but in OpenWrt we can
|
|
+ # install a server without plugins if we want to.
|
|
+ if test -z "$plugindir"
|
|
+ then
|
|
+ echo "Could not find plugin directory." >&2
|
|
+ echo "Will continue with \"/usr/lib/mariadb/plugin\"." >&2
|
|
+ plugindir=/usr/lib/mariadb/plugin
|
|
+ fi
|
|
pamtooldir=$plugindir
|
|
# relative from where the script was run for a relocatable install
|
|
elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
|
|
@@ -478,7 +486,9 @@ do
|
|
fi
|
|
done
|
|
|
|
-if test -n "$user"
|
|
+# There should be no need for this on OpenWrt. If this turns out to be a wrong guess then
|
|
+# we can revisit.
|
|
+if test -n ""
|
|
then
|
|
chown $user "$pamtooldir/auth_pam_tool_dir" && \
|
|
chmod 0700 "$pamtooldir/auth_pam_tool_dir"
|
|
@@ -499,6 +509,10 @@ then
|
|
echo
|
|
fi
|
|
fi
|
|
+fi
|
|
+
|
|
+if test -n "$user"
|
|
+then
|
|
args="$args --user=$user"
|
|
fi
|
|
|