diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index 5b5032c6d..d784433ed 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -118,6 +118,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh index 6138bd418..48c02a304 100755 --- a/plugins/php/versions/53/install.sh +++ b/plugins/php/versions/53/install.sh @@ -48,7 +48,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" - OPTIONS="${OPTIONS} --with-jpeg" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh index c1213fd64..045e74777 100755 --- a/plugins/php/versions/54/install.sh +++ b/plugins/php/versions/54/install.sh @@ -42,6 +42,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh index b03848920..dcbd168be 100755 --- a/plugins/php/versions/55/install.sh +++ b/plugins/php/versions/55/install.sh @@ -41,6 +41,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh index 046015744..36f647dc5 100755 --- a/plugins/php/versions/56/install.sh +++ b/plugins/php/versions/56/install.sh @@ -41,6 +41,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/70/install.sh b/plugins/php/versions/70/install.sh index 75203d880..e33084488 100755 --- a/plugins/php/versions/70/install.sh +++ b/plugins/php/versions/70/install.sh @@ -41,6 +41,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/71/install.sh b/plugins/php/versions/71/install.sh index 60f315b7d..8a2e4b22f 100755 --- a/plugins/php/versions/71/install.sh +++ b/plugins/php/versions/71/install.sh @@ -40,6 +40,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/72/install.sh b/plugins/php/versions/72/install.sh index ccde35e98..45dc63f10 100755 --- a/plugins/php/versions/72/install.sh +++ b/plugins/php/versions/72/install.sh @@ -41,6 +41,7 @@ else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/plugins/php/versions/73/install.sh b/plugins/php/versions/73/install.sh index 80a2bf98f..d682b7624 100755 --- a/plugins/php/versions/73/install.sh +++ b/plugins/php/versions/73/install.sh @@ -44,7 +44,8 @@ if [ $sysName == 'Darwin' ]; then else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old" - OPTIONS="${OPTIONS} --with-gd" + OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" OPTIONS="${OPTIONS} --with-libzip=${serverPath}/lib/libzip" fi diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh index 1163b2816..6267eca9a 100755 --- a/plugins/php/versions/74/install.sh +++ b/plugins/php/versions/74/install.sh @@ -49,6 +49,8 @@ if [ $sysName == 'Darwin' ]; then export LDFLAGS="-L/usr/local/opt/libxml2/lib" else OPTIONS="--with-iconv=${serverPath}/lib/libiconv" + OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf" + OPTIONS="${OPTIONS} --with-jpeg --with-jpeg-dir=/usr/lib" OPTIONS="${OPTIONS} --with-curl" fi diff --git a/scripts/lib.sh b/scripts/lib.sh index 7f4ef69b0..6eb7abfc7 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -202,28 +202,6 @@ Install_OpenSSL() echo -e "Install_OpenSSL" >> ${libPath}/lib.pl } -Install_Lib() -{ - if [ -f "/www/server/nginx/sbin/nginx" ] || [ -f "/www/server/apache/bin/httpd" ] || [ -f "/www/server/mysql/bin/mysql" ]; then - return - fi - lockFile='${libPath}/data/mw_lib.lock' - if [ ! -f "${lockFile}" ];then - sed -i "s#SELINUX=enforcing#SELINUX=disabled#" /etc/selinux/config - rpm -e --nodeps mariadb-libs-* - - mv /etc/yum.repos.d/epel.repo /etc/yum.repos.d/epel.repo.backup - rm -f /var/run/yum.pid - for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel openssl openssl-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof pcre pcre-devel vixie-cron crontabs expat-devel readline-devel; - do yum -y install $yumPack;done - - mv /etc/yum.repos.d/epel.repo.backup /etc/yum.repos.d/epel.repo - groupadd www - useradd -s /sbin/nologin -M -g www www - echo 'true' > $lockFile - fi -} - Install_Curl() { @@ -333,11 +311,14 @@ elif [ "$OSNAME" == "ubuntu" ] || [ "$OSNAME" == "debian" ]; then #apt install -y libmariadbclient-dev else + for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof vixie-cron crontabs expat-devel readline-devel; + do yum -y install $yumPack;done + yum install -y openldap openldap-devel libtirpc libtirpc-devel rpcgen yum install -y bison re2c cmake yum install -y libmemcached libmemcached-devel - yum install -y curl-devel + yum install -y curl curl-devel yum install -y zlib zlib-devel yum install -y libzip libzip-devel yum install -y pcre pcre-devel