diff options
| -rw-r--r-- | mail-client/mutt/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-client/mutt/files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch | 225 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.19.ebuild | 3 |
3 files changed, 233 insertions, 2 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index b6fde5d3bbe7..1503100f8494 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/mutt # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.128 2009/05/28 16:26:38 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.129 2009/06/09 07:18:04 grobian Exp $ + + 09 Jun 2009; Fabian Groffen <grobian@gentoo.org> + +files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch, mutt-1.5.19.ebuild: + Add patch from upstream to fix libgnutls detection for the latest version of + the latter library. Bug #268456 28 May 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.11-r2.ebuild, -mutt-1.5.12.ebuild, -mutt-1.5.13.ebuild, -mutt-1.5.13-r1.ebuild, diff --git a/mail-client/mutt/files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch b/mail-client/mutt/files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch new file mode 100644 index 000000000000..8ad4965ac64e --- /dev/null +++ b/mail-client/mutt/files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch @@ -0,0 +1,225 @@ +http://dev.mutt.org/trac/changeset/15c662a95b91 + +Index: configure.ac +=================================================================== +--- configure.ac (revision 5862:16592f0dfdaf) ++++ configure.ac (revision 5865:15c662a95b91) +@@ -650,5 +650,5 @@ + dnl -- end imap dependencies -- + +-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using OpenSSL]), ++AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Enable TLS support using OpenSSL]), + [ if test "$with_ssl" != "no" + then +@@ -683,5 +683,5 @@ + ]) + +-AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using gnutls]), ++AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [enable TLS support using gnutls]), + [gnutls_prefix="$withval"], [gnutls_prefix="no"]) + if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes +@@ -691,19 +691,28 @@ + AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support]) + else +- MUTT_AM_PATH_GNUTLS([$gnutls_prefix], ++ if test "$gnutls_prefix" != "yes" ++ then ++ LDFLAGS="$LDFLAGS -L$gnutls_prefix/lib" ++ CPPFLAGS="$CPPFLAGS -I$gnutls_prefix/include" ++ fi ++ saved_LIBS="$LIBS" ++ ++ AC_CHECK_LIB(gnutls, gnutls_check_version, + [dnl GNUTLS found +- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS" +- MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS" +- +- AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ]) +- AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via GNUTLS. ]) ++ AC_CHECK_DECLS([GNUTLS_VERIFY_DISABLE_TIME_CHECKS], [], [], ++ [[#include <gnutls/x509.h>]]) ++ ++ LIBS="$saved_LIBS" ++ MUTTLIBS="$MUTTLIBS -lgnutls" ++ ++ AC_DEFINE(USE_SSL, 1, [ Define if you want support for SSL. ]) ++ AC_DEFINE(USE_SSL_GNUTLS, 1, [ Define if you want support for SSL via GNUTLS. ]) + + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o" + need_ssl=yes], +- [dnl GNUTLS not found +- AC_MSG_ERROR([could not find libgnutls]) +- ]) ++ [AC_MSG_ERROR([could not find libgnutls])]) + fi + fi ++ + AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) + +Index: 4/libgnutls.m4 +=================================================================== +--- m4/libgnutls.m4 (revision 3891:edccac2079c8) ++++ (revision ) +@@ -1,162 +1,0 @@ +-dnl Autoconf macros for libgnutls +-dnl $id$ +- +-# Modified for mutt 20050210 Brendan Cully +-# Modified for LIBGNUTLS -- nmav +-# Configure paths for LIBGCRYPT +-# Shamelessly stolen from the one of XDELTA by Owen Taylor +-# Werner Koch 99-12-09 +- +-dnl MUTT_AM_PATH_GNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS +-dnl +-AC_DEFUN([MUTT_AM_PATH_GNUTLS], +-[dnl +-dnl Get the cflags and libraries from the libgnutls-config script +-dnl +- libgnutls_config_prefix=$1 +- min_libgnutls_version=0.1.0 +- +- if test x$libgnutls_config_prefix != x ; then +- if test x${LIBGNUTLS_CONFIG+set} != xset ; then +- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config +- fi +- fi +- +- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) +- AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) +- no_libgnutls="" +- if test "$LIBGNUTLS_CONFIG" = "no" ; then +- no_libgnutls=yes +- else +- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` +- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` +- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` +- +- +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS" +- +-dnl +-dnl Now check if the installed libgnutls is sufficiently new. Also sanity +-dnl checks the results of libgnutls-config to some extent +-dnl +- rm -f conf.libgnutlstest +- AC_TRY_RUN([ +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <gnutls/gnutls.h> +- +-int +-main () +-{ +- system ("touch conf.libgnutlstest"); +- +- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) +- { +- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", +- "$libgnutls_config_version", gnutls_check_version(NULL) ); +- printf("*** was found! If libgnutls-config was correct, then it is best\n"); +- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); +- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); +- printf("*** before re-running configure\n"); +- } +- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) +- { +- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); +- printf("*** library (version %s)\n", gnutls_check_version(NULL) ); +- } +- else +- { +- if ( gnutls_check_version( "$min_libgnutls_version" ) ) +- { +- return 0; +- } +- else +- { +- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", +- gnutls_check_version(NULL) ); +- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", +- "$min_libgnutls_version" ); +- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); +- printf("*** \n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); +- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +-],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- +- if test "x$no_libgnutls" = x ; then +- AC_MSG_RESULT(yes) +- dnl some openssl compatibility code was moved in gnutls 1.2 +- AC_CHECK_HEADERS([gnutls/openssl.h]) +- ifelse([$2], , :, [$2]) +- else +- if test -f conf.libgnutlstest ; then +- : +- else +- AC_MSG_RESULT(no) +- fi +- if test "$LIBGNUTLS_CONFIG" = "no" ; then +- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" +- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" +- echo "*** full path to libgnutls-config." +- else +- if test -f conf.libgnutlstest ; then +- : +- else +- echo "*** Could not run libgnutls test program, checking why..." +- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" +- LIBS="$LIBS $LIBGNUTLS_LIBS" +- AC_TRY_LINK([ +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <gnutls/gnutls.h> +-], [ return !!gnutls_check_version(NULL); ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" +- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +- echo "***" ], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" +- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" +- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- LIBGNUTLS_CFLAGS="" +- LIBGNUTLS_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- rm -f conf.libgnutlstest +- AC_SUBST(LIBGNUTLS_CFLAGS) +- AC_SUBST(LIBGNUTLS_LIBS) +-]) +- +-dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/mail-client/mutt/mutt-1.5.19.ebuild b/mail-client/mutt/mutt-1.5.19.ebuild index a49491e529a4..89ecab9f8161 100644 --- a/mail-client/mutt/mutt-1.5.19.ebuild +++ b/mail-client/mutt/mutt-1.5.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.19.ebuild,v 1.5 2009/05/28 16:26:38 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.19.ebuild,v 1.6 2009/06/09 07:18:04 grobian Exp $ inherit eutils flag-o-matic autotools @@ -71,6 +71,7 @@ src_unpack() { for p in "${PATCHDIR}"/*.patch ; do epatch "${p}" done + epatch "${FILESDIR}"/${P}-libgnutls-test-15c662a95b91.patch fi if use sidebar ; then |