From 9cef14612476d5a6ccfa9afe26d547b3b6ad45be Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Fri, 23 Dec 2022 11:50:09 -0500
Subject: [PATCH] Update to 6.1

- Use libgcrypt for cryptographic hash functions
---
 .gitignore       | 2 ++
 btrfs-progs.spec | 9 +++++++--
 sources          | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 437820c..094b0bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,5 @@
 /btrfs-progs-v6.0.1.tar.xz
 /btrfs-progs-v6.0.2.tar.sign
 /btrfs-progs-v6.0.2.tar.xz
+/btrfs-progs-v6.1.tar.sign
+/btrfs-progs-v6.1.tar.xz
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 7191d1b..b8bb3b5 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -2,7 +2,7 @@
 %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
 
 Name:           btrfs-progs
-Version:        6.0.2
+Version:        6.1
 Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
@@ -19,6 +19,7 @@ BuildRequires:  libacl-devel, lzo-devel
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libgcrypt) >= 1.8.0
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libzstd) >= 1.0.0
 BuildRequires:  python3-sphinx
@@ -90,7 +91,7 @@ xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}
 
 %build
 ./autogen.sh
-%configure CFLAGS="%{optflags} -fno-strict-aliasing" --disable-python
+%configure CFLAGS="%{optflags} -fno-strict-aliasing" --with-crypto=libgcrypt --disable-python
 %make_build
 
 pushd libbtrfsutil/python
@@ -145,6 +146,10 @@ popd
 %{python3_sitearch}/btrfsutil-*.egg-info/
 
 %changelog
+* Fri Dec 23 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.1-1
+- Update to 6.1
+- Use libgcrypt for cryptographic hash functions
+
 * Fri Nov 25 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.0.2-1
 - Update to 6.0.2
 
diff --git a/sources b/sources
index ec5c1ce..470a5eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (btrfs-progs-v6.0.2.tar.sign) = 8775b786536c0046c52df143c04d7bc0c1351758993a27e8d40d1928b96db7073b94c9e1309f76c5542f05c7f815962f794d905c8d8a7c3e20a2dbe1dc6978f2
-SHA512 (btrfs-progs-v6.0.2.tar.xz) = 8e01fa6e3373d95a8e8577003ceb94722e4dfdf24110bfea79191a9862daf5e6580d72e898fdea134b5e86beeda32948eed572072f7906226189c6f1ac8615e3
+SHA512 (btrfs-progs-v6.1.tar.sign) = 597210a6315d66112858b8a009d6928a5cebb42e92ef0520d3fad6991aa7667da1ce0ea087cc8cc202fb260b24974386f0a8f8fcde081425915e75fa7356e169
+SHA512 (btrfs-progs-v6.1.tar.xz) = e20f70ea00f593d90b95b6f0f6b105fc72551b3be0b493c07e92fb31a8db3884edac6344ff1c7ffdc3688948f7bce7c226eea1372ee9f31d5b0194dda6d65389