New version that removes gnutls support and fixes permissions.
authorGrant Goodyear <g2boojum@gentoo.org>
Mon, 1 Nov 2004 17:58:09 +0000 (17:58 +0000)
committerGrant Goodyear <g2boojum@gentoo.org>
Mon, 1 Nov 2004 17:58:09 +0000 (17:58 +0000)
net-mail/cyrus-imap-admin/Manifest
net-mail/dovecot/ChangeLog
net-mail/dovecot/Manifest
net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild [deleted file]
net-mail/dovecot/dovecot-0.99.11-r1.ebuild [moved from net-mail/dovecot/dovecot-0.99.11.ebuild with 82% similarity]
net-mail/dovecot/files/digest-dovecot-0.99.10.9-r1 [deleted file]
net-mail/dovecot/files/digest-dovecot-0.99.11-r1 [moved from net-mail/dovecot/files/digest-dovecot-0.99.11 with 100% similarity]

index cc558c847e79ae0745b868d1e04f73ca8aecd54f..06a6133572f1c7298e9f267987db17685c93d094 100644 (file)
@@ -1,19 +1,16 @@
-MD5 257aa66be4dbe2a7270702e7a62c1ffd ChangeLog 4176
-MD5 512aac39218de307a117d4b37dc5c339 cyrus-imap-admin-2.1.12.ebuild 2752
-MD5 87c3fc7b593f16d5fac0cc2c9b0439b0 cyrus-imap-admin-2.1.13.ebuild 2770
-MD5 54defb7156a16d16d0e1db4f0f845544 cyrus-imap-admin-2.1.14.ebuild 3238
-MD5 af2b9234157e34b067a6a9e664c73b6d cyrus-imap-admin-2.2.3.ebuild 1955
-MD5 8ebe1d335fde0cdda741b32e3c82b27a cyrus-imap-admin-2.2.8.ebuild 2032
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 44c8500e0e411a07c008afc25bf9b64f ChangeLog 4586
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
-MD5 3c48192c623e37c0e7847ba62ede8750 files/cyrus-imap-admin-2.2.3-fPIC.patch 616
-MD5 dd34152fac580be8cccb1d1b69bb1ebc files/cyrus-imap-admin-2.2.8-fPIC.patch 584
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
-MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-admin-2.1.14 155
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imap-admin-2.2.3 70
+MD5 8ebe1d335fde0cdda741b32e3c82b27a cyrus-imap-admin-2.2.8.ebuild 2032
 MD5 6453c70342b78c99a073a06292b7e757 files/digest-cyrus-imap-admin-2.2.8 70
+MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
+MD5 dd34152fac580be8cccb1d1b69bb1ebc files/cyrus-imap-admin-2.2.8-fPIC.patch 584
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBhnrE5FrxP71izLARAkPMAJ9vI4JTnPd1wL90IFqMsCWsJHqyiQCfY3M9
+nwMj1d67MyzV4fMAhxKOHpk=
+=qZrf
+-----END PGP SIGNATURE-----
index 019175fd16697f20ef3da27306f1379b8fcd53e5..602d2d95ab75c89493f00e2bbcb19d0f36cd896d 100644 (file)
@@ -1,6 +1,18 @@
 # 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.16 2004/09/22 08:30:51 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.17 2004/11/01 17:58:09 g2boojum Exp $
+
+*dovecot-0.99.11-r1 (01 Nov 2004)
+
+  01 Nov 2004; Grant Goodyear <g2boojum@gentoo.org>
+  -dovecot-0.99.10.9-r1.ebuild, +dovecot-0.99.11-r1.ebuild,
+  -dovecot-0.99.11.ebuild:
+  New revision that removes gnutls support, since
+  upstream tells us that gnutls will be broken for some
+  time (http://www.dovecot.org/list/dovecot/2004-November/005169.html),
+  thanks to Ooblick (bug #67628) for finding the problem.  Also fixed
+  permissions, thanks to tove (bug #68824).  Marking stable on x86
+  and removing old (and broken) versions.
 
   22 Sep 2004; Andrej Kacian <ticho@gentoo.org> dovecot-0.99.10.9-r1.ebuild,
   dovecot-0.99.11.ebuild:
index afd102befb4ced690ae148dc2211a8e1b8038265..df80150da522ea14479667caf05edee25ee4ad86 100644 (file)
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 39caa38dcc27e4361c65c2de51f4ecb1 ChangeLog 3187
-MD5 f62fe889a665a930594c0dac95a36aea dovecot-0.99.11.ebuild 4320
+MD5 876386cb1bd33f430423f380a8c10fc6 dovecot-0.99.11-r1.ebuild 4767
+MD5 83f280e3d4b3f115044c983cac0e2172 ChangeLog 3722
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
-MD5 3c59316030c9059b0b429504b259cfac dovecot-0.99.10.9-r1.ebuild 4483
-MD5 e0953fc12832b50768fe3267b66c9740 files/digest-dovecot-0.99.10.9-r1 69
-MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
-MD5 3d6d703cf014f2defc8fed34b50849a9 files/digest-dovecot-0.99.11 67
 MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBUThE10xuJSrg3/sRAsUrAJ4spRz2EWqEFvXd1ZMZNfCCRQaslACePTZE
-LzLrMOHFXIgI1pnGGK+fgKM=
-=mc1w
------END PGP SIGNATURE-----
+MD5 3d6d703cf014f2defc8fed34b50849a9 files/digest-dovecot-0.99.11-r1 67
+MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
diff --git a/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild b/net-mail/dovecot/dovecot-0.99.10.9-r1.ebuild
deleted file mode 100644 (file)
index e9fb6c2..0000000
+++ /dev/null
@@ -1,154 +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.9-r1.ebuild,v 1.3 2004/09/22 08:30:51 ticho Exp $
-
-IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://dovecot.org/"
-SRC_URI="http://dovecot.org/releases/${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 )
-       mysql? ( dev-db/mysql )
-       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 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"
-       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."
-}
similarity index 82%
rename from net-mail/dovecot/dovecot-0.99.11.ebuild
rename to net-mail/dovecot/dovecot-0.99.11-r1.ebuild
index 4a51e66a22b2e418f4417a733d8b5d583a518dd4..5ac8f6fc703df6431a308d8518867011d9d7eb37 100644 (file)
@@ -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.11.ebuild,v 1.2 2004/09/22 08:30:51 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.11-r1.ebuild,v 1.1 2004/11/01 17:58:09 g2boojum Exp $
 
 IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
 inherit eutils
@@ -11,27 +11,28 @@ SRC_URI="http://dovecot.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 ~amd64 ~sparc ~ppc"
 
 #PROVIDE="virtual/imapd"
 
-# Note: current dovecot will break on gnutls-1.0.5
+# Note: current dovecot will break on gnutls
+# http://www.dovecot.org/list/dovecot/2004-November/005169.html
 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 )
        mysql? ( dev-db/mysql )
        vpopmail? ( net-mail/vpopmail )"
+       #gnutls? ( <=net-libs/gnutls-1.0.4 )
 
 RDEPEND="${DEPEND}
        net-mail/mailbase"
 
 
-pkg_preinst() {
+pkg_setup() {
        # Add user and group for login process (same as for fedora/redhat)
        enewgroup dovecot 97
        enewuser dovecot 97 /bin/false /dev/null dovecot
@@ -47,10 +48,20 @@ src_compile() {
        use postgres && myconf="${myconf} --with-pgsql"
        use mysql && myconf="${myconf} --with-mysql"
        use sasl && myconf="${myconf} --with-cyrus-sasl2"
+       # gnutls support no longer working
+       # (http://www.dovecot.org/list/dovecot/2004-November/005169.html)
+       use ssl && myconf="${myconf} --with-ssl=openssl"
+       if use gnutls; then
+               eerror 'GNUTLS support no longer available, see'
+               eerror 'http://www.dovecot.org/list/dovecot/2004-November/005169.html'
+               eerror
+               eerror 'Please set USE="-gnutls ssl" if you want TLS support.'
+               die
+       fi
        # 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 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 \
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.9-r1 b/net-mail/dovecot/files/digest-dovecot-0.99.10.9-r1
deleted file mode 100644 (file)
index 5762ad1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db002224ab32d29fb4ffbd58920bcf26 dovecot-0.99.10.9.tar.gz 861605