Attachment 91793 Details for Bug 129274 – dovecot.diff

[patch] dovecot.diff

dovecot.diff (text/plain; x-mac-type="0"; x-mac-creator="0"), 3.62 KB, created by Yarema on 2008-12-13 05:45:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2008-12-13 05:45:15 UTC

Size: 3.62 KB

patch

obsolete

>diff -u -r -N dovecot-1.1.7/Makefile dovecot/Makefile
>--- dovecot-1.1.7/Makefile	2008-11-29 03:38:53.000000000 -0500
>+++ dovecot/Makefile	2008-12-10 22:06:15.000000000 -0500
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	dovecot
> PORTVERSION=	1.1.7
>+PORTREVISION=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	http://www.dovecot.org/releases/1.1/
> 
>diff -u -r -N dovecot-1.1.7/files/dovecot.sh.in dovecot/files/dovecot.sh.in
>--- dovecot-1.1.7/files/dovecot.sh.in	2008-11-29 03:38:53.000000000 -0500
>+++ dovecot/files/dovecot.sh.in	2008-12-10 22:16:00.000000000 -0500
>@@ -20,31 +20,40 @@
> # read configuration and set defaults
> load_rc_config ${name}
> : ${dovecot_enable:="NO"}
>+: ${dovecot_config:="%%PREFIX%%/etc/${name}.conf"}
> 
> command="%%PREFIX%%/sbin/${name}"
>-command_args="-c ${dovecot_config:="%%PREFIX%%/etc/${name}.conf"}"
>-required_files="${dovecot_config}"
> start_precmd="start_precmd"
> stop_postcmd="stop_postcmd"
>-extra_commands="restart"
>-
>-base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
>-login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
>-login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
>-
>-pidfile="${base_dir}/master.pid"
>+restart_cmd="restart_cmd"
> 
> start_precmd()
> {	# Ensure runtime directories exist with correct permissions
>-	local gid
>-	gid=$(/usr/sbin/pw usershow -n "${login_user}" 2>/dev/null | /usr/bin/cut -d: -f4)
>+	local login_user login_gid
>+	login_user=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_user:/ { print $2 }')
>+	login_gid=$(/usr/sbin/pw usershow -n "${login_user}" 2>/dev/null | /usr/bin/cut -d: -f4)
> 	/usr/bin/install -o root -g wheel -m 0755 -d ${base_dir}
>-	/usr/bin/install -o root -g ${gid} -m 0750 -d ${login_dir}
>+	/usr/bin/install -o root -g ${login_gid} -m 0750 -d ${login_dir}
> }
> 
> stop_postcmd()
> {	# Cleanup runtime directories
>-	rm -rf ${base_dir} 2>/dev/null
>+	rm -rf ${login_dir} ${base_dir} 2>/dev/null
>+}
>+
>+restart_cmd()
>+{	# Overriding makes rc.subr run this once for each instance
>+	run_rc_command stop
>+	run_rc_command start
> }
> 
>-run_rc_command "$1"
>+# To start multiple instances of dovecot set dovecot_config to
>+# a space seperated list of configuration files.
>+for config in ${dovecot_config}; do
>+	required_files="${config}"
>+	command_args="-c ${config}"
>+	base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }')
>+	login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
>+	pidfile="${base_dir}/master.pid"
>+	run_rc_command "$1"
>+done
>diff -u -r -N dovecot-1.1.7/files/pkg-message.in dovecot/files/pkg-message.in
>--- dovecot-1.1.7/files/pkg-message.in	2008-09-08 02:42:28.000000000 -0400
>+++ dovecot/files/pkg-message.in	2008-12-11 00:30:20.407757529 -0500
>@@ -1,12 +1,21 @@
> ---------------------------------------------------------------------
>  
>  You can get basic IMAP and POP3 services running by enabling
>- dovecot in /etc/rc.conf.
>+ dovecot in the /etc/rc.conf file.
> 
>- In this basic configuration Dovecot will authenticate users against
>+	dovecot_enable
>+		(bool) If set to ``YES'', run the dovecot command
>+		at boot time.
>+
>+ In the basic configuration Dovecot will authenticate users against
>  the system's passwd file and use the default /var/mail/$USER mbox
>  files.
> 
>-  echo dovecot_enable="YES" >> /etc/rc.conf
>- 
>+	dovecot_config
>+		(str) Path to dovecot configuration file(s).
>+		Default %%PREFIX%%/etc/dovecot.conf.
>+
>+ To start multiple instances of dovecot set dovecot_config to
>+ a space seperated list of configuration files.
>+
> ---------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 129274: 91791 | 91792 | 91793