From: Roy Marples Date: Thu, 12 Apr 2007 15:24:31 +0000 (+0000) Subject: Define LDAP_DEPRECATED for OpenLDAP 2.3 users #162437 which also stops it segfaulting... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ba8f8ebf5441dd3a9a7b4de3845fc98bd36a473;p=gentoo.git Define LDAP_DEPRECATED for OpenLDAP 2.3 users #162437 which also stops it segfaulting on amd64, #174139. Package-Manager: portage-2.1.2.3 --- diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 9ad3bc043b9f..0b6a7208cbb4 100644 --- a/net-mail/dovecot/ChangeLog +++ b/net-mail/dovecot/ChangeLog @@ -1,6 +1,13 @@ # 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.103 2007/04/10 07:43:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.104 2007/04/12 15:24:31 uberlord Exp $ + +*dovecot-1.0_rc31-r1 (12 Apr 2007) + + 12 Apr 2007; Roy Marples + +files/dovecot-1.0_rc31-ldap.patch, +dovecot-1.0_rc31-r1.ebuild: + Define LDAP_DEPRECATED for OpenLDAP 2.3 users #162437 which also stops it + segfaulting on amd64, #174139. *dovecot-1.0_rc31 (10 Apr 2007) diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 6610009ec655..1ee0874ddb9a 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,3 +1,7 @@ +AUX dovecot-1.0_rc31-ldap.patch 502 RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 SHA1 b9c4f72d56de03c323d1aa7e18c5195d526c1e28 SHA256 3224b0c08c0f09e73e35542d5b91a251ba6c25278e148bd203bdd2256222257a +MD5 ad1cfd518233a37539c41f1cf3a95180 files/dovecot-1.0_rc31-ldap.patch 502 +RMD160 b0942e7acdfd43ceb9607d0915d85c5d6e65a457 files/dovecot-1.0_rc31-ldap.patch 502 +SHA256 3224b0c08c0f09e73e35542d5b91a251ba6c25278e148bd203bdd2256222257a files/dovecot-1.0_rc31-ldap.patch 502 AUX dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab SHA1 f31c1476107dd4ca4919fe3e994ef6cb82f5a8c1 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 MD5 6d3e44da73ef66d20b42a5fad49731f0 files/dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878 @@ -54,14 +58,18 @@ EBUILD dovecot-1.0_rc30.ebuild 6276 RMD160 33f959963e3e4b16c6ca630c961bfcdbf2022 MD5 78c6d1a37f885bff6ccab4121713d54f dovecot-1.0_rc30.ebuild 6276 RMD160 33f959963e3e4b16c6ca630c961bfcdbf2022059 dovecot-1.0_rc30.ebuild 6276 SHA256 bdc1bab4ee1e6c54e08d41057413e1ae7587dfe5ec2d5fcbd60519ec3af36631 dovecot-1.0_rc30.ebuild 6276 +EBUILD dovecot-1.0_rc31-r1.ebuild 6360 RMD160 373c33cc0f4c306f29e3006448336f27ec61bfe6 SHA1 b2b536f93bf0325bd442cdb4a71826433e104350 SHA256 63efd8ca8fee2f4baf008900c5378c1dced0dc88589aecbf4323e0177065df89 +MD5 af75b4bc6707a2a27781b06a7d48080b dovecot-1.0_rc31-r1.ebuild 6360 +RMD160 373c33cc0f4c306f29e3006448336f27ec61bfe6 dovecot-1.0_rc31-r1.ebuild 6360 +SHA256 63efd8ca8fee2f4baf008900c5378c1dced0dc88589aecbf4323e0177065df89 dovecot-1.0_rc31-r1.ebuild 6360 EBUILD dovecot-1.0_rc31.ebuild 6276 RMD160 518fd345deb4294e9507a24d2c5cfb725b3267f5 SHA1 8b2f88a4dbb9028f7d0bcdc70ecce51798325ce6 SHA256 83dc31aa2f89a089fd9e21b4455c058cd651f58ff22baf146b3517a9cedc5c4b MD5 963ccbe48b87a0f60392a1bb13cd55ec dovecot-1.0_rc31.ebuild 6276 RMD160 518fd345deb4294e9507a24d2c5cfb725b3267f5 dovecot-1.0_rc31.ebuild 6276 SHA256 83dc31aa2f89a089fd9e21b4455c058cd651f58ff22baf146b3517a9cedc5c4b dovecot-1.0_rc31.ebuild 6276 -MISC ChangeLog 16972 RMD160 5d8a41f9107e55e188bd486c65d45383ed37c0a0 SHA1 c8f31a273ba996c2fdd836c0a0ebdd4e75eeeb69 SHA256 b6dbb064674facb0977a47d74eca4cecbcce3bc2188c5d6ed312b9fd0a731ec8 -MD5 d226740da0aef3c8dacdd8cf650470d7 ChangeLog 16972 -RMD160 5d8a41f9107e55e188bd486c65d45383ed37c0a0 ChangeLog 16972 -SHA256 b6dbb064674facb0977a47d74eca4cecbcce3bc2188c5d6ed312b9fd0a731ec8 ChangeLog 16972 +MISC ChangeLog 17234 RMD160 ee04e70b5faab60ceffdf729f642e1da66bc2c0b SHA1 02f37c26a9e8f42a3852b5e8c05d1ef9081da022 SHA256 e30ba9f5528051e102a42aba0c2d484766550a22219e876a58032b8d646ed20f +MD5 220325a383602adc51233c6e3a664929 ChangeLog 17234 +RMD160 ee04e70b5faab60ceffdf729f642e1da66bc2c0b ChangeLog 17234 +SHA256 e30ba9f5528051e102a42aba0c2d484766550a22219e876a58032b8d646ed20f ChangeLog 17234 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -99,3 +107,6 @@ SHA256 c3508b6b77b6dccf07446005e8a5f0e751420457188d4891573920a77e262a26 files/di MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31 506 RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31 506 SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31 506 +MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31-r1 506 +RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31-r1 506 +SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31-r1 506 diff --git a/net-mail/dovecot/dovecot-1.0_rc31-r1.ebuild b/net-mail/dovecot/dovecot-1.0_rc31-r1.ebuild new file mode 100644 index 000000000000..230dced473fb --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_rc31-r1.ebuild @@ -0,0 +1,212 @@ +# 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_rc31-r1.ebuild,v 1.1 2007/04/12 15:24:31 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 suid 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_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-ldap.patch +} + +src_compile() { + 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" + emake || die "make failed" + fi +} + +src_install () { + make DESTDIR="${D}" install || die "make install failed" + use suid && fperms +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 + 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-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}" + 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}" + 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" + 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_rc31-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_rc31-r1 new file mode 100644 index 000000000000..8938b85ddd51 --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc31-r1 @@ -0,0 +1,6 @@ +MD5 246b74f72bc710b3348307955de29292 dovecot-1.0.rc31.tar.gz 1672213 +RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d dovecot-1.0.rc31.tar.gz 1672213 +SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a dovecot-1.0.rc31.tar.gz 1672213 +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 diff --git a/net-mail/dovecot/files/dovecot-1.0_rc31-ldap.patch b/net-mail/dovecot/files/dovecot-1.0_rc31-ldap.patch new file mode 100644 index 000000000000..f3eb41a161e0 --- /dev/null +++ b/net-mail/dovecot/files/dovecot-1.0_rc31-ldap.patch @@ -0,0 +1,14 @@ +diff -ur dovecot-1.0.rc29/src/auth/db-ldap.h dovecot-1.0.rc29/src/auth/db-ldap.h +--- dovecot-1.0.rc29/src/auth/db-ldap.h 2007-01-19 15:15:13.000000000 +0000 ++++ dovecot-1.0.rc29/src/auth/db-ldap.h 2007-04-12 09:29:06.000000000 +0100 +@@ -1,6 +1,10 @@ + #ifndef __DB_LDAP_H + #define __DB_LDAP_H + ++/* Functions like ldap_bind have been deprecated in openldap 2.3 ++ * This define enables them until the code here can be refactored */ ++#define LDAP_DEPRECATED 1 ++ + #include + + struct auth_request;