update package vmime

3 files changed, 8 insertions, 60 deletions

diff --git a/index.html b/index.html
index 1b34bb7..18a0bd5 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">9e8cdca</td>
+        <td id="vmime-version">3ac625e</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 2e6e53d..fa3a833 100644
--- a/src/vmime-1-fixes.patch
+++ b/src/vmime-1-fixes.patch
@@ -1,10 +1,10 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 3d2906a3f2a09e04214d65a97bde050e0a56074f Mon Sep 17 00:00:00 2001
+From 2d8c442ed2a86b9286d8914cd8adaa69ceb1a9f1 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/4] disable shared libs (MXE-specific)
+Subject: [PATCH 1/2] disable shared libs (MXE-specific)
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,14 +130,14 @@ index 4f044a2..93c90f4 100644
 1.7.10.4
 
 
-From ee640686ca7e8008838b10ff4ec77fcad157cd21 Mon Sep 17 00:00:00 2001
+From d218856183f5840b7d46bcbb22db735b0e043da9 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/4] add private dependencies to .pc file (MXE-specific)
+Subject: [PATCH 2/2] add private dependencies to .pc file (MXE-specific)
 
 
 diff --git a/libvmime.pc.in b/libvmime.pc.in
-index 5745c52..cea2927 100644
+index 5745c52..d9e153f 100644
 --- a/libvmime.pc.in
 +++ b/libvmime.pc.in
 @@ -7,6 +7,8 @@ Name: @VMIME_LIBRARY_NAME@
@@ -146,61 +146,9 @@ index 5745c52..cea2927 100644
  Requires: @VMIME_PKGCONFIG_REQUIRES@
 +Requires.private: gnutls libgsasl
  Libs: -L${libdir} -lvmime @VMIME_PKGCONFIG_LIBS@
-+Libs.private: -liconv
++Libs.private: -liconv -lws2_32
  Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@
  
 -- 
 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 9fcd802..319b3c7 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -3,7 +3,7 @@
 
 PKG             := vmime
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 6a3993ee5052758ba53cf04b5e5ad3c20da024bb
+$(PKG)_CHECKSUM := 7e2270d899a87889231119d8c9a9d4a39deb1563
 $(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