From 836cdf4f9cda114405bab3469f69e5591cdde836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Mare=C5=A1?= Date: Fri, 3 Oct 2025 14:59:51 +0200 Subject: [PATCH 1/2] Debian: /etc/recodex/worker/config-1.yml should be a conffile --- CMakeLists.txt | 2 +- install/conffiles | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 install/conffiles diff --git a/CMakeLists.txt b/CMakeLists.txt index b030187..824b8f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,7 +301,7 @@ if(UNIX) set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/install/postinst") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Petr Stefan ") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") - set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/install/postinst;") + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/install/postinst;${CMAKE_CURRENT_SOURCE_DIR}/install/conffiles") set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${RECODEX_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${CPACK_RPM_PACKAGE_ARCHITECTURE}") elseif(MSVC) set(CPACK_GENERATOR "NSIS") diff --git a/install/conffiles b/install/conffiles new file mode 100644 index 0000000..0ffc4df --- /dev/null +++ b/install/conffiles @@ -0,0 +1 @@ +/etc/recodex/worker/config-1.yml From 610884d1c5e50fe96ffaddf87770d21eeabdfcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Mare=C5=A1?= Date: Fri, 3 Oct 2025 15:02:59 +0200 Subject: [PATCH 2/2] Fix a typo --- src/sandbox/isolate_sandbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sandbox/isolate_sandbox.cpp b/src/sandbox/isolate_sandbox.cpp index 81696e3..442d41b 100644 --- a/src/sandbox/isolate_sandbox.cpp +++ b/src/sandbox/isolate_sandbox.cpp @@ -111,7 +111,7 @@ void isolate_sandbox::isolate_init() logger_->debug("Initializing isolate..."); - // Create unnamend pipe + // Create unnamed pipe if (pipe(fd) == -1) { log_and_throw(logger_, "Cannot create pipe: ", strerror(errno)); } childpid = fork();