|
Lines 1-6
Link Here
|
| 1 |
--- CMakeLists.txt.orig 2019-01-11 15:10:33 UTC |
1 |
--- CMakeLists.txt.orig 2019-02-23 13:28:34 UTC |
| 2 |
+++ CMakeLists.txt |
2 |
+++ CMakeLists.txt |
| 3 |
@@ -9,12 +9,15 @@ include(CheckIncludeFile) |
3 |
@@ -6,12 +6,15 @@ include(TestBigEndian) |
| 4 |
|
4 |
|
| 5 |
option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON) |
5 |
option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON) |
| 6 |
option(USE_APPARMOR "Enable AppArmor profile" OFF) |
6 |
option(USE_APPARMOR "Enable AppArmor profile" OFF) |
|
Lines 17-37
Link Here
|
| 17 |
set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") |
17 |
set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") |
| 18 |
mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR) |
18 |
mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR) |
| 19 |
|
19 |
|
| 20 |
@@ -22,8 +25,6 @@ find_program(HELP2MAN help2man DOC "path |
20 |
@@ -19,8 +22,6 @@ find_program(HELP2MAN help2man DOC "path to help2man e |
| 21 |
find_program(DD dd DOC "path to dd executable") |
21 |
find_program(DD dd DOC "path to dd executable") |
| 22 |
find_program(BASE64 base64 DOC "path to base64 executable") |
22 |
find_program(BASE64 base64 DOC "path to base64 executable") |
| 23 |
find_program(OPENSSL openssl DOC "path to OpenSSL executable") |
23 |
find_program(OPENSSL openssl DOC "path to OpenSSL executable") |
| 24 |
-find_program(INSSERV insserv DOC "path to insserv executable") |
24 |
-find_program(INSSERV insserv DOC "path to insserv executable") |
| 25 |
-find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable") |
25 |
-find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable") |
|
|
26 |
find_program(SYSTEMD systemd) |
| 26 |
find_library(LIBSOCKET socket) |
27 |
find_library(LIBSOCKET socket) |
| 27 |
find_library(LIBNSL nsl) |
28 |
find_library(LIBNSL nsl) |
|
|
29 |
@@ -65,26 +66,6 @@ endif() |
| 30 |
check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) |
| 31 |
add_definitions(-DSIZEOF_UNSIGNED_LONG=${SIZEOF_UNSIGNED_LONG}) |
| 28 |
|
32 |
|
| 29 |
@@ -60,26 +61,6 @@ if(HAVE_SYS_TYPES_H) |
|
|
| 30 |
add_definitions(-DHAVE_SYS_TYPES_H) |
| 31 |
endif() |
| 32 |
|
| 33 |
-if(NOT DEFINED INIT_FLAVOR) |
33 |
-if(NOT DEFINED INIT_FLAVOR) |
| 34 |
- if(IS_DIRECTORY "${SYSD_UNIT_DIR}" AND EXISTS "/usr/lib/systemd/systemd") |
34 |
- if(SYSTEMD) |
| 35 |
- message(STATUS "Detected init flavor: systemd") |
35 |
- message(STATUS "Detected init flavor: systemd") |
| 36 |
- set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system") |
36 |
- set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system") |
| 37 |
- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init" AND EXISTS "/lib/init/upstart-job") |
37 |
- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init" AND EXISTS "/lib/init/upstart-job") |
|
Lines 53-62
Link Here
|
| 53 |
add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c) |
53 |
add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c) |
| 54 |
enable_testing() |
54 |
enable_testing() |
| 55 |
add_executable(${PROJECT_NAME}_tests tests.c sha1.c srs2.c) |
55 |
add_executable(${PROJECT_NAME}_tests tests.c sha1.c srs2.c) |
| 56 |
@@ -92,15 +73,7 @@ endif() |
56 |
@@ -95,15 +76,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") |
| 57 |
|
57 |
target_link_libraries(${PROJECT_NAME}_tests ${LIBSOCKET} ${LIBNSL}) |
| 58 |
get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION) |
58 |
endif() |
| 59 |
get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE) |
59 |
set(POSTSRSD "${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}") |
| 60 |
-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}") |
60 |
-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}") |
| 61 |
-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}") |
61 |
-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}") |
| 62 |
-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}") |
62 |
-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}") |
|
Lines 69-75
Link Here
|
| 69 |
configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY) |
69 |
configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY) |
| 70 |
|
70 |
|
| 71 |
configure_file(postinstall.cmake.in postinstall.cmake @ONLY) |
71 |
configure_file(postinstall.cmake.in postinstall.cmake @ONLY) |
| 72 |
@@ -110,7 +83,7 @@ add_custom_command(TARGET ${PROJECT_NAME |
72 |
@@ -113,7 +86,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD |
| 73 |
COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD} |
73 |
COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD} |
| 74 |
VERBATIM |
74 |
VERBATIM |
| 75 |
) |
75 |
) |
|
Lines 78-84
Link Here
|
| 78 |
endif() |
78 |
endif() |
| 79 |
|
79 |
|
| 80 |
if(USE_APPARMOR) |
80 |
if(USE_APPARMOR) |
| 81 |
@@ -127,6 +100,8 @@ if(USE_SELINUX) |
81 |
@@ -130,6 +103,8 @@ if(USE_SELINUX) |
| 82 |
endif() |
82 |
endif() |
| 83 |
|
83 |
|
| 84 |
install(TARGETS ${PROJECT_NAME} DESTINATION "sbin") |
84 |
install(TARGETS ${PROJECT_NAME} DESTINATION "sbin") |