Compare commits

..

4 Commits

3 changed files with 77 additions and 32 deletions

View File

@@ -124,12 +124,15 @@ detect_os_1 () {
# - Support systemd ? # - Support systemd ?
# - # -
if [[ "X$(which systemd)" = "X" ]]; then systemd=$(which systemd)
SYSTEMD_EXISTS=false systemctl=$(which systemctl)
else if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
SYSTEMD_EXISTS=true SYSTEMD_EXISTS=true
else
SYSTEMD_EXISTS=false
fi fi
# - Set variable # - Set variable
# - os_dist # - os_dist
# - os_version # - os_version

View File

@@ -124,10 +124,12 @@ detect_os_1 () {
# - Support systemd ? # - Support systemd ?
# - # -
if [[ "X$(which systemd)" = "X" ]]; then systemd=$(which systemd)
SYSTEMD_EXISTS=false systemctl=$(which systemctl)
else if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
SYSTEMD_EXISTS=true SYSTEMD_EXISTS=true
else
SYSTEMD_EXISTS=false
fi fi
# - Set variable # - Set variable

View File

@@ -240,10 +240,12 @@ _backup_date="$(date +%Y%m%d-%H%M)"
# - Support systemd ? # - Support systemd ?
# - # -
if [[ "X$(which systemd)" = "X" ]]; then systemd=$(which systemd)
SYSTEMD_EXISTS=false systemctl=$(which systemctl)
else if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
SYSTEMD_EXISTS=true SYSTEMD_EXISTS=true
else
SYSTEMD_EXISTS=false
fi fi
# - Set variable # - Set variable
@@ -291,13 +293,13 @@ _required_base_packages="$_required_base_packages
re2c re2c
sqlite3 sqlite3
exif libexiv2-dev exif libexiv2-dev
netpbm libnetpbm10-dev netpbm
libnetpbm-dev
libmcrypt-dev mcrypt libmcrypt-dev mcrypt
libwebp-dev libwebp-dev
libpq-dev postgresql-client libpq-dev postgresql-client
libreadline-dev libncurses-dev libreadline-dev libncurses-dev
libxslt1-dev libpcre3-dev libxslt1-dev
libc-client-dev
libicu-dev libicu-dev
libtidy-dev libtidy-dev
libmm-dev libgmp-dev libkrb5-dev libldap-dev libmm-dev libgmp-dev libkrb5-dev libldap-dev
@@ -313,6 +315,25 @@ _required_base_packages="$_required_base_packages
# libcroco3-dev # libcroco3-dev
# libc-client-dev is no longer available on debian 13
#
if [[ "$os_dist" = "debian" ]] && [[ $os_version -lt 13 ]] ; then
_required_base_packages="$_required_base_packages
libc-client-dev"
fi
# Package libpcre3-dev is not availabl at debian 13, but libpcre2-dev is
# available there.
#
if [[ "$os_dist" = "debian" ]] && [[ $os_version -lt 13 ]] ; then
_required_base_packages="$_required_base_packages
libpcre3-dev"
else
_required_base_packages="$_required_base_packages
libpcre2-dev"
fi
# - Package libgraphicsmagick++3 is not available at ubunru 18.04" # - Package libgraphicsmagick++3 is not available at ubunru 18.04"
# - # -
if [[ "$os_dist" != "ubuntu" ]] ; then if [[ "$os_dist" != "ubuntu" ]] ; then
@@ -4033,8 +4054,12 @@ else
--with-openssl" --with-openssl"
fi fi
if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \ #if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \
|| [[ "$PHP_MAJOR_VERSION" -lt 8 ]] ; then # || [[ "$PHP_MAJOR_VERSION" -lt 8 ]] ; then
if [[ "$os_dist" = "debian" ]] && [[ "$os_version" -lt 13 ]] \
&& ( [[ "$PHP_MAJOR_VERSION" -lt 8 ]] \
|| ( [[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]] ) ) ; then
config_params="$config_params config_params="$config_params
--with-imap --with-imap
@@ -6923,33 +6948,48 @@ echo "" >> ${_logdir}/pecl_install.log
echononl "\tInstall 'imap' via pecl.." echononl "\tInstall 'imap' via pecl.."
if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -ge 4 ]]) \ if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -ge 4 ]]) \
|| [[ "$PHP_MAJOR_VERSION" -gt 8 ]] ; then || [[ "$PHP_MAJOR_VERSION" -gt 8 ]] \
printf "\n" | ${PREFIX_PHP}/bin/pecl install imap >> "${_logdir}/pecl_install.log" 2>&1 || ([[ "$os_dist" = "debian" ]] && [[ "$os_version" -ge 13 ]]) ; then
if [ "$?" = "0" ]; then
echo_ok
echononl "\tphp.ini: extension=imap .." if ( dpkg -s libc-client-dev > /dev/null 2>&1 \
_extension="imap.so" || dpkg -s libc-client2007e-dev > /dev/null 2>&1 \
perl -i -n -p -e "s#^(\s*\[PHP\]\s*)#\1\nextension=${_extension}\n#" $PHP_INI_FILE || dpkg -s libc-client2007f-dev > /dev/null 2>&1 \
|| dpkg -s uw-imap-dev >/dev/null 2>&1; ) \
|| [[ -f /usr/local/imap/lib/libc-client.a ]] ; then
printf "\n" | ${PREFIX_PHP}/bin/pecl install imap >> "${_logdir}/pecl_install.log" 2>&1
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
echo_ok echo_ok
echononl "\tphp.ini: extension=imap .."
_extension="imap.so"
perl -i -n -p -e "s#^(\s*\[PHP\]\s*)#\1\nextension=${_extension}\n#" $PHP_INI_FILE
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
fi
else else
echo_failed echo_failed
echo ""
echononl "continue anyway [yes/no]: "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/nno]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
echo ""
fi fi
else else
echo_failed
echo "" echo_skipped
echononl "continue anyway [yes/no]: " warn "The imap plugin cannot be installed - no imap library was found. "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/nno]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
echo ""
fi fi
else else