Merge f45544138d into fe647b81c2

HISTORY

@@ -1,4 +1,7 @@
 
+Version 6.12.2  2024-09-16
+ * use libfastcommon V1.75 and libserverframe 1.2.5
+
 Version 6.12.1  2024-03-06
  * adapt to libserverframe 1.2.3
  * bugfixed: notify_leader_changed support IPv6 correctly

INSTALL

@@ -11,7 +11,7 @@ Chinese language: http://www.fastken.com/
 # command lines as:
 
    git clone https://github.com/happyfish100/libfastcommon.git
-   cd libfastcommon; git checkout V1.0.73
+   cd libfastcommon; git checkout V1.0.75
    ./make.sh clean && ./make.sh && ./make.sh install
 
 
@@ -21,7 +21,7 @@ Chinese language: http://www.fastken.com/
 # command lines as:
 
    git clone https://github.com/happyfish100/libserverframe.git
-   cd libserverframe; git checkout V1.2.3
+   cd libserverframe; git checkout V1.2.5
    ./make.sh clean && ./make.sh && ./make.sh install
 
 # step 3. download fastdfs source codes and install it, 
@@ -30,7 +30,7 @@ Chinese language: http://www.fastken.com/
 # command lines as:
 
    git clone https://github.com/happyfish100/fastdfs.git
-   cd fastdfs; git checkout V6.12.1
+   cd fastdfs; git checkout V6.12.2
    ./make.sh clean && ./make.sh && ./make.sh install
 
 

common/fdfs_global.c

@@ -20,7 +20,7 @@
 #include "fastcommon/logger.h"
 #include "fdfs_global.h"
 
-Version g_fdfs_version = {6, 12, 1};
+Version g_fdfs_version = {6, 12, 2};
 bool g_use_connection_pool = false;
 ConnectionPool g_connection_pool;
 int g_connection_pool_max_idle_time = 3600;

fastdfs.spec

@@ -7,7 +7,7 @@
 %define CommitVersion %(echo $COMMIT_VERSION)
 
 Name: %{FastDFS}
-Version: 6.12.1
+Version: 6.12.2
 Release: 1%{?dist}
 Summary: FastDFS server and client
 License: GPL
@@ -16,7 +16,7 @@ URL: 	https://github.com/happyfish100/fastdfs/
 Source: https://github.com/happyfish100/fastdfs/%{name}-%{version}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: libserverframe-devel >= 1.2.3
+BuildRequires: libserverframe-devel >= 1.2.5
 Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id
 Requires: %{FDFSServer} = %{version}-%{release}
 Requires: %{FDFSTool} = %{version}-%{release}
@@ -26,7 +26,7 @@ This package provides tracker & storage of fastdfs
 commit version: %{CommitVersion}
 
 %package -n %{FDFSServer}
-Requires: libserverframe >= 1.2.3
+Requires: libserverframe >= 1.2.5
 Requires: %{FDFSConfig}
 Summary: fastdfs tracker & storage
 
@@ -35,7 +35,7 @@ Requires: %{FDFSClient}
 Summary: fastdfs tools
 
 %package -n %{FDFSClient}
-Requires: libserverframe >= 1.2.3
+Requires: libserverframe >= 1.2.5
 Requires: %{FDFSConfig}
 Summary: The client dynamic library of fastdfs
 

make.sh

@@ -60,7 +60,11 @@ if [ "$uname" = "Linux" ]; then
   fi
   CFLAGS="$CFLAGS"
 elif [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then
-  LIBS="$LIBS -L/usr/lib"
+  if [ $OS_BITS -eq 64 ]; then
+    LIBS="$LIBS -L/usr/lib64"
+  else
+    LIBS="$LIBS -L/usr/lib"
+  fi
   CFLAGS="$CFLAGS"
   if [ "$uname" = "Darwin" ]; then
     CFLAGS="$CFLAGS -DDARWIN"