update package vmime

index.html

@@ -2127,7 +2127,7 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="vmime-package">vmime</td>
-        <td id="vmime-version">c2474f2</td>
+        <td id="vmime-version">a17cb75</td>
         <td id="vmime-website"><a href="http://www.vmime.org/">VMime</a></td>
     </tr>
     <tr>

src/vmime-1-fixes.patch

@@ -1,17 +1,17 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 1a7959cf317dcb06db55dc44cdf58c89ee223321 Mon Sep 17 00:00:00 2001
+From ce156951d6c3290d2e277fb103b2314f261b2833 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 (MXE-specific)
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b9e221..2ca9f1e 100644
+index 30e8220..0ff3542 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -86,21 +86,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
+@@ -88,21 +88,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v
  	ENDIF()
  ENDIF()
  
@@ -33,7 +33,7 @@ index 0b9e221..2ca9f1e 100644
  # Static library
  #
  # Note: cannot have two targets with the same name so the static version has
-@@ -120,19 +105,12 @@ SET_TARGET_PROPERTIES(
+@@ -122,19 +107,12 @@ SET_TARGET_PROPERTIES(
  
  # These next two lines are required but it is unclear exactly what they do.
  # The CMake FAQ mentions they are necessary and it does not work otherwise.
@@ -53,7 +53,7 @@ index 0b9e221..2ca9f1e 100644
  	TARGETS ${VMIME_LIBRARY_NAME}-static
  	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
  	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs
-@@ -220,11 +198,7 @@ SET(CPACK_SOURCE_IGNORE_FILES          "\\\\.git;~$;build/")
+@@ -222,11 +200,7 @@ SET(CPACK_SOURCE_IGNORE_FILES          "\\\\.git;~$;build/")
  SET(CPACK_SOURCE_PACKAGE_FILE_NAME     ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
  
  # Set components
@@ -66,7 +66,7 @@ index 0b9e221..2ca9f1e 100644
  
  SET(CPACK_COMPONENT_STATICLIBS_DISPLAY_NAME "Static libraries")
  SET(CPACK_COMPONENT_STATICLIBS_DESCRIPTION
-@@ -234,7 +208,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
+@@ -236,7 +210,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers")
  SET(CPACK_COMPONENT_HEADERS_DESCRIPTION
  	"C/C++ header files.")
  
@@ -74,7 +74,7 @@ index 0b9e221..2ca9f1e 100644
  SET(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
  SET(CPACK_COMPONENT_HEADERS_GROUP    "Development")
  SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "")
-@@ -438,12 +411,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
+@@ -440,12 +413,6 @@ IF(VMIME_HAVE_SASL_SUPPORT)
  		${GSASL_INCLUDE_DIR}
  	)
  
@@ -87,7 +87,7 @@ index 0b9e221..2ca9f1e 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")
-@@ -493,12 +460,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -495,12 +462,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
  			${GNUTLS_LIBRARY_DIRS}
  		)
  
@@ -100,7 +100,7 @@ index 0b9e221..2ca9f1e 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")
-@@ -510,12 +471,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
+@@ -512,12 +473,6 @@ IF(VMIME_HAVE_TLS_SUPPORT)
  			${OPENSSL_INCLUDE_DIR}
  		)
  
@@ -113,7 +113,7 @@ index 0b9e221..2ca9f1e 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")
-@@ -539,12 +494,6 @@ INCLUDE_DIRECTORIES(
+@@ -541,12 +496,6 @@ INCLUDE_DIRECTORIES(
  	${ICONV_INCLUDE_DIR}
  )
  
@@ -126,11 +126,58 @@ index 0b9e221..2ca9f1e 100644
  
  ##############################################################################
  # Platform
+@@ -579,11 +528,6 @@ IF(WIN32)
+ 	CHECK_LIBRARY_EXISTS("ws2_32" getch "${CMAKE_LIBRARY_PATH}" VMIME_HAVE_LIBWS2_32)
+ 
+ 	IF(VMIME_HAVE_LIBWS2_32)
+-		TARGET_LINK_LIBRARIES(
+-			${VMIME_LIBRARY_NAME}
+-			${TARGET_LINK_LIBRARIES}
+-			"ws2_32"
+-		)
+ 	ENDIF()
+ 
+ 	# MLang
+@@ -593,12 +537,6 @@ IF(WIN32)
+ 	IF(VMIME_HAVE_MLANG_H)
+ 		IF(VMIME_HAVE_MLANG_LIB)
+ 			SET(VMIME_HAVE_MLANG ON)
+-
+-			TARGET_LINK_LIBRARIES(
+-				${VMIME_LIBRARY_NAME}
+-				${TARGET_LINK_LIBRARIES}
+-				"mlang"
+-			)
+ 		ENDIF()
+ 	ENDIF()
+ 
+@@ -617,21 +555,10 @@ CHECK_SYMBOL_EXISTS(SYS_gettid sys/syscall.h VMIME_HAVE_SYSCALL_GETTID)
+ 
+ FIND_PACKAGE(Threads)
+ 
+-TARGET_LINK_LIBRARIES(
+-	${VMIME_LIBRARY_NAME}
+-	${TARGET_LINK_LIBRARIES}
+-	${CMAKE_THREAD_LIBS_INIT}
+-)
+-
+ FIND_LIBRARY(PTHREAD_LIB pthread)
+ 
+ IF(PTHREAD_LIB)
+ 	SET(VMIME_HAVE_PTHREAD 1)
+-	TARGET_LINK_LIBRARIES(
+-		${VMIME_LIBRARY_NAME}
+-		${TARGET_LINK_LIBRARIES}
+-		${PTHREAD_LIB}
+-	)
+ ELSE(PTHREAD_LIB)
+ 	SET(VMIME_HAVE_PTHREAD 0)
+ ENDIF(PTHREAD_LIB)
 -- 
 1.7.10.4
 
 
-From 2484acc9f40d72d7dc09e6115c9a2a93eb1c41e6 Mon Sep 17 00:00:00 2001
+From a9512fe1f639dfbdae1ab91825e0da228a40b55b 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 (MXE-specific)

src/vmime.mk

@@ -3,7 +3,7 @@
 
 PKG             := vmime
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 803c81b3793341c8f5db405d977f5ee710a4b2e3
+$(PKG)_CHECKSUM := fbc7a68a8173b1d7d89edc58992940ce36dd056a
 $(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