Attachment 172549 Details for Bug 211098 – newer patch with bigger changes in rc script

[patch] newer patch with bigger changes in rc script

postsrsd_20160715.patch (text/plain), 3.72 KB, created by Miroslav Lachman on 2016-07-15 09:31:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2016-07-15 09:31:43 UTC

Size: 3.72 KB

patch

obsolete

>diff -r -u3 postsrsd.orig/Makefile postsrsd/Makefile
>--- postsrsd.orig/Makefile	2016-07-14 20:48:56.708741693 +0200
>+++ postsrsd/Makefile	2016-07-14 21:00:02.764533667 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	postsrsd
> PORTVERSION=	1.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail
> 
> MAINTAINER=	ports@bsdserwis.com
>@@ -31,6 +31,6 @@
> 
> DOCS_CMAKE_ON=	-DENABLE_DOCS:STRING="ON"
> 
>-PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz etc/postsrsd.secret
>+PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz
> 
> .include <bsd.port.mk>
>diff -r -u3 postsrsd.orig/files/patch-postinstall.cmake.in postsrsd/files/patch-postinstall.cmake.in
>--- postsrsd.orig/files/patch-postinstall.cmake.in	2016-07-14 20:48:56.710578268 +0200
>+++ postsrsd/files/patch-postinstall.cmake.in	2016-07-14 20:59:24.697535737 +0200
>@@ -1,6 +1,11 @@
>---- postinstall.cmake.in.orig	2015-12-13 08:56:05 UTC
>-+++ postinstall.cmake.in
>-@@ -7,51 +7,13 @@ set(INIT_FLAVOR "@INIT_FLAVOR@")
>+--- postinstall.cmake.in.orig	2015-12-13 09:56:05.000000000 +0100
>++++ postinstall.cmake.in	2016-07-14 20:58:08.347539472 +0200
>+@@ -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(SECRET_FILE "@PROJECT_NAME@.secret")
>  set(DD "@DD@")
>  set(BASE64_ENCODE "@BASE64_ENCODE@")
>@@ -53,7 +58,7 @@
>  	message(STATUS "Generating secret key")
>  	execute_process(
>  		COMMAND ${DD} if=/dev/urandom bs=18 count=1
>-@@ -60,7 +22,7 @@ if(GENERATE_SRS_SECRET AND DD AND BASE64
>+@@ -60,7 +21,7 @@
>  		ERROR_QUIET
>  		OUTPUT_STRIP_TRAILING_WHITESPACE
>  	)
>diff -r -u3 postsrsd.orig/files/postsrsd.in postsrsd/files/postsrsd.in
>--- postsrsd.orig/files/postsrsd.in	2016-07-14 20:48:56.709577460 +0200
>+++ postsrsd/files/postsrsd.in	2016-07-15 11:14:16.513271808 +0200
>@@ -52,29 +52,15 @@
> # Options other than above can be set with $postsrsd_flags.
> # see postsrsd documentation for detail.
> 
>-if [ "x${postsrsd_uid}" != "x" ];then
>-    _uid_prefix="-u"
>-fi
>-if [ "x${postsrsd_domain}" != "x" ];then
>-    postsrsd_domain="-d ${postsrsd_domain}"
>-fi
>-if [ "x${postsrsd_secret}" != "x" ];then
>-    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
>+[ -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} ${postsrsd_domain} ${postsrsd_secret} ${postsrsd_forward_port} ${postsrsd_reverse_port} ${postsrsd_idle_timeout} ${postsrsd_exclude_domains} ${postsrsd_flags}"
>+command_args=" -D ${_uid_prefix} ${postsrsd_uid} -p ${pidfile} ${cmd_args} ${postsrsd_flags}"
> 
> postsrsd_prepcmd ()
> {
>@@ -84,6 +70,9 @@
>     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()

Flags:

ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 211098: 172531 | 172549