courier-imap-4.10 fails to compile with gnutls-3 (tried with
gnutls-3.0.20):
libcouriergnutls.c:12:26: fatal error: gnutls/extra.h: No such file or
directory
The following patch seems to compile and pass the tests. But I am not
familiar with the code (or with gnutls), so ...
--
Eray Aslan
---
--- tcpd/configure.in 2011-09-29 12:13:27.000000000 +0000
+++ tcpd/configure.in 2012-06-19 07:59:54.000000000 +0000
@@ -368,7 +368,7 @@
then
LIBCOURIERTLSGNUTLS="libcouriertlsgnutls.la"
CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
- gnutlsdep="`$PKGCONFIG --libs gnutls` -lgnutls-extra"
+ gnutlsdep="`$PKGCONFIG --libs gnutls`"
fi
AC_CHECK_SIZEOF(gnutls_transport_ptr_t,0, [
--- tcpd/libcouriergnutls.c 2011-04-04 15:03:59.000000000 +0000
+++ tcpd/libcouriergnutls.c 2012-06-19 07:59:44.000000000 +0000
@@ -9,7 +9,6 @@
#include "tlscache.h"
#include "soxwrap/soxwrap.h"
#include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
#include <gnutls/x509.h>
#include <gnutls/openpgp.h>
#include <stdio.h>
@@ -146,7 +145,7 @@
{ NULL, 0}
}, all_comps[]={
{ "DEFLATE", GNUTLS_COMP_DEFLATE},
- { "LZO", GNUTLS_COMP_LZO},
+ { "ZLIB", GNUTLS_COMP_ZLIB},
{ "NULL", GNUTLS_COMP_NULL},
{ NULL, 0}
}, all_certs[]={
@@ -408,14 +407,6 @@
return (NULL);
}
- if (gnutls_global_init_extra() < 0)
- {
- gnutls_global_deinit();
- fprintf(stderr, "gnutls_global_init() failed\n");
- free(p);
- errno=EINVAL;
- return (NULL);
- }
}
if (!(words=splitwords(safe_getenv(p, "TLS_PROTOCOL",
--- imap/pop3d-ssl.dist.in 2011-04-13 16:39:29.000000000 +0000
+++ imap/pop3d-ssl.dist.in 2012-06-19 10:16:14.000000000 +0000
@@ -184,7 +184,7 @@
#
# Optional compression. "ALL" selects all available compression methods.
#
-# Available compression methods: DEFLATE, LZO, NULL
+# Available compression methods: DEFLATE, ZLIB, NULL
TLS_COMPRESSION=ALL
--- imap/imapd-ssl.dist.in 2011-04-13 16:39:29.000000000 +0000
+++ imap/imapd-ssl.dist.in 2012-06-19 10:16:34.000000000 +0000
@@ -196,7 +196,7 @@
#
# Optional compression. "ALL" selects all available compression methods.
#
-# Available compression methods: DEFLATE, LZO, NULL
+# Available compression methods: DEFLATE, ZLIB, NULL
TLS_COMPRESSION=ALL
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Courier-imap mailing list
[email protected]
Unsubscribe: https://lists.sourceforge.net/lists/listinfo/courier-imap
