* [gentoo-commits] gentoo-x86 commit in net-mail/cyrus-imapd: cyrus-imapd-2.4.17-r1.ebuild ChangeLog
@ 2013-10-18 18:42 Stefan Briesenick (sbriesen)
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Briesenick (sbriesen) @ 2013-10-18 18:42 UTC (permalink / raw
To: gentoo-commits
sbriesen 13/10/18 18:42:52
Modified: ChangeLog
Added: cyrus-imapd-2.4.17-r1.ebuild
Log:
fix configure-error with USE=mysql (bug #477782) and added patch for squatter segfaults.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key BB6C42C7)
Revision Changes Path
1.212 net-mail/cyrus-imapd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.211&r2=1.212
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog 25 Feb 2013 12:09:57 -0000 1.211
+++ ChangeLog 18 Oct 2013 18:42:51 -0000 1.212
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/cyrus-imapd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.211 2013/02/25 12:09:57 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.212 2013/10/18 18:42:51 sbriesen Exp $
+
+*cyrus-imapd-2.4.17-r1 (18 Oct 2013)
+
+ 18 Oct 2013; Stefan Briesenick <sbriesen@gentoo.org>
+ +cyrus-imapd-2.4.17-r1.ebuild, +files/cyrus-imapd-2.4.17-statuscache.diff:
+ fix configure-error with USE=mysql (bug #477782) and added patch for squatter
+ segfaults.
25 Feb 2013; Eray Aslan <eras@gentoo.org> cyrus-imapd-2.4.17.ebuild:
Add cmulocal m4dir to eautoreconf - bug #458956
1.1 net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.1&content-type=text/plain
Index: cyrus-imapd-2.4.17-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.1 2013/10/18 18:42:51 sbriesen Exp $
EAPI=4
inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
MY_P=${P/_/}
DESCRIPTION="The Cyrus IMAP Server."
HOMEPAGE="http://www.cyrusimap.org/"
SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
LICENSE="BSD-with-attribution"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
RDEPEND="sys-libs/zlib
>=dev-libs/cyrus-sasl-2.1.13
afs? ( net-fs/openafs )
berkdb? ( >=sys-libs/db-3.2 )
kerberos? ( virtual/krb5 )
mysql? ( virtual/mysql )
nntp? ( !net-nntp/leafnode )
pam? (
virtual/pam
>=net-mail/mailbase-1
)
postgres? ( dev-db/postgresql-base )
snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
sqlite? ( dev-db/sqlite )
ssl? ( >=dev-libs/openssl-0.9.6 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
DEPEND="$RDEPEND"
# get rid of old style virtual - bug 350792
# all blockers really needed?
RDEPEND="${RDEPEND}
!mail-mta/courier
!net-mail/bincimap
!net-mail/courier-imap
!net-mail/uw-imap"
REQUIRED_USE="afs? ( kerberos )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
enewuser cyrus -1 -1 /usr/cyrus mail
}
src_prepare() {
# fix squatter segfaults, see:
# https://bugzilla.cyrusimap.org/show_bug.cgi?id=3757
epatch "${FILESDIR}/${P}-statuscache.diff"
# Fix master(8)->cyrusmaster(8) manpage.
for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
sed -i -e 's:master\.8:cyrusmaster.8:g' \
-e 's:master(8):cyrusmaster(8):g' \
"${i}" || die "sed failed" || die "sed failed"
done
mv man/master.8 man/cyrusmaster.8 || die "mv failed"
sed -i -e "s:MASTER:CYRUSMASTER:g" \
-e "s:Master:Cyrusmaster:g" \
-e "s:master:cyrusmaster:g" \
man/cyrusmaster.8 || die "sed failed"
# do not strip
sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
# correct afs include and liblwp.a directory
sed -i -e '/I${with_afs_incdir/s/\/include//' \
-e '/liblwp/s/liblwp/afs\/liblwp/' \
"${S}"/configure{,.in} || die
# same with lock.h
sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
ptclient/afskrb.c || die
# libcom_err.a to libafscom_err.a
sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
configure{,.in} || die
sed -i -e "s/ar cr/$(tc-getAR) cr/" \
perl/sieve/lib/Makefile.in \
imap/Makefile.in \
lib/Makefile.in \
installsieve/Makefile.in \
com_err/et/Makefile.in \
sieve/Makefile.in \
syslog/Makefile.in || die
AT_M4DIR="cmulocal" eautoreconf
}
src_configure() {
local myconf
if use mysql ; then
myconf=$(mysql_config --include)
myconf="--with-mysql-incdir=${myconf#-I}"
myconf+=" --with-mysql-libdir=/usr/$(get_libdir)/mysql"
fi
if use afs ; then
myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
myconf+=" --with-afs-incdir=/usr/include/afs"
fi
if use berkdb ; then
myconf+=" --with-bdb-incdir=$(db_includedir)"
fi
econf \
--enable-murder \
--enable-netscapehack \
--enable-idled \
--with-service-path=/usr/$(get_libdir)/cyrus \
--with-cyrus-user=cyrus \
--with-cyrus-group=mail \
--with-com_err=yes \
--with-sasl \
--without-perl \
--without-krb \
--without-krbdes \
--with-zlib \
$(use_enable afs) \
$(use_enable afs krb5afspts) \
$(use_with berkdb bdb) \
$(use_enable nntp) \
$(use_enable replication) \
$(use_enable kerberos gssapi) \
$(use_with mysql) \
$(use_with postgres pgsql) \
$(use_with sqlite) \
$(use_with ssl openssl) \
$(use_enable sieve) \
$(use_with snmp) \
$(use_with tcpd libwrap) \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install
# file collision - bug #368245
if ! use nntp ; then
rm "${D}"/usr/share/man/man8/fetchnews.8*
fi
dodoc README*
dohtml doc/*.html doc/murder.png
docinto text
dodoc doc/text/*
cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
cp -r contrib tools "${D}/usr/share/doc/${PF}"
rm -f doc/text/Makefile*
insinto /etc
doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
# turn off sieve if not installed
if ! use sieve; then
sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
fi
newinitd "${FILESDIR}/cyrus.rc6" cyrus
newconfd "${FILESDIR}/cyrus.confd" cyrus
newpamd "${FILESDIR}/cyrus.pam-include" sieve
for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
keepdir "/var/${subdir}"
fowners cyrus:mail "/var/${subdir}"
fperms 0750 "/var/${subdir}"
done
for subdir in imap/{user,quota,sieve} spool/imap ; do
for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
keepdir "/var/${subdir}/${i}"
fowners cyrus:mail "/var/${subdir}/${i}"
fperms 0750 "/var/${subdir}/${i}"
done
done
}
pkg_preinst() {
if ! has_version ${CATEGORY}/${PN} ; then
elog "For correct logging add the following to /etc/syslog.conf:"
elog " local6.* /var/log/imapd.log"
elog " auth.debug /var/log/auth.log"
echo
elog "You have to add user cyrus to the sasldb2. Do this with:"
elog " saslpasswd2 cyrus"
fi
}
pkg_postinst() {
# do not install server.{key,pem) if they exist.
if use ssl ; then
if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
install_cert /etc/ssl/cyrus/server
chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
fi
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-mail/cyrus-imapd: cyrus-imapd-2.4.17-r1.ebuild ChangeLog
@ 2015-06-26 17:33 Brian Evans (grknight)
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans (grknight) @ 2015-06-26 17:33 UTC (permalink / raw
To: gentoo-commits
grknight 15/06/26 17:33:50
Modified: cyrus-imapd-2.4.17-r1.ebuild ChangeLog
Log:
Non-maintainer commit: Fix mysql_config references for build failures wrt bug 525102
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)
Revision Changes Path
1.5 net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild?r1=1.4&r2=1.5
Index: cyrus-imapd-2.4.17-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cyrus-imapd-2.4.17-r1.ebuild 28 Dec 2014 16:31:47 -0000 1.4
+++ cyrus-imapd-2.4.17-r1.ebuild 26 Jun 2015 17:33:50 -0000 1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.4 2014/12/28 16:31:47 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.5 2015/06/26 17:33:50 grknight Exp $
EAPI=4
@@ -17,12 +17,13 @@
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
+# virtual/mysql-5.5 added for the --variable= option below
RDEPEND="sys-libs/zlib
>=dev-libs/cyrus-sasl-2.1.13
afs? ( net-fs/openafs )
berkdb? ( >=sys-libs/db-3.2 )
kerberos? ( virtual/krb5 )
- mysql? ( virtual/mysql )
+ mysql? ( >=virtual/mysql-5.5 )
nntp? ( !net-nntp/leafnode )
pam? (
virtual/pam
@@ -98,9 +99,8 @@
src_configure() {
local myconf
if use mysql ; then
- myconf=$(mysql_config --include)
- myconf="--with-mysql-incdir=${myconf#-I}"
- myconf+=" --with-mysql-libdir=/usr/$(get_libdir)/mysql"
+ myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
+ myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
fi
if use afs ; then
myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
1.216 net-mail/cyrus-imapd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?rev=1.216&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/cyrus-imapd/ChangeLog?r1=1.215&r2=1.216
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- ChangeLog 28 Dec 2014 16:31:47 -0000 1.215
+++ ChangeLog 26 Jun 2015 17:33:50 -0000 1.216
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/cyrus-imapd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.215 2014/12/28 16:31:47 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.216 2015/06/26 17:33:50 grknight Exp $
+
+ 26 Jun 2015; Brian Evans <grknight@gentoo.org> cyrus-imapd-2.4.17-r1.ebuild:
+ Non-maintainer commit: Fix mysql_config references for build failures wrt bug
+ 525102
28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
cyrus-imapd-2.4.16.ebuild, cyrus-imapd-2.4.17.ebuild,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-26 17:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-18 18:42 [gentoo-commits] gentoo-x86 commit in net-mail/cyrus-imapd: cyrus-imapd-2.4.17-r1.ebuild ChangeLog Stefan Briesenick (sbriesen)
-- strict thread matches above, loose matches on Subject: below --
2015-06-26 17:33 Brian Evans (grknight)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox