* [gentoo-commits] gentoo-x86 commit in net-mail/dovecot: ChangeLog dovecot-2.0_rc4.ebuild dovecot-2.0_rc3.ebuild
@ 2010-08-05 13:20 Jeremy Olexa (darkside)
0 siblings, 0 replies; only message in thread
From: Jeremy Olexa (darkside) @ 2010-08-05 13:20 UTC (permalink / raw
To: gentoo-commits
darkside 10/08/05 13:20:45
Modified: ChangeLog
Added: dovecot-2.0_rc4.ebuild
Removed: dovecot-2.0_rc3.ebuild
Log:
Version bump, bug #331285 by Eray Aslan. Service name changed to sieve for pam. Reorder linking for --as-needed flag.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.251 net-mail/dovecot/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/ChangeLog?r1=1.250&r2=1.251
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- ChangeLog 26 Jul 2010 23:21:59 -0000 1.250
+++ ChangeLog 5 Aug 2010 13:20:44 -0000 1.251
@@ -1,6 +1,17 @@
# ChangeLog for net-mail/dovecot
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.250 2010/07/26 23:21:59 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.251 2010/08/05 13:20:44 darkside Exp $
+
+*dovecot-2.0_rc4 (05 Aug 2010)
+
+ 05 Aug 2010; Jeremy Olexa <darkside@gentoo.org>
+ -files/dovecot-1.1.11-11112baa8592.patch,
+ -files/dovecot-1.1.11-4736327a8740.patch,
+ -files/dovecot-1.1.11-bdc5391e52df.patch,
+ -files/dovecot-1.1.11-c08c602ca0dc.patch, -dovecot-2.0_rc3.ebuild,
+ +dovecot-2.0_rc4.ebuild, +files/dovecot-2.0_rc4-asneeded.patch:
+ Version bump, bug #331285 by Eray Aslan. Service name changed to sieve for
+ pam. Reorder linking for --as-needed flag.
*dovecot-1.2.13 (26 Jul 2010)
1.1 net-mail/dovecot/dovecot-2.0_rc4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc4.ebuild?rev=1.1&content-type=text/plain
Index: dovecot-2.0_rc4.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_rc4.ebuild,v 1.1 2010/08/05 13:20:44 darkside Exp $
EAPI="2"
inherit eutils versionator ssl-cert
MY_P="${P/_/.}"
major_minor="$( get_version_component_range 1-2 )"
sieve_snapshot="cac6acdc4d0e"
SRC_URI="http://dovecot.org/releases/${major_minor}/rc/${MY_P}.tar.gz
sieve? (
http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
)
managesieve? (
http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
) "
DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
HOMEPAGE="http://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1" # MIT too?
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
IUSE="berkdb bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve
mbox mdbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
DEPEND="berkdb? ( sys-libs/db )
caps? ( sys-libs/libcap )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
mysql? ( virtual/mysql )
pam? ( virtual/pam )
postgres? ( dev-db/postgresql-base )
sqlite? ( dev-db/sqlite )
ssl? ( dev-libs/openssl )
vpopmail? ( net-mail/vpopmail )"
RDEPEND="${DEPEND}
>=net-mail/mailbase-0.00-r8"
S=${WORKDIR}/${MY_P}
pkg_setup() {
if use managesieve && ! use sieve; then
ewarn "managesieve USE flag selected but sieve USE flag unselected"
ewarn "sieve USE flag will be turned on"
fi
# Add user and group for login process (same as for fedora/redhat)
# default internal user
enewgroup dovecot 97
enewuser dovecot 97 -1 /dev/null dovecot
# add "mail" group for suid'ing. Better security isolation.
if use suid; then
enewgroup mail
fi
# default login user
enewuser dovenull -1 -1 /dev/null
}
src_prepare() {
epatch "${FILESDIR}/dovecot-2.0_rc4-asneeded.patch"
}
src_configure() {
local conf=""
if use postgres || use mysql || use sqlite; then
conf="${conf} --with-sql"
fi
local storages=""
for storage in cydir sdbox mdbox maildir mbox; do
use ${storage} && storages="${storage} ${storages}"
done
[ "${storages}" ] || storages="maildir"
econf \
--localstatedir=/var \
--with-moduledir="/usr/$( get_libdir )/dovecot" \
$( use_with bzip2 bzlib ) \
$( use_with caps libcap ) \
$( use_with kerberos gssapi ) \
$( use_with ldap ) \
$( use_with mysql ) \
$( use_with pam ) \
$( use_with postgres pgsql ) \
$( use_with sqlite ) \
$( use_with ssl ) \
$( use_with vpopmail ) \
$( use_with zlib ) \
--with-storages="${storages}" \
--disable-rpath \
${conf}
if use sieve || use managesieve ; then
# The sieve plugin needs this file to be build to determine the plugin
# directory and the list of libraries to link to.
emake dovecot-config || die "emake dovecot-config failed"
# snapshot. should not be necessary for 2.0 release
cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
./autogen.sh || die "autogen failed"
# stupid no-op check in Makefile
#sed -i -e 's/^check: check-recursive/check: test/' Makefile*
econf \
--localstatedir=/var \
--enable-shared \
--with-dovecot="../${MY_P}" \
$( use_with managesieve )
fi
}
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
if use sieve || use managesieve ; then
cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
fi
}
src_test() {
default_src_test
# not yet
#if use sieve || use managesieve ; then
#einfo "Beginning sieve tests..."
# snapshot. should not be necessary for 2.0 release
#cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
#default_src_test
#fi
}
src_install () {
emake DESTDIR="${D}" install || die "make install failed"
# insecure:
# use suid && fperms u+s /usr/libexec/dovecot/deliver
# better:
if use suid;then
einfo "Changing perms to allow deliver to be suided"
fowners root:mail "${D}"/usr/libexec/dovecot/deliver
fperms 4750 "${D}"/usr/libexec/dovecot/deliver
fi
newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
rm -rf "${D}"/usr/share/doc/dovecot
rm -rf "${D}"/usr/share/aclocal
dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
dodoc doc/*.{txt,cnf,xml,sh} || die "dodoc doc failed"
docinto example-config
dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
docinto example-config/conf.d
dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
docinto wiki
dodoc doc/wiki/* || die "dodoc wiki failed"
doman doc/man/*.{1,7}
# 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"
local confd="${D}/etc/dovecot/conf.d"
insinto /etc/dovecot
doins doc/example-config/*.{conf,ext}
insinto /etc/dovecot/conf.d
doins doc/example-config/conf.d/*.{conf,ext}
fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
"${confd}/../README" || die "sed failed"
# .maildir is the Gentoo default
local mail_location="maildir:~/.maildir"
if ! use maildir; then
if use mbox; then
mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
keepdir /var/dovecot
sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
"${confd}/10-mail.conf" || die "sed failed"
elif use sdbox ; then
mail_location="sdbox:~/.sdbox"
elif use mdbox ; then
mail_location="mdbox:~/.mdbox"
fi
fi
sed -i -e \
"s|#mail_location =|mail_location = ${mail_location}|" \
"${confd}/10-mail.conf" \
|| die "failed to update mail location settings in 10-mail.conf"
# We're using pam files (imap and pop3) provided by mailbase
if use pam; then
sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
"${confd}/auth-system.conf.ext" \
|| die "failed to update PAM settings in auth-system.conf.ext"
# mailbase does not provide a managesieve pam file
use managesieve && dosym imap /etc/pam.d/sieve
sed -i -e \
's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
"${confd}/10-auth.conf" \
|| die "failed to update PAM settings in 10-auth.conf"
fi
# Disable ipv6 if necessary
if ! use ipv6; then
sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
|| die "failed to update listen settings in dovecot.conf"
fi
# Update ssl cert locations
if use ssl; then
sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
|| die "ssl conf failed"
sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
fi
# Install SQL configuration
if use mysql || use postgres; then
sed -i -e \
's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
"${confd}/10-auth.conf" || die "failed to update SQL settings in \
10-auth.conf"
fi
# Install LDAP configuration
if use ldap; then
sed -i -e \
's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
"${confd}/10-auth.conf" \
|| die "failed to update ldap settings in 10-auth.conf"
fi
if use vpopmail; then
sed -i -e \
's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
"${confd}/10-auth.conf" \
|| die "failed to update vpopmail settings in 10-auth.conf"
fi
if use sieve || use managesieve ; then
cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
emake DESTDIR="${D}" install || die "make install failed (sieve)"
sed -i -e \
's/^[[:space:]]*#mail_plugins =/mail_plugins = sieve/' "${confd}/15-lda.conf" \
|| die "failed to update sieve settings in 15-lda.conf"
rm -rf "${D}"/usr/share/doc/dovecot
dodoc doc/*.txt
docinto example-config/conf.d
dodoc doc/example-config/conf.d/*.conf
insinto /etc/dovecot/conf.d
doins doc/example-config/conf.d/90-sieve.conf
use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
docinto sieve/rfc
dodoc doc/rfc/*.txt
docinto sieve/devel
dodoc doc/devel/DESIGN
doman doc/man/*.1
fi
}
pkg_preinst() {
has_version =${CATEGORY}/${PN}-0*
dovecot_upgrade_from_0_x=$?
has_version =${CATEGORY}/${PN}-1*
dovecot_upgrade_from_1_x=$?
if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
elog "There are a lot of changes in configuration files. Please read"
elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
elog "in ${ROOT}etc/dovecot"
elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
elog "There are a lot of changes in configuration files in dovecot-2.0."
elog "Please read http://wiki2.dovecot.org/Upgrading/2.0 and"
elog "check the conf files in ${ROOT}etc/dovecot."
elog "You can also run doveconf -n before running etc-update or"
elog "dispatch-conf to get an idea about what needs to be changed."
ewarn "Do not {re}start dovecot without checking your conf files"
ewarn "and making the necessary changes."
fi
}
pkg_postinst() {
if use ssl; then
# 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
einfo "Creating SSL certificate"
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
install_cert /etc/ssl/dovecot/server
fi
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-05 13:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05 13:20 [gentoo-commits] gentoo-x86 commit in net-mail/dovecot: ChangeLog dovecot-2.0_rc4.ebuild dovecot-2.0_rc3.ebuild Jeremy Olexa (darkside)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox