diff options
| author |   Torsten Veller <tove@gentoo.org> | 2010-05-18 06:06:51 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2010-05-18 06:06:51 +0000 |
| commit | b51d410ff242fc4423fd9a4aba015ec64d4b430d (patch) | |
| tree | 8fa29112fb16c73fd168876b2765eabb622fc2af /net-mail/fetchmail/files | |
| parent | Install ruby files in a version-specific directory. Hardcode for now since th... (diff) | |
| download | gentoo-2-b51d410ff242fc4423fd9a4aba015ec64d4b430d.tar.gz gentoo-2-b51d410ff242fc4423fd9a4aba015ec64d4b430d.tar.bz2 gentoo-2-b51d410ff242fc4423fd9a4aba015ec64d4b430d.zip | |
Remove insecure warning if sslfingerprint is given (#319907). Thanks to David Fellows. Don't link libwww's libmd5 (#319283). Thanks to Karl Hakimian and Matthias Andree
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-mail/fetchmail/files')
| -rw-r--r-- | net-mail/fetchmail/files/MD5_library_pickup.patch | 40 | ||||
| -rw-r--r-- | net-mail/fetchmail/files/debian-580796.patch | 15 |
2 files changed, 55 insertions, 0 deletions
diff --git a/net-mail/fetchmail/files/MD5_library_pickup.patch b/net-mail/fetchmail/files/MD5_library_pickup.patch new file mode 100644 index 000000000000..575572c68c1e --- /dev/null +++ b/net-mail/fetchmail/files/MD5_library_pickup.patch @@ -0,0 +1,40 @@ +From: Matthias Andree <matthias.andree@gmx.de> +Date: Mon, 17 May 2010 21:10:16 +0200 +Subject: [PATCH] Fix MD5* library pickup. + +Avoid picking up libmd5, which fails if libwww is installed because libmd5 +uses "long" rather than fixed-width types. This fails on non-32-bit machines. + +Only probe libmd if md5.h is found. + +To fix Gentoo Bug #319283, reported by Karl Hakimian. +--- + NEWS | 4 ++++ + configure.ac | 12 +++++++++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + +index 2ff315f..943eb3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -171,9 +171,15 @@ dnl [LIBS="$LIBS -lintl"]) + + AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat]) + +-AC_SEARCH_LIBS(MD5Init, [md5 md], [], +- [AC_LIBSOURCE(md5c.c) +- EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"]) ++have_md5=no ++if test "$ac_cv_header_md5_h" != no ; then ++ AC_SEARCH_LIBS(MD5Init, [md], [have_md5=yes]) ++fi ++ ++if test "$have_md5" != yes ; then ++ AC_LIBSOURCE(md5c.c) ++ EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)" ++fi + + AC_CHECK_FUNC(getopt_long, [], + [AC_LIBSOURCES([getopt.c, getopt1.c]) +-- +1.6.1 + diff --git a/net-mail/fetchmail/files/debian-580796.patch b/net-mail/fetchmail/files/debian-580796.patch new file mode 100644 index 000000000000..0bd65b1ca026 --- /dev/null +++ b/net-mail/fetchmail/files/debian-580796.patch @@ -0,0 +1,15 @@ +diff --git a/socket.c b/socket.c +index a3adfd8..2ebdfc6 100644 +--- a/socket.c ++++ b/socket.c +@@ -1009,8 +1009,8 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck + } + } + +- if (!certck && (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK +-|| !_verify_ok)) { ++ if (!certck && !fingerprint && ++ (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK || !_verify_ok)) { + report(stderr, GT_("Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n")); + } + |