Mercurial > mxe-octave
changeset 948:6ff524e4163c
upgrade package vmime to 0.9.1-svn-r545
r543 | vincent-richard | 2010-04-13 11:51:30 +0200 (Tue, 13 Apr 2010) | 1 line
Register non-standard encoding names.
r544 | vincent-richard | 2010-05-04 12:07:56 +0200 (Tue, 04 May 2010) | 1 line
Fixed typo.
r545 | vincent-richard | 2010-05-04 12:49:10 +0200 (Tue, 04 May 2010) | 1 line
Use STARTTLS for additional connections (thanks to Andrei).
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Mon, 10 May 2010 21:32:50 +0200 |
parents | d19d21103127 |
children | 3dcb4ece2c80 |
files | src/vmime-0.9.1-svn-r545-20100504.patch |
diffstat | 1 files changed, 77 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/vmime-0.9.1-svn-r545-20100504.patch Mon May 10 21:32:50 2010 +0200 @@ -0,0 +1,77 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -urN a/SConstruct b/SConstruct +--- a/SConstruct 2010-05-10 21:21:02.535809341 +0200 ++++ b/SConstruct 2010-05-10 21:21:28.163800740 +0200 +@@ -1071,7 +1071,7 @@ + # Generate pkg-config file for shared and static library + vmime_pc_in = open(packageVersionedGenericName + ".pc.in", 'w') + vmime_pc_in.write("# File automatically generated by SConstruct ('scons autotools')\n") +- vmime_pc_in.write("# DOT NOT EDIT!\n") ++ vmime_pc_in.write("# DO NOT EDIT!\n") + vmime_pc_in.write("\n") + vmime_pc_in.write("prefix=@prefix@\n") + vmime_pc_in.write("exec_prefix=@exec_prefix@\n") +@@ -1091,7 +1091,7 @@ + Makefile_am = open("Makefile.am", 'w') + Makefile_am.write(""" + # File automatically generated by SConstruct ('scons autotools') +-# DOT NOT EDIT! ++# DO NOT EDIT! + + BINDING = + INCLUDE = vmime +@@ -1123,7 +1123,7 @@ + Makefile_am = open("vmime/Makefile.am", 'w') + Makefile_am.write(""" + # File automatically generated by SConstruct ('scons autotools') +-# DOT NOT EDIT! ++# DO NOT EDIT! + """) + + #Makefile_am.write(packageVersionedName + "includedir = $(prefix)/include/@GENERIC_VERSIONED_LIBRARY_NAME@/@GENERIC_LIBRARY_NAME@\n") +@@ -1145,7 +1145,7 @@ + Makefile_am = open("src/Makefile.am", 'w') + Makefile_am.write(""" + # File automatically generated by SConstruct ('scons autotools') +-# DOT NOT EDIT! ++# DO NOT EDIT! + + AUTOMAKE_OPTIONS = no-dependencies foreign + INTERNALS = +@@ -1235,7 +1235,7 @@ + # configure.in + + # File automatically generated by SConstruct ('scons autotools') +-# DOT NOT EDIT! ++# DO NOT EDIT! + + # Init + """) +diff -urN a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp +--- a/src/net/imap/IMAPConnection.cpp 2010-05-10 21:21:02.392809549 +0200 ++++ b/src/net/imap/IMAPConnection.cpp 2010-05-10 21:21:28.163800740 +0200 +@@ -156,7 +156,7 @@ + const bool tlsRequired = HAS_PROPERTY(PROPERTY_CONNECTION_TLS_REQUIRED) + && GET_PROPERTY(bool, PROPERTY_CONNECTION_TLS_REQUIRED); + +- if (!store->isSecuredConnection() && tls) // only if not IMAPS ++ if (!store->isIMAPS() && tls) // only if not IMAPS + { + try + { +diff -urN a/src/utility/encoder/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp +--- a/src/utility/encoder/encoderFactory.cpp 2010-05-10 21:21:02.431820130 +0200 ++++ b/src/utility/encoder/encoderFactory.cpp 2010-05-10 21:21:28.163800740 +0200 +@@ -46,6 +46,10 @@ + registerName <sevenBitEncoder>("7bit"); + registerName <eightBitEncoder>("8bit"); + registerName <binaryEncoder>("binary"); ++ ++ // Also register some non-standard encoding names ++ registerName <sevenBitEncoder>("7-bit"); ++ registerName <eightBitEncoder>("8-bit"); + } + +