Merge pull request #905 from midoks/dev

常规更新

plugins/php/lib/freetype_old.sh

@@ -16,19 +16,19 @@ SOURCE_ROOT=$rootPath/source/lib
 if [ ! -d ${SERVER_ROOT}/freetype_old ];then
     cd $SOURCE_ROOT
 
-    if [ ! -f $SOURCE_ROOT/freetype-2.7.1.tar.gz ];then
-        wget -O freetype-2.7.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz  -T 5
+    if [ ! -f $SOURCE_ROOT/freetype-2.8.1.tar.gz ];then
+        wget -O freetype-2.8.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.gz  -T 5
     fi
 
-    if [ ! -d $SOURCE_ROOT/freetype-2.7.1 ];then
-        tar zxvf freetype-2.7.1.tar.gz
-        cd freetype-2.7.1
+    if [ ! -d $SOURCE_ROOT/freetype-2.8.1 ];then
+        tar zxvf freetype-2.8.1.tar.gz
+        cd freetype-2.8.1
     else
-        cd freetype-2.7.1
+        cd freetype-2.8.1
     fi
     
     ./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install
-    cd $SOURCE_ROOT && rm -rf freetype-2.7.1
-    cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/freetype-2.7.1
+    cd $SOURCE_ROOT && rm -rf freetype-2.8.1
+    cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/freetype-2.8.1
     #rm -rf freetype-2.7.1.tar.gz
 fi

plugins/php/versions/common/gd_old.sh

@@ -17,6 +17,9 @@ version=$2
 LIBNAME=gd
 LIBV=0
 
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 
 # if [ "$version" -lt "74" ];then
@@ -79,11 +82,24 @@ Install_lib()
 			OPTIONS="$OPTIONS --with-xpm-dir"
 		fi
 
+		# if [ "debian" == "$OSNAME" ]; then
+		# 	OPTIONS="$OPTIONS --with-freetype"
+		# else
+		# 	find_ft2=`pkg-config --list-all | grep freetype2`
+		# 	if [ "$find_ft2" != "" ];then
+		# 		OPTIONS="$OPTIONS --with-freetype-dir=${serverPath}/lib/freetype_old"
+		# 	fi
+		# fi
+
+		if [ ! -f ${serverPath}/lib/freetype_old ];then
+			echo "freetype_old not install , check!!"
+			return
+		fi
+
 		find_ft2=`pkg-config --list-all | grep freetype2`
-		if [ "$find_ft2" == "" ];then
+		if [ "$find_ft2" != "" ];then
 			OPTIONS="$OPTIONS --with-freetype-dir=${serverPath}/lib/freetype_old"
 		fi
-		
 
 		#--with-xpm
 		# =${serverPath}/lib/freetype_old

version/r3.9.txt

@@ -1,4 +1,4 @@
-cryptography==36.0.1
+cryptography>=46.0.7
 flask==2.0.3
 pyOpenSSL==22.0.0
 requests==2.27.1