From f6faec6651274c227ba9d61df04326639cf643cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Wed, 19 Dec 2018 19:30:58 -0300
Subject: [PATCH] recipes: libs/libarchive: remove patches for the previous
 version

---
 patches/libarchive/libarchive_libressl27.patch | 11 ------
 patches/libarchive/patch-libressl              | 51 --------------------------
 recipes/libs/libarchive/recipe                 |  3 --
 3 files changed, 65 deletions(-)
 delete mode 100644 patches/libarchive/libarchive_libressl27.patch
 delete mode 100644 patches/libarchive/patch-libressl

diff --git a/patches/libarchive/libarchive_libressl27.patch b/patches/libarchive/libarchive_libressl27.patch
deleted file mode 100644
index 8c16071c..00000000
--- a/patches/libarchive/libarchive_libressl27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libarchive/archive_openssl_hmac_private.h.orig	2017-05-07 21:38:09.000000000 -0300
-+++ libarchive/archive_openssl_hmac_private.h	2018-06-25 05:29:19.368032747 -0300
-@@ -28,7 +28,7 @@
- #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 < 0x20700000L )
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)
diff --git a/patches/libarchive/patch-libressl b/patches/libarchive/patch-libressl
deleted file mode 100644
index 5630d806..00000000
--- a/patches/libarchive/patch-libressl
+++ /dev/null
@@ -1,51 +0,0 @@
---- files/patch-libarchive-archive_openssl_evp_private.h	(revision 465490)
-+++ files/patch-libarchive-archive_openssl_evp_private.h	(working copy)
-@@ -1,11 +1,12 @@
----- libarchive/archive_openssl_evp_private.h.orig	Sun Jan 29 06:06:27 2017
--+++ libarchive/archive_openssl_evp_private.h	Fri Mar 10 12:53:43 2017
--@@ -28,7 +28,7 @@
-+--- libarchive/archive_openssl_evp_private.h.orig	2017-01-29 05:06:27 UTC
-++++ libarchive/archive_openssl_evp_private.h
-+@@ -28,7 +28,8 @@
-  #include <openssl/evp.h>
-  #include <openssl/opensslv.h>
-  
- -#if OPENSSL_VERSION_NUMBER < 0x10100000L
--+#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 EVP_MD_CTX *EVP_MD_CTX_new(void)
-Index: files/patch-libarchive_archive__openssl__hmac__private.h
-===================================================================
---- files/patch-libarchive_archive__openssl__hmac__private.h	(nonexistent)
-+++ files/patch-libarchive_archive__openssl__hmac__private.h	(working copy)
-@@ -0,0 +1,12 @@
-+--- libarchive/archive_openssl_hmac_private.h.orig	2018-03-22 20:47:12 UTC
-++++ 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)
-
-Property changes on: files/patch-libarchive_archive__openssl__hmac__private.h
-___________________________________________________________________
-Added: fbsd:nokeywords
-## -0,0 +1 ##
-+yes
-\ No newline at end of property
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
-Added: svn:mime-type
-## -0,0 +1 ##
-+text/plain
-\ No newline at end of property
diff --git a/recipes/libs/libarchive/recipe b/recipes/libs/libarchive/recipe
index e4d3f3e9..036d0bea 100644
--- a/recipes/libs/libarchive/recipe
+++ b/recipes/libs/libarchive/recipe
@@ -54,9 +54,6 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
-    # Fix build against LibreSSL 2.7
-#    patch -p0 < "${worktree}/patches/libarchive/libarchive_libressl27.patch"
-
     ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \
      $configure_args \
      --libdir=/usr/lib${libSuffix} \
-- 
2.11.4.GIT