Bump

Package-Manager: portage-2.1.2-r10

4 files changed, 225 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index be8846f19f72..fab7ee8c986f 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.89 2007/02/12 21:45:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.90 2007/02/20 13:26:43 uberlord Exp $
+
+*dovecot-1.0_rc23 (20 Feb 2007)
+
+  20 Feb 2007; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_rc23.ebuild:
+  Bump.
 
   12 Feb 2007; Roy Marples <uberlord@gentoo.org> dovecot-1.0_rc22.ebuild:
   Added ~x86-fbsd keyword, #166391
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index c20eb1cf2263..629d3b711f3f 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,6 +4,7 @@ RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
 DIST dovecot-1.0.rc15.tar.gz 1463069 RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b522e SHA1 9b618d0c1562aa64bd1e055ffa9fe5f2412514af SHA256 e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f
 DIST dovecot-1.0.rc22.tar.gz 1501122 RMD160 e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2 SHA1 966d5f1e251f63f21633666e6a65402e4129fc22 SHA256 ad93b4b1376c24f60eceb790f1ab162a99d1315920a8da802c08b0b73719470f
+DIST dovecot-1.0.rc23.tar.gz 1496678 RMD160 67c8622f957698bd017828c54bd59341c4a30cc9 SHA1 206a275cc109ab5528cfe3761409b539e762b7e4 SHA256 dbd581d999d8a952b806059a9b0d704fb0386c9a0a5f075df3ca9ca91b3d3e57
 DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
 EBUILD dovecot-1.0_rc15.ebuild 5318 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 SHA1 5cb08423188982d0befab9017e1004f7929cfc8d SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2
 MD5 61d0c3649db044745ecb0036357d9ee9 dovecot-1.0_rc15.ebuild 5318
@@ -13,10 +14,14 @@ EBUILD dovecot-1.0_rc22.ebuild 6065 RMD160 8332b9f71f09df1c9c3af8ecf55cd7b830a3d
 MD5 e78956ba7a8d04e1975616f55ac78a56 dovecot-1.0_rc22.ebuild 6065
 RMD160 8332b9f71f09df1c9c3af8ecf55cd7b830a3d256 dovecot-1.0_rc22.ebuild 6065
 SHA256 6dc8b9fbc76a46d74c2c92b02dfe1e327ab1958c487596839e50cb7ae618f3fd dovecot-1.0_rc22.ebuild 6065
-MISC ChangeLog 15112 RMD160 30093650896f7132b49c54b9fa4f08ed53153755 SHA1 8f2916fcbca6cb1c960f6231b727c3352a936838 SHA256 1de6b5ff4032218b822ccb3a1007571a8b431737a3fb299d8748f6b3dc45442c
-MD5 9e89292b8fb5a88ef4a2e8019bc0b43b ChangeLog 15112
-RMD160 30093650896f7132b49c54b9fa4f08ed53153755 ChangeLog 15112
-SHA256 1de6b5ff4032218b822ccb3a1007571a8b431737a3fb299d8748f6b3dc45442c ChangeLog 15112
+EBUILD dovecot-1.0_rc23.ebuild 6065 RMD160 e20805f8afa35b94c7327003925e8aea9cc01a50 SHA1 1ea45b3b15f761f3539945188d5c17b155cc2e91 SHA256 a96cde9d1460b7ff30fc61f96fa3a238a93b497b5403eccb3634d39c7aa00059
+MD5 51ffc24e206a4394b3bba32ec230330d dovecot-1.0_rc23.ebuild 6065
+RMD160 e20805f8afa35b94c7327003925e8aea9cc01a50 dovecot-1.0_rc23.ebuild 6065
+SHA256 a96cde9d1460b7ff30fc61f96fa3a238a93b497b5403eccb3634d39c7aa00059 dovecot-1.0_rc23.ebuild 6065
+MISC ChangeLog 15229 RMD160 57c8d8c89572a90f4cbcf36d1173812878598346 SHA1 11d04f186d88da4cb5ff8b06c13e166fa11e11e1 SHA256 91e508624b4a24a593a97e384091d0221d29fd13fb4372ecbbf26d0b4ff83cd0
+MD5 bd82d46a364160e65f628fddefd7515f ChangeLog 15229
+RMD160 57c8d8c89572a90f4cbcf36d1173812878598346 ChangeLog 15229
+SHA256 91e508624b4a24a593a97e384091d0221d29fd13fb4372ecbbf26d0b4ff83cd0 ChangeLog 15229
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -27,3 +32,6 @@ SHA256 0c0d306c2bac1ed1f287123160612db5f9c959afa54dac80c9db3794a258c197 files/di
 MD5 b8762cd88a48fd4070cbeb8955a9b406 files/digest-dovecot-1.0_rc22 506
 RMD160 94472fc54274a8c7b753912e2bcde76aabdc56fa files/digest-dovecot-1.0_rc22 506
 SHA256 25cf39af4bb026088025f99b11429b1215802626137bd4192e41811eea6a95f8 files/digest-dovecot-1.0_rc22 506
+MD5 2568998f3d02280a8681f3e5351687b0 files/digest-dovecot-1.0_rc23 506
+RMD160 8763a22b8b5879f4144a04d0e1d1a58abb4a652d files/digest-dovecot-1.0_rc23 506
+SHA256 97d2f534cb5d0455fd5dad3b91445ebe0c08f286ba8e459f7e80d093c232116f files/digest-dovecot-1.0_rc23 506
diff --git a/net-mail/dovecot/dovecot-1.0_rc23.ebuild b/net-mail/dovecot/dovecot-1.0_rc23.ebuild
new file mode 100644
index 000000000000..4641b9b35287
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc23.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc23.ebuild,v 1.1 2007/02/20 13:26:43 uberlord Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+pkg_setup() {
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+	local myconf=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+
+		econf --localstatedir=/var --sysconfdir=/etc/dovecot \
+		--with-ioloop=best --with-poll=best \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with pam) \
+		$(use_with pop3d) \
+		$(use_with postgres pgsql) \
+		$(use_with vpopmail) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+
+	if use sieve ; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed"
+		emake || die "make failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	if use doc ; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt ; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox ; then
+		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" || die
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam ; then
+		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${conf}" || die
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
+	fi
+
+	# Update ssl cert locations
+	if use ssl ; then
+		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
+			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
+			"${conf}" || die
+
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			insinto "${ROOT}"/etc/ssl/dovecot
+			docert server
+			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
+		fi
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres ; then
+		cp doc/dovecot-sql.conf "${D}"/etc/dovecot
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		dodoc doc/dovecot-sql.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		dodoc doc/dovecot-ldap.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve ; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0700 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	# Touch ssl certs so that they are modified outisde of src_install
+	# We do this so portage does't unmerge them - silly portage
+	if use ssl ; then
+		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+	fi
+
+	einfo "The dovecot configuration has vastly changed since 0.99."
+	einfo "You are encouraged to start afresh with a new configuration file."
+	einfo "see http://wiki.dovecot.org/ for configuration examples."
+
+	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
+		ewarn
+		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${basedir:-/var/run/dovecot}"
+	if use ssl \
+		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
+		einfo
+		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
+		einfo "These take some time to make, and dovecot will create them before"
+		einfo "it allows any SSL connections."
+		einfo "You can create them now before starting dovecot like so"
+		einfo "   emerge --config =${PF}"
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	einfo "Regenerating SSL parameters. This will take some time."
+	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_rc23 b/net-mail/dovecot/files/digest-dovecot-1.0_rc23
new file mode 100644
index 000000000000..e20011091944
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc23
@@ -0,0 +1,6 @@
+MD5 d595481d6c355106114f4263e49f70f3 dovecot-1.0.rc23.tar.gz 1496678
+RMD160 67c8622f957698bd017828c54bd59341c4a30cc9 dovecot-1.0.rc23.tar.gz 1496678
+SHA256 dbd581d999d8a952b806059a9b0d704fb0386c9a0a5f075df3ca9ca91b3d3e57 dovecot-1.0.rc23.tar.gz 1496678
+MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
+RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
+SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943