Version bump and uid/gid fix.

8 files changed, 25 insertions, 183 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 67b1280dc3b4..b4439f2514e1 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.14 2004/08/31 19:07:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.15 2004/09/19 20:09:05 g2boojum Exp $
+
+*dovecot-0.99.11 (19 Sep 2004)
+
+  19 Sep 2004; Grant Goodyear <g2boojum@gentoo.org>
+  dovecot-0.99.10.9-r1.ebuild, +dovecot-0.99.11.ebuild:
+  Version bump.  Thanks to Daniel Webert (bug #63849).
+  Also set static uid/gid.  (Thanks to Nils Marving, bug #58772)
 
 *dovecot-0.99.10.9-r1 (31 Aug 2004)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 216a14686192..8ac1bbeb4479 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa9702ac90c339920af609ea801c6c9d ChangeLog 2785
 MD5 4414bdad403b7c6a58a9c6140a911adf dovecot-0.99.10.9.ebuild 4400
 MD5 5664d25078f771112817cb172b95c093 dovecot-0.99.10.6.ebuild 4400
+MD5 0ac9ff76512ef4842498c9fbbea2354d dovecot-0.99.11.ebuild 4477
+MD5 9c729207c1946109a760aca6ef86f63f dovecot-0.99.10.9-r1.ebuild 4476
+MD5 aa9702ac90c339920af609ea801c6c9d ChangeLog 2785
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
-MD5 0ac9ff76512ef4842498c9fbbea2354d dovecot-0.99.10.9-r1.ebuild 4477
+MD5 d0c98a89b6d8d960ae0312a96256ecb8 files/digest-dovecot-0.99.10.6 69
 MD5 e0953fc12832b50768fe3267b66c9740 files/digest-dovecot-0.99.10.9 69
 MD5 e0953fc12832b50768fe3267b66c9740 files/digest-dovecot-0.99.10.9-r1 69
-MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
-MD5 d0c98a89b6d8d960ae0312a96256ecb8 files/digest-dovecot-0.99.10.6 69
 MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBNMxy10xuJSrg3/sRAigmAJ95sfqalUmuvswH8SzWr+Bf3iOvAQCfR3mj
-ily9d/ZYzWM1xVi2Z+gJGk4=
-=Zplk
------END PGP SIGNATURE-----
+MD5 3d6d703cf014f2defc8fed34b50849a9 files/digest-dovecot-0.99.11 67
+MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
diff --git a/net-mail/dovecot/dovecot-0.99.10.6.ebuild b/net-mail/dovecot/dovecot-0.99.10.6.ebuild
deleted file mode 100644
index 9dc080645b1b..000000000000
--- a/net-mail/dovecot/dovecot-0.99.10.6.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.6.ebuild,v 1.3 2004/08/16 23:50:08 g2boojum Exp $
-
-IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://dovecot.procontrol.fi/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~amd64 ~sparc ~ppc"
-
-#PROVIDE="virtual/imapd"
-
-# Note: current dovecot will break on gnutls-1.0.5
-DEPEND=">=sys-libs/db-3.2
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( sys-libs/pam )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	gnutls? ( <=net-libs/gnutls-1.0.4 )
-	postgres? ( dev-db/postgresql )
-	vpopmail? ( net-mail/vpopmail )"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-
-pkg_preinst() {
-	# Add user and group for login process
-	if ! getent group | grep -q ^dovecot
-	then
-		groupadd dovecot || die "problem adding group dovecot"
-	fi
-	if ! getent passwd | grep -q ^dovecot
-	then
-		useradd -c dovecot -d /usr/libexec/dovecot -g dovecot \
-		-s /bin/false dovecot  || die "problem adding user dovecot"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use debug && myconf="--enable-debug"
-	use ldap && myconf="${myconf} --with-ldap"
-	use ipv6 || myconf="${myconf} --disable-ipv6"
-	use nopop3d && myconf="${myconf} --without-pop3d"
-	use pam || myconf="${myconf} --without-pam"
-	use postgres && myconf="${myconf} --with-pgsql"
-	use sasl && myconf="${myconf} --with-cyrus-sasl2"
-	# prefer gnutls to ssl if both gnutls and ssl are defined
-	use gnutls && myconf="${myconf} --with-ssl=gnutls"
-	use ssl && ! use gnutls && myconf="${myconf} --with-ssl=openssl"
-	! use gnutls && ! use ssl && myconf="${myconf} --without-ssl"
-	use vpopmail || myconf="${myconf} --without-vpopmail"
-
-	./configure \
-	  --prefix=/usr \
-	  --host=${CHOST} \
-	  --mandir=/usr/share/man \
-	  --infodir=/usr/share/info \
-	  --datadir=/usr/share \
-	  --sysconfdir=/etc \
-	  --localstatedir=/var \
-	  ${myconf} || die "configure failed"
-	emake || die
-}
-
-src_install () {
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us, changing the default
-	# mail spool locations to the Gentoo defaults.  
-	if use mbox
-	then
-		# /var/spool/mail/$USER mail spool
-		# The location of the INDEX may be overridden by the user if desired.
-		if [ -z ${DOVECOT_INDEX_PATH} ]
-		then
-			DOVECOT_INDEX_PATH="/var/dovecot/%d/%n"
-			dodir /var/dovecot
-		fi
-		sed -e \
-			"s|#default_mail_env =|#default_mail_env = mbox:/var/spool/mail/%u:INDEX=${DOVECOT_INDEX_PATH}|" \
-			dovecot-example.conf > dovecot.conf
-	else
-		# $HOME/.maildir mail spool.  
-		sed -e \
-			's|#default_mail_env =|default_mail_env = maildir:%h/.maildir|' \
-			dovecot-example.conf > dovecot.conf
-	fi
-	insinto /etc
-	doins dovecot.conf
-
-	make DESTDIR=${D} install || die
-	rm ${D}/etc/dovecot-example.conf
-
-	# Documentation
-	rm -fr ${D}/usr/share/doc/dovecot
-	cd ${S}
-	dodoc AUTHORS COPYING* NEWS README TODO dovecot-example.conf
-	dodoc doc/*.txt doc/*.conf doc/*.cnf
-
-	# per default dovecot wants it ssl cert called dovecot.pem
-	# fix this in mkcert.sh, which we use to generate the ssl certs
-	cd ${S}/doc
-	sed -ie 's/imapd.pem/dovecot.pem/g' mkcert.sh
-	dodoc mkcert.sh
-
-	# rc script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dovecot.init dovecot
-
-	# PAM
-	if use pam
-	then
-		dodir /etc/pam.d
-		insinto /etc/pam.d
-		newins ${FILESDIR}/dovecot.pam dovecot
-	fi
-
-	# Create SSL certificates
-	if  use ssl || use gnutls
-	then
-		cd ${S}/doc
-		dodir /etc/ssl/certs
-		dodir /etc/ssl/private
-		# Let's not make a new certificate if we already have one
-		[ -e /etc/ssl/certs/dovecot.pem -a -e /etc/ssl/private/dovecot.pem ] \
-			|| SSLDIR=${D}/etc/ssl sh mkcert.sh
-	fi
-
-	dodir /var/run/dovecot
-	fowners root:root /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
-	fperms 0600 /etc/dovecot.conf
-}
-
-pkg_postinst() {
-	if use pam
-	then
-		ewarn "If you are upgrading from Dovecot prior to 0.99.10, be aware"
-		ewarn "that the PAM profile was changed from 'imap' to 'dovecot'."
-		einfo "Please review /etc/pam.d/dovecot."
-	fi
-	einfo "Please review /etc/dovecot.conf, particularly auth_userdb and auth_passdb."
-}
diff --git a/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild b/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild
index ebd293a6564e..fd1c08a63c8b 100644
--- a/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild
+++ b/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild,v 1.1 2004/08/31 19:07:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild,v 1.2 2004/09/19 20:09:05 g2boojum Exp $
 
 IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
 
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 ~amd64 ~sparc ~ppc"
 
 #PROVIDE="virtual/imapd"
 
diff --git a/net-mail/dovecot/dovecot-0.99.10.9.ebuild b/net-mail/dovecot/dovecot-0.99.11.ebuild
index eb17a1983f3b..722622e245c4 100644
--- a/net-mail/dovecot/dovecot-0.99.10.9.ebuild
+++ b/net-mail/dovecot/dovecot-0.99.11.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.9.ebuild,v 1.1 2004/08/17 16:05:24 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.11.ebuild,v 1.1 2004/09/19 20:09:05 g2boojum Exp $
 
-IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d"
+IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
+inherit eutils
 
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
 HOMEPAGE="http://dovecot.org/"
@@ -23,6 +24,7 @@ DEPEND=">=sys-libs/db-3.2
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	gnutls? ( <=net-libs/gnutls-1.0.4 )
 	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
 	vpopmail? ( net-mail/vpopmail )"
 
 RDEPEND="${DEPEND}
@@ -30,16 +32,9 @@ RDEPEND="${DEPEND}
 
 
 pkg_preinst() {
-	# Add user and group for login process
-	if ! getent group | grep -q ^dovecot
-	then
-		groupadd dovecot || die "problem adding group dovecot"
-	fi
-	if ! getent passwd | grep -q ^dovecot
-	then
-		useradd -c dovecot -d /usr/libexec/dovecot -g dovecot \
-		-s /bin/false dovecot  || die "problem adding user dovecot"
-	fi
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 /bin/false /dev/null dovecot
 }
 
 src_compile() {
@@ -50,6 +45,7 @@ src_compile() {
 	use nopop3d && myconf="${myconf} --without-pop3d"
 	use pam || myconf="${myconf} --without-pam"
 	use postgres && myconf="${myconf} --with-pgsql"
+	use mysql && myconf="${myconf} --with-mysql"
 	use sasl && myconf="${myconf} --with-cyrus-sasl2"
 	# prefer gnutls to ssl if both gnutls and ssl are defined
 	use gnutls && myconf="${myconf} --with-ssl=gnutls"
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.6 b/net-mail/dovecot/files/digest-dovecot-0.99.10.6
deleted file mode 100644
index 3efe7506f893..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-0.99.10.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f4f61147dc202a05c673a77535e5a46 dovecot-0.99.10.6.tar.gz 858545
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.9 b/net-mail/dovecot/files/digest-dovecot-0.99.10.9
deleted file mode 100644
index 5762ad1feafe..000000000000
--- a/net-mail/dovecot/files/digest-dovecot-0.99.10.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db002224ab32d29fb4ffbd58920bcf26 dovecot-0.99.10.9.tar.gz 861605
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.11 b/net-mail/dovecot/files/digest-dovecot-0.99.11
new file mode 100644
index 000000000000..7bf4daa05663
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-0.99.11
@@ -0,0 +1 @@
+MD5 05090ad784540b96c84f32080ada9f97 dovecot-0.99.11.tar.gz 863370