update: curl, expat, openssl, wt

5 files changed, 11 insertions, 39 deletions

diff --git a/src/curl.mk b/src/curl.mk
index 9d5f26c..01931ce 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -4,8 +4,8 @@ PKG             := curl
 $(PKG)_WEBSITE  := https://curl.haxx.se/libcurl/
 $(PKG)_DESCR    := cURL
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.65.3
-$(PKG)_CHECKSUM := f2d98854813948d157f6a91236ae34ca4a1b4cb302617cebad263d79b0235fea
+$(PKG)_VERSION  := 7.66.0
+$(PKG)_CHECKSUM := dbb48088193016d079b97c5c3efde8efa56ada2ebf336e8a97d04eb8e2ed98c1
 $(PKG)_SUBDIR   := curl-$($(PKG)_VERSION)
 $(PKG)_FILE     := curl-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://curl.haxx.se/download/$($(PKG)_FILE)
diff --git a/src/expat.mk b/src/expat.mk
index aba7670..05ac7fa 100644
--- a/src/expat.mk
+++ b/src/expat.mk
@@ -4,8 +4,8 @@ PKG             := expat
 $(PKG)_WEBSITE  := https://github.com/libexpat/libexpat
 $(PKG)_DESCR    := Expat XML Parser
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.7
-$(PKG)_CHECKSUM := cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
+$(PKG)_VERSION  := 2.2.8
+$(PKG)_CHECKSUM := 9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102
 $(PKG)_SUBDIR   := expat-$($(PKG)_VERSION)
 $(PKG)_FILE     := expat-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/openssl.mk b/src/openssl.mk
index ed098c7..498e35b 100644
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -3,8 +3,8 @@
 PKG             := openssl
 $(PKG)_WEBSITE  := https://www.openssl.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.1c
-$(PKG)_CHECKSUM := f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
+$(PKG)_VERSION  := 1.1.1d
+$(PKG)_CHECKSUM := 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.openssl.org/source/$($(PKG)_FILE)
diff --git a/src/wt-1-fixes.patch b/src/wt-1-fixes.patch
index 1562806..958b93c 100644
--- a/src/wt-1-fixes.patch
+++ b/src/wt-1-fixes.patch
@@ -8,18 +8,6 @@ Date: Sat, 1 Apr 2017 15:17:43 +0200
 Subject: [PATCH 1/4] Wt fixes
 
 
-diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
-index 1111111..2222222 100644
---- a/cmake/WtFindBoost-vintage.txt
-+++ b/cmake/WtFindBoost-vintage.txt
-@@ -58,6 +58,7 @@ ELSE(MSVC)
-       boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
-       boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
-       boost_thread-${BOOST_COMPILER}-mt
-+      boost_thread${BOOST_COMPILER}-mt
-       boost_thread-mt-${BOOST_VERSION}
-       boost_thread-mt
-       boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
 diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
 index 1111111..2222222 100644
 --- a/cmake/WtFindGm.txt
@@ -41,7 +29,7 @@ diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
 index 1111111..2222222 100644
 --- a/cmake/WtFindPangoFt2.txt
 +++ b/cmake/WtFindPangoFt2.txt
-@@ -43,13 +43,17 @@ SET(PANGO_FT2_INCLUDE_DIRS
+@@ -47,13 +47,17 @@ SET(PANGO_FT2_INCLUDE_DIRS
      ${GLIB2_INCLUDE_DIR}
      ${GLIB2_CONFIG_INCLUDE_DIR})
  
@@ -66,22 +54,6 @@ index 1111111..2222222 100644
  
  IF (PANGO_INCLUDE_DIR
      AND FT2_INCLUDE_DIR
-diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
-index 1111111..2222222 100644
---- a/cmake/WtFindSsl.txt
-+++ b/cmake/WtFindSsl.txt
-@@ -110,6 +110,11 @@ IF(WIN32)
-       AND SSL_LIB_DEBUG
-       AND SSL_TOO_LIB_RELEASE
-       AND SSL_TOO_LIB_DEBUG)
-+
-+  IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
-+      SET(SSL_FOUND true)
-+      SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
-+  ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
- ELSEIF(APPLE)
-   FIND_LIBRARY(SSL_LIB
-     NAMES
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
@@ -93,7 +65,7 @@ diff --git a/src/http/Reply.C b/src/http/Reply.C
 index 1111111..2222222 100644
 --- a/src/http/Reply.C
 +++ b/src/http/Reply.C
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  
  #ifdef WT_WIN32
  #ifndef __MINGW32__
@@ -101,7 +73,7 @@ index 1111111..2222222 100644
  // gmtime_r can be defined by mingw
  #ifndef gmtime_r
  namespace {
-@@ -42,6 +43,7 @@ struct tm* gmtime_r(const time_t* t, struct tm* r)
+@@ -43,6 +44,7 @@ struct tm* gmtime_r(const time_t* t, struct tm* r)
  #endif // gmtime_r
  #endif
  #endif
diff --git a/src/wt.mk b/src/wt.mk
index 9c79fff..48e9ec2 100644
--- a/src/wt.mk
+++ b/src/wt.mk
@@ -4,8 +4,8 @@ PKG             := wt
 $(PKG)_WEBSITE  := https://www.webtoolkit.eu/
 $(PKG)_DESCR    := Wt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.5
-$(PKG)_CHECKSUM := 0863f6e7118512d4976cae42e6849a6569e11f93601f0f276e793f26e22ed9e9
+$(PKG)_VERSION  := 4.1.1
+$(PKG)_CHECKSUM := e2dd571bbacf83b6da10dbe336832e21ec7e02057bdf752deb287570b726ba17
 $(PKG)_GH_CONF  := emweb/wt/tags
 $(PKG)_DEPS     := cc boost graphicsmagick libharu openssl pango postgresql sqlite