New release (7.2.3) and use of the official bitrock installer (via fakeuser and proot 3.2.1) instead of the repacked version from sourceforge.net

1 files changed, 42 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a0f38754ec67..bc81d3ceba24 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
 # Contributor: Thiago Perrotta <echo dGhpYWdvcGVycm90dGE5NUBnbWFpbC5jb20K | base64 -d >
 
-pkgname=xampp
-pkgver=7.1.1
+pkgname='xampp'
+pkgver='7.2.3'
 pkgrel=1
 pkgdesc="A free and open source cross-platform web server package (LAMP Stack), consisting mainly of the Apache HTTP Server, MySQL database, and interpreters for scripts written in the PHP and Perl programming languages"
 url="http://www.apachefriends.org/"
@@ -13,40 +13,63 @@ license=('GPL')
 arch=('x86_64')
 depends=('net-tools')
 optdepends=('polkit: to run XAMPP Manager from menu')
+makedepends=('fakeuser' 'proot-3.2.1')
 source=('lampp.service'
 	'xampp-manager.desktop'
 	'xampp-manager.png')
-
-# Due to problems with proot the file
-# "https://sourceforge.net/projects/xampp-linux/files/${pkgname}-linux-x64-${pkgver}-0.tar.xz"
-# is a re-packed version of
-# "https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
-
-source_x86_64=("https://sourceforge.net/projects/xampp-linux/files/${pkgname}-linux-x64-${pkgver}-0.tar.xz"
+source_x86_64=("https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
 	'org.freedesktop.xampp-manager.policy'
 	'xampp-manager-polkit')
 options=(!strip)
 install='xampp.install'
-md5sums=('db1881f9564f18ed34d877035c28a4b8'
-         'cbf909c2c3ad89470463eed2ce003f97'
-         'f214711d95b8135f16974e36128f3a68')
-md5sums_x86_64=('a9ba3b9cc901065885bcd3a871a6a5a9'
-                'ba7853fd8b3125b0a783753ca5e23447'
-                '9d246102ea20f27a13d119e57741ce7d')
+sha256sums=('9aa2e9b2ec768b7e0d5394cf27653a7c9d0291a890d058293109f1aeace79150'
+            '595de672753af57c4abf1b4549530bba02b004bd45dfa82054d58ea3a174a4e6'
+            '3df1d2fa8a8dbba21944045503b94315e5b7bc38b968ca5a816a57b83c6fd77a')
+sha256sums_x86_64=('56936439c458202b766fdf2e84136a104a475166c65c0cfa43fe722a9bca3a33'
+                   '4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418'
+                   '210beb9372baf79f01b783db6d93a0f9a07289af64dd72d9e09baecd0799a76b')
+
+_warning() {
+
+	echo "Due to limitations of the .run file of this package, you now must"
+	echo "have a mysql user in your system prior to its build."
+	echo "You can either create a mysql user manually or just run fakepkg"
+	echo "instead of makepkg. You can pass normal makepkg parameters to it,"
+	echo "such as fakepkg -si".
+
+}
 
 package() {
 
 	install -dm755 "${pkgdir}/opt/lampp"
-	cp -r "${srcdir}/lampp"/* "${pkgdir}/opt/lampp"
+
+	msg 'Creating a temporary mysql user/group with fakeadd (fakeuser)...'
+
+	getent group  mysql >/dev/null || fakeadd -G -n mysql -g 713        || _warning
+	getent passwd mysql >/dev/null || fakeadd -U -n mysql -g 713 -u 713 || _warning
+
+	msg "Extracting package (this might take several minutes, don't give up!)..."
+
+	chmod +x "${srcdir}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
+
+	# Using proot-3.2.1 (instead of the latest version) and passing the environment
+	# variable `PROOT_NO_SECCOMP=1` is only a workaround for this bug:
+	# https://github.com/proot-me/PRoot/issues/106
+	PROOT_NO_SECCOMP=1 proot -0 \
+		-b "${pkgdir}/opt/lampp:/opt/lampp" \
+		"${srcdir}/${pkgname}-linux-x64-${pkgver}-0-installer.run" \
+		--mode unattended --disable-components 'xampp_developer_files' --debuglevel 4 --launchapps 0 --debugtrace 'bitrock_debug.log'
+
+	chmod g-s -R "${pkgdir}/opt/lampp"
 
 	# Licenses
 	install -dm755 "${pkgdir}/usr/share/licenses/xampp"
 	cp "${pkgdir}/opt/lampp/licenses"/* "${pkgdir}/usr/share/licenses/xampp"
 
 	# /usr/bin executables
-	install -dm755 "${pkgdir}"/usr/bin
-	ln -sf /opt/lampp/lampp "${pkgdir}/usr/bin/xampp"
-	ln -sf /opt/lampp/lampp "${pkgdir}/usr/bin/lampp"
+	install -dm755 "${pkgdir}/usr/bin"
+	ln -sf '/opt/lampp/lampp' "${pkgdir}/usr/bin/xampp"
+	ln -sf '/opt/lampp/lampp' "${pkgdir}/usr/bin/lampp"
 	install -Dm755 "${srcdir}/xampp-manager-polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
 
 	# Systemd service