Attachment 74413 Details for Bug 107654 – dovecot-1.0.r17.diff

[patch] dovecot-1.0.r17.diff

dovecot-1.0.r17.diff (text/plain), 9.09 KB, created by Robin Breathe on 2007-01-07 16:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Breathe

Created: 2007-01-07 16:10:16 UTC

Size: 9.09 KB

patch

obsolete

>diff -ruN dovecot.orig/Makefile dovecot/Makefile
>--- dovecot.orig/Makefile	Fri Dec  1 09:39:34 2006
>+++ dovecot/Makefile	Sun Jan  7 15:49:49 2007
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	dovecot
>-DISTVERSION=	1.0.rc15
>+DISTVERSION=	1.0.rc17
> CATEGORIES=	mail ipv6
> MASTER_SITES=	http://www.dovecot.org/releases/
> 
>@@ -35,6 +35,11 @@
> .else
> CONFIGURE_ARGS+=	--without-docs
> .endif
>+
>+DOVECOT_UID?=	143
>+DOVECOT_GID?=	143
>+SCRIPT_ENV+=	DOVECOT_UID=${DOVECOT_UID} \
>+		DOVECOT_GID=${DOVECOT_GID}
> 
> OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
> 		SSL		"SSL support"		on  \
>diff -ruN dovecot.orig/distinfo dovecot/distinfo
>--- dovecot.orig/distinfo	Fri Dec  1 09:39:34 2006
>+++ dovecot/distinfo	Sun Jan  7 15:50:55 2007
>@@ -1,3 +1,3 @@
>-MD5 (dovecot-1.0.rc15.tar.gz) = 26f3d2b075856b1b1d180146363819e6
>-SHA256 (dovecot-1.0.rc15.tar.gz) = e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f
>-SIZE (dovecot-1.0.rc15.tar.gz) = 1463069
>+MD5 (dovecot-1.0.rc17.tar.gz) = 881bcc7d2c8fba6d337f3e616a602bf7
>+SHA256 (dovecot-1.0.rc17.tar.gz) = fa3ea565758e2426a88ab7912c8afcc0f930bad344c3fba50133ac4513d75b4f
>+SIZE (dovecot-1.0.rc17.tar.gz) = 1512386
>Binary files dovecot.orig/dovecot-1.0.r15.tbz and dovecot/dovecot-1.0.r15.tbz differ
>diff -ruN dovecot.orig/files/patch-dovecot-example.conf dovecot/files/patch-dovecot-example.conf
>--- dovecot.orig/files/patch-dovecot-example.conf	Wed Nov  8 01:12:17 2006
>+++ dovecot/files/patch-dovecot-example.conf	Sun Jan  7 15:43:04 2007
>@@ -1,5 +1,5 @@
>---- dovecot-example.conf.orig	Tue Nov  7 20:12:29 2006
>-+++ dovecot-example.conf	Tue Nov  7 20:24:05 2006
>+--- dovecot-example.conf.orig	Wed Jan  3 23:19:41 2007
>++++ dovecot-example.conf	Sun Jan  7 15:42:35 2007
> @@ -9,7 +9,7 @@
>  # Default values are shown for each setting, it's not required to uncomment
>  # any of the lines. Exception to this are paths, they're just examples with
>@@ -33,7 +33,7 @@
>  
>  # Allow full filesystem access to clients. There's no access checks other than
>  # what the operating system does for the active UID/GID. It works with both
>-@@ -295,6 +298,7 @@
>+@@ -300,6 +303,7 @@
>  # IP address. Useful for seeing who are actually using the IMAP processes
>  # (eg. shared mailboxes or if same uid is used for multiple accounts).
>  #verbose_proctitle = no
>@@ -41,7 +41,7 @@
>  
>  # Valid UID range for users, defaults to 500 and above. This is mostly
>  # to make sure that users can't log in as daemons or other system users.
>-@@ -308,6 +312,7 @@
>+@@ -313,6 +317,7 @@
>  # belongs to supplementary groups with non-valid GIDs, those groups are
>  # not set.
>  #first_valid_gid = 1
>@@ -49,7 +49,7 @@
>  #last_valid_gid = 0
>  
>  # Maximum number of running mail processes. When this limit is reached,
>-@@ -480,19 +485,19 @@
>+@@ -489,19 +494,19 @@
>  
>  protocol imap {
>    # Login executable location.
>@@ -73,7 +73,7 @@
>  
>    # Maximum IMAP command line length in bytes. Some clients generate very long
>    # command lines with huge mailboxes, so you may need to raise this if you get
>-@@ -502,7 +507,7 @@
>+@@ -511,7 +516,7 @@
>    # Support for dynamically loadable plugins. mail_plugins is a space separated
>    # list of plugins to load.
>    #mail_plugins = 
>@@ -82,7 +82,7 @@
>  
>    # Send IMAP capabilities in greeting message. This makes it unnecessary for
>    # clients to request it with CAPABILITY command, so it saves one round-trip.
>-@@ -534,6 +539,7 @@
>+@@ -546,6 +551,7 @@
>    #     accept '/' suffix in mailbox names in subscriptions list.
>    # The list is space-separated.
>    #imap_client_workarounds = outlook-idle
>@@ -90,7 +90,7 @@
>  }
>    
>  ##
>-@@ -542,11 +548,11 @@
>+@@ -554,11 +560,11 @@
>  
>  protocol pop3 {
>    # Login executable location.
>@@ -104,7 +104,7 @@
>  
>    # Don't try to set mails non-recent or seen with POP3 sessions. This is
>    # mostly intended to reduce disk I/O. With maildir it doesn't move files
>-@@ -591,6 +597,7 @@
>+@@ -604,6 +610,7 @@
>    # installations.
>    #
>    #pop3_uidl_format = 
>@@ -112,7 +112,7 @@
>  
>    # POP3 logout format string:
>    #  %t - number of TOP commands
>-@@ -605,7 +612,7 @@
>+@@ -618,7 +625,7 @@
>    # Support for dynamically loadable plugins. mail_plugins is a space separated
>    # list of plugins to load.
>    #mail_plugins = 
>@@ -121,7 +121,7 @@
>  
>    # Workarounds for various client bugs:
>    #   outlook-no-nuls:
>-@@ -616,6 +623,7 @@
>+@@ -629,6 +636,7 @@
>    #     missing. This option simply sends it if it's missing.
>    # The list is space-separated.
>    #pop3_client_workarounds = 
>@@ -129,7 +129,7 @@
>  }
>  
>  ##
>-@@ -633,10 +641,11 @@
>+@@ -646,10 +654,11 @@
>    # Support for dynamically loadable plugins. mail_plugins is a space separated
>    # list of plugins to load.
>    #mail_plugins = 
>@@ -142,7 +142,7 @@
>  
>    # UNIX socket path to master authentication server to find users.
>    #auth_socket_path = /var/run/dovecot/auth-master
>-@@ -647,7 +656,7 @@
>+@@ -660,7 +669,7 @@
>  ##
>  
>  # Executable location
>diff -ruN dovecot.orig/pkg-deinstall dovecot/pkg-deinstall
>--- dovecot.orig/pkg-deinstall	Fri Dec  1 09:39:34 2006
>+++ dovecot/pkg-deinstall	Sun Jan  7 14:11:29 2007
>@@ -52,7 +52,7 @@
> 		fi
> 	fi
> 
>-	delete_account Dovecot dovecot:143 dovecot:143
>+	delete_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143}
> 
> 	base=/var/run/dovecot
> 	DIRLIST="${base}/login ${base}"
>diff -ruN dovecot.orig/pkg-install dovecot/pkg-install
>--- dovecot.orig/pkg-install	Fri Dec  1 09:39:34 2006
>+++ dovecot/pkg-install	Sun Jan  7 14:27:21 2007
>@@ -59,7 +59,8 @@
> 			&& echo "ERROR: groupname '${group}' already in use by gid '${pw_group_gid}'"
> 		[ -n "${pw_gid_group}" -a "${group}" != "${pw_gid_group}" ] \
> 			&& echo "ERROR: gid '${gid}' already in use by group '${pw_gid_group}'"
>-		echo "Please resolve these issues and try again."
>+		echo "Please resolve these issues and try again:"
>+		echo "Either remove the conflicting group or if you wish to continue using a legacy group override DOVECOT_GID."
> 		exit 1
> 	fi
> 
>@@ -75,7 +76,8 @@
> 			&& echo "ERROR: username '${user}' already in use by uid '${pw_user_uid}'"
> 		[ -n "${pw_uid_user}" -a "${user}" != "${pw_uid_user}" ] \
> 			&& echo "ERROR: uid '${uid}' already in use by user '${pw_uid_user}'"
>-		echo "Please resolve these issues and try again."
>+		echo "Please resolve these issues and try again:"
>+		echo "Either remove the conflicting user or if you wish to continue using a legacy user override DOVECOT_UID."
> 		exit 1
> 	fi
> }
>@@ -83,7 +85,7 @@
> case $2 in
> 
> PRE-INSTALL)
>-	create_account Dovecot dovecot:143 dovecot:143 "Dovecot User" /var/empty /sbin/nologin
>+	create_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143} "Dovecot User" /var/empty /sbin/nologin
> 	;;
> 
> POST-INSTALL)
>diff -ruN dovecot.orig/pkg-plist dovecot/pkg-plist
>--- dovecot.orig/pkg-plist	Tue Oct 31 00:23:03 2006
>+++ dovecot/pkg-plist	Sun Jan  7 15:33:57 2007
>@@ -3,36 +3,41 @@
> etc/dovecot-example.conf
> @exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
> lib/dovecot/imap/lib01_acl_plugin.so
>-lib/dovecot/imap/lib01_convert_plugin.so
>-lib/dovecot/imap/lib01_quota_plugin.so
>-lib/dovecot/imap/lib01_zlib_plugin.a
>-lib/dovecot/imap/lib01_zlib_plugin.la
>-lib/dovecot/imap/lib01_zlib_plugin.so
>-lib/dovecot/imap/lib02_imap_quota_plugin.a
>-lib/dovecot/imap/lib02_imap_quota_plugin.la
>-lib/dovecot/imap/lib02_imap_quota_plugin.so
>-lib/dovecot/imap/lib02_trash_plugin.so
>+lib/dovecot/imap/lib02_lazy_expunge_plugin.so
>+lib/dovecot/imap/lib10_quota_plugin.so
>+lib/dovecot/imap/lib11_imap_quota_plugin.a
>+lib/dovecot/imap/lib11_imap_quota_plugin.la
>+lib/dovecot/imap/lib11_imap_quota_plugin.so
>+lib/dovecot/imap/lib11_trash_plugin.so
>+lib/dovecot/imap/lib20_convert_plugin.so
>+lib/dovecot/imap/lib20_zlib_plugin.a
>+lib/dovecot/imap/lib20_zlib_plugin.la
>+lib/dovecot/imap/lib20_zlib_plugin.so
> @dirrm lib/dovecot/imap
>-lib/dovecot/pop3/lib01_convert_plugin.so
>-lib/dovecot/pop3/lib01_quota_plugin.so
>-@dirrm lib/dovecot/pop3
> lib/dovecot/lda/lib01_acl_plugin.so
>-lib/dovecot/lda/lib01_convert_plugin.so
>-lib/dovecot/lda/lib01_quota_plugin.so
>-lib/dovecot/lda/lib02_trash_plugin.so
>+lib/dovecot/lda/lib10_quota_plugin.so
>+lib/dovecot/lda/lib11_trash_plugin.so
>+lib/dovecot/lda/lib20_convert_plugin.so
> @dirrm lib/dovecot/lda
>+lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
>+lib/dovecot/pop3/lib10_quota_plugin.so
>+lib/dovecot/pop3/lib20_convert_plugin.so
>+@dirrm lib/dovecot/pop3
> lib/dovecot/lib01_acl_plugin.a
> lib/dovecot/lib01_acl_plugin.la
> lib/dovecot/lib01_acl_plugin.so
>-lib/dovecot/lib01_convert_plugin.a
>-lib/dovecot/lib01_convert_plugin.la
>-lib/dovecot/lib01_convert_plugin.so
>-lib/dovecot/lib01_quota_plugin.a
>-lib/dovecot/lib01_quota_plugin.la
>-lib/dovecot/lib01_quota_plugin.so
>-lib/dovecot/lib02_trash_plugin.a
>-lib/dovecot/lib02_trash_plugin.la
>-lib/dovecot/lib02_trash_plugin.so
>+lib/dovecot/lib02_lazy_expunge_plugin.a
>+lib/dovecot/lib02_lazy_expunge_plugin.la
>+lib/dovecot/lib02_lazy_expunge_plugin.so
>+lib/dovecot/lib10_quota_plugin.a
>+lib/dovecot/lib10_quota_plugin.la
>+lib/dovecot/lib10_quota_plugin.so
>+lib/dovecot/lib11_trash_plugin.a
>+lib/dovecot/lib11_trash_plugin.la
>+lib/dovecot/lib11_trash_plugin.so
>+lib/dovecot/lib20_convert_plugin.a
>+lib/dovecot/lib20_convert_plugin.la
>+lib/dovecot/lib20_convert_plugin.so
> @dirrm lib/dovecot
> libexec/dovecot/checkpassword-reply
> %%LDA%%libexec/dovecot/deliver

Actions: View | Diff

Attachments on bug 107654: 74413