Attachment #74413 for bug #107654

View | Details | Raw Unified | Return to bug 107654
Collapse All | Expand All

Lines 7-13 Link Here

(-)dovecot/Makefile (-1 / +6 lines)
7	#	7	#
8		8
9	PORTNAME= dovecot	9	PORTNAME= dovecot
10	DISTVERSION= 1.0.rc15	10	DISTVERSION= 1.0.rc17
11	CATEGORIES= mail ipv6	11	CATEGORIES= mail ipv6
12	MASTER_SITES= http://www.dovecot.org/releases/	12	MASTER_SITES= http://www.dovecot.org/releases/
13		13
Lines 35-40 Link Here
35	.else	35	.else
36	CONFIGURE_ARGS+= --without-docs	36	CONFIGURE_ARGS+= --without-docs
37	.endif	37	.endif
		38
		39	DOVECOT_UID?= 143
		40	DOVECOT_GID?= 143
		41	SCRIPT_ENV+= DOVECOT_UID=${DOVECOT_UID} \
		42	DOVECOT_GID=${DOVECOT_GID}
38		43
39	OPTIONS= KQUEUE "kqueue(2) support" on \	44	OPTIONS= KQUEUE "kqueue(2) support" on \
40	SSL "SSL support" on \	45	SSL "SSL support" on \

Lines 1-3 Link Here

(-)dovecot/distinfo (-3 / +3 lines)
1	MD5 (dovecot-1.0.rc15.tar.gz) = 26f3d2b075856b1b1d180146363819e6	1	MD5 (dovecot-1.0.rc17.tar.gz) = 881bcc7d2c8fba6d337f3e616a602bf7
2	SHA256 (dovecot-1.0.rc15.tar.gz) = e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f	2	SHA256 (dovecot-1.0.rc17.tar.gz) = fa3ea565758e2426a88ab7912c8afcc0f930bad344c3fba50133ac4513d75b4f
3	SIZE (dovecot-1.0.rc15.tar.gz) = 1463069	3	SIZE (dovecot-1.0.rc17.tar.gz) = 1512386




--- 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

 
 # 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
@@ -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

 
 # 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.
@@ -313,6 +317,7 @@
 # belongs to supplementary groups with non-valid GIDs, those groups are
 # not set.
 #first_valid_gid = 1

 #last_valid_gid = 0
 
 # Maximum number of running mail processes. When this limit is reached,
@@ -489,19 +494,19 @@
 
 protocol imap {
   # Login executable location.

 
   # 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
@@ -511,7 +516,7 @@
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
   #mail_plugins = 

 
   # Send IMAP capabilities in greeting message. This makes it unnecessary for
   # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -546,6 +551,7 @@
   #     accept '/' suffix in mailbox names in subscriptions list.
   # The list is space-separated.
   #imap_client_workarounds = outlook-idle

 }
   
 ##
@@ -554,11 +560,11 @@
 
 protocol pop3 {
   # Login executable location.

 
   # 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
@@ -604,6 +610,7 @@
   # installations.
   #
   #pop3_uidl_format = 

 
   # POP3 logout format string:
   #  %t - number of TOP commands
@@ -618,7 +625,7 @@
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
   #mail_plugins = 

 
   # Workarounds for various client bugs:
   #   outlook-no-nuls:
@@ -629,6 +636,7 @@
   #     missing. This option simply sends it if it's missing.
   # The list is space-separated.
   #pop3_client_workarounds = 

 }
 
 ##
@@ -646,10 +654,11 @@
   # Support for dynamically loadable plugins. mail_plugins is a space separated
   # list of plugins to load.
   #mail_plugins = 

 
   # UNIX socket path to master authentication server to find users.
   #auth_socket_path = /var/run/dovecot/auth-master
@@ -660,7 +669,7 @@
 ##
 
 # Executable location

Lines 52-58 Link Here

(-)dovecot/pkg-deinstall (-1 / +1 lines)
52	fi	52	fi
53	fi	53	fi
54		54
55	delete_account Dovecot dovecot:143 dovecot:143	55	delete_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143}
56		56
57	base=/var/run/dovecot	57	base=/var/run/dovecot
58	DIRLIST="${base}/login ${base}"	58	DIRLIST="${base}/login ${base}"




			&& 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 "Either remove the conflicting group or if you wish to continue using a legacy group override DOVECOT_GID."
		exit 1
	fi


			&& 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 "Either remove the conflicting user or if you wish to continue using a legacy user override DOVECOT_UID."
		exit 1
	fi
}

case $2 in

PRE-INSTALL)
	create_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143} "Dovecot User" /var/empty /sbin/nologin
	;;

POST-INSTALL)




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/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/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/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

Return to bug 107654

Lines 1-5 Link Here

(-)dovecot/files/patch-dovecot-example.conf (-13 / +13 lines)
1	--- dovecot-example.conf.orig Tue Nov 7 20:12:29 2006	1	--- dovecot-example.conf.orig Wed Jan 3 23:19:41 2007
2	+++ dovecot-example.conf Tue Nov 7 20:24:05 2006	2	+++ dovecot-example.conf Sun Jan 7 15:42:35 2007
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
4	# Default values are shown for each setting, it's not required to uncomment	4	# Default values are shown for each setting, it's not required to uncomment
5	# any of the lines. Exception to this are paths, they're just examples with	5	# any of the lines. Exception to this are paths, they're just examples with
Lines 33-39 Link Here
33		33
34	# Allow full filesystem access to clients. There's no access checks other than	34	# Allow full filesystem access to clients. There's no access checks other than
35	# what the operating system does for the active UID/GID. It works with both	35	# what the operating system does for the active UID/GID. It works with both
36	@@ -295,6 +298,7 @@	36	@@ -300,6 +303,7 @@
37	# IP address. Useful for seeing who are actually using the IMAP processes	37	# IP address. Useful for seeing who are actually using the IMAP processes
38	# (eg. shared mailboxes or if same uid is used for multiple accounts).	38	# (eg. shared mailboxes or if same uid is used for multiple accounts).
39	#verbose_proctitle = no	39	#verbose_proctitle = no
Lines 41-47 Link Here
41		41
42	# Valid UID range for users, defaults to 500 and above. This is mostly	42	# Valid UID range for users, defaults to 500 and above. This is mostly
43	# to make sure that users can't log in as daemons or other system users.	43	# to make sure that users can't log in as daemons or other system users.
44	@@ -308,6 +312,7 @@	44	@@ -313,6 +317,7 @@
45	# belongs to supplementary groups with non-valid GIDs, those groups are	45	# belongs to supplementary groups with non-valid GIDs, those groups are
46	# not set.	46	# not set.
47	#first_valid_gid = 1	47	#first_valid_gid = 1
Lines 49-55 Link Here
49	#last_valid_gid = 0	49	#last_valid_gid = 0
50		50
51	# Maximum number of running mail processes. When this limit is reached,	51	# Maximum number of running mail processes. When this limit is reached,
52	@@ -480,19 +485,19 @@	52	@@ -489,19 +494,19 @@
53		53
54	protocol imap {	54	protocol imap {
55	# Login executable location.	55	# Login executable location.
Lines 73-79 Link Here
73		73
74	# Maximum IMAP command line length in bytes. Some clients generate very long	74	# Maximum IMAP command line length in bytes. Some clients generate very long
75	# command lines with huge mailboxes, so you may need to raise this if you get	75	# command lines with huge mailboxes, so you may need to raise this if you get
76	@@ -502,7 +507,7 @@	76	@@ -511,7 +516,7 @@
77	# Support for dynamically loadable plugins. mail_plugins is a space separated	77	# Support for dynamically loadable plugins. mail_plugins is a space separated
78	# list of plugins to load.	78	# list of plugins to load.
79	#mail_plugins =	79	#mail_plugins =
Lines 82-88 Link Here
82		82
83	# Send IMAP capabilities in greeting message. This makes it unnecessary for	83	# Send IMAP capabilities in greeting message. This makes it unnecessary for
84	# clients to request it with CAPABILITY command, so it saves one round-trip.	84	# clients to request it with CAPABILITY command, so it saves one round-trip.
85	@@ -534,6 +539,7 @@	85	@@ -546,6 +551,7 @@
86	# accept '/' suffix in mailbox names in subscriptions list.	86	# accept '/' suffix in mailbox names in subscriptions list.
87	# The list is space-separated.	87	# The list is space-separated.
88	#imap_client_workarounds = outlook-idle	88	#imap_client_workarounds = outlook-idle
Lines 90-96 Link Here
90	}	90	}
91		91
92	##	92	##
93	@@ -542,11 +548,11 @@	93	@@ -554,11 +560,11 @@
94		94
95	protocol pop3 {	95	protocol pop3 {
96	# Login executable location.	96	# Login executable location.
Lines 104-110 Link Here
104		104
105	# Don't try to set mails non-recent or seen with POP3 sessions. This is	105	# Don't try to set mails non-recent or seen with POP3 sessions. This is
106	# mostly intended to reduce disk I/O. With maildir it doesn't move files	106	# mostly intended to reduce disk I/O. With maildir it doesn't move files
107	@@ -591,6 +597,7 @@	107	@@ -604,6 +610,7 @@
108	# installations.	108	# installations.
109	#	109	#
110	#pop3_uidl_format =	110	#pop3_uidl_format =
Lines 112-118 Link Here
112		112
113	# POP3 logout format string:	113	# POP3 logout format string:
114	# %t - number of TOP commands	114	# %t - number of TOP commands
115	@@ -605,7 +612,7 @@	115	@@ -618,7 +625,7 @@
116	# Support for dynamically loadable plugins. mail_plugins is a space separated	116	# Support for dynamically loadable plugins. mail_plugins is a space separated
117	# list of plugins to load.	117	# list of plugins to load.
118	#mail_plugins =	118	#mail_plugins =
Lines 121-127 Link Here
121		121
122	# Workarounds for various client bugs:	122	# Workarounds for various client bugs:
123	# outlook-no-nuls:	123	# outlook-no-nuls:
124	@@ -616,6 +623,7 @@	124	@@ -629,6 +636,7 @@
125	# missing. This option simply sends it if it's missing.	125	# missing. This option simply sends it if it's missing.
126	# The list is space-separated.	126	# The list is space-separated.
127	#pop3_client_workarounds =	127	#pop3_client_workarounds =
Lines 129-135 Link Here
129	}	129	}
130		130
131	##	131	##
132	@@ -633,10 +641,11 @@	132	@@ -646,10 +654,11 @@
133	# Support for dynamically loadable plugins. mail_plugins is a space separated	133	# Support for dynamically loadable plugins. mail_plugins is a space separated
134	# list of plugins to load.	134	# list of plugins to load.
135	#mail_plugins =	135	#mail_plugins =
Lines 142-148 Link Here
142		142
143	# UNIX socket path to master authentication server to find users.	143	# UNIX socket path to master authentication server to find users.
144	#auth_socket_path = /var/run/dovecot/auth-master	144	#auth_socket_path = /var/run/dovecot/auth-master
145	@@ -647,7 +656,7 @@	145	@@ -660,7 +669,7 @@
146	##	146	##
147		147
148	# Executable location	148	# Executable location

Lines 59-65 Link Here

(-)dovecot/pkg-install (-3 / +5 lines)
59	&& echo "ERROR: groupname '${group}' already in use by gid '${pw_group_gid}'"	59	&& echo "ERROR: groupname '${group}' already in use by gid '${pw_group_gid}'"
60	[ -n "${pw_gid_group}" -a "${group}" != "${pw_gid_group}" ] \	60	[ -n "${pw_gid_group}" -a "${group}" != "${pw_gid_group}" ] \
61	&& echo "ERROR: gid '${gid}' already in use by group '${pw_gid_group}'"	61	&& echo "ERROR: gid '${gid}' already in use by group '${pw_gid_group}'"
62	echo "Please resolve these issues and try again."	62	echo "Please resolve these issues and try again:"
		63	echo "Either remove the conflicting group or if you wish to continue using a legacy group override DOVECOT_GID."
63	exit 1	64	exit 1
64	fi	65	fi
65		66
Lines 75-81 Link Here
75	&& echo "ERROR: username '${user}' already in use by uid '${pw_user_uid}'"	76	&& echo "ERROR: username '${user}' already in use by uid '${pw_user_uid}'"
76	[ -n "${pw_uid_user}" -a "${user}" != "${pw_uid_user}" ] \	77	[ -n "${pw_uid_user}" -a "${user}" != "${pw_uid_user}" ] \
77	&& echo "ERROR: uid '${uid}' already in use by user '${pw_uid_user}'"	78	&& echo "ERROR: uid '${uid}' already in use by user '${pw_uid_user}'"
78	echo "Please resolve these issues and try again."	79	echo "Please resolve these issues and try again:"
		80	echo "Either remove the conflicting user or if you wish to continue using a legacy user override DOVECOT_UID."
79	exit 1	81	exit 1
80	fi	82	fi
81	}	83	}
Lines 83-89 Link Here
83	case $2 in	85	case $2 in
84		86
85	PRE-INSTALL)	87	PRE-INSTALL)
86	create_account Dovecot dovecot:143 dovecot:143 "Dovecot User" /var/empty /sbin/nologin	88	create_account Dovecot dovecot:${DOVECOT_UID:-143} dovecot:${DOVECOT_GID:-143} "Dovecot User" /var/empty /sbin/nologin
87	;;	89	;;
88		90
89	POST-INSTALL)	91	POST-INSTALL)

Lines 3-38 Link Here

(-)dovecot/pkg-plist (-24 / +29 lines)
3	etc/dovecot-example.conf	3	etc/dovecot-example.conf
4	@exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi	4	@exec if [ ! -f %D/etc/dovecot.conf ] ; then cp -p %D/%F %B/dovecot.conf; fi
5	lib/dovecot/imap/lib01_acl_plugin.so	5	lib/dovecot/imap/lib01_acl_plugin.so
6	lib/dovecot/imap/lib01_convert_plugin.so	6	lib/dovecot/imap/lib02_lazy_expunge_plugin.so
7	lib/dovecot/imap/lib01_quota_plugin.so	7	lib/dovecot/imap/lib10_quota_plugin.so
8	lib/dovecot/imap/lib01_zlib_plugin.a	8	lib/dovecot/imap/lib11_imap_quota_plugin.a
9	lib/dovecot/imap/lib01_zlib_plugin.la	9	lib/dovecot/imap/lib11_imap_quota_plugin.la
10	lib/dovecot/imap/lib01_zlib_plugin.so	10	lib/dovecot/imap/lib11_imap_quota_plugin.so
11	lib/dovecot/imap/lib02_imap_quota_plugin.a	11	lib/dovecot/imap/lib11_trash_plugin.so
12	lib/dovecot/imap/lib02_imap_quota_plugin.la	12	lib/dovecot/imap/lib20_convert_plugin.so
13	lib/dovecot/imap/lib02_imap_quota_plugin.so	13	lib/dovecot/imap/lib20_zlib_plugin.a
14	lib/dovecot/imap/lib02_trash_plugin.so	14	lib/dovecot/imap/lib20_zlib_plugin.la
		15	lib/dovecot/imap/lib20_zlib_plugin.so
15	@dirrm lib/dovecot/imap	16	@dirrm lib/dovecot/imap
16	lib/dovecot/pop3/lib01_convert_plugin.so
17	lib/dovecot/pop3/lib01_quota_plugin.so
18	@dirrm lib/dovecot/pop3
19	lib/dovecot/lda/lib01_acl_plugin.so	17	lib/dovecot/lda/lib01_acl_plugin.so
20	lib/dovecot/lda/lib01_convert_plugin.so	18	lib/dovecot/lda/lib10_quota_plugin.so
21	lib/dovecot/lda/lib01_quota_plugin.so	19	lib/dovecot/lda/lib11_trash_plugin.so
22	lib/dovecot/lda/lib02_trash_plugin.so	20	lib/dovecot/lda/lib20_convert_plugin.so
23	@dirrm lib/dovecot/lda	21	@dirrm lib/dovecot/lda
		22	lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
		23	lib/dovecot/pop3/lib10_quota_plugin.so
		24	lib/dovecot/pop3/lib20_convert_plugin.so
		25	@dirrm lib/dovecot/pop3
24	lib/dovecot/lib01_acl_plugin.a	26	lib/dovecot/lib01_acl_plugin.a
25	lib/dovecot/lib01_acl_plugin.la	27	lib/dovecot/lib01_acl_plugin.la
26	lib/dovecot/lib01_acl_plugin.so	28	lib/dovecot/lib01_acl_plugin.so
27	lib/dovecot/lib01_convert_plugin.a	29	lib/dovecot/lib02_lazy_expunge_plugin.a
28	lib/dovecot/lib01_convert_plugin.la	30	lib/dovecot/lib02_lazy_expunge_plugin.la
29	lib/dovecot/lib01_convert_plugin.so	31	lib/dovecot/lib02_lazy_expunge_plugin.so
30	lib/dovecot/lib01_quota_plugin.a	32	lib/dovecot/lib10_quota_plugin.a
31	lib/dovecot/lib01_quota_plugin.la	33	lib/dovecot/lib10_quota_plugin.la
32	lib/dovecot/lib01_quota_plugin.so	34	lib/dovecot/lib10_quota_plugin.so
33	lib/dovecot/lib02_trash_plugin.a	35	lib/dovecot/lib11_trash_plugin.a
34	lib/dovecot/lib02_trash_plugin.la	36	lib/dovecot/lib11_trash_plugin.la
35	lib/dovecot/lib02_trash_plugin.so	37	lib/dovecot/lib11_trash_plugin.so
		38	lib/dovecot/lib20_convert_plugin.a
		39	lib/dovecot/lib20_convert_plugin.la
		40	lib/dovecot/lib20_convert_plugin.so
36	@dirrm lib/dovecot	41	@dirrm lib/dovecot
37	libexec/dovecot/checkpassword-reply	42	libexec/dovecot/checkpassword-reply
38	%%LDA%%libexec/dovecot/deliver	43	%%LDA%%libexec/dovecot/deliver