summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libxml2.mk4
-rw-r--r--src/libxslt.mk4
-rw-r--r--src/libzip-1-fixes.patch56
-rw-r--r--src/libzip.mk4
-rw-r--r--src/xmlsec-1-fixes.patch52
-rw-r--r--src/xmlsec.mk4
6 files changed, 64 insertions, 60 deletions
diff --git a/src/libxml2.mk b/src/libxml2.mk
index e3f99fa..7e79bbe 100644
--- a/src/libxml2.mk
+++ b/src/libxml2.mk
@@ -3,8 +3,8 @@
PKG := libxml2
$(PKG)_WEBSITE := http://www.xmlsoft.org/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 2.9.4
-$(PKG)_CHECKSUM := ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
+$(PKG)_VERSION := 2.9.9
+$(PKG)_CHECKSUM := 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
$(PKG)_SUBDIR := libxml2-$($(PKG)_VERSION)
$(PKG)_FILE := libxml2-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://xmlsoft.org/sources/$($(PKG)_FILE)
diff --git a/src/libxslt.mk b/src/libxslt.mk
index db3dc78..7e5d09d 100644
--- a/src/libxslt.mk
+++ b/src/libxslt.mk
@@ -3,8 +3,8 @@
PKG := libxslt
$(PKG)_WEBSITE := http://xmlsoft.org/XSLT/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.1.29
-$(PKG)_CHECKSUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce
+$(PKG)_VERSION := 1.1.33
+$(PKG)_CHECKSUM := 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
$(PKG)_SUBDIR := libxslt-$($(PKG)_VERSION)
$(PKG)_FILE := libxslt-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://xmlsoft.org/sources/$($(PKG)_FILE)
diff --git a/src/libzip-1-fixes.patch b/src/libzip-1-fixes.patch
new file mode 100644
index 0000000..dd9921d
--- /dev/null
+++ b/src/libzip-1-fixes.patch
@@ -0,0 +1,56 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Herkt <lachs0r@srsfckn.biz>
+Date: Fri, 3 May 2019 21:26:06 +0200
+Subject: [PATCH 1/2] Fix MinGW build on case-sensitive filesystems
+
+
+diff --git a/lib/zip_crypto_win.c b/lib/zip_crypto_win.c
+index 1111111..2222222 100644
+--- a/lib/zip_crypto_win.c
++++ b/lib/zip_crypto_win.c
+@@ -39,7 +39,7 @@
+ #define WIN32_LEAN_AND_MEAN
+ #define NOCRYPT
+
+-#include <Windows.h>
++#include <windows.h>
+ #include <bcrypt.h>
+
+ #pragma comment(lib, "bcrypt.lib")
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Herkt <lachs0r@srsfckn.biz>
+Date: Fri, 3 May 2019 23:39:11 +0200
+Subject: [PATCH 2/2] Fix pkg-config Libs.private for static linking
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -299,13 +299,17 @@ SET(exec_prefix \${prefix})
+ SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
+ SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+ SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+-IF(BZIP2_FOUND)
+- SET(LIBS "${LIBS} -lbz2")
+-ENDIF()
+-SET(LIBS "${LIBS} -lz")
+ IF(CMAKE_SYSTEM_NAME MATCHES BSD)
+ SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD)
++get_target_property(LIBS_PRIVATE zip LINK_LIBRARIES)
++foreach(LIB ${LIBS_PRIVATE})
++ if(LIB MATCHES "^/")
++ get_filename_component(LIB ${LIB} NAME_WE)
++ string(REGEX REPLACE "^lib" "" LIB ${LIB})
++ endif()
++ set(LIBS "${LIBS} -l${LIB}")
++endforeach()
+ CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
diff --git a/src/libzip.mk b/src/libzip.mk
index c8fcf40..fe98c44 100644
--- a/src/libzip.mk
+++ b/src/libzip.mk
@@ -3,8 +3,8 @@
PKG := libzip
$(PKG)_WEBSITE := https://libzip.org/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.5.1
-$(PKG)_CHECKSUM := 3ca79ff6b9a02b3e3bcf0b45f30a8159c3146658f57c8b6be0a370eabd3db071
+$(PKG)_VERSION := 1.5.2
+$(PKG)_CHECKSUM := 905ae156f7590f4f3ab251cb79a0a48023848a7ae176143ec9467a9421bdb699
$(PKG)_GH_CONF := nih-at/libzip/releases,rel-,,,-
$(PKG)_DEPS := cc bzip2 zlib
diff --git a/src/xmlsec-1-fixes.patch b/src/xmlsec-1-fixes.patch
deleted file mode 100644
index 1dd480d..0000000
--- a/src/xmlsec-1-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Sat, 7 Apr 2018 14:43:45 +1000
-Subject: [PATCH 1/1] fix static mingw builds with pkgconf
-
-see:
-https://github.com/lsh123/xmlsec/pull/162
-
-diff --git a/xmlsec-gcrypt.pc.in b/xmlsec-gcrypt.pc.in
-index 1111111..2222222 100644
---- a/xmlsec-gcrypt.pc.in
-+++ b/xmlsec-gcrypt.pc.in
-@@ -8,4 +8,5 @@ Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
- Cflags: @XMLSEC_GCRYPT_CFLAGS@
-+Cflags.private: -DXMLSEC_STATIC
- Libs: @XMLSEC_GCRYPT_LIBS@
-diff --git a/xmlsec-gnutls.pc.in b/xmlsec-gnutls.pc.in
-index 1111111..2222222 100644
---- a/xmlsec-gnutls.pc.in
-+++ b/xmlsec-gnutls.pc.in
-@@ -8,4 +8,5 @@ Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
- Cflags: @XMLSEC_GNUTLS_CFLAGS@
-+Cflags.private: -DXMLSEC_STATIC
- Libs: @XMLSEC_GNUTLS_LIBS@
-diff --git a/xmlsec-nss.pc.in b/xmlsec-nss.pc.in
-index 1111111..2222222 100644
---- a/xmlsec-nss.pc.in
-+++ b/xmlsec-nss.pc.in
-@@ -8,4 +8,5 @@ Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ @NSPR_PACKAGE@ >= @MOZILLA_MIN_VERSION@ @NSS_PACKAGE@ >= @MOZILLA_MIN_VERSION@
- Cflags: -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
-+Cflags.private: -DXMLSEC_STATIC
- Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
-diff --git a/xmlsec-openssl.pc.in b/xmlsec-openssl.pc.in
-index 1111111..2222222 100644
---- a/xmlsec-openssl.pc.in
-+++ b/xmlsec-openssl.pc.in
-@@ -8,4 +8,5 @@ Version: @VERSION@
- Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
- Cflags: @XMLSEC_OPENSSL_CFLAGS@
-+Cflags.private: -DXMLSEC_STATIC
- Libs: @XMLSEC_OPENSSL_LIBS@
diff --git a/src/xmlsec.mk b/src/xmlsec.mk
index efd3754..4067072 100644
--- a/src/xmlsec.mk
+++ b/src/xmlsec.mk
@@ -3,8 +3,8 @@
PKG := xmlsec
$(PKG)_WEBSITE := https://www.aleksey.com/xmlsec/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.2.25
-$(PKG)_CHECKSUM := 5a2d400043ac5b2aa84b66b6b000704f0f147077afc6546d73181f5c71019985
+$(PKG)_VERSION := 1.2.28
+$(PKG)_CHECKSUM := 88c0ebf5f73e6a2d3ce11dd099fd20adb4a2997f4e9ab8064bb3a2800fd23fab
$(PKG)_GH_CONF := lsh123/xmlsec/tags,xmlsec-,,,_
$(PKG)_DEPS := cc gnutls libgcrypt libltdl libxml2 libxslt openssl