[PR PATCH] btrfs-progs: update to 5.13.1

[PR PATCH] btrfs-progs: update to 5.13.1

[FollieHiyuki]

[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]

There is a new pull request by FollieHiyuki against master on the void-packages repository

https://github.com/FollieHiyuki/void-packages btrfs-progs
https://github.com/void-linux/void-packages/pull/32279

btrfs-progs: update to 5.13.1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32279.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-btrfs-progs-32279.patch --]
[-- Type: text/x-diff, Size: 3801 bytes --]

From f6da701fb124e0bfced0e511b385ec9479b19a62 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Jul 2021 18:35:41 +0300
Subject: [PATCH] btrfs-progs: update to 5.13.1

---
 ...973527a87a27b2cd9a41c8347fd4bdb74016.patch | 56 -------------------
 srcpkgs/btrfs-progs/template                  |  6 +-
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch

diff --git a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch b/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
deleted file mode 100644
index 22ba4b27683c..000000000000
--- a/srcpkgs/btrfs-progs/patches/6134973527a87a27b2cd9a41c8347fd4bdb74016.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6134973527a87a27b2cd9a41c8347fd4bdb74016 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Mon, 7 Jun 2021 17:38:46 +0200
-Subject: [PATCH] btrfs-progs: zoned: make it work without kernel support
-
-There's a report that a system with 4.19 kernel fails boot because
-device scan exits with error. This is because zoned support is compiled
-in btrfs-progs but not in kernel.
-
-To make new progs and old kernels work, do a fallback when the zoned
-ioctl is not available, as if it were a non-zoned device. There is no
-other option, but this is safe at least for the device scan that would
-not error out. Any unaligned writes to a zoned device will fail as
-expected.
-
-Issue: #376
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kernel-shared/zoned.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c
-index 2a6892b3c..dc850cd22 100644
---- a/kernel-shared/zoned.c
-+++ b/kernel-shared/zoned.c
-@@ -488,9 +488,14 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 	/* Do not call ioctl(BLKGETZONESZ) on a regular file. */
- 	if ((stat_buf.st_mode & S_IFMT) == S_IFBLK) {
- 		ret = ioctl(fd, BLKGETZONESZ, &zone_size_sector);
--		if (ret) {
--			error("zoned: ioctl BLKGETZONESZ failed (%m)");
--			exit(1);
-+		if (ret < 0) {
-+			if (errno == ENOTTY) {
-+				/* No kernel support, assuming non-zoned device */
-+				zone_size_sector = 0;
-+			} else {
-+				error("zoned: ioctl BLKGETZONESZ failed: %m");
-+				exit(1);
-+			}
- 		}
- 	} else {
- 		zone_size_sector = 0;
-@@ -528,7 +533,11 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw)
- 
- 	ret = ioctl(fd, BLKREPORTZONE, rep);
- 	if (ret) {
--		error("zoned: ioctl BLKREPORTZONE failed (%m)");
-+		if (errno == ENOTTY) {
-+			error("zoned: BLKREPORTZONE failed but BLKGETZONESZ works: %m");
-+			exit(1);
-+		}
-+		error("zoned: ioctl BLKREPORTZONE failed: %m");
- 		exit(1);
- 	}
- 	if (rep->nr_zones != 2) {
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index eeca5301f9fe..ef62f0b7ccba 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
-version=5.12.1
-revision=2
+version=5.13.1
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -16,7 +16,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://btrfs.wiki.kernel.org/index.php/Main_Page"
 changelog="https://raw.githubusercontent.com/kdave/btrfs-progs/master/CHANGES"
 distfiles="${KERNEL_SITE}/kernel/people/kdave/${pkgname}/${pkgname}-v${version}.tar.xz"
-checksum=950846fea454fb4b1c39f0fa454983644572df91df5c06047b335bf2d5473759
+checksum=3d7e5a01e68fbaf485c5f1da15c6b8a7d1455fb57b6e75a706f8e2bb37f4f399
 # Most of the tests depend on `mount` and `fallocate` commands, which are not
 # presented in chroot-util-linux
 make_check=no

Re: [PR PATCH] [Merged]: btrfs-progs: update to 5.13.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]

There's a merged pull request on the void-packages repository

btrfs-progs: update to 5.13.1
https://github.com/void-linux/void-packages/pull/32279

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->