From 9121e267089b9b2e4ef092573a42b287bf493255 Mon Sep 17 00:00:00 2001
From: Mike Ellery <mellery451@gmail.com>
Date: Wed, 28 Nov 2018 13:46:08 -0800
Subject: [PATCH] Update libarchive to 3.3.3 from official repo

---
 CMakeLists.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d80ca7f343..a147c27021 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -758,12 +758,8 @@ if (MSVC)
 endif ()
 ExternalProject_Add (libarchive
   PREFIX ${nih_cache_path}
-  # TODO: switch back to official repo once they allow ENABLE_WERROR option in
-  # mainline -- see https://github.com/libarchive/libarchive/pull/1033
-  #GIT_REPOSITORY https://github.com/libarchive/libarchive.git
-  #GIT_TAG v3.3.1
-  GIT_REPOSITORY https://github.com/mellery451/libarchive.git
-  GIT_TAG e78e48ea4e102fef7f379bc8f10afbfbf25633a6
+  GIT_REPOSITORY https://github.com/libarchive/libarchive.git
+  GIT_TAG v3.3.3
   CMAKE_ARGS
     # passing the compiler seems to be needed for windows CI, sadly
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}