diff options
Diffstat (limited to 'net-mail/cyrus-imspd')
| -rw-r--r-- | net-mail/cyrus-imspd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-mail/cyrus-imspd/Manifest | 6 | ||||
| -rw-r--r-- | net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild (renamed from net-mail/cyrus-imspd/cyrus-imspd-1.7.ebuild) | 35 | ||||
| -rw-r--r-- | net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1 (renamed from net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7) | 0 |
4 files changed, 28 insertions, 20 deletions
diff --git a/net-mail/cyrus-imspd/ChangeLog b/net-mail/cyrus-imspd/ChangeLog index a58d4513d664..66b8bf3c1761 100644 --- a/net-mail/cyrus-imspd/ChangeLog +++ b/net-mail/cyrus-imspd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/cyrus-imspd # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.1 2003/09/18 18:23:29 max Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.2 2003/10/10 17:37:08 max Exp $ + +*cyrus-imspd-1.7-r1 (10 Oct 2003) + + 10 Oct 2003; Max Kalika <max@gentoo.org> cyrus-imspd-1.7-r1.ebuild: + Fix USE=-ldap. Bump to stable on x86. *cyrus-imspd-1.7 (10 Sep 2003) diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest index de0a93b3edaf..31d2fe0c8e1b 100644 --- a/net-mail/cyrus-imspd/Manifest +++ b/net-mail/cyrus-imspd/Manifest @@ -1,10 +1,10 @@ -MD5 ca1d3e5d88bda410f48b0134bc7f4ce9 cyrus-imspd-1.7.ebuild 2299 -MD5 15c4db9a19c9023900f5a1341f2e996f ChangeLog 1851 +MD5 023956ebbb59bb0a9d5346b161746870 cyrus-imspd-1.7-r1.ebuild 2238 +MD5 14ed45c8dc0de6865ab68798a1fc0f85 ChangeLog 1997 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 3c8013bd55f6ce72fda11e0b0a058221 files/cyrus-imspd-db4.patch 3786 MD5 aa6f51b5cf7fcffd8af00e26c81c2eed files/imspd.conf 156 MD5 4abe3ce5da075b56135d9fb7060fc1e9 files/imspd.rc6 1149 MD5 7d092edc1868ef27ebd61712f1be77ce files/cyrus-imspd-gentoo.patch 5092 +MD5 091bfd9602efd88a1f6411bf09203ffc files/digest-cyrus-imspd-1.7-r1 68 MD5 25ae448568ad4a44c37e27243ed5b3e6 files/gentestcrt.sh 8797 -MD5 091bfd9602efd88a1f6411bf09203ffc files/digest-cyrus-imspd-1.7 68 MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220 diff --git a/net-mail/cyrus-imspd/cyrus-imspd-1.7.ebuild b/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild index b0d073212726..5cd74a20eed9 100644 --- a/net-mail/cyrus-imspd/cyrus-imspd-1.7.ebuild +++ b/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7.ebuild,v 1.1 2003/09/18 18:23:29 max Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.7-r1.ebuild,v 1.1 2003/10/10 17:37:08 max Exp $ DESCRIPTION="Internet Message Support Protocol (IMSP) server." HOMEPAGE="http://asg.web.cmu.edu/cyrus/" @@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${PN}-v${PV}.tar.gz" LICENSE="as-is" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" IUSE="kerberos ldap ssl" DEPEND="virtual/glibc @@ -18,7 +18,7 @@ DEPEND="virtual/glibc >=sys-apps/sed-4 kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.0 ) - ssl? ( >=dev-libs/openssl-0.9.6 >=net-misc/stunnel-4.04 )" + ssl? ( >=net-misc/stunnel-4 )" S="${WORKDIR}/${PN}-v${PV}" @@ -28,8 +28,8 @@ src_unpack() { epatch "${FILESDIR}/cyrus-imspd-gentoo.patch" epatch "${FILESDIR}/cyrus-imspd-db4.patch" - # cyrus 2.2.x has an extra library which things must link against - if [ -n "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then + # cyrus 2.2.x has an extra library. + if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then sed -e "s:-lcyrus:-lcyrus -lcyrus_min:" \ -i "${S}/imsp/Makefile.in" \ -i "${S}/cmulocal/libcyrus.m4" || die "sed failed" @@ -43,16 +43,15 @@ src_unpack() { } src_compile() { - local myconf="`use_with ldap ldap=ldap`" - - if [ "`use kerberos`" ] ; then - myconf="${myconf} --with-auth=krb --enable-gssapi" - else - myconf="${myconf} --with-auth=unix --without-krb --disable-gssapi" - fi - - econf ${myconf} - make || die "compile problem" + local myconf + myconf="${myconf} `use_with ldap ldap ldap`" + myconf="${myconf} `use_enable kerberos gssapi`" + + econf \ + --without-krb \ + --with-auth=unix \ + ${myconf} + emake || die "compile problem" } src_install() { @@ -71,9 +70,13 @@ src_install() { dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" /etc/conf.d/imspd - einfo "Generating self-signed test certificate." + ebegin "Generating self-signed test certificate" (yes "" | "${FILESDIR}/gentestcrt.sh") &>/dev/null + eend $? + ebegin "Generating PEM file" (cat server.key && echo && cat server.crt) > server.pem + eend $? + insinto /etc/ssl/imspd doins server.{key,crt,pem} fowners mail:root /etc/ssl/imspd/server.{key,crt,pem} diff --git a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7 b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1 index 7027025bfc13..7027025bfc13 100644 --- a/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7 +++ b/net-mail/cyrus-imspd/files/digest-cyrus-imspd-1.7-r1 |