From b6640f930c717dba010b311b6237c04532e07772 Mon Sep 17 00:00:00 2001 From: dabao1955 Date: Tue, 31 Dec 2024 23:37:22 +0800 Subject: [PATCH] ruri: new, 3.8 Signed-off-by: dabao1955 --- app-admin/ruri/autobuild/defines | 5 + .../patches/0001-Add-CMakeLists.txt.patch | 237 ++++++++++++++++++ app-admin/ruri/spec | 4 + 3 files changed, 246 insertions(+) create mode 100644 app-admin/ruri/autobuild/defines create mode 100644 app-admin/ruri/autobuild/patches/0001-Add-CMakeLists.txt.patch create mode 100644 app-admin/ruri/spec diff --git a/app-admin/ruri/autobuild/defines b/app-admin/ruri/autobuild/defines new file mode 100644 index 00000000000..48c7e532cc7 --- /dev/null +++ b/app-admin/ruri/autobuild/defines @@ -0,0 +1,5 @@ +PKGNAME=ruri + PKGSEC=admin + PKGDEP="libcap libseccomp" + PKGDES="A self-contained Linux container implementation" + ABTYPE=cmake diff --git a/app-admin/ruri/autobuild/patches/0001-Add-CMakeLists.txt.patch b/app-admin/ruri/autobuild/patches/0001-Add-CMakeLists.txt.patch new file mode 100644 index 00000000000..3f860e45b6d --- /dev/null +++ b/app-admin/ruri/autobuild/patches/0001-Add-CMakeLists.txt.patch @@ -0,0 +1,237 @@ +From 6397a80b2cf9da3330c32819758ec8027b642034 Mon Sep 17 00:00:00 2001 +From: dabao1955 +Date: Tue, 31 Dec 2024 10:43:59 +0800 +Subject: [PATCH] Add CMakeLists.txt + +--- + CMakeLists.txt | 207 ++++++++++++++++++++++++++++++++++++++++++++++ + test/check_flag.c | 3 + + 2 files changed, 210 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 test/check_flag.c + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..14f0feb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,207 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++# set the project name ++project(ruri LANGUAGES C) ++ ++# 检查头文件 ++include(CheckIncludeFile) ++ ++execute_process( ++ COMMAND date "+%Y-%m-%d" ++ OUTPUT_VARIABLE CMAKE_CURRENT_DATE ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++) ++ ++execute_process( ++ COMMAND date "+%H:%M:%S" ++ OUTPUT_VARIABLE CMAKE_CURRENT_TIME ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++) ++ ++add_definitions(-DBUILD_DATE="${CMAKE_CURRENT_DATE}") ++add_definitions(-DBUILD_TIME="${CMAKE_CURRENT_TIME}") ++ ++find_program(CCACHE_FOUND ccache) ++if(CCACHE_FOUND) ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) ++ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) ++ message(STATUS "Using ccache: ${CCACHE_FOUND}") ++else() ++ message(STATUS "Ccache not found. Compiling with cache will be disabled.") ++endif(CCACHE_FOUND) ++ ++check_include_file("time.h" HAVE_TIME_H) ++check_include_file("grp.h" HAVE_GRP_H) ++check_include_file("fcntl.h" HAVE_FCNTL_H) ++check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H) ++check_include_file("sys/mount.h" HAVE_SYS_MOUNT_H) ++check_include_file("sys/socket.h" HAVE_SYS_SOCKET_H) ++check_include_file("linux/fs.h" HAVE_LINUX_FS_H) ++check_include_file("linux/version.h" HAVE_LINUX_VERSION_H) ++check_include_file("linux/sched.h" HAVE_LINUX_SCHED_H) ++check_include_file("sys/capability.h" HAVE_SYS_CAPABILITY_H) ++check_include_file("seccomp.h" HAVE_SECCOMP_H) ++check_include_file("pthread.h" HAVE_PTHREAD_H) ++ ++# 如果没有找到头文件，则抛出错误 ++if(NOT HAVE_TIME_H) ++ message(FATAL_ERROR "Missing required header: time.h") ++endif() ++if(NOT HAVE_GRP_H) ++ message(FATAL_ERROR "Missing required header: grp.h") ++endif() ++if(NOT HAVE_FCNTL_H) ++ message(FATAL_ERROR "Missing required header: fcntl.h") ++endif() ++if(NOT HAVE_SYS_IOCTL_H) ++ message(FATAL_ERROR "Missing required header: sys/ioctl.h") ++endif() ++if(NOT HAVE_SYS_MOUNT_H) ++ message(FATAL_ERROR "Missing required header: sys/mount.h") ++endif() ++if(NOT HAVE_SYS_SOCKET_H) ++ message(FATAL_ERROR "Missing required header: sys/socket.h") ++endif() ++if(NOT HAVE_LINUX_FS_H) ++ message(FATAL_ERROR "Missing required header: linux/fs.h") ++endif() ++if(NOT HAVE_LINUX_VERSION_H) ++ message(FATAL_ERROR "Missing required header: linux/version.h") ++endif() ++if(NOT HAVE_LINUX_SCHED_H) ++ message(FATAL_ERROR "Missing required header: linux/sched.h") ++endif() ++if(NOT HAVE_SYS_CAPABILITY_H) ++ message(FATAL_ERROR "Missing required header: sys/capability.h") ++endif() ++if(NOT HAVE_SECCOMP_H) ++ message(FATAL_ERROR "Missing required header: seccomp.h") ++endif() ++if(NOT HAVE_PTHREAD_H) ++ message(FATAL_ERROR "Missing required header: pthread.h") ++endif() ++ ++# 查找库 ++find_library(CAP_LIBRARY cap) ++find_library(SECCOMP_LIBRARY seccomp) ++find_library(PTHREAD_LIBRARY pthread) ++ ++# 检查每个库是否存在 ++if(NOT CAP_LIBRARY) ++ message(FATAL_ERROR "libcap is required") ++endif() ++ ++if(NOT SECCOMP_LIBRARY) ++ message(FATAL_ERROR "libseccomp is required") ++endif() ++ ++if(NOT PTHREAD_LIBRARY) ++ message(FATAL_ERROR "pthread is required") ++endif() ++ ++# 设置默认的 CFLAGS 和 LDFLAGS ++set(CFLAGS_LIST ++ "-flto=auto" ++ "-pie" ++ "-fstack-protector-all" ++ "-fdata-sections" ++ "-fno-omit-frame-pointer" ++ "-fno-stack-protector" ++ "-ftrivial-auto-var-init=pattern" ++ "-fstack-clash-protection" ++ "-Wno-unused-result" ++ "-mshstk" ++ "-ffunction-sections" ++ "-Wl,--gc-sections" ++ "-Wl,--strip-all" ++ "-Wl,--disable-new-dtags" ++ "-Wl,--build-id=sha1" ++ "-Wl,-z,norelro" ++ "-Wl,-z,execstack" ++ "-Wall" ++ "-Wextra" ++ "-Wconversion" ++ "-pedantic" ++ "-pipe" ++) ++ ++foreach(flag IN LISTS CFLAGS_LIST) ++ try_compile(result ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/test/check_flag.c COMPILE_DEFINITIONS ${flag}) ++ if(result) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") ++ message(STATUS "Compiler supports flag: ${flag}") ++ else() ++ message(WARNING "Compiler does not support flag: ${flag}") ++ endif() ++endforeach() ++ ++set(LDFLAGS "-Wl,-z,relro -Wl,-z,noexecstack -Wl,-z,now") ++ ++# 处理调试和静态链接构建选项 ++option(ENABLE_DEBUG "Enable debug build" OFF) ++option(ENABLE_STATIC "Enable static linking" OFF) ++option(BUILD_LIB "BUILD with lib" OFF) ++ ++# 根据调试选项修改 CFLAGS ++if(ENABLE_DEBUG) ++ message(WARNING "Warning: DEBUG mode is enabled") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -DDEBUG_BUILD -DRURI_DEBUG -DRURI_DEV") ++else() ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -DNDEBUG") ++endif() ++ ++# 根据静态链接选项修改 LDFLAGS ++if(ENABLE_STATIC) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") ++endif() ++ ++# 将 LDFLAGS 添加到链接器标志中 ++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LDFLAGS}") ++ ++execute_process( ++ COMMAND git rev-parse --short HEAD ++ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ++ OUTPUT_VARIABLE GIT_COMMIT_ID ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++) ++ ++add_definitions(-DRURI_COMMIT_ID="${GIT_COMMIT_ID}") ++ ++file(GLOB SOURCES ${CMAKE_SOURCE_DIR}/src/*.c ${CMAKE_SOURCE_DIR}/src/easteregg/*.c) ++ ++if (BUILD_LIB) ++ set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ add_library(ruri SHARED ${SOURCES}) ++ install (TARGETS ruri DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/usr/lib/) ++else () ++# add the executable ++ set(CMAKE_POSITION_INDEPENDENT_CODE OFF) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") ++ add_executable(ruri ${SOURCES}) ++ add_custom_command( ++ TARGET ruri ++ POST_BUILD ++ COMMAND strip ruri ++ VERBATIM ++ ) ++ install (TARGETS ruri DESTINATION /usr/bin/) ++endif() ++ ++# on linux clang 14 ++if (CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ if (ENABLE_STATIC) ++ target_link_libraries(ruri -lcap -lseccomp) ++ else() ++ find_library(LCAP cap) ++ find_library(LSECCOMP seccomp) ++ target_link_libraries(ruri ${LCAP} ${LSECCOMP}) ++ endif() ++endif() ++ ++add_custom_target( ++ tidy ++ COMMAND clang-tidy --checks=*,-clang-analyzer-security.insecureAPI.strcpy,-altera-unroll-loops,-cert-err33-c,-concurrency-mt-unsafe,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-readability-function-cognitive-complexity,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-bugprone-easily-swappable-parameters,-cert-err34-c,-misc-include-cleaner,-readability-identifier-length,-bugprone-signal-handler,-cert-msc54-cpp,-cert-sig30-c,-altera-id-dependent-backward-branch,-bugprone-suspicious-realloc-usage,-hicpp-signed-bitwise,-clang-analyzer-security.insecureAPI.UncheckedReturn --list-checks ${SOURCES} -- -lpthread -lseccomp -lcap -Wall -Wextra ++ COMMENT "Running tidy" ++ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ruri/src/ # Set correct path where main.go is located ++) +diff --git a/test/check_flag.c b/test/check_flag.c +new file mode 100644 +index 0000000..c30d8f1 +--- /dev/null ++++ b/test/check_flag.c +@@ -0,0 +1,3 @@ ++int main(){ ++ return 0; ++} +-- +2.39.5 + diff --git a/app-admin/ruri/spec b/app-admin/ruri/spec new file mode 100644 index 00000000000..7804ed2e39f --- /dev/null +++ b/app-admin/ruri/spec @@ -0,0 +1,4 @@ +VER=3.8 +SRCS="git::commit=tags/v$VER;copy-repo=true::https://github.com/Moe-Hacker/ruri" +CHKSUMS="SKIP" +CHKUPDATE="anitya::id=376165"