diff options
| author | Florian Franzmann | 2017-07-10 19:05:25 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2017-07-10 19:05:25 +0200 |
| commit | 55d60a091b16059246fdae3ecb35abb6a433d265 (patch) | |
| tree | c62e52dcbc1c0e81f41363ec701071da754fd707 /archive-libs/libarchive | |
| parent | b36518d08d4a475a0fd5c2c9edc804a6109d86cc (diff) | |
archive-libs/libarchive: version 3.3.2
Diffstat (limited to 'archive-libs/libarchive')
| -rwxr-xr-x | archive-libs/libarchive/DETAILS | 4 | ||||
| -rw-r--r-- | archive-libs/libarchive/HISTORY | 4 | ||||
| -rwxr-xr-x | archive-libs/libarchive/PRE_BUILD | 2 | ||||
| -rw-r--r-- | archive-libs/libarchive/libressl.patch | 29 |
4 files changed, 23 insertions, 16 deletions
diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS index 6493be89b0..8ad34e729d 100755 --- a/archive-libs/libarchive/DETAILS +++ b/archive-libs/libarchive/DETAILS @@ -1,6 +1,6 @@ SPELL=libarchive - VERSION=3.3.1 - SOURCE_HASH=sha512:90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 + VERSION=3.3.2 + SOURCE_HASH=sha512:1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 SECURITY_PATCH=6 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY index a712cbad4b..4687acc10f 100644 --- a/archive-libs/libarchive/HISTORY +++ b/archive-libs/libarchive/HISTORY @@ -1,3 +1,7 @@ +2017-07-10 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 3.3.2 + * PRE_BUILD, libressl.patch: patch renewed + 2017-06-10 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD: added, to apply patch * libressl.patch: added, to fix build with libressl diff --git a/archive-libs/libarchive/PRE_BUILD b/archive-libs/libarchive/PRE_BUILD index 2c03a54fca..2af8029185 100755 --- a/archive-libs/libarchive/PRE_BUILD +++ b/archive-libs/libarchive/PRE_BUILD @@ -1,4 +1,4 @@ default_pre_build && cd "${SOURCE_DIRECTORY}" && -patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" +patch -p1 < "${SPELL_DIRECTORY}/libressl.patch" diff --git a/archive-libs/libarchive/libressl.patch b/archive-libs/libarchive/libressl.patch index a6f758e6f8..6cc6aba229 100644 --- a/archive-libs/libarchive/libressl.patch +++ b/archive-libs/libarchive/libressl.patch @@ -1,5 +1,16 @@ ---- libarchive/archive_openssl_evp_private.h.orig -+++ libarchive/archive_openssl_evp_private.h +From 966f2546cba91e53e1c5afce6969752ad90f8adc Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <bwlf@bandrate.org> +Date: Mon, 10 Jul 2017 19:02:12 +0200 +Subject: [PATCH] libressl + +--- + libarchive/archive_openssl_evp_private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_openssl_evp_private.h b/libarchive/archive_openssl_evp_private.h +index 43a3ccc..90b1c8f 100644 +--- a/libarchive/archive_openssl_evp_private.h ++++ b/libarchive/archive_openssl_evp_private.h @@ -28,7 +28,7 @@ #include <openssl/evp.h> #include <openssl/opensslv.h> @@ -9,14 +20,6 @@ #include <stdlib.h> /* malloc, free */ #include <string.h> /* memset */ static inline EVP_MD_CTX *EVP_MD_CTX_new(void) ---- libarchive/archive_openssl_hmac_private.h.orig -+++ libarchive/archive_openssl_hmac_private.h -@@ -28,7 +28,7 @@ - #include <openssl/hmac.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #include <stdlib.h> /* malloc, free */ - #include <string.h> /* memset */ - static inline HMAC_CTX *HMAC_CTX_new(void) +-- +2.13.2 + |