Use systemd-sysusers and systemd-tmpfiles for `mysql` user and group

7 files changed, 34 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d64b2b86640..2f76fa04040d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = xampp
 	pkgdesc = A stand-alone LAMPP distribution
 	pkgver = 7.4.10
-	pkgrel = 3
-	url = http://www.apachefriends.org/
+	pkgrel = 4
+	url = https://www.apachefriends.org/
 	install = xampp.install
 	arch = x86_64
 	license = GPL
@@ -14,22 +14,26 @@ pkgbase = xampp
 	optdepends = pygtk: for using XAMPP Control Panel
 	options = !strip
 	source = bitrock-unpacker.tcl
-	source = xampp.service
 	source = org.freedesktop.xampp-manager.policy
+	source = xampp.service
+	source = xampp.sysusers
+	source = xampp.tmpfiles
 	source = xampp-control-panel
 	source = xampp-control-panel.desktop
+	source = xampp-manager
 	source = xampp-manager.desktop
 	source = xampp-manager.png
-	source = xampp-manager-polkit
 	sha256sums = 3f262ef4b3e752992667ab482cbf364e3b9e6f95b4b6fb12a1ce6fa7a88f124e
-	sha256sums = 78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f
 	sha256sums = 4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418
+	sha256sums = 78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f
+	sha256sums = 37e24dacf3a52037d0cddb11d979917f81741bf399ec5fa5e847359909b7bc25
+	sha256sums = abdd8e08dc12b1cc57f430460b4653d2b76c53c43f113635983c98e59769ee63
 	sha256sums = aadc86347958f83165afdcf3b65e08c9b9ead4fa1356bb9fa328dbb4c17a78cf
 	sha256sums = 731daee35514cce22b8d6b37224bfec08302d219a59b1b30acc3c6b1a799634a
-	sha256sums = 595de672753af57c4abf1b4549530bba02b004bd45dfa82054d58ea3a174a4e6
-	sha256sums = 3df1d2fa8a8dbba21944045503b94315e5b7bc38b968ca5a816a57b83c6fd77a
 	sha256sums = e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688
-	source_x86_64 = https://www.apachefriends.org/xampp-files/7.4.10/xampp-linux-x64-7.4.10-0-installer.run
+	sha256sums = e2bfb817ba3c46d0e70b93e0575887c3260413e2737ba6d4347a31a3566a197a
+	sha256sums = 3df1d2fa8a8dbba21944045503b94315e5b7bc38b968ca5a816a57b83c6fd77a
+	source_x86_64 = https://www.apachefriends.org//xampp-files/7.4.10/xampp-linux-x64-7.4.10-0-installer.run
 	sha256sums_x86_64 = dc216c55f99b04a9e1a458c7c881127fdbf30963710a32f6d5228a09c3cde722
 
 pkgname = xampp
diff --git a/PKGBUILD b/PKGBUILD
index 2ce86096eec8..81c55ece83c3 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,9 @@
 
 pkgname='xampp'
 pkgver='7.4.10'
-pkgrel=3
+pkgrel=4
 pkgdesc='A stand-alone LAMPP distribution'
-url='http://www.apachefriends.org/'
+url='https://www.apachefriends.org/'
 license=('GPL')
 arch=('x86_64')
 depends=('net-tools')
@@ -18,24 +18,28 @@ optdepends=('polkit: for launching XAMPP Manager and Control Panel from menu'
             'pygtk: for using XAMPP Control Panel')
 makedepends=('sdx' 'tclkit' 'rsync')
 source=('bitrock-unpacker.tcl'
-	'xampp.service'
 	'org.freedesktop.xampp-manager.policy'
+	'xampp.service'
+	'xampp.sysusers'
+	'xampp.tmpfiles'
 	'xampp-control-panel'
 	'xampp-control-panel.desktop'
+	'xampp-manager'
 	'xampp-manager.desktop'
-	'xampp-manager.png'
-	'xampp-manager-polkit')
-source_x86_64=("https://www.apachefriends.org/${pkgname}-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run")
+	'xampp-manager.png')
+source_x86_64=("${url}/${pkgname}-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run")
 options=(!strip)
 install='xampp.install'
 sha256sums=('3f262ef4b3e752992667ab482cbf364e3b9e6f95b4b6fb12a1ce6fa7a88f124e'
-            '78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f'
             '4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418'
+            '78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f'
+            '37e24dacf3a52037d0cddb11d979917f81741bf399ec5fa5e847359909b7bc25'
+            'abdd8e08dc12b1cc57f430460b4653d2b76c53c43f113635983c98e59769ee63'
             'aadc86347958f83165afdcf3b65e08c9b9ead4fa1356bb9fa328dbb4c17a78cf'
             '731daee35514cce22b8d6b37224bfec08302d219a59b1b30acc3c6b1a799634a'
-            '595de672753af57c4abf1b4549530bba02b004bd45dfa82054d58ea3a174a4e6'
-            '3df1d2fa8a8dbba21944045503b94315e5b7bc38b968ca5a816a57b83c6fd77a'
-            'e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688')
+            'e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688'
+            'e2bfb817ba3c46d0e70b93e0575887c3260413e2737ba6d4347a31a3566a197a'
+            '3df1d2fa8a8dbba21944045503b94315e5b7bc38b968ca5a816a57b83c6fd77a')
 sha256sums_x86_64=('dc216c55f99b04a9e1a458c7c881127fdbf30963710a32f6d5228a09c3cde722')
 
 prepare() {
@@ -100,13 +104,15 @@ package() {
 
 	# Executables
 	install -dm755 "${pkgdir}/usr/bin"
-	install -Dm755 "${srcdir}/xampp-manager-polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
+	install -Dm755 "${srcdir}/xampp-manager" "${pkgdir}/usr/bin/xampp-manager"
 	install -Dm755 "${srcdir}/xampp-control-panel" "${pkgdir}/usr/bin/xampp-control-panel"
 	ln -sf '/opt/lampp/lampp' "${pkgdir}/usr/bin/xampp"
 
-	# Systemd service
+	# Systemd files
 	install -dm755 "${pkgdir}/etc/systemd/system"
 	install -Dm644 "${srcdir}/xampp.service" "${pkgdir}/etc/systemd/system/xampp.service"
+	install -Dm644 "${srcdir}/xampp.sysusers" "${pkgdir}/usr/lib/sysusers.d/xampp.conf"
+	install -Dm644 "${srcdir}/xampp.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/xampp.conf"
 
 	# Desktop launcher
 	install -Dm644 "${srcdir}/xampp-manager.png" "${pkgdir}/usr/share/pixmaps/xampp-manager.png"
diff --git a/xampp-manager-polkit b/xampp-manager
index 6acd2b3eb3dd..6acd2b3eb3dd 100644
--- a/xampp-manager-polkit
+++ b/xampp-manager
diff --git a/xampp-manager.desktop b/xampp-manager.desktop
index 17458840cb72..4878af0b44b6 100644
--- a/xampp-manager.desktop
+++ b/xampp-manager.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Name=XAMPP Manager
 Comment=XAMPP server manager
-Exec=/usr/bin/xampp-manager_polkit
+Exec=/usr/bin/xampp-manager
 StartupWMClass=XAMPP
 Icon=xampp-manager
 Terminal=false
diff --git a/xampp.install b/xampp.install
index 81ee76b2d900..f4e117c6b850 100644
--- a/xampp.install
+++ b/xampp.install
@@ -3,13 +3,6 @@ _BACKUP=('opt/lampp/etc' 'opt/lampp/htdocs' 'opt/lampp/var')
 
 post_install() {
 
-	if ! id -u mysql &> /dev/null; then
-		echo 'Creating `mysql` user and group...'
-		useradd -r -s /usr/bin/nologin mysql
-	fi
-
-	chown -R mysql:mysql '/opt/lampp/var/mysql/'
-
 	echo
 	echo 'XAMPP is now installed below the /opt/lampp directory.'
 	echo
@@ -92,17 +85,6 @@ pre_remove() {
 
 post_remove() {
 
-	if id -u mysql &> /dev/null; then
-		echo
-		echo 'A `mysql` user is still present in the system. It is possible that other'
-		echo 'programs require its presence. If you are certain that no program requires it,'
-		echo 'launch'
-		echo
-		echo '    sudo userdel mysql'
-		echo
-		echo 'to delete the `mysql` user and group from the system.'
-	fi
-
 	echo
 	echo 'REMEMBER: Your `htdocs` folder was backed up to `/opt/htdocs-backups`.'
 	echo
diff --git a/xampp.sysusers b/xampp.sysusers
new file mode 100644
index 000000000000..19e6223427a1
--- /dev/null
+++ b/xampp.sysusers
@@ -0,0 +1,2 @@
+g mysql - -
+u mysql - "MySQL"
diff --git a/xampp.tmpfiles b/xampp.tmpfiles
new file mode 100644
index 000000000000..12fcea413d59
--- /dev/null
+++ b/xampp.tmpfiles
@@ -0,0 +1 @@
+Z /opt/lampp/var/mysql/ - mysql mysql -