diff --git a/0001-fix-compile-error-with-SFGlobalVariables.patch b/0001-fix-compile-error-with-SFGlobalVariables.patch new file mode 100644 index 0000000000000000000000000000000000000000..fca3734fd6fe9bbb8acd2efc4832d70f4ada1075 --- /dev/null +++ b/0001-fix-compile-error-with-SFGlobalVariables.patch @@ -0,0 +1,80 @@ +From ff2aef1735572f1a653dba3e36728d1e14fdfba4 Mon Sep 17 00:00:00 2001 +From: YuQing <384681@qq.com> +Date: Mon, 26 Feb 2024 22:13:21 +0800 +Subject: [PATCH] adapt to libserverframe 1.2.3 +--- + storage/storage_func.c | 8 ++++---- + tracker/tracker_func.c | 2 +- + tracker/tracker_service.c | 6 +++--- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/storage/storage_func.c b/storage/storage_func.c +index 1a1bea6..2435b6e 100644 +--- a/storage/storage_func.c ++++ b/storage/storage_func.c +@@ -1508,7 +1508,7 @@ int storage_func_init(const char *filename) + SF_SET_CONTEXT_INI_CONFIG_EX(config, fc_comm_type_sock, filename, + &iniContext, NULL, FDFS_STORAGE_SERVER_DEF_PORT, + FDFS_STORAGE_SERVER_DEF_PORT, DEFAULT_WORK_THREADS, +- "buff_size"); ++ "buff_size", 0); + if ((result=sf_load_config_ex("storaged", &config, fixed_buffer_size, + task_buffer_extra_size, need_set_run_by)) != 0) + { +@@ -1668,12 +1668,12 @@ int storage_func_init(const char *filename) + (g_sync_end_time.hour == 23 && \ + g_sync_end_time.minute == 59)); + +- if (g_sf_global_vars.min_buff_size < sizeof(TrackerHeader) + +- TRUNK_BINLOG_BUFFER_SIZE) ++ if (g_sf_global_vars.net_buffer_cfg.min_buff_size < ++ sizeof(TrackerHeader) + TRUNK_BINLOG_BUFFER_SIZE) + { + logError("file: "__FILE__", line: %d, " + "item \"buff_size\" is too small, value: %d < %d!", +- __LINE__, g_sf_global_vars.min_buff_size, ++ __LINE__, g_sf_global_vars.net_buffer_cfg.min_buff_size, + (int)sizeof(TrackerHeader) + TRUNK_BINLOG_BUFFER_SIZE); + result = EINVAL; + break; +diff --git a/tracker/tracker_func.c b/tracker/tracker_func.c +index 4c0d04b..0f30413 100644 +--- a/tracker/tracker_func.c ++++ b/tracker/tracker_func.c +@@ -191,7 +191,7 @@ int tracker_load_from_conf_file(const char *filename) + SF_SET_CONTEXT_INI_CONFIG_EX(config, fc_comm_type_sock, filename, + &iniContext, NULL, FDFS_TRACKER_SERVER_DEF_PORT, + FDFS_TRACKER_SERVER_DEF_PORT, DEFAULT_WORK_THREADS, +- "buff_size"); ++ "buff_size", 0); + if ((result=sf_load_config_ex("trackerd", &config, fixed_buffer_size, + task_buffer_extra_size, need_set_run_by)) != 0) + { +diff --git a/tracker/tracker_service.c b/tracker/tracker_service.c +index 0a541d5..d90328e 100644 +--- a/tracker/tracker_service.c ++++ b/tracker/tracker_service.c +@@ -2908,9 +2908,9 @@ static int tracker_deal_server_list_all_groups(struct fast_task_info *pTask) + + expect_size = sizeof(TrackerHeader) + g_groups.count * + sizeof(TrackerGroupStat); +- if (expect_size > g_sf_global_vars.min_buff_size) ++ if (expect_size > g_sf_global_vars.net_buffer_cfg.min_buff_size) + { +- if (expect_size <= g_sf_global_vars.max_buff_size) ++ if (expect_size <= g_sf_global_vars.net_buffer_cfg.max_buff_size) + { + if ((result=free_queue_set_send_buffer_size(pTask, expect_size)) != 0) + { +@@ -2926,7 +2926,7 @@ static int tracker_deal_server_list_all_groups(struct fast_task_info *pTask) + "you should increase max_buff_size in tracker.conf", + __LINE__, TRACKER_PROTO_CMD_SERVER_LIST_ALL_GROUPS, + pTask->client_ip, expect_size, +- g_sf_global_vars.max_buff_size); ++ g_sf_global_vars.net_buffer_cfg.max_buff_size); + pTask->send.ptr->length = sizeof(TrackerHeader); + return ENOSPC; + } +-- +2.27.0 + diff --git a/fastdfs.spec b/fastdfs.spec index f4df0c90e9a4c79d203e6bb1467bd362402edf6d..ae2e3e0673d687e155dce5a2e190733d398ce5a4 100644 --- a/fastdfs.spec +++ b/fastdfs.spec @@ -1,12 +1,14 @@ Name: fastdfs Version: 6.12.0 -Release: 1 +Release: 2 Summary: FastDFS server and client License: GPL3.0 Group: Arch/Tech URL: https://github.com/happyfish100/fastdfs Source: https://github.com/happyfish100/fastdfs/archive/V%{version}.tar.gz +Patch1: 0001-fix-compile-error-with-SFGlobalVariables.patch + Requires: gcc cmake BuildRequires: libfastcommon-devel >= 1.0.66 BuildRequires: libserverframe-devel >= 1.2.1 @@ -110,6 +112,9 @@ rm -rf %{buildroot} %config(noreplace) /etc/fdfs/*.conf %changelog +* Fri Jun 21 2024 zhangyaqi - 6.12.0-2 +- fix compile error with SFGlobalVariables + * Mon Feb 26 2024 liweigang - 6.12.0-1 - update to version 6.12.0