summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO12
-rwxr-xr-xPKGBUILD67
-rw-r--r--properties.ini.in30
-rw-r--r--xampp-control-panel4
-rw-r--r--xampp-control-panel.desktop2
-rw-r--r--xampp-manager4
6 files changed, 84 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 450832a7873b..2758ddaa16e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xampp
pkgdesc = A stand-alone LAMPP distribution
pkgver = 7.4.10
- pkgrel = 6
+ pkgrel = 7
url = https://www.apachefriends.org/
install = xampp.install
arch = x86_64
@@ -12,9 +12,12 @@ pkgbase = xampp
depends = net-tools
optdepends = polkit: for launching XAMPP Manager and Control Panel from menu
optdepends = pygtk: for using XAMPP Control Panel
+ options = staticlibs
+ options = libtool
options = !strip
source = bitrock-unpacker.tcl
source = org.freedesktop.xampp-manager.policy
+ source = properties.ini.in
source = xampp.service
source = xampp.svg
source = xampp.sysusers
@@ -25,13 +28,14 @@ pkgbase = xampp
source = xampp-manager.desktop
sha256sums = 3f262ef4b3e752992667ab482cbf364e3b9e6f95b4b6fb12a1ce6fa7a88f124e
sha256sums = 4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418
+ sha256sums = db911d689c2b78d02b3829cabf03822bb213d21dfa557f388989e10e837860bc
sha256sums = 78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f
sha256sums = a3fc7f2b570af9d05435f2f9a0b8d7d9b30ee1dbeaea152f8e249ef5ef0461c9
sha256sums = 37e24dacf3a52037d0cddb11d979917f81741bf399ec5fa5e847359909b7bc25
sha256sums = abdd8e08dc12b1cc57f430460b4653d2b76c53c43f113635983c98e59769ee63
- sha256sums = aadc86347958f83165afdcf3b65e08c9b9ead4fa1356bb9fa328dbb4c17a78cf
- sha256sums = 82017853d6a50a53fde31deef4746c63d246e660597daca6986f6ac16dac0801
- sha256sums = e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688
+ sha256sums = d6135f2f5f089b6293d4d2e87072ec63071e8f76c40e1e2642ed27812c84318c
+ sha256sums = 6451a2e210a7d4d807618c7042a966343cc346ec860680d777b463c30026057e
+ sha256sums = 6fa0e2ce22b51d5c611ff0b4179fc3bdf575a2cd3c69f2dd9f0d4dd6e3ab8814
sha256sums = 584f891f908aa5ea95c9a19d4298c1a582e81fcace3ab0741cbd3f4fac33128a
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
diff --git a/PKGBUILD b/PKGBUILD
index 9b279596bfbf..50f422d86f46 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,10 @@
pkgname='xampp'
pkgver='7.4.10'
-pkgrel=6
+pkgrel=7
pkgdesc='A stand-alone LAMPP distribution'
+_platform='linux-x64'
+_uppkgrel=0
url='https://www.apachefriends.org/'
license=('GPL')
arch=('x86_64')
@@ -19,6 +21,7 @@ optdepends=('polkit: for launching XAMPP Manager and Control Panel from menu'
makedepends=('sdx' 'tclkit' 'rsync')
source=('bitrock-unpacker.tcl'
'org.freedesktop.xampp-manager.policy'
+ 'properties.ini.in'
'xampp.service'
'xampp.svg'
'xampp.sysusers'
@@ -27,18 +30,19 @@ source=('bitrock-unpacker.tcl'
'xampp-control-panel.desktop'
'xampp-manager'
'xampp-manager.desktop')
-source_x86_64=("${url}/${pkgname}-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run")
-options=(!strip)
+source_x86_64=("${url}/${pkgname}-files/${pkgver}/${pkgname}-${_platform}-${pkgver}-${_uppkgrel}-installer.run")
+options=(staticlibs libtool !strip)
install='xampp.install'
sha256sums=('3f262ef4b3e752992667ab482cbf364e3b9e6f95b4b6fb12a1ce6fa7a88f124e'
'4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418'
+ 'db911d689c2b78d02b3829cabf03822bb213d21dfa557f388989e10e837860bc'
'78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f'
'a3fc7f2b570af9d05435f2f9a0b8d7d9b30ee1dbeaea152f8e249ef5ef0461c9'
'37e24dacf3a52037d0cddb11d979917f81741bf399ec5fa5e847359909b7bc25'
'abdd8e08dc12b1cc57f430460b4653d2b76c53c43f113635983c98e59769ee63'
- 'aadc86347958f83165afdcf3b65e08c9b9ead4fa1356bb9fa328dbb4c17a78cf'
- '82017853d6a50a53fde31deef4746c63d246e660597daca6986f6ac16dac0801'
- 'e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688'
+ 'd6135f2f5f089b6293d4d2e87072ec63071e8f76c40e1e2642ed27812c84318c'
+ '6451a2e210a7d4d807618c7042a966343cc346ec860680d777b463c30026057e'
+ '6fa0e2ce22b51d5c611ff0b4179fc3bdf575a2cd3c69f2dd9f0d4dd6e3ab8814'
'584f891f908aa5ea95c9a19d4298c1a582e81fcace3ab0741cbd3f4fac33128a')
sha256sums_x86_64=('dc216c55f99b04a9e1a458c7c881127fdbf30963710a32f6d5228a09c3cde722')
@@ -48,8 +52,10 @@ prepare() {
cd "${srcdir}"
msg 'Extracting package...'
- "${srcdir}/bitrock-unpacker.tcl" "${srcdir}/${pkgname}-linux-x64-${pkgver}-0-installer.run" \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}"
+ chmod +x "${srcdir}/bitrock-unpacker.tcl"
+ rm -rf "${srcdir}/${pkgname}-${_platform}-${pkgver}"
+ "${srcdir}/bitrock-unpacker.tcl" "${srcdir}/${pkgname}-${_platform}-${pkgver}-0-installer.run" \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}"
}
@@ -60,16 +66,21 @@ package() {
msg 'Recreating package tree...'
install -dm755 "${pkgdir}/opt/lampp"
rsync -azq --remove-source-files \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/xampp_core_files/xampp_core_folder"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/xampp_developer_files/xampp_developer_folder"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/native_apache_adapter/apache_xampp_linux"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/native_proftpd_adapter/proftpd_xampp_linux"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/native_mysql_adapter/mysql_xampp_linux"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/manager/binary"/. \
- "${srcdir}/${pkgname}-linux-x64-${pkgver}/common_native_adapter/common"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/xampp_core_files/xampp_core_folder"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/xampp_developer_files/xampp_developer_folder"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/native_apache_adapter/apache_xampp_linux"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/native_proftpd_adapter/proftpd_xampp_linux"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/native_mysql_adapter/mysql_xampp_linux"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/manager/binary"/. \
+ "${srcdir}/${pkgname}-${_platform}-${pkgver}/common_native_adapter/common"/. \
"${pkgdir}/opt/lampp"
- rm -rf "${srcdir}/${pkgname}-linux-x64-${pkgver}"
+ rm "${pkgdir}/opt/lampp/ctlscript.bat" "${pkgdir}/opt/lampp/killprocess.bat"
+
+ # Set root location in all files
+ msg 'Setting root location globally (it might take a few minutes)...'
+ find "${pkgdir}/opt/lampp/" -type f \
+ -exec sed -i 's/\@\@BITNAMI_XAMPP_ROOT\@\@/\/opt\/lampp/gI;s/\@\@BITROCK_INSTALLDIR\@\@/\/opt\/lampp/gI' '{}' \;
# Temp folders
install -dm777 "${pkgdir}/opt/lampp/phpmyadmin/tmp"
@@ -79,15 +90,19 @@ package() {
#msg 'Configuring phpMyAdmin settings for MySQL...'
#find "${pkgdir}/opt/lampp/phpmyadmin" -type f -exec sed -i 's/localhost/localhost:3306/gI' '{}' \;
- # Links
- install -dm755 "${pkgdir}/opt/lampp/share/lampp"
- ln -sf '/opt/lampp/xampp' "${pkgdir}/opt/lampp/lampp"
- ln -sf '/opt/lampp/share/xampp/' "${pkgdir}/opt/lampp/share/lampp/"
+ # Links and missing files
+ ln -s '/opt/lampp/xampp' "${pkgdir}/opt/lampp/lampp"
+ test -d "${pkgdir}/opt/lampp/share/lampp" || \
+ ln -sf '/opt/lampp/share/xampp' "${pkgdir}/opt/lampp/share/lampp"
- # Set root location in all files
- msg 'Setting root location globally (it might take a few minutes)...'
- find "${pkgdir}/opt/lampp/" -type f \
- -exec sed -i 's/\@\@BITNAMI_XAMPP_ROOT\@\@/\/opt\/lampp/gI;s/\@\@BITROCK_INSTALLDIR\@\@/\/opt\/lampp/gI' '{}' \;
+ sed \
+ "
+ s/@STACK_VERSION@/${pkgver}-${_uppkgrel}/g
+ s/@PLATFORM@/${_platform}/g
+ " \
+ "${srcdir}/properties.ini.in" > "${pkgdir}/opt/lampp/properties.ini"
+
+ echo -n "${pkgver}-${_uppkgrel}" > "${pkgdir}/opt/lampp/lib/VERSION"
# For using MariaDB from the official packages (currently unused option)
#find "${pkgdir}/opt/lampp/mysql/scripts" -type f -exec sed -i 's/\/opt\/lampp\/var\/mysql\/$HOSTNAME.pid/\/var\/lib\/mysql\/$HOSTNAME.pid/gI' '{}' \;
@@ -101,13 +116,13 @@ package() {
# Licenses
install -dm755 "${pkgdir}/usr/share/licenses"
chmod -R a+rX,u+w "${pkgdir}/opt/lampp/licenses"
- ln -sf "/opt/lampp/licenses" "${pkgdir}/usr/share/licenses/xampp"
+ ln -s "/opt/lampp/licenses" "${pkgdir}/usr/share/licenses/xampp"
# Executables
install -dm755 "${pkgdir}/usr/bin"
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"
+ ln -s '/opt/lampp/xampp' "${pkgdir}/usr/bin/xampp"
# Systemd files
install -dm755 "${pkgdir}/etc/systemd/system"
diff --git a/properties.ini.in b/properties.ini.in
new file mode 100644
index 000000000000..5e210297818a
--- /dev/null
+++ b/properties.ini.in
@@ -0,0 +1,30 @@
+[General]
+installdir=/opt/lampp
+base_stack_name=XAMPP
+base_stack_key=
+base_stack_version=@STACK_VERSION@
+base_stack_platform=@PLATFORM@
+base_stack_service=
+require_root_privileges=1
+[Apache]
+apache_server_port=80
+apache_user=daemon
+apache_group=daemon
+apache_server_ssl_port=443
+apache_root_directory=/opt/lampp
+apache_htdocs_directory=/opt/lampp/htdocs
+apache_domainname=127.0.0.1
+apache_configuration_directory=/opt/lampp/apache2/conf
+[MySQL]
+mysql_port=3306
+mysql_host=localhost
+mysql_root_directory=/opt/lampp/
+mysql_binary_directory=/opt/lampp/bin
+mysql_data_directory=/opt/lampp/var/mysql/
+mysql_configuration_directory=/opt/lampp/etc
+mysql_arguments=-u root -S "/opt/lampp/var/mysql/mysql.sock"
+mysql_socket=/opt/lampp/var/mysql/mysql.sock
+[PHP]
+php_binary_directory=/opt/lampp/bin
+php_configuration_directory=/opt/lampp/etc
+php_extensions_directory=/opt/lampp/lib/php/extensions/no-debug-non-zts-20190902
diff --git a/xampp-control-panel b/xampp-control-panel
index 5a7f9cb226fb..33c3df623d51 100644
--- a/xampp-control-panel
+++ b/xampp-control-panel
@@ -1,6 +1,6 @@
#!/bin/sh
if which pkexec &> /dev/null; then
- pkexec python2 "/opt/lampp/share/xampp-control-panel/xampp-control-panel.py"
+ pkexec env DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" python2 '/opt/lampp/share/xampp-control-panel/xampp-control-panel.py'
else
- python2 /opt/lampp/share/xampp-control-panel/xampp-control-panel.py
+ python2 '/opt/lampp/share/xampp-control-panel/xampp-control-panel.py'
fi
diff --git a/xampp-control-panel.desktop b/xampp-control-panel.desktop
index e4381a92356a..26200a27409f 100644
--- a/xampp-control-panel.desktop
+++ b/xampp-control-panel.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
Version=1.0
Name=XAMPP Control Panel
Comment=XAMPP control panel
-Exec= /usr/bin/xampp-control-panel
+Exec=/usr/bin/xampp-control-panel
StartupWMClass=XAMPP
Icon=xampp
Terminal=false
diff --git a/xampp-manager b/xampp-manager
index 6acd2b3eb3dd..7da55301b988 100644
--- a/xampp-manager
+++ b/xampp-manager
@@ -1,6 +1,6 @@
#!/bin/sh
if which pkexec &> /dev/null; then
- pkexec "/opt/lampp/manager-linux-x64.run" "$@"
+ pkexec env DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" '/opt/lampp/manager-linux-x64.run' "${@}"
else
- /opt/lampp/manager-linux-x64.run "$@"
+ '/opt/lampp/manager-linux-x64.run' "$@"
fi