From 257b0bcbb9ad5e26754259ce27560983d5c416c0 Mon Sep 17 00:00:00 2001 From: zhengshuxin Date: Wed, 8 Mar 2023 11:51:17 +0800 Subject: [PATCH] Release acl 3.6.1-0 version --- Makefile | 2 +- lib_acl/lib_acl.rc | 6 +++--- lib_acl/lib_acl_vc2017.rc | 8 ++++---- lib_acl/lib_acl_vc2019.rc | 8 ++++---- lib_acl/src/init/acl_init.c | 2 +- lib_acl_cpp/lib_acl_cpp_vc2003.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2008.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2010.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2012.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2013.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2015.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2017.rc | 8 ++++---- lib_acl_cpp/lib_acl_cpp_vc2019.rc | 8 ++++---- packaging/acl-libs.spec | 9 +++++++-- 14 files changed, 52 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index cedc60162..52b5b1378 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ endif ############################################################################## .PHONY = check help all_lib all samples all clean install uninstall uninstall_all build_one -VERSION = 3.6.0-4 +VERSION = 3.6.1-0 default: build_one acl_master help h: diff --git a/lib_acl/lib_acl.rc b/lib_acl/lib_acl.rc index 6099fb2ec..6ac54a5a5 100644 --- a/lib_acl/lib_acl.rc +++ b/lib_acl/lib_acl.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,3 - PRODUCTVERSION 3,6,0,3 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -75,7 +75,7 @@ BEGIN VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 0, 3" + VALUE "ProductVersion", "3, 6, 1, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2017.rc b/lib_acl/lib_acl_vc2017.rc index 7ab7bbbb1..9a62cec80 100644 --- a/lib_acl/lib_acl_vc2017.rc +++ b/lib_acl/lib_acl_vc2017.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,3 - PRODUCTVERSION 3,6,0,3 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.0.3" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl" VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 0, 3" + VALUE "ProductVersion", "3, 6, 1, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/lib_acl_vc2019.rc b/lib_acl/lib_acl_vc2019.rc index 7ab7bbbb1..9a62cec80 100644 --- a/lib_acl/lib_acl_vc2019.rc +++ b/lib_acl/lib_acl_vc2019.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,3 - PRODUCTVERSION 3,6,0,3 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "Comments", "本库为跨平台的C库，包括了网络通讯，服务器框架等功能" VALUE "FileDescription", "acl 库" - VALUE "FileVersion", "3.6.0.3" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl" VALUE "LegalCopyright", "zsx (C) 2022" VALUE "OriginalFilename", "lib_acl.lib" VALUE "ProductName", " acl 库" - VALUE "ProductVersion", "3, 6, 0, 3" + VALUE "ProductVersion", "3, 6, 1, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl/src/init/acl_init.c b/lib_acl/src/init/acl_init.c index 51bc6faa0..477ddec43 100644 --- a/lib_acl/src/init/acl_init.c +++ b/lib_acl/src/init/acl_init.c @@ -25,7 +25,7 @@ #include "init.h" -static char *version = "3.6.0-4 20230129-16:42"; +static char *version = "3.6.1-0 20230308-11:45"; const char *acl_version(void) { diff --git a/lib_acl_cpp/lib_acl_cpp_vc2003.rc b/lib_acl_cpp/lib_acl_cpp_vc2003.rc index 99c4a7ecf..b09a6a369 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2003.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2003.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "zsx" VALUE "FileDescription", "acl_cpp 库" - VALUE "FileVersion", "3, 6, 0, 0" + VALUE "FileVersion", "3, 6, 1, 0" VALUE "InternalName", "lib_acl_" VALUE "LegalCopyright", "acl_cpp (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", "acl_cpp 库" - VALUE "ProductVersion", "3, 6, 0, 0" + VALUE "ProductVersion", "3, 6, 1, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2008.rc b/lib_acl_cpp/lib_acl_cpp_vc2008.rc index bfa8505c8..0386a0cf1 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2008.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2008.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "zsx" VALUE "FileDescription", "acl_cpp 库" - VALUE "FileVersion", "3, 6, 0, 0" + VALUE "FileVersion", "3, 6, 1, 0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "acl_cpp (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", "acl_cpp 库" - VALUE "ProductVersion", "3, 6, 0, 0" + VALUE "ProductVersion", "3, 6, 1, 0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2010.rc b/lib_acl_cpp/lib_acl_cpp_vc2010.rc index a1b267238..f0ee4f0ed 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2010.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2010.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2012.rc b/lib_acl_cpp/lib_acl_cpp_vc2012.rc index 11573794a..0c8d1586c 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2012.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2012.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2013.rc b/lib_acl_cpp/lib_acl_cpp_vc2013.rc index 16cd6dc3d..9f2015add 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2013.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2013.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2015.rc b/lib_acl_cpp/lib_acl_cpp_vc2015.rc index 7c60fcdf9..2ac596809 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2015.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2015.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2017.rc b/lib_acl_cpp/lib_acl_cpp_vc2017.rc index 46475eff8..ae7b65b36 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2017.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2017.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/lib_acl_cpp/lib_acl_cpp_vc2019.rc b/lib_acl_cpp/lib_acl_cpp_vc2019.rc index ce7710609..15beaad2c 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2019.rc +++ b/lib_acl_cpp/lib_acl_cpp_vc2019.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "通用的C++库" VALUE "CompanyName", "zsx" VALUE "FileDescription", "lib_acl_cpp 库" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "lib_acl_cpp" VALUE "LegalCopyright", "版权所有 (C) 2022" VALUE "OriginalFilename", "lib_acl_cpp.lib" VALUE "ProductName", " lib_acl_cpp 库" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" diff --git a/packaging/acl-libs.spec b/packaging/acl-libs.spec index 4efb00815..0de244d71 100644 --- a/packaging/acl-libs.spec +++ b/packaging/acl-libs.spec @@ -1,8 +1,8 @@ -%define release_id 4 +%define release_id 0 Summary: The powerful c/c++ library Name: acl-libs -Version: 3.6.0 +Version: 3.6.1 Release: %{release_id} Group: System/Libs License: IBM @@ -45,6 +45,11 @@ rm -rf %{buildroot} %changelog +* Wed Mar 08 2023 shuxin.zheng shuxin.zheng@qq.com 3.6.1-0-20230308.11 +- feature: SSL module in acl including Openssl and MbedTLS supports multiple certificates in server side. +- feature: support MbedTLS 3.3.0 version. +- optimize: optimize memory usage. + * Thu Jan 19 2023 shuxin.zheng shuxin.zheng@qq.com 3.6.0-4-20230119.15 - feature: add fiber's stack backtrace - feature: add fiber mutex dead lock checking