add a 1.1 beta version

Package-Manager: portage-2.1.4_rc9

4 files changed, 253 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 125035b4009e..4b865237a5b6 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.130 2007/12/12 17:19:37 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.131 2007/12/12 17:51:10 wschlich Exp $
+
+*dovecot-1.1_beta11 (12 Dec 2007)
+
+  12 Dec 2007; Wolfram Schlich <wschlich@gentoo.org>
+  +dovecot-1.1_beta11.ebuild:
+  add a 1.1 beta version
 
 *dovecot-1.0.9 (12 Dec 2007)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9262c927e116..599384b754c0 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,7 +9,9 @@ DIST dovecot-1.0.7-MANAGESIEVE-v9.diff.gz 103777 RMD160 6e8557c435b581edf89837d2
 DIST dovecot-1.0.7.tar.gz 1783918 RMD160 94a1f99aa0c2a7c2db8a106733f2de37080fd1eb SHA1 cc5f0892f184216c24ed6cfaa9d58183d5b94a4f SHA256 7e0521a6efc94e6d3d02d172de1dd0fcd38aaccd35b05b0bb368e8919d8622f3
 DIST dovecot-1.0.8.tar.gz 1793784 RMD160 d892f958b0531b13519c03c32f74138f97b27099 SHA1 ffb71a6d1c7f6dd963cb1f7313652c7a6d1b409f SHA256 f4fa1c5c5d10b04b924f19737a74bb5d1b99b403582a38e89dc786279fcd66d1
 DIST dovecot-1.0.9.tar.gz 1796543 RMD160 535cf4c9672c8e44e751f5ffad911440707fc7d4 SHA1 87d89ff79d967c95ab8e59a1c1b3f710caffc290 SHA256 a1861f42954a5497dc27eb6549e980524f75a50a03f58ac184e1770cff8a881d
+DIST dovecot-1.1.beta11.tar.gz 2191702 RMD160 8e12488e4d1c7023d6a95f5e49963898861b7ade SHA1 ca20b8c15f98014413212b1ded32fb0cd024552b SHA256 273b06a5b69873f7b29c0e67809cf4b1a9e41f14194089f65718739fe7e99509
 DIST dovecot-sieve-1.0.2.tar.gz 451753 RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f SHA1 70b423eae6e47bc38f81faa36503228c1a8a5550 SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a
+DIST dovecot-sieve-1.1.2.tar.gz 464909 RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 SHA1 81e317b4d5a58a180253d08fb32713d5c861d934 SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef
 EBUILD dovecot-1.0.3.ebuild 6265 RMD160 589c924113f22f2d9a987bb08cde3d9af51b119d SHA1 c381fe220b91f5777b76046a2dca43e62b0ff823 SHA256 605f498e92b2d8d2bc3c56852cb5823e1c6db7f0aa8c7b7ac185096f400a5493
 MD5 0c0a8621003c8008a7b5a523e6c03d73 dovecot-1.0.3.ebuild 6265
 RMD160 589c924113f22f2d9a987bb08cde3d9af51b119d dovecot-1.0.3.ebuild 6265
@@ -34,10 +36,14 @@ EBUILD dovecot-1.0.9.ebuild 7098 RMD160 596b1a54f98963437ffa23dc5cd0cd7e3be30f1e
 MD5 f0dc3f1164472b12da5bd0d0e6aa1c9f dovecot-1.0.9.ebuild 7098
 RMD160 596b1a54f98963437ffa23dc5cd0cd7e3be30f1e dovecot-1.0.9.ebuild 7098
 SHA256 bb6a0a05c6f0c98cf335dc634b4ce5a9c2fa09779f90e396592bbd736eaf6381 dovecot-1.0.9.ebuild 7098
-MISC ChangeLog 20696 RMD160 4a0a1c90cfcc96c6453890c6f37e61d8c3b3af2a SHA1 717073e76b03853c0e1cd0309123a36892e586b9 SHA256 9963a535d06d730e6b42f8b7f6c982c1ad9f1c1bd05438f4da64bdcf7fc8ded5
-MD5 ebb181066b6ffcff6aa2f3e124ebe44e ChangeLog 20696
-RMD160 4a0a1c90cfcc96c6453890c6f37e61d8c3b3af2a ChangeLog 20696
-SHA256 9963a535d06d730e6b42f8b7f6c982c1ad9f1c1bd05438f4da64bdcf7fc8ded5 ChangeLog 20696
+EBUILD dovecot-1.1_beta11.ebuild 7124 RMD160 2e3fa988c4b2c73c10673c2862fed40e91380b85 SHA1 b2cc04ac5356e5acb5c01e3fbbd8faf4e97a491e SHA256 f71ccf34510157f548212854332d51e2c323de1a8575376faa88ba36a539adfe
+MD5 d7fb02c83555e0519441cb067bf62865 dovecot-1.1_beta11.ebuild 7124
+RMD160 2e3fa988c4b2c73c10673c2862fed40e91380b85 dovecot-1.1_beta11.ebuild 7124
+SHA256 f71ccf34510157f548212854332d51e2c323de1a8575376faa88ba36a539adfe dovecot-1.1_beta11.ebuild 7124
+MISC ChangeLog 20840 RMD160 8b5af88e3247293d75dcc934b299c668f056dbb7 SHA1 7a8d60ed3f4690779c0fb5545b46ea30a319f112 SHA256 702a905a0f4e578e10c9383615f7f8c35c2237b81b1b34c77b1c417252e44fbe
+MD5 6a99bd9d1a809872f984bdff9b883f4f ChangeLog 20840
+RMD160 8b5af88e3247293d75dcc934b299c668f056dbb7 ChangeLog 20840
+SHA256 702a905a0f4e578e10c9383615f7f8c35c2237b81b1b34c77b1c417252e44fbe ChangeLog 20840
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -60,3 +66,6 @@ SHA256 0d2d481acb31a53b54835c80db254dfbeeeea183e26a5af331cef0480339084f files/di
 MD5 268a4c25332bd441418881949bdd5f6b files/digest-dovecot-1.0.9 792
 RMD160 400008cf0c85a945e60bfd570a42ec13555ad13d files/digest-dovecot-1.0.9 792
 SHA256 305a490145cfd5055caba4fecfd604baeec315b049b815783d2c1dd04184cf35 files/digest-dovecot-1.0.9 792
+MD5 a9d03917d7516d92ed8f6a812d8f5222 files/digest-dovecot-1.1_beta11 518
+RMD160 3114f906c03563b16a5dd425f2ec19dd88769fed files/digest-dovecot-1.1_beta11 518
+SHA256 094dda670e323aebad52e3dd1bb7319d6c3aeeabac7736b60e4fc6a3e812760a files/digest-dovecot-1.1_beta11 518
diff --git a/net-mail/dovecot/dovecot-1.1_beta11.ebuild b/net-mail/dovecot/dovecot-1.1_beta11.ebuild
new file mode 100644
index 000000000000..cd0c00906e6a
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1_beta11.ebuild
@@ -0,0 +1,227 @@
+# 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.1_beta11.ebuild,v 1.1 2007/12/12 17:51:10 wschlich Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.1.2"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+#MANAGESIEVE="dovecot-1.0.7-MANAGESIEVE-v9"
+
+SRC_URI="http://dovecot.org/releases/1.1/beta/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+#managesieve? ( http://sinas.rename-it.nl/~sirius/${MANAGESIEVE}.diff.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.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 suid vpopmail" # managesieve 
+
+# 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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+#	use managesieve && epatch "${DISTDIR}"/${MANAGESIEVE}.diff.gz
+}
+
+pkg_setup() {
+#	if ! use sieve && use managesieve; then
+#		eerror "managesieve USE flag selected but sieve USE flag unselected"
+#		die "USE flag problem"
+#	fi
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+#	use managesieve && eautoreconf
+	local myconf=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--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 (sieve)"
+		emake || die "make failed (sieve)"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+#	use managesieve && dodoc README.managesieve
+	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 "failed to update mail location settings in dovecot.conf"
+
+	# 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 "failed to update PAM settings in dovecot.conf"
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	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 "failed to update SSL settings in dovecot.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
+			|| die "failed to update SQL settings in dovecot-sql.conf"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
+			|| die "failed to update LDAP settings in dovecot-ldap.conf"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install \
+			|| die "make install failed (sieve)"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	local varname=${1}
+	if [[ -z ${varname} ]]; then
+		die "${FUNCNAME}: variable name missing"
+	fi
+	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	elog "The Dovecot configuration has vastly changed since 0.99."
+	elog "You are encouraged to start afresh with a new configuration file."
+	elog "see http://wiki.dovecot.org/ for configuration examples."
+
+	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
+		echo
+		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+	if use ssl; then
+		# 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
+			einfo "Creating SSL certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
+			echo
+			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
+			elog "These take some time to make, and dovecot will create them before"
+			elog "it allows any SSL connections."
+			elog "You can create them now before starting dovecot like so"
+			elog "   emerge --config =${PF}"
+		fi
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	if use ssl; then
+		einfo "Regenerating SSL parameters. This will take some time."
+		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+	fi
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.1_beta11 b/net-mail/dovecot/files/digest-dovecot-1.1_beta11
new file mode 100644
index 000000000000..10c060ccdc6e
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.1_beta11
@@ -0,0 +1,6 @@
+MD5 4f6d51f3aadae58f1fa3b024f317fbad dovecot-1.1.beta11.tar.gz 2191702
+RMD160 8e12488e4d1c7023d6a95f5e49963898861b7ade dovecot-1.1.beta11.tar.gz 2191702
+SHA256 273b06a5b69873f7b29c0e67809cf4b1a9e41f14194089f65718739fe7e99509 dovecot-1.1.beta11.tar.gz 2191702
+MD5 39a078ca358dbc3f2b70e5f32e480d21 dovecot-sieve-1.1.2.tar.gz 464909
+RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 dovecot-sieve-1.1.2.tar.gz 464909
+SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef dovecot-sieve-1.1.2.tar.gz 464909