diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-24 05:37:45 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-07-24 05:37:45 (GMT) |
| commit | dbfbbb0fa4eb7a1c797d45da1539233302634694 (patch) | |
| tree | 48b88f40db965b640dd3da206cb9ae4566622d1d /src | |
| parent | 35639b1184f0094df980e13595161f885c4be885 (diff) | |
| download | mxe-dbfbbb0fa4eb7a1c797d45da1539233302634694.zip mxe-dbfbbb0fa4eb7a1c797d45da1539233302634694.tar.gz mxe-dbfbbb0fa4eb7a1c797d45da1539233302634694.tar.bz2 | |
libarchive: update 3.1.2 --> 3.3.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/libarchive-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/libarchive.mk | 4 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/libarchive-1-fixes.patch b/src/libarchive-1-fixes.patch index 8576f8d..8d9423e 100644 --- a/src/libarchive-1-fixes.patch +++ b/src/libarchive-1-fixes.patch @@ -2,14 +2,14 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. -From 47b80beedcb3d8e6296e2d0b970bb0c82abb4424 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" <fix@me> Date: Tue, 14 Feb 2012 12:40:24 +0100 Subject: [PATCH] fix pkg-config diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in -index 95d7159..8288f31 100644 +index 1111111..2222222 100644 --- a/build/pkgconfig/libarchive.pc.in +++ b/build/pkgconfig/libarchive.pc.in @@ -8,4 +8,4 @@ Description: library that can create and read several streaming archive formats @@ -18,6 +18,25 @@ index 95d7159..8288f31 100644 Libs: -L${libdir} -larchive -Libs.private: @LIBS@ +Libs.private: @LIBS@ -liconv --- -1.7.8.3 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tim Kientzle <kientzle@acm.org> +Date: Sun, 16 Jul 2017 16:10:08 -0700 +Subject: [PATCH] Issue #924: fix capitalization of bcrypt.h header + +taken from: +https://github.com/libarchive/libarchive/commit/06052e47e500ef4c8c937c4c8b987433a647cb4c + +diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h +index 1111111..2222222 100644 +--- a/libarchive/archive_cryptor_private.h ++++ b/libarchive/archive_cryptor_private.h +@@ -64,7 +64,7 @@ typedef struct { + } archive_crypto_ctx; + + #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) +-#include <Bcrypt.h> ++#include <bcrypt.h> + + /* Common in other bcrypt implementations, but missing from VS2008. */ + #ifndef BCRYPT_SUCCESS diff --git a/src/libarchive.mk b/src/libarchive.mk index e60b59d..805a97e 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -4,8 +4,8 @@ PKG := libarchive $(PKG)_WEBSITE := https://www.libarchive.org/ $(PKG)_DESCR := Libarchive $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.2 -$(PKG)_CHECKSUM := eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e +$(PKG)_VERSION := 3.3.2 +$(PKG)_CHECKSUM := ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.libarchive.org/downloads/$($(PKG)_FILE) |