From 0a9feb3b5572886a9e7f665aa5b05dea161c19a1 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 14 Apr 2022 19:46:48 +0200
Subject: [PATCH] libarchive: Update to 3.6.1

drop cygwin-only patch
---
 .../0001-libarchive-3.3.3-bcrypt-fix.patch    | 63 -------------------
 mingw-w64-libarchive/PKGBUILD                 |  9 +--
 2 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 mingw-w64-libarchive/0001-libarchive-3.3.3-bcrypt-fix.patch

diff --git a/mingw-w64-libarchive/0001-libarchive-3.3.3-bcrypt-fix.patch b/mingw-w64-libarchive/0001-libarchive-3.3.3-bcrypt-fix.patch
deleted file mode 100644
index 1bc3a76018..0000000000
--- a/mingw-w64-libarchive/0001-libarchive-3.3.3-bcrypt-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur libarchive-3.3.3.orig/libarchive/archive_cryptor.c libarchive-3.3.3/libarchive/archive_cryptor.c
---- libarchive-3.3.3.orig/libarchive/archive_cryptor.c	2018-09-04 15:36:21.010905600 -0400
-+++ libarchive-3.3.3/libarchive/archive_cryptor.c	2018-09-04 15:39:13.953139100 -0400
-@@ -57,7 +57,7 @@
- 	return 0;
- }
- 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) || defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_WINDOWS_H)
- #ifdef _MSC_VER
- #pragma comment(lib, "Bcrypt.lib")
- #endif
-@@ -168,7 +168,7 @@
- 	return 0;
- }
- 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) || defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_WINDOWS_H)
- 
- static int
- aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)
-diff -Naur libarchive-3.3.3.orig/libarchive/archive_cryptor_private.h libarchive-3.3.3/libarchive/archive_cryptor_private.h
---- libarchive-3.3.3.orig/libarchive/archive_cryptor_private.h	2018-09-04 15:36:21.079906500 -0400
-+++ libarchive-3.3.3/libarchive/archive_cryptor_private.h	2018-09-04 15:39:58.077520000 -0400
-@@ -63,7 +63,10 @@
- 	unsigned	encr_pos;
- } archive_crypto_ctx;
- 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) || defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_WINDOWS_H)
-+#if defined(__CYGWIN__)
-+	# include <windows.h>
-+#endif
- #include <bcrypt.h>
- 
- /* Common in other bcrypt implementations, but missing from VS2008. */
-diff -Naur libarchive-3.3.3.orig/libarchive/archive_hmac.c libarchive-3.3.3/libarchive/archive_hmac.c
---- libarchive-3.3.3.orig/libarchive/archive_hmac.c	2018-09-04 15:36:20.986905600 -0400
-+++ libarchive-3.3.3/libarchive/archive_hmac.c	2018-09-04 15:41:06.218433900 -0400
-@@ -74,7 +74,7 @@
- 	memset(ctx, 0, sizeof(*ctx));
- }
- 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) || defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_WINDOWS_H)
- 
- #ifndef BCRYPT_HASH_REUSABLE_FLAG
- # define BCRYPT_HASH_REUSABLE_FLAG 0x00000020
-diff -Naur libarchive-3.3.3.orig/libarchive/archive_hmac_private.h libarchive-3.3.3/libarchive/archive_hmac_private.h
---- libarchive-3.3.3.orig/libarchive/archive_hmac_private.h	2018-09-04 15:36:21.006904800 -0400
-+++ libarchive-3.3.3/libarchive/archive_hmac_private.h	2018-09-04 15:42:32.374554800 -0400
-@@ -53,7 +53,10 @@
- 
- typedef	CCHmacContext archive_hmac_sha1_ctx;
- 
--#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-+#elif defined(_WIN32) || defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && defined(HAVE_WINDOWS_H)
-+#if defined(__CYGWIN__)
-+	# include <windows.h>
-+#endif
- #include <bcrypt.h>
- 
- typedef struct {
diff --git a/mingw-w64-libarchive/PKGBUILD b/mingw-w64-libarchive/PKGBUILD
index 1872fde290..ef20265c1a 100644
--- a/mingw-w64-libarchive/PKGBUILD
+++ b/mingw-w64-libarchive/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=libarchive
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="Multi-format archive and compression library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -24,15 +24,12 @@ depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs
          ${MINGW_PACKAGE_PREFIX}-zstd)
 options=('!libtool' 'strip')
 source=("https://github.com/libarchive/libarchive/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz"
-        "0001-libarchive-3.3.3-bcrypt-fix.patch"
         "0002-fix-openssl-library-check.patch")
-sha256sums=('df283917799cb88659a5b33c0a598f04352d61936abcd8a48fe7b64e74950de7'
-            '2c318a025029998a9389eb99ab80f733c0fcf3b4888421879f2f6b4530d7f522'
+sha256sums=('5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6'
             'fe51cc1f215239dbf39c65d1e70aabb72c2ec121b37d941fd8da23dbba4344dc')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i ${srcdir}/0001-libarchive-3.3.3-bcrypt-fix.patch
 
   # https://github.com/libarchive/libarchive/pull/1714
   patch -p1 -i ${srcdir}/0002-fix-openssl-library-check.patch