diff options
| author | Natamo <madstk1@pm.me> | 2019-10-30 14:16:13 +0000 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-12-30 22:51:58 +0100 |
| commit | f12f2b778ee936808ce7577efd837e62d877c67a (patch) | |
| tree | 195b4bc40a7fc90d610657b8470c45bc9d911f13 | |
| parent | e7c9637e4dbfb6c0c2594ed61dac794a4153b4e8 (diff) | |
| download | aports-f12f2b778ee936808ce7577efd837e62d877c67a.tar.bz2 aports-f12f2b778ee936808ce7577efd837e62d877c67a.tar.xz | |
main/mariadb: fix plugin directory
When using MariaDB without services - in this case, in a Docker container
- mariadb-install-db will fail, as it tries to load /usr/lib*/plugin and
/usr/lib*/mysql/plugin. None of which exist, in a MariaDB installation.
The correct path would be /usr/lib*/mariadb/plugin.
Failure to load plugins, leads to inability to load PAM and inherently fails the installation.
| -rw-r--r-- | main/mariadb/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mariadb/fix-plugin-dir.patch | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 49d94df31f..7d8fecab01 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -7,7 +7,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.4.10 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="https://www.mariadb.org/" pkgusers="mysql" @@ -15,7 +15,6 @@ pkggroups="mysql" arch="all" license="GPL-2.0-or-later" depends="$pkgname-common" -checkdepends="perl" _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" depends_dev="openssl-dev zlib-dev mariadb-connector-c-dev" makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev @@ -46,7 +45,6 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad " # dbug test fails under rootbld #options="!check" -builddir="$srcdir/$pkgname-$pkgver" # secfixes: # 10.4.10-r0: @@ -114,8 +112,6 @@ builddir="$srcdir/$pkgname-$pkgver" # Available plugins https://mariadb.com/kb/en/library/list-of-plugins/ # All cmake configuration options can be displayed with: cmake ../server -LH build() { - cd "$builddir" - cmake . -DBUILD_CONFIG=mysql_release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc \ @@ -188,13 +184,11 @@ build() { } check() { - cd "$builddir" # exclude test-connect which seems to be buggy. testsuite does not set port env var ctest -E '(test-connect)' } package() { - cd "$builddir" make DESTDIR="$pkgdir/" install install -Dm 755 "$startdir"/$pkgname.initd \ diff --git a/main/mariadb/fix-plugin-dir.patch b/main/mariadb/fix-plugin-dir.patch new file mode 100644 index 0000000000..1a990cf0eb --- /dev/null +++ b/main/mariadb/fix-plugin-dir.patch @@ -0,0 +1,11 @@ +--- a/scripts/mysql_install_db.sh ++++ b/scripts/mysql_install_db.sh +@@ -358,7 +358,7 @@ + cannot_find_file fill_help_tables.sql @pkgdata_locations@ + exit 1 + fi +- plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin` ++ plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib*/mariadb/plugin` + 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" |