Mercurial > mxe-octave

annotate src/vmime-0.9.1-svn-r545-20100504.patch @ 948:6ff524e4163c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
948
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 diff -urN a/SConstruct b/SConstruct
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 --- a/SConstruct 2010-05-10 21:21:02.535809341 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 +++ b/SConstruct 2010-05-10 21:21:28.163800740 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 @@ -1071,7 +1071,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 # Generate pkg-config file for shared and static library
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 vmime_pc_in = open(packageVersionedGenericName + ".pc.in", 'w')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 vmime_pc_in.write("# File automatically generated by SConstruct ('scons autotools')\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 - vmime_pc_in.write("# DOT NOT EDIT!\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 + vmime_pc_in.write("# DO NOT EDIT!\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 vmime_pc_in.write("\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 vmime_pc_in.write("prefix=@prefix@\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 vmime_pc_in.write("exec_prefix=@exec_prefix@\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -1091,7 +1091,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 Makefile_am = open("Makefile.am", 'w')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 Makefile_am.write("""
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 # File automatically generated by SConstruct ('scons autotools')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -# DOT NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +# DO NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 BINDING =
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 INCLUDE = vmime
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 @@ -1123,7 +1123,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 Makefile_am = open("vmime/Makefile.am", 'w')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 Makefile_am.write("""
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 # File automatically generated by SConstruct ('scons autotools')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 -# DOT NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 +# DO NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 """)
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 #Makefile_am.write(packageVersionedName + "includedir = $(prefix)/include/@GENERIC_VERSIONED_LIBRARY_NAME@/@GENERIC_LIBRARY_NAME@\n")
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 @@ -1145,7 +1145,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 Makefile_am = open("src/Makefile.am", 'w')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 Makefile_am.write("""
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 # File automatically generated by SConstruct ('scons autotools')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 -# DOT NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 +# DO NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 AUTOMAKE_OPTIONS = no-dependencies foreign
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 INTERNALS =
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 @@ -1235,7 +1235,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 # configure.in
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 # File automatically generated by SConstruct ('scons autotools')
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 -# DOT NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 +# DO NOT EDIT!
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 # Init
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 """)
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 diff -urN a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 --- a/src/net/imap/IMAPConnection.cpp 2010-05-10 21:21:02.392809549 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 +++ b/src/net/imap/IMAPConnection.cpp 2010-05-10 21:21:28.163800740 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 @@ -156,7 +156,7 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 const bool tlsRequired = HAS_PROPERTY(PROPERTY_CONNECTION_TLS_REQUIRED)
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 && GET_PROPERTY(bool, PROPERTY_CONNECTION_TLS_REQUIRED);
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 - if (!store->isSecuredConnection() && tls) // only if not IMAPS
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 + if (!store->isIMAPS() && tls) // only if not IMAPS
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 {
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 try
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 {
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 diff -urN a/src/utility/encoder/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 --- a/src/utility/encoder/encoderFactory.cpp 2010-05-10 21:21:02.431820130 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 +++ b/src/utility/encoder/encoderFactory.cpp 2010-05-10 21:21:28.163800740 +0200
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 @@ -46,6 +46,10 @@
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 registerName <sevenBitEncoder>("7bit");
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 registerName <eightBitEncoder>("8bit");
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 registerName <binaryEncoder>("binary");
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 +
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 + // Also register some non-standard encoding names
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 + registerName <sevenBitEncoder>("7-bit");
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 + registerName <eightBitEncoder>("8-bit");
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 }
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76
6ff524e4163c upgrade package vmime to 0.9.1-svn-r545
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77