From fbd3bb27e7bf84d29c175aaaef2d494f807d473b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 15 Apr 2021 22:02:07 +0200
Subject: [PATCH] mariadb: fix template, update INSTALL

usr/bin/mysql_install_db is only supposed to initilize the state,
for upgrades mysql_upgrade should be used
---
 srcpkgs/mariadb/INSTALL  | 8 +++++++-
 srcpkgs/mariadb/template | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
index 256a89f2df..88334bbe14 100644
--- a/srcpkgs/mariadb/INSTALL
+++ b/srcpkgs/mariadb/INSTALL
@@ -2,6 +2,12 @@
 #
 case ${ACTION} in
 post)
-	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	if [ "$UPDATE" = "yes" ]; then
+		:
+	elif [ -f var/lib/mysql/mysql-bin.index ]; then
+		:
+	else
+		chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	fi
 	;;
 esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 894e1bd7b8..8cbc1357da 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -65,7 +65,7 @@ post_install() {
 	vmkdir usr/lib/security
 	vmkdir etc/security
 	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
-	mv ${DESTDIR}/usr/share/user_map.conf etc/security/
+	mv ${DESTDIR}/usr/share/user_map.conf ${DESTDIR}/etc/security/
 
 	vsv mysqld
 }