From 3da99be30f5fb86a131368022e50e6fc464cebea Mon Sep 17 00:00:00 2001
From: rongxin <rongxin@api7.ai>
Date: Sat, 14 Dec 2024 08:56:23 +0800
Subject: [PATCH 1/3] chore: remove grpc client

---
 VERSION                 |  2 +-
 build-api7ee-runtime.sh | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/VERSION b/VERSION
index 314c3d717..ab679818c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.5
\ No newline at end of file
+1.1.6
\ No newline at end of file
diff --git a/build-api7ee-runtime.sh b/build-api7ee-runtime.sh
index 43d33c86d..6b5d19218 100755
--- a/build-api7ee-runtime.sh
+++ b/build-api7ee-runtime.sh
@@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
 apisix_nginx_module_ver="1.16.3"
 wasm_nginx_module_ver="0.6.5"
 lua_var_nginx_module_ver="v0.5.3"
-grpc_client_nginx_module_ver="v0.4.4"
 lua_resty_events_ver="0.2.0"
 
 
@@ -130,14 +129,6 @@ else
         lua-var-nginx-module-${lua_var_nginx_module_ver}
 fi
 
-if [ "$repo" == grpc-client-nginx-module ]; then
-    cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
-else
-    git clone --depth=1 -b $grpc_client_nginx_module_ver \
-        https://github.com/api7/grpc-client-nginx-module \
-        grpc-client-nginx-module-${grpc_client_nginx_module_ver}
-fi
-
 cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
 ./patch.sh ../openresty-${OPENRESTY_VERSION}
 cd ..
@@ -152,9 +143,6 @@ cd ..
 
 luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
 no_pool_patch=${no_pool_patch:-}
-# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
-# version of grpc-client-nginx-module
-grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
 
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
@@ -172,7 +160,7 @@ fi
 
 
 ./configure --prefix="$OR_PREFIX" \
-    --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
+    --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
     --with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
     $debug_args \
     --add-module=../mod_dubbo-${mod_dubbo_ver} \
@@ -182,7 +170,6 @@ fi
     --add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
     --add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
     --add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
-    --add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
     --add-module=../lua-resty-events-${lua_resty_events_ver} \
     --with-poll_module \
     --with-pcre-jit \
@@ -233,10 +220,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
 sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
 cd ..
 
-cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
-sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
-cd ..
-
 # package etcdctl
 ETCD_ARCH="amd64"
 ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}

From cc88a877de2ebf59e1ab36705ed93b12f23ab58e Mon Sep 17 00:00:00 2001
From: Nic <qianyong@api7.ai>
Date: Thu, 26 Dec 2024 11:31:40 +0800
Subject: [PATCH 2/3] update version

Signed-off-by: Nic <qianyong@api7.ai>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ab679818c..2bf1ca5f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.6
\ No newline at end of file
+1.1.7

From de90feaa05540642f9ba8f7670a5294d9156b54f Mon Sep 17 00:00:00 2001
From: Nic <qianyong@api7.ai>
Date: Sat, 28 Dec 2024 13:10:26 +0800
Subject: [PATCH 3/3] f

Signed-off-by: Nic <qianyong@api7.ai>
---
 build-api7ee-runtime.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build-api7ee-runtime.sh b/build-api7ee-runtime.sh
index 0202aacfc..e780bd8d2 100755
--- a/build-api7ee-runtime.sh
+++ b/build-api7ee-runtime.sh
@@ -210,6 +210,10 @@ fi
     $no_pool_patch \
     -j`nproc`
 
+# ref: https://github.com/api7/grpc-client-nginx-module/pull/34
+# After loading Go code from .so, the signalfd doesn't work anymore
+sed -i "s/#ifndef NGX_HTTP_LUA_HAVE_SIGNALFD/#ifdef NGX_HTTP_LUA_HAVE_SIGNALFD/" $(find -name 'ngx_auto_config.h')
+
 make -j`nproc`
 sudo make install
 cd ..