Prevent from updating MySQL to MariaDB on Ubuntu and simplify libcurl…

… code
FOGProject · Feb 4, 2020 · 28debc9 · 28debc9
1 parent 760c781
commit 28debc9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/common/functions.sh b/lib/common/functions.sh
@@ -640,6 +640,9 @@ installPackages() {
             packages="${packages} php${php_ver}-bcmath bc"
             case $linuxReleaseName in
                 *[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*)
+                    if [[ $OSVersion -gt 17 ]]; then
+                        packages="${packages// libcurl3 / libcurl4 }">>$workingdir/error_logs/fog_error_${version}.log 2>&1
+                    fi
                     addUbuntuRepo
                     ;;
                 *[Dd][Ee][Bb][Ii][Aa][Nn]*)

diff --git a/lib/ubuntu/config.sh b/lib/ubuntu/config.sh
@@ -19,6 +19,7 @@
 [[ -z $repo ]] && repo="php"
 [[ -z $packageQuery ]] && packageQuery="dpkg -l \$x | grep '^ii'"
 if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then
+    sysvrcconf="sysv-rc-conf"
     if [[ $OSVersion -gt 9  ]]; then
         [[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.3"
     elif [[ $OSVersion -gt 8 ]]; then
@@ -29,26 +30,21 @@ if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then
 elif [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*) ]]; then
     DEBIAN_FRONTEND=noninteractive apt-get purge -yq sysv-rc-conf >/dev/null 2>&1
     if [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*) ]]; then
-        libcurl="libcurl3"
-        if [[ $OSVersion -gt 17 ]]; then
-            libcurl="libcurl4"
-        fi
         case $OSVersion in
             19|20)
                 php_ver="7.3"
                 [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
                 [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
                 [[ -z $phpcmd ]] && phpcmd="php"
-                packages="apache2 build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2-mod-php${php_ver} libc6 $libcurl liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server $phpfpm php-gettext php${php_ver} php${php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap php${php_ver}-mysql php${php_ver}-mysqlnd tar tftpd-hpa tftp-hpa vsftpd wget xinetd zlib1g"
                 ;;
             18)
                 php_ver="7.2"
                 [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
                 [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
                 [[ -z $phpcmd ]] && phpcmd="php"
-                packages="apache2 build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2-mod-php${php_ver} libc6 $libcurl liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server $phpfpm php-gettext php${php_ver} php${php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap php${php_ver}-mysql php${php_ver}-mysqlnd sysv-rc-conf tar tftpd-hpa tftp-hpa vsftpd wget xinetd zlib1g"
                 ;;
             *)
+                sysvrcconf="sysv-rc-conf"
                 php_ver="7.1"
                 [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm"
                 [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap"
@@ -98,7 +94,7 @@ fi
 [[ -z $phpcmd ]] && phpcmd="php"
 case $linuxReleaseName in
     *[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Bb][Ii][Aa][Nn]*|*[Mm][Ii][Nn][Tt]*)
-        [[ -z $packages ]] && packages="apache2 build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2-mod-php${php_ver} libc6 $libcurl liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server $phpfpm php-gettext php${php_ver} php${php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap php${php_ver}-mysql php${php_ver}-mysqlnd sysv-rc-conf tar tftpd-hpa tftp-hpa vsftpd wget xinetd zlib1g"
+        [[ -z $packages ]] && packages="apache2 build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-fastcgi libapache2-mod-php${php_ver} libc6 libcurl3 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server $phpfpm php-gettext php${php_ver} php${php_ver}-cli php${php_ver}-curl php${php_ver}-gd php${php_ver}-json $phpldap php${php_ver}-mysql php${php_ver}-mysqlnd ${sysvrcconf} tar tftpd-hpa tftp-hpa vsftpd wget xinetd zlib1g"
         [[ -z $packageinstaller ]] && packageinstaller="apt-get -yq install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
         [[ -z $packagelist ]] && packagelist="apt-cache pkgnames | grep"
         [[ -z $packageupdater ]] && packageupdater="apt-get -yq upgrade -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.7.102');
+        define('FOG_VERSION', '1.5.7.103');
         define('FOG_SCHEMA', 268);
         define('FOG_BCACHE_VER', 134);
         define('FOG_CLIENT_VERSION', '0.11.19');