Index: head/mail/postsrsd/Makefile =================================================================== --- head/mail/postsrsd/Makefile (revision 533461) +++ head/mail/postsrsd/Makefile (revision 533462) @@ -1,34 +1,34 @@ # Created by: Krzysztof Stryjek # $FreeBSD$ PORTNAME= postsrsd -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= mail MAINTAINER= ports@bsdserwis.com COMMENT= Postfix Sender Rewriting Scheme daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= help2man:misc/help2man USES= cmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= roehling CMAKE_ARGS= --no-warn-unused-cli \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" USE_RC_SUBR= ${PORTNAME} PORTDOCS= README.md main.cf.ex README_UPGRADE.md OPTIONS_DEFINE= DOCS DOCS_CMAKE_BOOL= ENABLE_DOCS PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz .include Index: head/mail/postsrsd/distinfo =================================================================== --- head/mail/postsrsd/distinfo (revision 533461) +++ head/mail/postsrsd/distinfo (revision 533462) @@ -1,3 +1,3 @@ TIMESTAMP = 1488207086 -SHA256 (roehling-postsrsd-1.5_GH0.tar.gz) = 418e2d239cc4c70e4877f6c63ded7edb3e89a52147e59c702f49b6cb96c45b07 -SIZE (roehling-postsrsd-1.5_GH0.tar.gz) = 32019 +SHA256 (roehling-postsrsd-1.6_GH0.tar.gz) = c7db909ec0e326cc92b624d1776ce96acc8bc1637bae532c4bd981168118aa13 +SIZE (roehling-postsrsd-1.6_GH0.tar.gz) = 32111 Index: head/mail/postsrsd/files/patch-CMakeLists.txt =================================================================== --- head/mail/postsrsd/files/patch-CMakeLists.txt (revision 533461) +++ head/mail/postsrsd/files/patch-CMakeLists.txt (revision 533462) @@ -1,89 +1,89 @@ ---- CMakeLists.txt.orig 2019-01-11 15:10:33 UTC +--- CMakeLists.txt.orig 2019-02-23 13:28:34 UTC +++ CMakeLists.txt -@@ -9,12 +9,15 @@ include(CheckIncludeFile) +@@ -6,12 +6,15 @@ include(TestBigEndian) option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON) option(USE_APPARMOR "Enable AppArmor profile" OFF) +option(MK_CHROOT_DIR "Chroot jail for daemon" OFF) option(USE_SELINUX "Enable SELinux policy module" OFF) +if(MK_CHROOT_DIR) set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon") +endif() set(SYSCONF_DIR "/etc" CACHE PATH "Global system configuration folder") set(SYSD_UNIT_DIR "${SYSCONF_DIR}/systemd/system" CACHE PATH "Systemd unit file folder") -set(CONFIG_DIR "${SYSCONF_DIR}/default" CACHE PATH "Location of startup configuration file") +set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Location of startup configuration file") set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files") mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR) -@@ -22,8 +25,6 @@ find_program(HELP2MAN help2man DOC "path +@@ -19,8 +22,6 @@ find_program(HELP2MAN help2man DOC "path to help2man e find_program(DD dd DOC "path to dd executable") find_program(BASE64 base64 DOC "path to base64 executable") find_program(OPENSSL openssl DOC "path to OpenSSL executable") -find_program(INSSERV insserv DOC "path to insserv executable") -find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable") + find_program(SYSTEMD systemd) find_library(LIBSOCKET socket) find_library(LIBNSL nsl) +@@ -65,26 +66,6 @@ endif() + check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) + add_definitions(-DSIZEOF_UNSIGNED_LONG=${SIZEOF_UNSIGNED_LONG}) -@@ -60,26 +61,6 @@ if(HAVE_SYS_TYPES_H) - add_definitions(-DHAVE_SYS_TYPES_H) - endif() - -if(NOT DEFINED INIT_FLAVOR) -- if(IS_DIRECTORY "${SYSD_UNIT_DIR}" AND EXISTS "/usr/lib/systemd/systemd") +- if(SYSTEMD) - message(STATUS "Detected init flavor: systemd") - set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system") - elseif(IS_DIRECTORY "${SYSCONF_DIR}/init" AND EXISTS "/lib/init/upstart-job") - message(STATUS "Detected init flavor: upstart") - set(INIT_FLAVOR "upstart" CACHE STRING "Init daemon of this system") - elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "${SYSCONF_DIR}/init.d/functions") - message(STATUS "Detected init flavor: sysv-redhat") - set(INIT_FLAVOR "sysv-redhat" CACHE STRING "Init daemon of this system") - elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "/lib/lsb/init-functions") - message(STATUS "Detected init flavor: sysv-lsb") - set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system") - else() - message(STATUS "Detected init flavor: none") - message(STATUS "System startup files will not be installed") - set(INIT_FLAVOR "" CACHE STRING "Init daemon of this system") - endif() -endif() - add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c) enable_testing() add_executable(${PROJECT_NAME}_tests tests.c sha1.c srs2.c) -@@ -92,15 +73,7 @@ endif() - - get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION) - get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE) +@@ -95,15 +76,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + target_link_libraries(${PROJECT_NAME}_tests ${LIBSOCKET} ${LIBNSL}) + endif() + set(POSTSRSD "${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}") -set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}") -string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}") -string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}") -configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY) -configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY) -configure_file(init/${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY) -configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY) -configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY) configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY) configure_file(postinstall.cmake.in postinstall.cmake @ONLY) -@@ -110,7 +83,7 @@ add_custom_command(TARGET ${PROJECT_NAME +@@ -113,7 +86,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD} VERBATIM ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "share/man/man8") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "man/man8") endif() if(USE_APPARMOR) -@@ -127,6 +100,8 @@ if(USE_SELINUX) +@@ -130,6 +103,8 @@ if(USE_SELINUX) endif() install(TARGETS ${PROJECT_NAME} DESTINATION "sbin") +if(ENABLE_DOCS) install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}") +endif() install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")