Attachment #244580 for bug #273002




PORTNAME=	postsrsd
PORTVERSION=	2.0.8
PORTEPOCH=	1
CATEGORIES=	mail

MAINTAINER=	ports@bsdserwis.com
COMMENT=	Postfix Sender Rewriting Scheme daemon
WWW=		https://github.com/roehling/postsrsd

LICENSE=	BSD3CLAUSE GPLv3+
LICENSE_COMB=	dual

LIB_DEPENDS=	libconfuse.so:devel/libconfuse

USES=		cmake cpe pkgconfig
USE_LDCONFIG=	yes

CPE_VENDOR=	${PORTNAME}_project

USE_GITHUB=	yes
GH_ACCOUNT=	roehling
USE_RC_SUBR=	${PORTNAME}

OPTIONS_DEFINE=	DOCS REDIS SQLITE

DOCS_CMAKE_BOOL=	ENABLE_DOCS

REDIS_DESC=		Store envelope senders in redis
REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
REDIS_CMAKE_BOOL=	WITH_REDIS

SQLITE_DESC=	Use sqlite3 backebd for storing envelope senders
SQLITE_USES=	sqlite
SQLITE_CMAKE_BOOL=	WITH_SQLITE

CMAKE_ARGS=	--no-warn-unused-cli \
		-DBUILD_TESTING=OFF \
		-DCMAKE_BUILD_TYPE=Release \
		-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS \
		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
		-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"

SUB_FILES=	pkg-message
		sbin/postsrsd

PLIST_FILES=	\
		sbin/postsrsd \
		"@dir /var/db/${PORTNAME}"

PORTDOCS=	README.rst CHANGELOG.rst postsrsd.conf

DOCS_CMAKE_BOOL=	ENABLE_DOCS

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/mail/postsrsd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488207086	1	TIMESTAMP = 1693511528
2	SHA256 (roehling-postsrsd-1.10_GH0.tar.gz) = 4880bf12f1a75791f10a995e46a7fce26ee760d1d6942b4602244d2026d4e64a	2	SHA256 (roehling-postsrsd-2.0.8_GH0.tar.gz) = c2eb4af90ce42ec394adf7b9b94f700b851e3a6a6a8a2a843a57dc9f45260f8e
3	SIZE (roehling-postsrsd-1.10_GH0.tar.gz) = 34844	3	SIZE (roehling-postsrsd-2.0.8_GH0.tar.gz) = 64185




--- CMakeLists.txt.orig	2023-08-25 21:10:07 UTC
+++ CMakeLists.txt
@@ -49,7 +49,7 @@ set(POSTSRSD_CONFIGDIR
         "The default directory where PostSRSd should look for configuration files"
 )
 set(POSTSRSD_DATADIR
-    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/${PROJECT_NAME}"
+    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/db/${PROJECT_NAME}"
     CACHE PATH "The default directory where PostSRSd should put runtime data"
 )
 set(POSTSRSD_CHROOTDIR
@@ -73,24 +73,21 @@ option(WITH_REDIS
        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(TESTS_WITH_ASAN "Run test suite with AddressSanitizer" ON)
 option(DEVELOPER_BUILD "Add strict compiler options for development only" 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"
 )
-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}"
@@ -118,7 +115,6 @@ mark_as_advanced(
     TESTS_WITH_ASAN
     GENERATE_SRS_SECRET
     DEVELOPER_BUILD
-    SYSTEMD_UNITDIR
     POSTSRSD_CONFIGDIR
     POSTSRSD_CHROOTDIR
     POSTSRSD_DATADIR
@@ -200,11 +196,7 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 find_package(Threads QUIET)
-        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_definitions(-DPOSTSRSD_VERSION=\"${PROJECT_VERSION}\")
 add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)
 
@@ -95,16 +79,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
 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}.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(init/${PROJECT_NAME}-systemd-launcher.in ${PROJECT_NAME}-systemd-launcher @ONLY)
 
-add_autotools_dependency(
-    Confuse
-    LIBRARY_NAME confuse
-    EXPORTED_TARGET Confuse::Confuse
-)
+find_package(Confuse REQUIRED)
 
 if(WITH_REDIS)
     set(DISABLE_TESTS
@@ -221,6 +213,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)
@@ -364,13 +357,9 @@ install(TARGETS postsrsd RUNTIME DESTINATION ${CMAKE_I
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.conf"
         DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}"
 )
-if(INSTALL_SYSTEMD_SERVICE)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service"
-            DESTINATION "${SYSTEMD_UNITDIR}"
-    )
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sysusers.d/${PROJECT_NAME}.conf"
-            DESTINATION "${SYSTEMD_SYSUSERSDIR}"
-    )
+
+if(ENABLE_DOCS)
+       install(FILES README.rst CHANGELOG.rst doc/postsrsd.conf DESTINATION "${DOC_DIR}" )
 endif()
 
 if(GENERATE_SRS_SECRET)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-systemd-launcher DESTINATION "share/${PROJECT_NAME}")
+if(ENABLE_DOCS)
+	install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
+endif()
 install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
 install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")




--- postinstall.cmake.in.orig	2015-12-13 08:56:05 UTC
+++ postinstall.cmake.in
@@ -1,4 +1,3 @@
-set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
 set(SYSCONF_DIR "@SYSCONF_DIR@")
 set(SYSD_UNIT_DIR "@SYSD_UNIT_DIR@")
 set(CHROOT_DIR "@CHROOT_DIR@")
@@ -7,51 +6,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")
 set(SECRET_FILE "@PROJECT_NAME@.secret")
 set(DD "@DD@")
 set(BASE64_ENCODE "@BASE64_ENCODE@")
-set(INSSERV "@INSSERV@")
-set(CHKCONFIG "@CHKCONFIG@")
 
 if(CHROOT_DIR AND NOT EXISTS "$ENV{DESTDIR}${CHROOT_DIR}")
 	message(STATUS "Chroot jail: $ENV{DESTDIR}${CHROOT_DIR}")
 	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
 endif()
 
-if(INIT_FLAVOR)
-	if (NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
-		file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")
-	else()
-		file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@.new")
-		message(STATUS "")
-		message(STATUS "*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*")
-		message(STATUS "*!* ${CONFIG_DIR}/@PROJECT_NAME@ will NOT be overwritten!")
-		message(STATUS "*!* Please note the changes from @PROJECT_NAME@.new in the same folder and")
-		message(STATUS "*!* update your configuration accordinly.")
-		message(STATUS "*!* See also README_UPGRADE.md for details")
-		message(STATUS "*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*")
-		message(STATUS "")
-	endif()
-endif()
-
-if(INIT_FLAVOR STREQUAL "sysv-lsb")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
-	if(INSSERV)
-		execute_process(
-			COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@
-		)
-	endif()
-elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
-	if(CHKCONFIG AND NOT "$ENV{DESTDIR}")
-		execute_process(
-			COMMAND ${CHKCONFIG} --add @PROJECT_NAME@
-		)
-	endif()
-elseif(INIT_FLAVOR STREQUAL "upstart")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf")
-elseif(INIT_FLAVOR STREQUAL "systemd")
-	file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSD_UNIT_DIR}" RENAME "@PROJECT_NAME@.service")
-endif()
-
-if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}${SYSCONF_DIR}/${SECRET_FILE}")
+if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom")
 	message(STATUS "Generating secret key")
 	execute_process(
 		COMMAND ${DD} if=/dev/urandom bs=18 count=1
@@ -60,7 +21,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64
 		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${CONFIG_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
 file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
 endif()
 

Added Link Here

(-)b/mail/postsrsd/files/patch-src_config.c (+10 lines)
1	--- src/config.c.orig 2023-07-15 18:53:41 UTC
2	+++ src/config.c
3	@@ -21,6 +21,7 @@
4	#include "util.h"
5
6	#include <errno.h>
7	+#include <getopt.h>
8	#include <stdio.h>
9	#include <stdlib.h>
10	#include <string.h>

Added Link Here

(-)b/mail/postsrsd/files/patch-src_srs.c (+10 lines)
1	--- src/srs.c.orig 2023-07-15 18:53:41 UTC
2	+++ src/srs.c
3	@@ -21,6 +21,7 @@
4
5	#include <ctype.h>
6	#include <string.h>
7	+#include <strings.h>
8
9	char* postsrsd_forward(const char* addr, const char* domain, srs_t* srs,
10	database_t* db, domain_set_t* local_domains, bool* error,

Added Link Here

(-)b/mail/postsrsd/files/pkg-message.in (+11 lines)
1	[
2	{ type: install
3	message: <<EOM
4	If you upgrading from postsrsd 1.x you should remember to check
5	and modify postsrsd.conf file. postsrsd dropped support for command line
6	parameters.
7	Additional setup instructions and sample config file can be found at:
8	%%DOCSDIR%%
9	EOM
10	}
11	]




# postsrsd_enable (bool):   Set to "NO" by default.
#                           Set it to "YES" to enable postsrsd.
# postsrsd_uid (str):       Set username to run postsrsd.
# postsrsd_secret (str):    Secret file file. See postsrsd(8)
# postsrsd_domain (str):    Local domain name: rewrite to originate from this domain
# postsrsd_exclude_domains (str):      Domains to exclude (comma-separated list)
# postsrsd_forward_port (int): Port to listen for forward map
# postsrsd_reverse_port (int): Port to listen for reverse map
# postsrsd_idle_timeout (int): Timeout for idle client connection
# postsrsd_flags (str):     Flags passed to start command.

. /etc/rc.subr

# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
: ${postsrsd_enable="NO"}
: ${postsrsd_domain=`/bin/hostname`}
: ${postsrsd_uid="mailnull"}
: ${postsrsd_secret="%%PREFIX%%/etc/postsrsd.secret"}
: ${postsrsd_forward_port="10001"}
: ${postsrsd_reverse_port="10002"}
: ${postsrsd_idle_timeout="1800"}
: ${postsrsd_exclude_domains=""}

# Options other than above can be set with $postsrsd_flags.
# see postsrsd documentation for detail.

[ -n "${postsrsd_uid}" ] && _uid_prefix="-u"
[ -n "${postsrsd_domain}" ] && cmd_args="-d ${postsrsd_domain}"
[ -n "${postsrsd_secret}" ] && cmd_args="${cmd_args} -s ${postsrsd_secret}"
[ -n "${postsrsd_forward_port}" ] && cmd_args="${cmd_args} -f ${postsrsd_forward_port}"
[ -n "${postsrsd_reverse_port}" ] && cmd_args="${cmd_args} -r ${postsrsd_reverse_port}"
[ -n "${postsrsd_idle_timeout}" ] && cmd_args="${cmd_args} -t ${postsrsd_idle_timeout}"
[ -n "${postsrsd_exclude_domains}" ] && cmd_args="${cmd_args} -X${postsrsd_exclude_domains}"

command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${cmd_args} ${postsrsd_flags}"


Return to bug 273002

Lines 1-35 Link Here

(-)b/mail/postsrsd/Makefile (-11 / +26 lines)
1	PORTNAME= postsrsd	1	PORTNAME= postsrsd
2	DISTVERSION= 1.10	2	PORTVERSION= 2.0.8
3	PORTEPOCH= 1
4	CATEGORIES= mail	3	CATEGORIES= mail
5		4
6	MAINTAINER= ports@bsdserwis.com	5	MAINTAINER= ports@bsdserwis.com
7	COMMENT= Postfix Sender Rewriting Scheme daemon	6	COMMENT= Postfix Sender Rewriting Scheme daemon
8	WWW= https://github.com/roehling/postsrsd	7	WWW= https://github.com/roehling/postsrsd
9		8
10	LICENSE= GPLv2+	9	LICENSE= BSD3CLAUSE GPLv3+
11	LICENSE_FILE= ${WRKSRC}/LICENSE	10	LICENSE_COMB= dual
12		11
13	BUILD_DEPENDS= help2man:misc/help2man	12	LIB_DEPENDS= libconfuse.so:devel/libconfuse
14		13
15	USES= cmake cpe pkgconfig	14	USES= cmake cpe pkgconfig
		15	USE_LDCONFIG= yes
		16
16	CPE_VENDOR= ${PORTNAME}_project	17	CPE_VENDOR= ${PORTNAME}_project
17		18
18	USE_GITHUB= yes	19	USE_GITHUB= yes
19	GH_ACCOUNT= roehling	20	GH_ACCOUNT= roehling
20	USE_RC_SUBR= ${PORTNAME}	21	USE_RC_SUBR= ${PORTNAME}
21		22
		23	OPTIONS_DEFINE= DOCS REDIS SQLITE
		24
		25	DOCS_CMAKE_BOOL= ENABLE_DOCS
		26
		27	REDIS_DESC= Store envelope senders in redis
		28	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
		29	REDIS_CMAKE_BOOL= WITH_REDIS
		30
		31	SQLITE_DESC= Use sqlite3 backebd for storing envelope senders
		32	SQLITE_USES= sqlite
		33	SQLITE_CMAKE_BOOL= WITH_SQLITE
		34
22	CMAKE_ARGS= --no-warn-unused-cli \	35	CMAKE_ARGS= --no-warn-unused-cli \
		36	-DBUILD_TESTING=OFF \
		37	-DCMAKE_BUILD_TYPE=Release \
		38	-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS \
23	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \	39	-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
24	-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"	40	-DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib"
25		41
26	PLIST_FILES= man/man8/postsrsd.8.gz \	42	SUB_FILES= pkg-message
27	sbin/postsrsd
28		43
29	PORTDOCS= README.md README_UPGRADE.md main.cf.ex	44	PLIST_FILES= \
		45	sbin/postsrsd \
		46	"@dir /var/db/${PORTNAME}"
30		47
31	OPTIONS_DEFINE= DOCS	48	PORTDOCS= README.rst CHANGELOG.rst postsrsd.conf
32
33	DOCS_CMAKE_BOOL= ENABLE_DOCS
34		49
35	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-88 Link Here

(-)b/mail/postsrsd/files/patch-CMakeLists.txt (-81 / +79 lines)
1	--- CMakeLists.txt.orig 2020-12-12 09:55:17 UTC	1	--- CMakeLists.txt.orig 2023-08-25 21:10:07 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -7,12 +7,15 @@ include(CTest)	3	@@ -49,7 +49,7 @@ set(POSTSRSD_CONFIGDIR
4		4	"The default directory where PostSRSd should look for configuration files"
5	option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON)	5	)
6	option(USE_APPARMOR "Enable AppArmor profile" OFF)	6	set(POSTSRSD_DATADIR
		7	- "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/${PROJECT_NAME}"
		8	+ "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/db/${PROJECT_NAME}"
		9	CACHE PATH "The default directory where PostSRSd should put runtime data"
		10	)
		11	set(POSTSRSD_CHROOTDIR
		12	@@ -73,24 +73,21 @@ option(WITH_REDIS
		13	OFF
		14	)
		15	add_feature_info(WITH_REDIS WITH_REDIS "use Redis as database backend")
		16	+set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files")
7	+option(MK_CHROOT_DIR "Chroot jail for daemon" OFF)	17	+option(MK_CHROOT_DIR "Chroot jail for daemon" OFF)
8	option(USE_SELINUX "Enable SELinux policy module" OFF)	18	option(TESTS_WITH_ASAN "Run test suite with AddressSanitizer" ON)
9		19	option(DEVELOPER_BUILD "Add strict compiler options for development only" OFF)
10	+if(MK_CHROOT_DIR)	20	-option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" ON)
11	set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")	21	+option(GENERATE_SRS_SECRET "Generate and install a postsrsd.secret" OFF)
12	+endif()	22	add_feature_info(
13	set(SYSCONF_DIR "/etc" CACHE PATH "Global system configuration folder")	23	GENERATE_SRS_SECRET
14	set(SYSD_UNIT_DIR "${SYSCONF_DIR}/systemd/system" CACHE PATH "Systemd unit file folder")	24	GENERATE_SRS_SECRET
15	-set(CONFIG_DIR "${SYSCONF_DIR}/default" CACHE PATH "Location of startup configuration file")	25	"generate missing ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME}.secret on install"
16	+set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Location of startup configuration file")	26	)
17	set(DOC_DIR "share/doc/${PROJECT_NAME}" CACHE PATH "Path for documentation files")	27	-option(INSTALL_SYSTEMD_SERVICE "Install the systemd postsrsd.service unit" ON)
18	mark_as_advanced(CHROOT_DIR SYSCONF_DIR SYSD_UNIT_DIR CONFIG_DIR DOC_DIR)	28	+option(INSTALL_SYSTEMD_SERVICE "Install the systemd postsrsd.service unit" OFF)
19		29	add_feature_info(
20	@@ -20,8 +23,6 @@ find_program(HELP2MAN help2man DOC "path to help2man e	30	INSTALL_SYSTEMD_SERVICE INSTALL_SYSTEMD_SERVICE
21	find_program(DD dd DOC "path to dd executable")	31	"install the systemd postsrsd.service unit"
22	find_program(BASE64 base64 DOC "path to base64 executable")	32	)
23	find_program(OPENSSL openssl DOC "path to OpenSSL executable")	33	-find_systemd_unit_destination(DETECTED_SYSTEMD_UNITDIR)
24	-find_program(INSSERV insserv DOC "path to insserv executable")	34	-set(SYSTEMD_UNITDIR
25	-find_program(CHKCONFIG chkconfig DOC "path to chkconfig executable")	35	- "${DETECTED_SYSTEMD_UNITDIR}"
26	find_program(SYSTEMCTL systemctl DOC "path to systemctl executable")	36	- CACHE PATH "Install destination for the systemd postsrsd.service unit"
27		37	-)
28	if(CMAKE_SYSTEM_NAME MATCHES "SunOS")	38	find_systemd_sysusers_destination(DETECTED_SYSTEMD_SYSUSERSDIR)
29	@@ -69,23 +70,6 @@ endif()	39	set(SYSTEMD_SYSUSERSDIR
30	check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)	40	"${DETECTED_SYSTEMD_SYSUSERSDIR}"
31	add_definitions(-DSIZEOF_UNSIGNED_LONG=${SIZEOF_UNSIGNED_LONG})	41	@@ -118,7 +115,6 @@ mark_as_advanced(
32		42	TESTS_WITH_ASAN
33	-if(NOT DEFINED INIT_FLAVOR)	43	GENERATE_SRS_SECRET
34	- if(SYSTEMCTL)	44	DEVELOPER_BUILD
35	- message(STATUS "Detected init flavor: systemd")	45	- SYSTEMD_UNITDIR
36	- set(INIT_FLAVOR "systemd" CACHE STRING "Init daemon of this system")	46	POSTSRSD_CONFIGDIR
37	- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "${SYSCONF_DIR}/init.d/functions")	47	POSTSRSD_CHROOTDIR
38	- message(STATUS "Detected init flavor: sysv-redhat")	48	POSTSRSD_DATADIR
39	- set(INIT_FLAVOR "sysv-redhat" CACHE STRING "Init daemon of this system")	49	@@ -200,11 +196,7 @@ endif()
40	- elseif(IS_DIRECTORY "${SYSCONF_DIR}/init.d" AND EXISTS "/lib/lsb/init-functions")	50	set(THREADS_PREFER_PTHREAD_FLAG TRUE)
41	- message(STATUS "Detected init flavor: sysv-lsb")	51	find_package(Threads QUIET)
42	- set(INIT_FLAVOR "sysv-lsb" CACHE STRING "Init daemon of this system")
43	- else()
44	- message(STATUS "Detected init flavor: none")
45	- message(STATUS "System startup files will not be installed")
46	- set(INIT_FLAVOR "" CACHE STRING "Init daemon of this system")
47	- endif()
48	-endif()
49	-
50	add_definitions(-DPOSTSRSD_VERSION=\"${PROJECT_VERSION}\")
51	add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)
52
53	@@ -95,16 +79,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
54	endif()
55
56	set(POSTSRSD "${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
57	-set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
58	-string(REGEX REPLACE "^/+" "" APPARMOR_PROFILE "${APPARMOR_PROFILE}")
59	-string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
60
61	-configure_file(init/${PROJECT_NAME}.sysv-lsb.in ${PROJECT_NAME}.sysv-lsb @ONLY)
62	-configure_file(init/${PROJECT_NAME}.sysv-redhat.in ${PROJECT_NAME}.sysv-redhat @ONLY)
63	-configure_file(init/${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
64	-configure_file(init/${PROJECT_NAME}.systemd.in ${PROJECT_NAME}.systemd @ONLY)
65	configure_file(init/${PROJECT_NAME}.default.in ${PROJECT_NAME}.default @ONLY)
66	-configure_file(init/${PROJECT_NAME}-systemd-launcher.in ${PROJECT_NAME}-systemd-launcher @ONLY)
67		52
68	configure_file(postinstall.cmake.in postinstall.cmake @ONLY)	53	-add_autotools_dependency(
		54	- Confuse
		55	- LIBRARY_NAME confuse
		56	- EXPORTED_TARGET Confuse::Confuse
		57	-)
		58	+find_package(Confuse REQUIRED)
69		59
70	@@ -118,7 +94,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD	60	if(WITH_REDIS)
71	COMMAND ${HELP2MAN} ARGS -s8 -o${PROJECT_NAME}.8 -n "Postfix Sender Rewriting Scheme daemon" -N -h-h -v-v ${CMAKE_CURRENT_BINARY_DIR}/${POSTSRSD}	61	set(DISABLE_TESTS
72	VERBATIM	62	@@ -221,6 +213,7 @@ if(WITH_REDIS)
		63	DIRECTORY "${hiredis_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL TRUE
		64	)
		65	endif()
		66	+ find_package(Hiredis REQUIRED)
		67	if(TARGET hiredis::hiredis_static)
		68	set(HIREDIS_TARGET hiredis::hiredis_static)
		69	elseif(TARGET hiredis::hiredis)
		70	@@ -364,13 +357,9 @@ install(TARGETS postsrsd RUNTIME DESTINATION ${CMAKE_I
		71	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.conf"
		72	DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${PROJECT_NAME}"
73	)	73	)
74	-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "share/man/man8")	74	-if(INSTALL_SYSTEMD_SERVICE)
75	+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "man/man8")	75	- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.service"
76	endif()	76	- DESTINATION "${SYSTEMD_UNITDIR}"
77		77	- )
78	if(USE_APPARMOR)	78	- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sysusers.d/${PROJECT_NAME}.conf"
79	@@ -135,6 +111,8 @@ if(USE_SELINUX)	79	- DESTINATION "${SYSTEMD_SYSUSERSDIR}"
		80	- )
		81	+
		82	+if(ENABLE_DOCS)
		83	+ install(FILES README.rst CHANGELOG.rst doc/postsrsd.conf DESTINATION "${DOC_DIR}" )
80	endif()	84	endif()
81		85
82	install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")	86	if(GENERATE_SRS_SECRET)
83	-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-systemd-launcher DESTINATION "share/${PROJECT_NAME}")
84	+if(ENABLE_DOCS)
85	+ install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
86	+endif()
87	install(FILES README.md README_UPGRADE.md main.cf.ex DESTINATION "${DOC_DIR}")
88	install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")

Removed Link Here

(-)a/mail/postsrsd/files/patch-postinstall.cmake.in (-69 lines)
1	--- postinstall.cmake.in.orig 2015-12-13 08:56:05 UTC
2	+++ postinstall.cmake.in
3	@@ -1,4 +1,3 @@
4	-set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
5	set(SYSCONF_DIR "@SYSCONF_DIR@")
6	set(SYSD_UNIT_DIR "@SYSD_UNIT_DIR@")
7	set(CHROOT_DIR "@CHROOT_DIR@")
8	@@ -7,51 +6,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")
9	set(SECRET_FILE "@PROJECT_NAME@.secret")
10	set(DD "@DD@")
11	set(BASE64_ENCODE "@BASE64_ENCODE@")
12	-set(INSSERV "@INSSERV@")
13	-set(CHKCONFIG "@CHKCONFIG@")
14
15	if(CHROOT_DIR AND NOT EXISTS "$ENV{DESTDIR}${CHROOT_DIR}")
16	message(STATUS "Chroot jail: $ENV{DESTDIR}${CHROOT_DIR}")
17	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
18	endif()
19
20	-if(INIT_FLAVOR)
21	- if (NOT EXISTS "$ENV{DESTDIR}${CONFIG_DIR}/@PROJECT_NAME@")
22	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@")
23	- else()
24	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.default" DESTINATION "${CONFIG_DIR}" RENAME "@PROJECT_NAME@.new")
25	- message(STATUS "")
26	- message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*")
27	- message(STATUS "! ${CONFIG_DIR}/@PROJECT_NAME@ will NOT be overwritten!")
28	- message(STATUS "! Please note the changes from @PROJECT_NAME@.new in the same folder and")
29	- message(STATUS "! update your configuration accordinly.")
30	- message(STATUS "! See also README_UPGRADE.md for details")
31	- message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*")
32	- message(STATUS "")
33	- endif()
34	-endif()
35	-
36	-if(INIT_FLAVOR STREQUAL "sysv-lsb")
37	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-lsb" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
38	- if(INSSERV)
39	- execute_process(
40	- COMMAND ${INSSERV} -p "$ENV{DESTDIR}${SYSCONF_DIR}/init.d" @PROJECT_NAME@
41	- )
42	- endif()
43	-elseif(INIT_FLAVOR STREQUAL "sysv-redhat")
44	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.sysv-redhat" TYPE PROGRAM DESTINATION "${SYSCONF_DIR}/init.d" RENAME "@PROJECT_NAME@")
45	- if(CHKCONFIG AND NOT "$ENV{DESTDIR}")
46	- execute_process(
47	- COMMAND ${CHKCONFIG} --add @PROJECT_NAME@
48	- )
49	- endif()
50	-elseif(INIT_FLAVOR STREQUAL "upstart")
51	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.upstart" DESTINATION "${SYSCONF_DIR}/init" RENAME "@PROJECT_NAME@.conf")
52	-elseif(INIT_FLAVOR STREQUAL "systemd")
53	- file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@.systemd" DESTINATION "${SYSD_UNIT_DIR}" RENAME "@PROJECT_NAME@.service")
54	-endif()
55	-
56	-if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom" AND NOT EXISTS "$ENV{DESTDIR}${SYSCONF_DIR}/${SECRET_FILE}")
57	+if(GENERATE_SRS_SECRET AND DD AND BASE64_ENCODE AND EXISTS "/dev/urandom")
58	message(STATUS "Generating secret key")
59	execute_process(
60	COMMAND ${DD} if=/dev/urandom bs=18 count=1
61	@@ -60,7 +21,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64
62	ERROR_QUIET
63	OUTPUT_STRIP_TRAILING_WHITESPACE
64	)
65	-file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${SYSCONF_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
66	+file(INSTALL FILES "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}" DESTINATION "${CONFIG_DIR}" RENAME "${SECRET_FILE}" PERMISSIONS OWNER_READ OWNER_WRITE)
67	file(REMOVE "@CMAKE_CURRENT_BINARY_DIR@/${SECRET_FILE}")
68	endif()
69

Lines 13-24 Link Here

(-)b/mail/postsrsd/files/postsrsd.in (-18 lines)
13	# postsrsd_enable (bool): Set to "NO" by default.	13	# postsrsd_enable (bool): Set to "NO" by default.
14	# Set it to "YES" to enable postsrsd.	14	# Set it to "YES" to enable postsrsd.
15	# postsrsd_uid (str): Set username to run postsrsd.	15	# postsrsd_uid (str): Set username to run postsrsd.
16	# postsrsd_secret (str): Secret file file. See postsrsd(8)
17	# postsrsd_domain (str): Local domain name: rewrite to originate from this domain
18	# postsrsd_exclude_domains (str): Domains to exclude (comma-separated list)
19	# postsrsd_forward_port (int): Port to listen for forward map
20	# postsrsd_reverse_port (int): Port to listen for reverse map
21	# postsrsd_idle_timeout (int): Timeout for idle client connection
22	# postsrsd_flags (str): Flags passed to start command.	16	# postsrsd_flags (str): Flags passed to start command.
23		17
24	. /etc/rc.subr	18	. /etc/rc.subr
Lines 38-61 load_rc_config $name Link Here
38	# DO NOT CHANGE THESE DEFAULT VALUES HERE	32	# DO NOT CHANGE THESE DEFAULT VALUES HERE
39	#	33	#
40	: ${postsrsd_enable="NO"}	34	: ${postsrsd_enable="NO"}
41	: ${postsrsd_domain=`/bin/hostname`}
42	: ${postsrsd_uid="mailnull"}	35	: ${postsrsd_uid="mailnull"}
43	: ${postsrsd_secret="%%PREFIX%%/etc/postsrsd.secret"}
44	: ${postsrsd_forward_port="10001"}
45	: ${postsrsd_reverse_port="10002"}
46	: ${postsrsd_idle_timeout="1800"}
47	: ${postsrsd_exclude_domains=""}
48		36
49	# Options other than above can be set with $postsrsd_flags.	37	# Options other than above can be set with $postsrsd_flags.
50	# see postsrsd documentation for detail.	38	# see postsrsd documentation for detail.
51		39
52	[ -n "${postsrsd_uid}" ] && _uid_prefix="-u"	40	[ -n "${postsrsd_uid}" ] && _uid_prefix="-u"
53	[ -n "${postsrsd_domain}" ] && cmd_args="-d ${postsrsd_domain}"
54	[ -n "${postsrsd_secret}" ] && cmd_args="${cmd_args} -s ${postsrsd_secret}"
55	[ -n "${postsrsd_forward_port}" ] && cmd_args="${cmd_args} -f ${postsrsd_forward_port}"
56	[ -n "${postsrsd_reverse_port}" ] && cmd_args="${cmd_args} -r ${postsrsd_reverse_port}"
57	[ -n "${postsrsd_idle_timeout}" ] && cmd_args="${cmd_args} -t ${postsrsd_idle_timeout}"
58	[ -n "${postsrsd_exclude_domains}" ] && cmd_args="${cmd_args} -X${postsrsd_exclude_domains}"
59		41
60	command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${cmd_args} ${postsrsd_flags}"	42	command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${cmd_args} ${postsrsd_flags}"
61		43