diff options
author | Roy Marples <uberlord@gentoo.org> | 2006-07-04 18:55:33 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2006-07-04 18:55:33 +0000 |
commit | 548ff329b90f7efa288e8e4257ecc5440321ccd1 (patch) | |
tree | d71a70770224494877526c4d5f95e922bd16302e /net-mail | |
parent | Version bump. (diff) | |
download | gentoo-2-548ff329b90f7efa288e8e4257ecc5440321ccd1.tar.gz gentoo-2-548ff329b90f7efa288e8e4257ecc5440321ccd1.tar.bz2 gentoo-2-548ff329b90f7efa288e8e4257ecc5440321ccd1.zip |
Version bump.
(Portage version: 2.1.1_pre2-r2)
(Unsigned Manifest commit)
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/dovecot/Manifest | 39 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild | 178 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild | 176 | ||||
-rw-r--r-- | net-mail/dovecot/files/digest-dovecot-1.0_beta9-r1 | 3 | ||||
-rw-r--r-- | net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2 | 3 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch | 202 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch | 13 |
7 files changed, 12 insertions, 602 deletions
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 426461f68f39..6b0526395e24 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,38 +1,26 @@ -AUX dovecot-1.0_beta9-configure.patch 5653 RMD160 b457be12aa6f1a5611eda71425f0c75ed5cb7b9f SHA1 19485333c29cfd69942be2f4588df0d105801ec5 SHA256 c615563fba36ed75e0664d8641fe1695a37e9f8b30ea84e12ef9bb630ec4a23d -MD5 8002fe13f0b2e5d31876b8da20bc8ea4 files/dovecot-1.0_beta9-configure.patch 5653 -RMD160 b457be12aa6f1a5611eda71425f0c75ed5cb7b9f files/dovecot-1.0_beta9-configure.patch 5653 -SHA256 c615563fba36ed75e0664d8641fe1695a37e9f8b30ea84e12ef9bb630ec4a23d files/dovecot-1.0_beta9-configure.patch 5653 -AUX dovecot-1.0_beta9-ssl_listen.patch 612 RMD160 0f0bd71636cb0af8b575cefb3b901dc06bd64004 SHA1 267fbbc1f96c623815b45ea1be7f275a849e43be SHA256 20a47e302d90b3b922ba218cef37ecbf2a0fa1af6f91fce71a28b96f00d932df -MD5 6962c02a7f827ac8235b8e10fa11c962 files/dovecot-1.0_beta9-ssl_listen.patch 612 -RMD160 0f0bd71636cb0af8b575cefb3b901dc06bd64004 files/dovecot-1.0_beta9-ssl_listen.patch 612 -SHA256 20a47e302d90b3b922ba218cef37ecbf2a0fa1af6f91fce71a28b96f00d932df files/dovecot-1.0_beta9-ssl_listen.patch 612 AUX dovecot.init 619 RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 SHA1 408fc13f5a9ccd8b40e7f82f99e3b18912e24c1f SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 MD5 155396035a3ecb1f5171b0432072181b files/dovecot.init 619 RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 files/dovecot.init 619 SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 files/dovecot.init 619 DIST dovecot-1.0.beta8.tar.gz 1392106 RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 SHA1 fedd38c29a2bc396df386636ed5d8b65ecab0ff6 SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2 -DIST dovecot-1.0.beta9.tar.gz 1245601 RMD160 30d423b9fd2056fd8d898bc4bc630d3806cc64c4 SHA1 c3f5014e67cd993206373915ee622ed1f68b4b14 SHA256 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8 DIST dovecot-1.0.rc1.tar.gz 1254731 RMD160 fa761a2b24ede31b383b505ed36fc202810191cd SHA1 4b56d2205cd8b7229e368c736c993ebc1f59fe5e SHA256 b3fdcbf6093e3672bd3f78fa360569b527926274f9c9d5de83eccbe10660d072 +DIST dovecot-1.0.rc2.tar.gz 1257435 RMD160 cbb1919f30ccc82033ddda5a9a4b2e9695f78eb9 SHA1 548d691166c71533cce05f72204d5f728941bab6 SHA256 594b38c099a4576e22d8a33673fd1461332c09a1e2c715792f6c2ff656b1bf6e EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d SHA1 060efcf3110e6ef0015e3087cce46780943243e6 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6 MD5 9394fb4f53cb69bb777019adf947d2e7 dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d dovecot-1.0_beta8.ebuild 4645 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6 dovecot-1.0_beta8.ebuild 4645 -EBUILD dovecot-1.0_beta9-r1.ebuild 5112 RMD160 4a89796c50f6ccee78e32ca2accc5a89a039753b SHA1 988736b57bae17cfac4ce6a68d745b127e17a527 SHA256 848c5f84555c9ecb23c4f272e48a78f96aa87526c0a5531fa0fcf2b796b2033e -MD5 54848d55bbb5965e8429fe516e681c40 dovecot-1.0_beta9-r1.ebuild 5112 -RMD160 4a89796c50f6ccee78e32ca2accc5a89a039753b dovecot-1.0_beta9-r1.ebuild 5112 -SHA256 848c5f84555c9ecb23c4f272e48a78f96aa87526c0a5531fa0fcf2b796b2033e dovecot-1.0_beta9-r1.ebuild 5112 -EBUILD dovecot-1.0_beta9-r2.ebuild 5037 RMD160 61c23aba34aab11e2cf2bded5d62781ac32261be SHA1 9e19601a4cf116e47c292abb521867ed62faedac SHA256 254bb9452b8ad71b344c4238d733504db412794971118080684c8711cb2cef44 -MD5 ac23260f50a03f29212593e0eaa7faf0 dovecot-1.0_beta9-r2.ebuild 5037 -RMD160 61c23aba34aab11e2cf2bded5d62781ac32261be dovecot-1.0_beta9-r2.ebuild 5037 -SHA256 254bb9452b8ad71b344c4238d733504db412794971118080684c8711cb2cef44 dovecot-1.0_beta9-r2.ebuild 5037 EBUILD dovecot-1.0_rc1.ebuild 4799 RMD160 bd804b8b494981815a170b69a824c6caf72ef945 SHA1 b5a039ce9942f4331f507e9a75e758e71ffcd618 SHA256 8f8eb55c5740868e461520112e96e8b810078d6c857b040a484182c1e5de324f MD5 9ff448b7fab9913b4734d292741ea196 dovecot-1.0_rc1.ebuild 4799 RMD160 bd804b8b494981815a170b69a824c6caf72ef945 dovecot-1.0_rc1.ebuild 4799 SHA256 8f8eb55c5740868e461520112e96e8b810078d6c857b040a484182c1e5de324f dovecot-1.0_rc1.ebuild 4799 -MISC ChangeLog 10482 RMD160 b50ff2faf22389c0a036e925a10e449204f5c934 SHA1 6514c44429f2147e46dcc9aec568e87b5f7bbfae SHA256 fb92a422124a3491203430136d7a69267bcf0ef7d91349727124c32cbda5ea7f -MD5 c5d828e4fbbdb5e3db6d12b844481772 ChangeLog 10482 -RMD160 b50ff2faf22389c0a036e925a10e449204f5c934 ChangeLog 10482 -SHA256 fb92a422124a3491203430136d7a69267bcf0ef7d91349727124c32cbda5ea7f ChangeLog 10482 +EBUILD dovecot-1.0_rc2.ebuild 4837 RMD160 047d2df3da88d9d0e7c7fd0d8cbf52bf487c831d SHA1 e6011d5592e4ea06c856d2375ab645db8359bc94 SHA256 0af4cc65241e41ca26bda2407a4dba2ab02b7cf17b954d80bc5f6637e504dd9b +MD5 7f9ef3ca05705bded925708890df45dd dovecot-1.0_rc2.ebuild 4837 +RMD160 047d2df3da88d9d0e7c7fd0d8cbf52bf487c831d dovecot-1.0_rc2.ebuild 4837 +SHA256 0af4cc65241e41ca26bda2407a4dba2ab02b7cf17b954d80bc5f6637e504dd9b dovecot-1.0_rc2.ebuild 4837 +MISC ChangeLog 10605 RMD160 c62c971a8a11ae25362242313c91cd8bfe062301 SHA1 cb598b5177a1d4a1a0ffe993bba45acd779eb278 SHA256 416a50d033f1ecb2184e38122327de6e22da0288b79257cd0243997f3d8a9ae4 +MD5 791381c2d29f044b49692d21bcc0390c ChangeLog 10605 +RMD160 c62c971a8a11ae25362242313c91cd8bfe062301 ChangeLog 10605 +SHA256 416a50d033f1ecb2184e38122327de6e22da0288b79257cd0243997f3d8a9ae4 ChangeLog 10605 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -40,12 +28,9 @@ SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 metadata MD5 630ceba3b8cb8ecda31605cf8682ea3c files/digest-dovecot-1.0_beta8 256 RMD160 5c835e169f576f6c5f68d9aff62dfc34c3a9fc81 files/digest-dovecot-1.0_beta8 256 SHA256 bdeba92a3fd4e386e383101a09a3b9ce315a5dd235e5b8008e10c2f54b74dc3d files/digest-dovecot-1.0_beta8 256 -MD5 8fcd45ae0df65f8003fff7b5cf52ca34 files/digest-dovecot-1.0_beta9-r1 256 -RMD160 0f4e4d23d25958324702954e021b86156ca4d319 files/digest-dovecot-1.0_beta9-r1 256 -SHA256 ac470d07b4fb41fbfd3758040462ab8ab425d5331d649360ec887e3157c0bcb9 files/digest-dovecot-1.0_beta9-r1 256 -MD5 8fcd45ae0df65f8003fff7b5cf52ca34 files/digest-dovecot-1.0_beta9-r2 256 -RMD160 0f4e4d23d25958324702954e021b86156ca4d319 files/digest-dovecot-1.0_beta9-r2 256 -SHA256 ac470d07b4fb41fbfd3758040462ab8ab425d5331d649360ec887e3157c0bcb9 files/digest-dovecot-1.0_beta9-r2 256 MD5 675f59fe8800ef50b7cc427f7d99f5e3 files/digest-dovecot-1.0_rc1 250 RMD160 567e11d670f5d274b9bde25219a21f7be9159fee files/digest-dovecot-1.0_rc1 250 SHA256 dce9ddd8541fd972defe1b17ceacfb708469eb16e067e1e9bd3d923a06438ab6 files/digest-dovecot-1.0_rc1 250 +MD5 1b420253aeeb0c66a66d0130c3f79ff6 files/digest-dovecot-1.0_rc2 250 +RMD160 ce2efdc2589df26a1b42476b493a30a3c75553e7 files/digest-dovecot-1.0_rc2 250 +SHA256 9cb8858afcad7af0cf0a43c96d00c153e7e49dbe84f59634b637eb74dec5199f files/digest-dovecot-1.0_rc2 250 diff --git a/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild b/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild deleted file mode 100644 index 825e132e6083..000000000000 --- a/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild,v 1.1 2006/06/16 08:42:06 uberlord Exp $ - -inherit autotools eutils - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="http://dovecot.org/" -MY_P="${P/_/.}" -S="${WORKDIR}/${MY_P}" -SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail" - -DEPEND=">=sys-apps/sed-4 - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - postgres? ( dev-db/postgresql ) - mysql? ( dev-db/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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}"-configure.patch - eautoconf - epunt_cxx -} - -src_compile() { - local myconf - use ssl && myconf="${myconf} --with-ssl=openssl" \ - || myconf="${myconf} --without-ssl" - - econf --localstatedir=/var \ - $(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" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - - newinitd "${FILESDIR}"/dovecot.init dovecot - - # Create the dovecot.conf file from the dovecot-example.conf file that - # the dovecot folks nicely left for us.... - mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf - fperms 0600 /etc/dovecot.conf - - # .maildir is the Gentoo default, but we need to support mbox to - local mailenv="maildir:%h/.maildir" - if use mbox ; then - mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" - keepdir /var/dovecot - sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \ - "${D}"/etc/dovecot.conf - fi - sed -i -e \ - "s|#default_mail_env =|default_mail_env = ${mailenv}|" \ - "${D}"/etc/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 = "\*"|' \ - "${D}"/etc/dovecot.conf - fi - - # Listen on ipv6 and ipv4 - if use ipv6 ; then - sed -i -e 's/^#listen = \*/listen = \[::\]/g' \ - "${D}"/etc/dovecot.conf - else - # BETA9 FIX ONLY - REMOVE IF NOT BETA9 - # Beta9 has issues when compiled without ipv6 - # setting ssl_listen = * fixes the issue - sed -i -e 's/^#ssl_listen =/ssl_listen = */g' \ - "${D}"/etc/dovecot.conf - fi - - # Install SQL configuration - if use mysql || use postgres ; then - cp doc/dovecot-sql.conf "${D}"/etc - fperms 600 /etc/dovecot-sql.conf - sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' \ - "${D}"/etc/dovecot.conf - fi - - # Install LDAP configuration - if use ldap ; then - cp doc/dovecot-ldap.conf "${D}"/etc - fperms 600 /etc/dovecot-ldap.conf - sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' \ - "${D}"/etc/dovecot.conf - fi - - # Documentation - rm -rf "${D}"/usr/share/doc/dovecot - if use doc ; then - dodoc AUTHORS NEWS README TODO dovecot-example.conf - dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh - fi - - # Create SSL certificates - if use ssl ; then - dodir /etc/ssl/certs - dodir /etc/ssl/private - # Let's not make a new certificate if we already have one - if ! [[ -e /etc/ssl/certs/dovecot.pem && \ - -e /etc/ssl/private/dovecot.pem ]]; then - einfo "Generating X.509 certificate for SSL" - pushd doc >/dev/null && \ - SSLDIR="${D}"/etc/ssl sh mkcert.sh && \ - popd >/dev/null - fi - 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.conf -} - -pkg_postinst() { - 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." - - local base_dir="$(get_config_var base_dir)" - base_dir="${basedir:-/var/run/dovecot}" - if [[ ! -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/dovecot-1.0_beta9-r2.ebuild b/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild deleted file mode 100644 index 89c70f697ca7..000000000000 --- a/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild,v 1.1 2006/06/16 11:28:55 uberlord Exp $ - -inherit autotools eutils - -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="http://dovecot.org/" -MY_P="${P/_/.}" -S="${WORKDIR}/${MY_P}" -SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail" - -DEPEND=">=sys-apps/sed-4 - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl ) - postgres? ( dev-db/postgresql ) - mysql? ( dev-db/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_unpack() { - unpack ${A} - cd "${S}" - - # Fix ssl_listen - epatch "${FILESDIR}/${P}"-ssl_listen.patch - - # Get dovecot to autodetect nice kernel features such as inotify and kqueue - epatch "${FILESDIR}/${P}"-configure.patch - eautoconf - epunt_cxx -} - -src_compile() { - local myconf - use ssl && myconf="${myconf} --with-ssl=openssl" \ - || myconf="${myconf} --without-ssl" - - econf --localstatedir=/var \ - $(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" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - - newinitd "${FILESDIR}"/dovecot.init dovecot - - # Create the dovecot.conf file from the dovecot-example.conf file that - # the dovecot folks nicely left for us.... - mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf - fperms 0600 /etc/dovecot.conf - - # .maildir is the Gentoo default, but we need to support mbox to - local mailenv="maildir:%h/.maildir" - if use mbox ; then - mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u" - keepdir /var/dovecot - sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \ - "${D}"/etc/dovecot.conf - fi - sed -i -e \ - "s|#default_mail_env =|default_mail_env = ${mailenv}|" \ - "${D}"/etc/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 = "\*"|' \ - "${D}"/etc/dovecot.conf - fi - - # Listen on ipv6 and ipv4 - if use ipv6 ; then - sed -i -e 's/^#listen = \*/listen = \[::\]/g' \ - "${D}"/etc/dovecot.conf - fi - - # Install SQL configuration - if use mysql || use postgres ; then - cp doc/dovecot-sql.conf "${D}"/etc - fperms 600 /etc/dovecot-sql.conf - sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' \ - "${D}"/etc/dovecot.conf - fi - - # Install LDAP configuration - if use ldap ; then - cp doc/dovecot-ldap.conf "${D}"/etc - fperms 600 /etc/dovecot-ldap.conf - sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' \ - "${D}"/etc/dovecot.conf - fi - - # Documentation - rm -rf "${D}"/usr/share/doc/dovecot - if use doc ; then - dodoc AUTHORS NEWS README TODO dovecot-example.conf - dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh - fi - - # Create SSL certificates - if use ssl ; then - dodir /etc/ssl/certs - dodir /etc/ssl/private - # Let's not make a new certificate if we already have one - if ! [[ -e /etc/ssl/certs/dovecot.pem && \ - -e /etc/ssl/private/dovecot.pem ]]; then - einfo "Generating X.509 certificate for SSL" - pushd doc >/dev/null && \ - SSLDIR="${D}"/etc/ssl sh mkcert.sh && \ - popd >/dev/null - fi - 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.conf -} - -pkg_postinst() { - 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." - - local base_dir="$(get_config_var base_dir)" - base_dir="${basedir:-/var/run/dovecot}" - if [[ ! -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_beta9-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r1 deleted file mode 100644 index 5e22728901a3..000000000000 --- a/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5c19a21afb8a02c95f3f62fa37d8e1ed dovecot-1.0.beta9.tar.gz 1245601 -RMD160 30d423b9fd2056fd8d898bc4bc630d3806cc64c4 dovecot-1.0.beta9.tar.gz 1245601 -SHA256 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8 dovecot-1.0.beta9.tar.gz 1245601 diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2 b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2 deleted file mode 100644 index 5e22728901a3..000000000000 --- a/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5c19a21afb8a02c95f3f62fa37d8e1ed dovecot-1.0.beta9.tar.gz 1245601 -RMD160 30d423b9fd2056fd8d898bc4bc630d3806cc64c4 dovecot-1.0.beta9.tar.gz 1245601 -SHA256 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8 dovecot-1.0.beta9.tar.gz 1245601 diff --git a/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch b/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch deleted file mode 100644 index 67626a48ff94..000000000000 --- a/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch +++ /dev/null @@ -1,202 +0,0 @@ -Add detection for working epoll, inotify, kqueue, dnotify and poll. -This should solve the issue of inotify.h being present but the kernel -and/or glibc does not support it. - ---- configure.in 2006-06-13 12:24:58.000000000 +0100 -+++ configure.in 2006-06-18 02:34:41.000000000 +0100 -@@ -364,29 +371,39 @@ - dnl * I/O loop function - have_ioloop=no - --dnl we currently don't use epoll automatically because it fails at runtime --dnl if we're not running 2.6 kernel --if test "$ioloop" = "epoll"; then -- AC_CHECK_FUNC(epoll_create, [ -+if test "$ioloop" = "" || test "$ioloop" = "epoll"; then -+ AC_TRY_RUN([ -+ #include <stdint.h> -+ #include <sys/epoll.h> -+ #include <errno.h> -+ -+ #include <linux/unistd.h> -+ -+ _syscall1 (int, epoll_create, int, size) -+ -+ int main() -+ { -+ return epoll_create(5) < 1; -+ } -+ ], [ - AC_DEFINE(IOLOOP_EPOLL,, Implement I/O loop with Linux 2.6 epoll()) - have_ioloop=yes -+ ioloop=epoll - ], [ -- ioloop="" -+ if test "$ioloop" != "" ; then -+ AC_MSG_WARN([epoll ioloop requested but epoll_create() is not available]) -+ fi - ]) - fi - --if test "$ioloop" = "kqueue"; then -- if test "$ac_cv_func_kqueue" != yes ; then -- AC_MSG_WARN([kqueue ioloop requested but kqueue() is not available]) -- ioloop="" -- elif test "$ac_cv_func_kevent" != yes ; then -- AC_MSG_WARN([kqueue ioloop requested but kevent() is not available]) -- ioloop="" -- else -- AC_DEFINE(IOLOOP_KQUEUE,, [Implement I/O loop with BSD kqueue()]) -- ioloop=kqueue -- have_ioloop=yes -- fi -+if test "$ioloop" = "" || test "$ioloop" = "kqueue"; then -+ if test "$ac_cv_func_kqueue" = yes && test "$ac_cv_func_kevent" == yes ; then -+ AC_DEFINE(IOLOOP_KQUEUE,, [Implement I/O loop with BSD kqueue()]) -+ ioloop=kqueue -+ have_ioloop=yes -+ elif test "$ioloop" = "kqueue"; then -+ AC_MSG_WARN([kqueue ioloop requested but kqueue() is not available]) -+ fi - fi - - if test "$ioloop" = "" || test "$ioloop" = "poll"; then -@@ -404,69 +421,94 @@ - - have_notify=none - --if test "$notify" = "" || test "$notify" = "dnotify"; then -- dnl * dnotify? -- AC_TRY_COMPILE([ -- #define _GNU_SOURCE -- #include <fcntl.h> -- #include <signal.h> -- #include <unistd.h> -- ], [ -- fcntl(0, F_SETSIG, SIGRTMIN); -- fcntl(0, F_NOTIFY, DN_CREATE | DN_DELETE | DN_RENAME | DN_MULTISHOT); -- ], [ -- AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, Use Linux dnotify) -- have_notify=dnotify -- ], [ -- if test "$notify" = "dnotify"; then -- AC_MSG_ERROR([dnotify requested but not available]) -- fi -- ]) --elif test "$notify" = "inotify"; then -+if test "$notify" = "" || test "$notify" = "inotify" ; then -+ AC_MSG_CHECKING([if we can use inotify]) - dnl * inotify? -- AC_TRY_COMPILE([ -+ AC_TRY_RUN([ - #define _GNU_SOURCE - #include <sys/ioctl.h> - #include <fcntl.h> - #include <sys/inotify.h> - #include <stdio.h> -- ], [ -- int wd, fd; -- char * fn = "/tmp"; -+ -+ int main() -+ { -+ int wd, fd; -+ char * fn = "/tmp"; - -- fd = inotify_init (); -- if (fd < 0) -- perror ("inotify_init"); -- -- wd = inotify_add_watch (fd, fn, IN_ALL_EVENTS); -+ fd = inotify_init (); -+ if (fd < 0) -+ { -+ perror ("inotify_init"); -+ return (-1); -+ } -+ -+ wd = inotify_add_watch (fd, fn, IN_ALL_EVENTS); -+ -+ if (wd < 0) -+ { -+ perror ("inotify_add_watch"); -+ return (-2); -+ } - -- if (wd < 0) -- perror ("inotify_add_watch"); -+ inotify_rm_watch (fd, wd); - -- inotify_rm_watch (fd, wd); -- -- close (fd); -+ close (fd); -+ } - ], [ - have_notify=inotify -+ notify=inotify - AC_DEFINE(IOLOOP_NOTIFY_INOTIFY,, Use Linux inotify) -+ AC_MSG_RESULT("yes") - ], [ -- AC_MSG_ERROR([inotify requested but not available, check for existence of <sys/inotify.h>]) -+ AC_MSG_RESULT("no") -+ if test "$notify" = "inotify"; then -+ AC_MSG_WARN([inotify requested but not available]) -+ notify="" -+ fi - ]) --elif test "$notify" = "kqueue"; then -+fi -+ -+if test "$notify" = "" || test "$notify" = "kqueue"; then -+ AC_MSG_CHECKING([if we can use BSD kqueue() notify]) - dnl * BSD kqueue() notify -- if test "$ac_cv_func_kqueue" != yes ; then -- AC_MSG_WARN([kqueue notify requested but kqueue() is not available]) -- notify="" -- elif test "$ac_cv_func_kevent" != yes ; then -- AC_MSG_WARN([kqueue notify requested but kevent() is not available]) -- notify="" -- else -+ if test "$ac_cv_func_kqueue" == yes && test "$ac_cv_func_kevent" == yes ; then - have_notify=kqueue -+ notify=kqueue -+ AC_MSG_RESULT("yes") - AC_DEFINE(IOLOOP_NOTIFY_KQUEUE,, - Use BSD kqueue directory changes notificaton) -+ else -+ AC_MSG_RESULT("no") -+ if test "$notfify" = "kqueue" ; then -+ AC_MSG_WARN([kqueue notify requested but kqueue() is not available]) -+ notify="" -+ fi - fi --else -- AC_MSG_ERROR([Unknown notify method: $notify]) -+fi -+ -+if test "$notify" = "" || test "$notify" = "dnotify"; then -+ AC_MSG_CHECKING([if we can use dnotify]) -+ dnl * dnotify? -+ AC_TRY_COMPILE([ -+ #define _GNU_SOURCE -+ #include <fcntl.h> -+ #include <signal.h> -+ #include <unistd.h> -+ ], [ -+ fcntl(0, F_SETSIG, SIGRTMIN); -+ fcntl(0, F_NOTIFY, DN_CREATE | DN_DELETE | DN_RENAME | DN_MULTISHOT); -+ ], [ -+ AC_MSG_RESULT("yes") -+ AC_DEFINE(IOLOOP_NOTIFY_DNOTIFY,, Use Linux dnotify) -+ have_notify=dnotify -+ notify=dnotify -+ ], [ -+ AC_MSG_RESULT("no") -+ if test "$notify" = "dnotify"; then -+ AC_MSG_WARN([dnotify requested but not available]) -+ fi -+ ]) - fi - - if test "$have_notify" = "none"; then diff --git a/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch b/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch deleted file mode 100644 index 2bd88229800e..000000000000 --- a/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/master/main.c.orig 2006-06-16 12:07:06.000000000 +0100 -+++ src/master/main.c 2006-06-16 12:08:01.000000000 +0100 -@@ -355,7 +355,9 @@ - resolve_ip(set->listen, &set->listen_ip, &set->listen_port); - resolve_ip(set->ssl_listen, &set->ssl_listen_ip, &set->ssl_listen_port); - -- if (set->ssl_listen_ip.family == 0 && set->ssl_listen == NULL) -+ /* if ssl_listen wasn't explicitly set in the config file, -+ use the non-ssl IP settings for the ssl listener, too. */ -+ if (set->ssl_listen_ip.family == 0 && *set->ssl_listen == '\0') - set->ssl_listen_ip = set->listen_ip; - - /* register wanted protocols */ |