gfwleak/tango-kni
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整打包脚本

Browse Source 
* 安装之前停止sapp
  * 增加noreplace配置
  * 增加debuginfo包
  * 移除sapp.toml, conflist.inf, project_list.conf
This commit is contained in:
崔一鸣
2019-09-23 17:07:14 +08:00
parent 7a6616ed5d
commit b0bbde41b0
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -21,4 +21,4 @@ add_subdirectory(vendor)
add_subdirectory(common)
add_subdirectory(entry)
# cmake -DCMAKE_BUILD_TYPE=Debug
# cmake -DCMAKE_BUILD_TYPE=Debug/RelWithDebInfo

16
cmake/Package.cmake
View File

@@ -9,8 +9,8 @@ message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
set(CPACK_PACKAGE_VENDOR "MESASOFT")
set(CPACK_PACKAGE_VERSION_MAJOR "${KNI_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${KNI_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${KNI_VERSION_PATCH}-${KNI_DESCRIBE}")
set(CMAKE_INSTALL_PREFIX "/opt/tsg/kni")
set(CPACK_PACKAGE_VERSION_PATCH "${KNI_VERSION_PATCH}.${KNI_DESCRIBE}")
set(CMAKE_INSTALL_PREFIX "/home/mesasoft/sapp_run")
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
# RPM Build
@@ -19,16 +19,16 @@ set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
#set(CPACK_RPM_DEBUGINFO_PACKAGE on)
set(CPACK_RPM_DEBUGINFO_PACKAGE on)
set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
#set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
install(FILES build/entry/libkni.so DESTINATION ./plug/business/kni)
install(FILES vendor/http.so DESTINATION ./plug/protocol/http)
install(FILES conf/sapp/sapp.toml conf/sapp/project_list.conf
conf/sapp/gdev/gdev.conf DESTINATION ./etc)
install(FILES conf/sapp/conflist.inf DESTINATION ./plug)
install(FILES conf/sapp/gdev/gdev.conf DESTINATION ./etc)
install(FILES conf/sapp/http/http.conf DESTINATION ./conf/http)
install(FILES conf/sapp/http/http.inf DESTINATION ./plug/protocol/http)
install(FILES conf/sapp/kni/kni.inf DESTINATION ./plug/business/kni)
@@ -43,6 +43,6 @@ else()
endif()
# setup %config(noreplace)
#set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/pangu/pangu_pxy.conf"
# "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/kni/kni.conf")
set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/gdev.conf"
"%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/kni/kni.conf")
include(CPack)

1
cmake/PreInstall.in Normal file
View File

@@ -0,0 +1 @@
systemctl stop sapp

4
entry/src/kni_maat.cpp
View File

@@ -184,8 +184,8 @@ error_out:
static int index_of_enforce_policy(struct Maat_rule_t* result, size_t size)
{
size_t i = 0;
int biggest_intercept_policy_id = -1, ret_intercept_idx;
int biggest_bypass_policy_id = -1, ret_bypass_idx;
int biggest_intercept_policy_id = -1, ret_intercept_idx = -1;
int biggest_bypass_policy_id = -1, ret_bypass_idx = -1;
for(i = 0; i < size; i++)
{
if((unsigned char)result[i].action == KNI_ACTION_BYPASS)