From: Roy Marples Date: Fri, 16 Jun 2006 08:42:06 +0000 (+0000) Subject: New version that works for glibc-2.4 users who haven't emerged glibc against linux... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76e35c29cbe44f60409c42a31ddfae62c98617d9;p=gentoo.git New version that works for glibc-2.4 users who haven't emerged glibc against linux-headers-2.6.16 Package-Manager: portage-2.1 --- diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 8c9b05a8da58..11e19eea9cf2 100644 --- a/net-mail/dovecot/ChangeLog +++ b/net-mail/dovecot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-mail/dovecot # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.53 2006/06/15 08:50:41 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.54 2006/06/16 08:42:06 uberlord Exp $ + +*dovecot-1.0_beta9-r1 (16 Jun 2006) + + 16 Jun 2006; Roy Marples + +files/dovecot-1.0_beta9-configure.patch, +dovecot-1.0_beta9-r1.ebuild: + Patch configure.in to detect working inotify, epoll, kqueue, dnotify as + we cannot do so in the ebuild. 15 Jun 2006; Roy Marples dovecot-1.0_beta8-r1.ebuild, dovecot-1.0_beta9.ebuild: diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 690cb0fa1d63..bb5442448dda 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,3 +1,7 @@ +AUX dovecot-1.0_beta9-configure.patch 5320 RMD160 9896dc22d4f3517d024f420f5449cd9e3cb151cf SHA1 9e4cfc8fabb88a0aeff80ac9d251d89a942ea43d SHA256 3b230cb7c5c474a044501dd5e74aee4b4dc4e94b3dc613f1efde38c998b8023c +MD5 2a79dc0c1c24b5e51d8c93c3a590c899 files/dovecot-1.0_beta9-configure.patch 5320 +RMD160 9896dc22d4f3517d024f420f5449cd9e3cb151cf files/dovecot-1.0_beta9-configure.patch 5320 +SHA256 3b230cb7c5c474a044501dd5e74aee4b4dc4e94b3dc613f1efde38c998b8023c files/dovecot-1.0_beta9-configure.patch 5320 AUX dovecot.init 619 RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 SHA1 408fc13f5a9ccd8b40e7f82f99e3b18912e24c1f SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 MD5 155396035a3ecb1f5171b0432072181b files/dovecot.init 619 RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 files/dovecot.init 619 @@ -12,14 +16,18 @@ EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7 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.ebuild 5515 RMD160 30fdfda8a9231a638e737e41664bb52ffe915a86 SHA1 39210271922d02f74f197d601524e33804cf0212 SHA256 4c5f9d1b1451ade0011769f3810f597da2d806b449c36c7f6d6789c211519c91 MD5 efa3b47d51fcf811bacd0b0e9146fda0 dovecot-1.0_beta9.ebuild 5515 RMD160 30fdfda8a9231a638e737e41664bb52ffe915a86 dovecot-1.0_beta9.ebuild 5515 SHA256 4c5f9d1b1451ade0011769f3810f597da2d806b449c36c7f6d6789c211519c91 dovecot-1.0_beta9.ebuild 5515 -MISC ChangeLog 9864 RMD160 94200cfa6421acf9ba2f5f8e879f29b7e44a57c9 SHA1 8026bd40e83557752d1beda479f4b5bae16d886f SHA256 a4a9f96133bcdb87786420687700b90b3145364f8f56dfcee5128eb8ccddb688 -MD5 f7a13b103e1ddc9b5bab37a87e21e602 ChangeLog 9864 -RMD160 94200cfa6421acf9ba2f5f8e879f29b7e44a57c9 ChangeLog 9864 -SHA256 a4a9f96133bcdb87786420687700b90b3145364f8f56dfcee5128eb8ccddb688 ChangeLog 9864 +MISC ChangeLog 10132 RMD160 1b9546eec93a4f359d4637b1467caba51a746bcb SHA1 83ee48620eb5216d810859100ab2e69e116b4fcb SHA256 a9d8129650bb9608aae881e06415d4e0bdfd3e452a34737cefe6fa953d9ea79d +MD5 4c506e9f155adc18fa44caf080167d87 ChangeLog 10132 +RMD160 1b9546eec93a4f359d4637b1467caba51a746bcb ChangeLog 10132 +SHA256 a9d8129650bb9608aae881e06415d4e0bdfd3e452a34737cefe6fa953d9ea79d ChangeLog 10132 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -33,3 +41,6 @@ SHA256 ea917d2411bb907e433ecae9ae8c396bb0bcf20e54bfd69e95338d2aca4674b5 files/di MD5 8fcd45ae0df65f8003fff7b5cf52ca34 files/digest-dovecot-1.0_beta9 256 RMD160 0f4e4d23d25958324702954e021b86156ca4d319 files/digest-dovecot-1.0_beta9 256 SHA256 ac470d07b4fb41fbfd3758040462ab8ab425d5331d649360ec887e3157c0bcb9 files/digest-dovecot-1.0_beta9 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 diff --git a/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild b/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild new file mode 100644 index 000000000000..825e132e6083 --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_beta9-r1.ebuild @@ -0,0 +1,178 @@ +# 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/files/digest-dovecot-1.0_beta9-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r1 new file mode 100644 index 000000000000..5e22728901a3 --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r1 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..02b4f7a43502 --- /dev/null +++ b/net-mail/dovecot/files/dovecot-1.0_beta9-configure.patch @@ -0,0 +1,191 @@ +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-15 14:46:05.620287008 +0100 +@@ -364,29 +364,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 ++ #include ++ #include ++ ++ #include ++ ++ _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 +414,83 @@ + + have_notify=none + +-if test "$notify" = "" || test "$notify" = "dnotify"; then +- dnl * dnotify? +- AC_TRY_COMPILE([ +- #define _GNU_SOURCE +- #include +- #include +- #include +- ], [ +- 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 + dnl * inotify? +- AC_TRY_COMPILE([ ++ AC_TRY_RUN([ + #define _GNU_SOURCE + #include + #include + #include + #include +- ], [ +- 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_ERROR([inotify requested but not available, check for existence of ]) ++ if test "$notify" = "inotify"; then ++ AC_MSG_WARN([inotify requested but not available]) ++ fi + ]) +-elif test "$notify" = "kqueue"; then ++fi ++ ++if test "$notify" = "" || test "$notify" = "kqueue"; then + 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_DEFINE(IOLOOP_NOTIFY_KQUEUE,, + Use BSD kqueue directory changes notificaton) ++ else ++ if test "$notfify" = "kqueue" ; then ++ AC_MSG_WARN([kqueue notify requested but kqueue() is not available]) ++ fi + fi +-else +- AC_MSG_ERROR([Unknown notify method: $notify]) ++fi ++ ++if test "$notify" = "" || test "$notify" = "dnotify"; then ++ dnl * dnotify? ++ AC_TRY_COMPILE([ ++ #define _GNU_SOURCE ++ #include ++ #include ++ #include ++ ], [ ++ 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 ++ notify=dnotify ++ ], [ ++ if test "$notify" = "dnotify"; then ++ AC_MSG_WARN([dnotify requested but not available]) ++ fi ++ ]) + fi + + if test "$have_notify" = "none"; then