diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-12-09 10:03:43 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2018-12-09 10:03:43 +0000 |
| commit | 0e89c51ca475c9076d1081117e07467c8f0739bf (patch) | |
| tree | dd4d8f593622a4c68a55d063edb8d4e21f53ee31 /patches | |
| parent | 77e5f8a111c1955408640c4c7ff720f6f2e280bf (diff) | |
| download | midipix_build-0e89c51ca475c9076d1081117e07467c8f0739bf.tar.bz2 midipix_build-0e89c51ca475c9076d1081117e07467c8f0739bf.tar.xz | |
vars/build.vars: updates libarchive{,_host} to v3.3.3 (fixes build failure.)
patches/libarchive-3.3.2.local.patch: removes obsolete patch.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libarchive-3.3.2.local.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/patches/libarchive-3.3.2.local.patch b/patches/libarchive-3.3.2.local.patch deleted file mode 100644 index 7bf80662..00000000 --- a/patches/libarchive-3.3.2.local.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/libarchive/archive_openssl_hmac_private.h.orig 2018-03-22 20:47:12 UTC -+++ b/libarchive/archive_openssl_hmac_private.h -@@ -28,7 +28,8 @@ - #include <openssl/hmac.h> - #include <openssl/opensslv.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - #include <stdlib.h> /* malloc, free */ - #include <string.h> /* memset */ - static inline HMAC_CTX *HMAC_CTX_new(void) -From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger <joerg@bec.de> -Date: Tue, 5 Sep 2017 18:12:19 +0200 -Subject: [PATCH] Do something sensible for empty strings to make fuzzers - happy. - ---- - libarchive/archive_read_support_format_xar.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c -index 7a22beb9d..93eeacc5e 100644 ---- a/libarchive/archive_read_support_format_xar.c -+++ b/libarchive/archive_read_support_format_xar.c -@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) - uint64_t l; - int digit; - -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - digit = *p - '0'; - while (digit >= 0 && digit < 10 && char_cnt-- > 0) { -@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) - { - int64_t l; - int digit; -- -+ -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - while (char_cnt-- > 0) { - if (*p >= '0' && *p <= '7') |