diff options
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/mutt/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/mutt/Manifest | 13 | ||||
| -rw-r--r-- | mail-client/mutt/files/mutt-1.5.11-sasl.patch | 23 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.11.ebuild | 12 |
4 files changed, 37 insertions, 17 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 5b6e89b472e2..ec66a76aac0e 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/mutt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.61 2005/09/19 10:52:09 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.62 2005/09/19 20:18:32 ferdy Exp $ + + 19 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> + +files/mutt-1.5.11-sasl.patch, mutt-1.5.11.ebuild: + fix sasl wrt bug #106545 *mutt-1.5.11 (19 Sep 2005) diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index d4ebfe109df3..e4ac50041630 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,14 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961 MD5 327b8e25b061f5295baca07bfddab43d mutt-1.5.10-r1.ebuild 5581 -MD5 01812fa47f93e711194bb1a26b5f3797 mutt-1.5.11.ebuild 5647 +MD5 48ff2631e39ebe74ebc38c2539da6cd8 mutt-1.5.11.ebuild 5699 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605 MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268 MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331 MD5 7b596d703142a407d735d9786a8560c3 ChangeLog 18828 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348 +MD5 b6fc34b06ff62e2d791baff50be9c43a files/mutt-1.5.11-sasl.patch 777 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667 MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659 MD5 2dfbb4deb083480353ea66f578066061 files/mutt-1.5.9-sasl.patch 1378 @@ -22,10 +20,3 @@ MD5 dfc509d0b1283134c72b0be93dcb1815 files/digest-mutt-1.5.11 653 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDLph0ViELBEf1JB0RAghAAJ9dBKxJt9+lzLVFuryi9Kuzca+tYgCfUEqq -hDccl1er5h5YhJi+O19vOLM= -=bhBf ------END PGP SIGNATURE----- diff --git a/mail-client/mutt/files/mutt-1.5.11-sasl.patch b/mail-client/mutt/files/mutt-1.5.11-sasl.patch new file mode 100644 index 000000000000..526784653f61 --- /dev/null +++ b/mail-client/mutt/files/mutt-1.5.11-sasl.patch @@ -0,0 +1,23 @@ +--- configure.in.old 2005-09-19 22:07:56.000000000 +0200 ++++ configure.in 2005-09-19 22:09:00.000000000 +0200 +@@ -600,14 +600,14 @@ + AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) + + AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network security library]), +- [ +- if test "$need_socket" != "yes" +- then +- AC_MSG_ERROR([SASL support is only useful with POP or IMAP support]) +- fi +- ++ [ + if test "$with_sasl" != "no" + then ++ if test "$need_socket" != "yes" ++ then ++ AC_MSG_ERROR([SASL support is only useful with POP or IMAP support]) ++ fi ++ + if test "$with_sasl" != "yes" + then + CPPFLAGS="$CPPFLAGS -I$with_sasl/include" diff --git a/mail-client/mutt/mutt-1.5.11.ebuild b/mail-client/mutt/mutt-1.5.11.ebuild index e5b631679c99..93659592e2fc 100644 --- a/mail-client/mutt/mutt-1.5.11.ebuild +++ b/mail-client/mutt/mutt-1.5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11.ebuild,v 1.1 2005/09/19 10:52:09 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11.ebuild,v 1.2 2005/09/19 20:18:32 ferdy Exp $ inherit eutils flag-o-matic @@ -66,6 +66,9 @@ pkg_setup() { src_unpack() { unpack ${P}.tar.gz && cd ${S} || die "unpack failed" + # Fix configure.in sasl checking + epatch "${FILESDIR}/${P}-sasl.patch" + if ! use vanilla ; then for p in ${!patch_*} ; do epatch ${DISTDIR}/${!p} @@ -104,8 +107,7 @@ src_compile() { --with-regex \ --disable-fcntl --enable-flock \ --enable-nfs-fix --enable-external-dotlock \ - --with-mixmaster \ - --without-sasl" + --with-mixmaster" # See Bug #22787 unset WANT_AUTOCONF_2_5 WANT_AUTOCONF @@ -130,9 +132,9 @@ src_compile() { myconf="${myconf} --with-ssl" fi # not sure if this should be mutually exclusive with the other two - myconf="${myconf} $(use_with sasl sasl2)" + myconf="${myconf} $(use_with sasl)" else - myconf="${myconf} --without-gnutls --without-ssl --without-sasl2" + myconf="${myconf} --without-gnutls --without-ssl --without-sasl" fi # See Bug #11170 |