update package vmime

3 files changed, 64 insertions, 11 deletions

diff --git a/index.html b/index.html
index d772236..078a541 100644
--- a/index.html
+++ b/index.html
@@ -2078,7 +2078,7 @@ USE_OSGPLUGIN(<plugin2>)
     </tr>
     <tr>
         <td id="vmime-package">vmime</td>
-        <td id="vmime-version">1ba5e86</td>
+        <td id="vmime-version">9e8cdca</td>
         <td id="vmime-website"><a href="http://www.vmime.org/">VMime</a></td>
     </tr>
     <tr>
diff --git a/src/vmime-1-fixes.patch b/src/vmime-1-fixes.patch
index b547b03..2e6e53d 100644
--- a/src/vmime-1-fixes.patch
+++ b/src/vmime-1-fixes.patch
@@ -1,14 +1,14 @@
 This file is part of MXE.
 See index.html for further information.
 
-From f74fad8e74da1a17ca90046d735e666bee767722 Mon Sep 17 00:00:00 2001
+From 3d2906a3f2a09e04214d65a97bde050e0a56074f Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 12 Nov 2012 12:28:25 +0100
-Subject: [PATCH 1/2] disable shared libs
+Subject: [PATCH 1/4] disable shared libs (MXE-specific)
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5be9ca3..ce0fc09 100644
+index 4f044a2..93c90f4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -81,21 +81,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
@@ -74,7 +74,7 @@ index 5be9ca3..ce0fc09 100644
  SET(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
  SET(CPACK_COMPONENT_HEADERS_GROUP    "Development")
  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "")
-@@ -431,12 +404,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
+@@ -434,12 +407,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
  		${GSASL_INCLUDE_DIR}
  	)
  
@@ -87,7 +87,7 @@ index 5be9ca3..ce0fc09 100644
  	SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}")
  	SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GSASL_INCLUDE_DIR}")
  	SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl")
-@@ -488,12 +455,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -491,12 +458,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
  			${GNUTLS_LIBRARY_DIRS}
  		)
  
@@ -100,7 +100,7 @@ index 5be9ca3..ce0fc09 100644
  		SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}")
  		SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GNUTLS_INCLUDE_DIR}")
  		SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgnutls")
-@@ -505,12 +466,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -508,12 +469,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
  			${OPENSSL_INCLUDE_DIR}
  		)
  
@@ -113,7 +113,7 @@ index 5be9ca3..ce0fc09 100644
  		SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}")
  		SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${OPENSSL_INCLUDE_DIR}")
  		SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libopenssl")
-@@ -534,12 +489,6 @@ INCLUDE_DIRECTORIES(
+@@ -537,12 +492,6 @@ INCLUDE_DIRECTORIES(
  	${ICONV_INCLUDE_DIR}
  )
  
@@ -130,10 +130,10 @@ index 5be9ca3..ce0fc09 100644
 1.7.10.4
 
 
-From 739e6b49b1f421fa39e2e3e292932ff5c200626d Mon Sep 17 00:00:00 2001
+From ee640686ca7e8008838b10ff4ec77fcad157cd21 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 12 Nov 2012 13:58:12 +0100
-Subject: [PATCH 2/2] add private dependencies to .pc file
+Subject: [PATCH 2/4] add private dependencies to .pc file (MXE-specific)
 
 
 diff --git a/libvmime.pc.in b/libvmime.pc.in
@@ -152,3 +152,55 @@ index 5745c52..cea2927 100644
 -- 
 1.7.10.4
 
+
+From d8dcb313d102020ff073c2e053d100ef978d132d Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 24 Dec 2012 14:24:30 +0100
+Subject: [PATCH 3/4] add missing declaration for inet_ntop (MXE-specific)
+
+
+diff --git a/src/platforms/windows/windowsSocket.cpp b/src/platforms/windows/windowsSocket.cpp
+index 72c5f0f..e4698ad 100644
+--- a/src/platforms/windows/windowsSocket.cpp
++++ b/src/platforms/windows/windowsSocket.cpp
+@@ -35,6 +35,13 @@
+ 
+ #include <ws2tcpip.h>
+ 
++typedef const TCHAR * PCTSTR;
++extern "C" PCTSTR WSAAPI inet_ntop(
++    INT  Family,
++    PVOID pAddr,
++    PTSTR pStringBuf,
++    size_t StringBufSize
++);
+ 
+ namespace vmime {
+ namespace platforms {
+-- 
+1.7.10.4
+
+
+From af753b988ddc356b356c4a282da05c59264b9e5a Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 24 Dec 2012 14:49:43 +0100
+Subject: [PATCH 4/4] fix example6: missing arg to
+ defaultCertificateVerifier::verify
+
+
+diff --git a/examples/example6.cpp b/examples/example6.cpp
+index 53ff978..6b7cba2 100644
+--- a/examples/example6.cpp
++++ b/examples/example6.cpp
+@@ -153,7 +153,7 @@ public:
+ 		{
+ 			setX509TrustedCerts(m_trustedCerts);
+ 
+-			defaultCertificateVerifier::verify(chain);
++			defaultCertificateVerifier::verify(chain, hostname);
+ 		}
+ 		catch (vmime::exceptions::certificate_verification_exception&)
+ 		{
+-- 
+1.7.10.4
+
diff --git a/src/vmime.mk b/src/vmime.mk
index 2826c41..9fcd802 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -3,7 +3,7 @@
 
 PKG             := vmime
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 4082390977ca91bbbb4b5e5000bc09b3d67c8bd5
+$(PKG)_CHECKSUM := 6a3993ee5052758ba53cf04b5e5ad3c20da024bb
 $(PKG)_SUBDIR   := kisli-vmime-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$(PKG)_FILE
@@ -21,6 +21,7 @@ define $(PKG)_BUILD
         -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
         -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \
         -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=False \
+        -DCMAKE_CXX_FLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \
         .
 
     # Disable VMIME_HAVE_MLANG_H