--- CMakeLists.txt.orig 2026-08-12 08:28:49 UTC +++ CMakeLists.txt @@ -42,7 +42,7 @@ set(POSTSRSD_DATADIR "The default directory where PostSRSd should look for configuration files" ) set(POSTSRSD_DATADIR - "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/${PROJECT_NAME}" + "/var/db/${PROJECT_NAME}" CACHE PATH "The default directory where PostSRSd should put runtime data" ) set(POSTSRSD_CHROOTDIR @@ -66,6 +66,8 @@ add_feature_info(WITH_REDIS WITH_REDIS "use Redis as d OFF ) add_feature_info(WITH_REDIS WITH_REDIS "use Redis as database backend") +set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") +option(MK_CHROOT_DIR "Chroot jail for daemon" OFF) option(WITH_SECCOMP "Enable additional sandboxing with seccomp" OFF) add_feature_info( WITH_SECCOMP WITH_SECCOMP "use seccomp for additional sandboxing" @@ -90,13 +92,13 @@ option(EXECUTABLE_WITH_ASAN "Build PostSRSd executable option(EXECUTABLE_WITH_ASAN "Build PostSRSd executable with AddressSanitizer" OFF ) -option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" ON) +option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" OFF) add_feature_info( GENERATE_SRS_SECRET GENERATE_SRS_SECRET "generate missing ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME}.secret on install" ) -option(INSTALL_SYSTEMD_SERVICE "Install the systemd postsrsd.service unit" ON) +option(INSTALL_SYSTEMD_SERVICE "Install the systemd postsrsd.service unit" OFF) add_feature_info( INSTALL_SYSTEMD_SERVICE INSTALL_SYSTEMD_SERVICE "install the systemd postsrsd.service unit" @@ -108,11 +110,6 @@ add_feature_info( INSTALL_SYSTEMD_SYSUSERS DO_INSTALL_SYSTEMD_SYSUSERS "instruct systemd to create the PostSRSd user \"${POSTSRSD_USER}\"" ) -find_systemd_unit_destination(DETECTED_SYSTEMD_UNITDIR) -set(SYSTEMD_UNITDIR - "${DETECTED_SYSTEMD_UNITDIR}" - CACHE PATH "Install destination for the systemd postsrsd.service unit" -) find_systemd_sysusers_destination(DETECTED_SYSTEMD_SYSUSERSDIR) set(SYSTEMD_SYSUSERSDIR "${DETECTED_SYSTEMD_SYSUSERSDIR}" @@ -303,6 +300,7 @@ if(WITH_REDIS) DIRECTORY "${hiredis_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL TRUE ) endif() + find_package(Hiredis REQUIRED) if(TARGET hiredis::hiredis_static) set(HIREDIS_TARGET hiredis::hiredis_static) elseif(TARGET hiredis::hiredis) @@ -342,11 +340,7 @@ if(WITH_SECCOMP) endif() if(WITH_SECCOMP) - add_autotools_dependency( - seccomp - LIBRARY_NAME seccomp - EXPORTED_TARGET seccomp::seccomp - ) +find_package(Confuse REQUIRED) endif() configure_file( @@ -422,10 +416,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_N DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}" ) -if(INSTALL_SYSTEMD_SERVICE) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service" - DESTINATION "${SYSTEMD_UNITDIR}" - ) +if(ENABLE_DOCS) + install(FILES README.rst CHANGELOG.rst doc/postsrsd.conf DESTINATION "${DOC_DIR}" ) endif() if(INSTALL_SYSTEMD_SYSUSERS AND NOT POSTSRSD_USER STREQUAL "nobody") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sysusers.d/${PROJECT_NAME}.conf"