Attachment #172549 for bug #211098

Lines 3-9 Link Here

(-)postsrsd/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= postsrsd	4	PORTNAME= postsrsd
5	PORTVERSION= 1.3	5	PORTVERSION= 1.3
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= mail	7	CATEGORIES= mail
8		8
9	MAINTAINER= ports@bsdserwis.com	9	MAINTAINER= ports@bsdserwis.com
Lines 31-36 Link Here
31		31
32	DOCS_CMAKE_ON= -DENABLE_DOCS:STRING="ON"	32	DOCS_CMAKE_ON= -DENABLE_DOCS:STRING="ON"
33		33
34	PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret	34	PLIST_FILES= sbin/postsrsd man/man8/postsrsd.8.gz
35		35
36	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)postsrsd/files/patch-postinstall.cmake.in (-4 / +9 lines)
1	--- postinstall.cmake.in.orig 2015-12-13 08:56:05 UTC	1	--- postinstall.cmake.in.orig 2015-12-13 09:56:05.000000000 +0100
2	+++ postinstall.cmake.in	2	+++ postinstall.cmake.in 2016-07-14 20:58:08.347539472 +0200
3	@@ -7,51 +7,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")	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 @@
4	set(SECRET_FILE "@PROJECT_NAME@.secret")	9	set(SECRET_FILE "@PROJECT_NAME@.secret")
5	set(DD "@DD@")	10	set(DD "@DD@")
6	set(BASE64_ENCODE "@BASE64_ENCODE@")	11	set(BASE64_ENCODE "@BASE64_ENCODE@")
Lines 53-59 Link Here
53	message(STATUS "Generating secret key")	58	message(STATUS "Generating secret key")
54	execute_process(	59	execute_process(
55	COMMAND ${DD} if=/dev/urandom bs=18 count=1	60	COMMAND ${DD} if=/dev/urandom bs=18 count=1
56	@@ -60,7 +22,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64	61	@@ -60,7 +21,7 @@
57	ERROR_QUIET	62	ERROR_QUIET
58	OUTPUT_STRIP_TRAILING_WHITESPACE	63	OUTPUT_STRIP_TRAILING_WHITESPACE
59	)	64	)




# 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}"
    postsrsd_secret="-s ${postsrsd_secret}"
fi
if [ "x${postsrsd_forward_port}" != "x" ];then
    postsrsd_forward_port="-f ${postsrsd_forward_port}"
fi
if [ "x${postsrsd_reverse_port}" != "x" ];then
    postsrsd_reverse_port="-r ${postsrsd_reverse_port}"
fi
if [ "x${postsrsd_idle_timeout}" != "x" ];then
    postsrsd_idle_timeout="-t ${postsrsd_idle_timeout}"
fi
if [ "x${postsrsd_exclude_domains}" != "x" ];then
    postsrsd_exclude_domains="-X${postsrsd_exclude_domains}"
fi

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

postsrsd_prepcmd ()
{

    if [ -n "${postsrsd_uid}" ] ; then
	chown ${postsrsd_uid} ${_piddir}
    fi
    if [ ! -f "${postsrsd_secret}" ] ; then
	tr -cd "[:alnum:]" < /dev/urandom | head -c 24 > "${postsrsd_secret}"
    fi
}

postsrsd_postcmd()

Return to bug 211098

Lines 52-80 Link Here

(-)postsrsd/files/postsrsd.in (-22 / +11 lines)
52	# Options other than above can be set with $postsrsd_flags.	52	# Options other than above can be set with $postsrsd_flags.
53	# see postsrsd documentation for detail.	53	# see postsrsd documentation for detail.
54		54
55	if [ "x${postsrsd_uid}" != "x" ];then	55	[ -n "${postsrsd_uid}" ] && _uid_prefix="-u"
56	_uid_prefix="-u"	56	[ -n "${postsrsd_domain}" ] && cmd_args="-d ${postsrsd_domain}"
57	fi	57	[ -n "${postsrsd_secret}" ] && cmd_args="${cmd_args} -s ${postsrsd_secret}"
58	if [ "x${postsrsd_domain}" != "x" ];then	58	[ -n "${postsrsd_forward_port}" ] && cmd_args="${cmd_args} -f ${postsrsd_forward_port}"
59	postsrsd_domain="-d ${postsrsd_domain}"	59	[ -n "${postsrsd_reverse_port}" ] && cmd_args="${cmd_args} -r ${postsrsd_reverse_port}"
60	fi	60	[ -n "${postsrsd_idle_timeout}" ] && cmd_args="${cmd_args} -t ${postsrsd_idle_timeout}"
61	if [ "x${postsrsd_secret}" != "x" ];then	61	[ -n "${postsrsd_exclude_domains}" ] && cmd_args="${cmd_args} -X${postsrsd_exclude_domains}"
62	postsrsd_secret="-s ${postsrsd_secret}"
63	fi
64	if [ "x${postsrsd_forward_port}" != "x" ];then
65	postsrsd_forward_port="-f ${postsrsd_forward_port}"
66	fi
67	if [ "x${postsrsd_reverse_port}" != "x" ];then
68	postsrsd_reverse_port="-r ${postsrsd_reverse_port}"
69	fi
70	if [ "x${postsrsd_idle_timeout}" != "x" ];then
71	postsrsd_idle_timeout="-t ${postsrsd_idle_timeout}"
72	fi
73	if [ "x${postsrsd_exclude_domains}" != "x" ];then
74	postsrsd_exclude_domains="-X${postsrsd_exclude_domains}"
75	fi
76		62
77	command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${postsrsd_domain} ${postsrsd_secret} ${postsrsd_forward_port} ${postsrsd_reverse_port} ${postsrsd_idle_timeout} ${postsrsd_exclude_domains} ${postsrsd_flags}"	63	command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${cmd_args} ${postsrsd_flags}"
78		64
79	postsrsd_prepcmd ()	65	postsrsd_prepcmd ()
80	{	66	{
Lines 84-89 Link Here
84	if [ -n "${postsrsd_uid}" ] ; then	70	if [ -n "${postsrsd_uid}" ] ; then
85	chown ${postsrsd_uid} ${_piddir}	71	chown ${postsrsd_uid} ${_piddir}
86	fi	72	fi
		73	if [ ! -f "${postsrsd_secret}" ] ; then
		74	tr -cd "[:alnum:]" < /dev/urandom \| head -c 24 > "${postsrsd_secret}"
		75	fi
87	}	76	}
88		77
89	postsrsd_postcmd()	78	postsrsd_postcmd()