update socat

jingjingxyk · Dec 3, 2024 · 54b86ef · 54b86ef
1 parent bf82c80
commit 54b86ef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/sapi/scripts/cygwin-install-depend.sh b/sapi/scripts/cygwin-install-depend.sh
@@ -16,64 +16,52 @@ cd ${__PROJECT__}
 # 命令行参数
 # https://www.cygwin.com/faq/faq.html#faq.setup.cli
 
-
-
-
 # wget http://cygwin.com/setup-x86_64.exe
 
-
 ## 同时安装多个包 参考 https://ardupilot.org/dev/docs/building-setup-windows-cygwin.html
 
 ## 命令行参数 https://www.cygwin.com/faq/faq.html#faq.setup.cli
 
 # re2c no found
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode    --site  http://mirrors.ustc.edu.cn/cygwin/ --packages  git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils
-
-
-exit 0
-
+# setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode    --site  http://mirrors.ustc.edu.cn/cygwin/ --packages  git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils
+setup-x86_64.exe --quiet-mode --site http://mirrors.ustc.edu.cn/cygwin/ --packages git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils
 
 exit 0
 
-
 C:\cygwin\bin\bash.exe --norc --noprofile
 
-mv  c:/cygdrive/c/Users/biubiu/Downloads/setup-x86_64.exe C:/cygwin64/bin/
+ls -hl C:/cygwin64/bin/
 
-
-move  C:\Users\biubiu\Downloads\setup-x86_64.exe C:\cygwin64\bin
 dir C:\cygwin64\bin\setup-x86_64.exe
 # cmd 需要使用该管理员权限运行
 
 # add alias to bash_aliases
-echo "alias cygwin='C:/cygwin64/setup-x86_64.exe -q -P'" >> ~/.bash_aliases
+echo "alias cygwin='C:/cygwin64/setup-x86_64.exe -q -P'" >>~/.bash_aliases
 source ~/.bash_aliases
 
 # add bash_aliases to bashrc if missing
-echo "source ~/.bash_aliases" >> ~/.profile
+echo "source ~/.bash_aliases" >>~/.profile
 
 # win7 可能运行不了，因为缺少https证书 。使用镜像地址，请选在http 协议
 setup-x86_64.exe --help
 setup-x86_64.exe -q -s http://mirror.internode.on.net
 setup-x86_64.exe -q -s http://mirrors.ustc.edu.cn/cygwin/
 
-C:/cygwin/setup-x86_64.exe  --no-shortcuts  --quiet-mode  --disable-buggy-antivirus   --packages wget,tar,libtool,re2c,bison,gcc-g++,autoconf,automake,openssl
+C:/cygwin/setup-x86_64.exe --no-shortcuts --quiet-mode --disable-buggy-antivirus --packages wget,tar,libtool,re2c,bison,gcc-g++,autoconf,automake,openssl
 exit 0
 
-./setup-x86_64.exe  --no-shortcuts  -q   -s http://mirrors.ustc.edu.cn/cygwin/   --packages     make
-
+./setup-x86_64.exe --no-shortcuts -q -s http://mirrors.ustc.edu.cn/cygwin/ --packages make
 
 #  安装apt-cyg 参考： https://zhuanlan.zhihu.com/p/66930502
 
 ## apt-cyg必要环境
 # base tar wget bzip2 gawk xz
 # curl -Lo apt-cyg rawgit.com/transcode-open/apt-cyg/master/apt-cyg
 
-lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg > apt-cyg
+lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg >apt-cyg
 install apt-cyg /bin
 apt-cyg --help
 
 # apt-cyg mirror https://mirrors.ustc.edu.cn/cygwin/
 
-apt-cyg install wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel libreadline-devel  libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils
-
+apt-cyg install wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel libreadline-devel libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils
diff --git a/sapi/scripts/cygwin/install-cygwin.sh b/sapi/scripts/cygwin/install-cygwin.sh
@@ -45,10 +45,10 @@ while [ $# -gt 0 ]; do
 done
 
 # setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  http://mirrors.ustc.edu.cn/cygwin/ --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils,openssl-devel,zip,unzip
-#setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  http://mirrors.ustc.edu.cn/cygwin/ --packages
+# setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  http://mirrors.ustc.edu.cn/cygwin/ --packages
 
 
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils,openssl-devel,zip,unzip
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages  zip unzip  icu libicu-devel
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages  libpq5 libpq-devel
+setup-x86_64.exe  --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils,openssl-devel,zip,unzip
+setup-x86_64.exe  --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages  zip unzip  icu libicu-devel
+setup-x86_64.exe  --quiet-mode --disable-buggy-antivirus    --site  $SITE --packages  libpq5 libpq-devel
 
diff --git a/sapi/src/builder/library/socat.php b/sapi/src/builder/library/socat.php
@@ -13,11 +13,11 @@
             ->withHomePage('http://www.dest-unreach.org/socat/')
             ->withLicense('http://www.dest-unreach.org/socat/doc/README', Library::LICENSE_GPL)
             //->withUrl('http://www.dest-unreach.org/socat/download/socat-1.7.4.4.tar.gz')
-            ->withFile('socat-1.8.0.0.tar.gz')
+            ->withFile('socat-1.8.0.1.tar.gz')
             ->withDownloadScript(
                 'socat',
                 <<<EOF
-                git clone -b tag-1.8.0.0	 https://repo.or.cz/socat.git
+                git clone -b tag-1.8.0.1	 https://repo.or.cz/socat.git
 EOF
             )
             ->withBuildCached(false)