| 1 |
flameeyes 10/04/19 10:58:08 |
| 2 |
|
| 3 |
Modified: ChangeLog cyrus-imspd-1.8-r1.ebuild |
| 4 |
Log: |
| 5 |
QA: fix some obvious mistakes, make sure to die if the newsbin fails (bug #298587); fix build with cyrus-imap-dev-2.3. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.19 net-mail/cyrus-imspd/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/ChangeLog?rev=1.19&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/ChangeLog?rev=1.19&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/ChangeLog?r1=1.18&r2=1.19 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v |
| 18 |
retrieving revision 1.18 |
| 19 |
retrieving revision 1.19 |
| 20 |
diff -u -r1.18 -r1.19 |
| 21 |
--- ChangeLog 26 Dec 2007 21:54:03 -0000 1.18 |
| 22 |
+++ ChangeLog 19 Apr 2010 10:58:08 -0000 1.19 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-mail/cyrus-imspd |
| 25 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.18 2007/12/26 21:54:03 phreak Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/ChangeLog,v 1.19 2010/04/19 10:58:08 flameeyes Exp $ |
| 29 |
+ |
| 30 |
+ 19 Apr 2010; Diego E. Pettenò <flameeyes@g.o> |
| 31 |
+ cyrus-imspd-1.8-r1.ebuild: |
| 32 |
+ QA: fix some obvious mistakes, make sure to die if the newsbin fails (bug |
| 33 |
+ #298587); fix build with cyrus-imap-dev-2.3. |
| 34 |
|
| 35 |
26 Dec 2007; Christian Heim <phreak@g.o> |
| 36 |
-files/digest-cyrus-imspd-1.8: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: cyrus-imspd-1.8-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- cyrus-imspd-1.8-r1.ebuild 16 Dec 2007 13:48:30 -0000 1.1 |
| 53 |
+++ cyrus-imspd-1.8-r1.ebuild 19 Apr 2010 10:58:08 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
-# Copyright 1999-2007 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild,v 1.1 2007/12/16 13:48:30 dertobi123 Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imspd/cyrus-imspd-1.8-r1.ebuild,v 1.2 2010/04/19 10:58:08 flameeyes Exp $ |
| 60 |
|
| 61 |
inherit eutils ssl-cert |
| 62 |
|
| 63 |
@@ -27,7 +27,7 @@ |
| 64 |
epatch "${FILESDIR}/${P}-gentoo.patch" |
| 65 |
|
| 66 |
# Cyrus 2.2.x has an extra library. |
| 67 |
- if [ "`best_version '=dev-libs/cyrus-imap-dev-2.2*'`" ] ; then |
| 68 |
+ if has_version '>=dev-libs/cyrus-imap-dev-2.2'; then |
| 69 |
sed -i -e "s:-lcyrus:-lcyrus -lcyrus_min:" \ |
| 70 |
"${S}/imsp/Makefile.in" \ |
| 71 |
"${S}/cmulocal/libcyrus.m4" || die "sed failed" |
| 72 |
@@ -36,7 +36,7 @@ |
| 73 |
|
| 74 |
src_compile() { |
| 75 |
econf \ |
| 76 |
- $(use_with ldap ldap ldap) \ |
| 77 |
+ $(use_with ldap) \ |
| 78 |
$(use_enable kerberos gssapi) \ |
| 79 |
--without-krb \ |
| 80 |
--with-auth=unix |
| 81 |
@@ -49,23 +49,23 @@ |
| 82 |
} |
| 83 |
|
| 84 |
src_install() { |
| 85 |
- newsbin imsp/cyrus-imspd imspd |
| 86 |
+ newsbin imsp/cyrus-imspd imspd || die |
| 87 |
|
| 88 |
- newinitd "${FILESDIR}/imspd.rc6" imspd |
| 89 |
- newconfd "${FILESDIR}/imspd.conf" imspd |
| 90 |
+ newinitd "${FILESDIR}/imspd.rc6" imspd || die |
| 91 |
+ newconfd "${FILESDIR}/imspd.conf" imspd || die |
| 92 |
|
| 93 |
keepdir /var/imsp{,/user} |
| 94 |
|
| 95 |
if use ssl ; then |
| 96 |
insinto /etc/stunnel |
| 97 |
- newins "${FILESDIR}/stunnel.conf" imspd.conf |
| 98 |
+ newins "${FILESDIR}/stunnel.conf" imspd.conf || die |
| 99 |
fi |
| 100 |
- dodoc README imsp/options.sample notes/* |
| 101 |
+ dodoc README imsp/options.sample notes/* || die |
| 102 |
} |
| 103 |
|
| 104 |
pkg_postinst() { |
| 105 |
if use ssl ; then |
| 106 |
- dosed "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" "${ROOT:-/}"etc/conf.d/imsp |
| 107 |
+ sed -i -e "s:#IMSPD_USE_SSL:IMSPD_USE_SSL:" "${ROOT:-/}"etc/conf.d/imsp |
| 108 |
SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMSP Server}" |
| 109 |
install_cert /etc/ssl/imspd/server |
| 110 |
fi |
Archives