Accepting request 1154476 from home:ddiss:bcachefs_upstream_vendor

- Update to release v1.6.4
  * fix build on powerpc
  * drop upstream rust-use-libc-Ioctl-type-for-ioctl-request-argument.patch

OBS-URL: https://build.opensuse.org/request/show/1154476
OBS-URL: https://build.opensuse.org/package/show/filesystems/bcachefs-tools?expand=0&rev=22

bcachefs-tools-vendored-1.6.3.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEKnAFLkS8Qha+jvQrE6szbY3KbnYFAmXVOSUACgkQE6szbY3K
-bnYpyA//W+uVLe3jvm2kbWGNMqwYUZxikRpdtOgzR9Gdhk6TeiaLAWRzzHByIDWB
-U7d7IVdCtxnoNpD4nwloaqSjUO+F4GpQBHkLiopm6vCFLCJGi4Wr42xepXEt+xwo
-hSZkDhLjU9k4TyXFi4RhDgvYtCF7zkq66v+ghzYq814yYh+pcssig6ZBLuJdmQDN
-OIvckK4dHzS8aK6Hd7f0OQCKbf1cvnHMIYHMwMtYOcY5csqvW/QorVG7tZCMdMy8
-is4JI5uPsirCqXJYpQL4/8ymgFCA4khxvjKSZLG6+s2ITioh96oqv/aEaH3uJQ/d
-10Vcv2InPC2zPVPHyC97kauZR1or201ucIP2OC5RtP6RcEszk35+Pk2eAcMGdjtw
-3FLfbWsEfmoLhzpL1JnVNxHYEaFVP+6XHhxgOKFIKMQY/yUV4jKW8s3HrVL47G4/
-LdIVHRkJiu4mkav+bRhzpOR2OWAOjGXpYhFLmGPIpbQmyFJZVTIOWoRXsImxbaM0
-C+7Jgm4DIB8ooiq5oDVrenco69uATKoLtbIFtZqgxOpUeNG5hOWV+RjML13XFm/S
-Rd4hhD/XneR8+XNZjALteGhkHhXPxkd1eUSoJDfXirNQ1zPoXFKwMdmEzjNjRztd
-Cug7UoC7Xy5vSzuM8kM+3wotF35adO8N3sql29dmghD4Fub8Y+s=
-=x8lG
------END PGP SIGNATURE-----

bcachefs-tools-vendored-1.6.4.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEKnAFLkS8Qha+jvQrE6szbY3KbnYFAmXZOAIACgkQE6szbY3K
+bnaQ9w//VP0DGJBd191BmVgVW37g4f5rx9RMUrNKy1cYmE723vXv3G3l5qQA1Sl/
+rW82Gc+v7Yeh8PolAG6LVn2OzBVgiPVUn0//KUAOCcM7n3UEGOSH045fqBpuJHTT
+iC+xWrvR36rhhyuW9VVED4aea9Yv2pwYFfL9e20hGweN4RPzzMPbWT7ZMj/QfuH1
+F0bHLZgs93D/ipJDVN0pLP2MRqkkOQ48ch3TkuIboCp/XFcpY//nWeGsNsrWi/lR
+4oQr6/R0Q77AMPvp4spmgvle5EiYtrI3O/WyCUDjWRN+xlE8yBrawlID4mNd7WIw
+xWHz7Z0VBuntUpMJIzi//suxwYm7tfuFeZ5MGsZi7k0uPNqGOsW6JkMgRz9fhROw
+9RBMYURkChViSDhJwz7cYTWLDxJYbxp9qEvVUROKUe4hfBjC9jlC+ksVBWYnYrwd
+ijckkTUZCFQVqthUNwboL4/ypQKsfDRWhnsSZqz1Nk/GiKOddFL13WDCCXX3BXRY
+5XUx+U6rS7yTK2W3nkifdT4gDcI4Oa4c591hMreKMkWq4fldNosBdwrnujk4dS+r
+NYK5U/ScEQj9QymAp60Jax8cOGrlAXfYjtm6Gvnua/ny7eCRCG55vyTGqg+BFMbW
+CPSxUnUlA4ZAv7O8JtWiaBaEGADMydgezrpicEKg2FNZlqsokMA=
+=t0YU
+-----END PGP SIGNATURE-----

bcachefs-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar  4 01:54:50 UTC 2024 - David Disseldorp <ddiss@suse.de>
+
+- Update to release v1.6.4
+  * fix build on powerpc
+  * drop upstream rust-use-libc-Ioctl-type-for-ioctl-request-argument.patch
+
 -------------------------------------------------------------------
 Thu Feb 22 06:23:25 UTC 2024 - David Disseldorp <ddiss@suse.de>
 

bcachefs-tools.spec

@@ -17,7 +17,7 @@
 
 
 Name:           bcachefs-tools
-Version:        1.6.3
+Version:        1.6.4
 Release:        0
 Summary:        Configuration utilities for bcachefs
 License:        GPL-2.0-or-later
@@ -26,7 +26,6 @@ URL:            https://bcachefs.org/
 Source0:        https://evilpiepirate.org/%name/%name-vendored-%version.tar.zst
 Source1:        https://evilpiepirate.org/%name/%name-vendored-%version.tar.sign
 Source2:        %{name}.keyring
-Patch0:         rust-use-libc-Ioctl-type-for-ioctl-request-argument.patch
 BuildRequires:  cargo
 BuildRequires:  clang-devel
 BuildRequires:  libaio-devel >= 0.3.111

rust-use-libc-Ioctl-type-for-ioctl-request-argument.patch

@@ -1,65 +0,0 @@
-From 25e84a9917fc8c2f1c7d2976e946c5e5a22b3589 Mon Sep 17 00:00:00 2001
-From: Thomas Bertschinger <tahbertschinger@gmail.com>
-Date: Tue, 20 Feb 2024 20:24:20 -0700
-Subject: [PATCH] rust: use libc::Ioctl type for ioctl() request argument
-
-The second argument to ioctl() can be defined as a different type by
-different libc implementations, and can be a different size on different
-architectures depending on what type it is defined as. For example,
-glibc defines it as `unsigned long` which may have a different size on
-32-bit vs. 64-bit architectures, and musl libc defines it as `int`.
-
-The Rust libc crate exposes a type `libc::Ioctl` which is defined as the
-appropriate integer type for the given libc implementation. Using this
-type for the request argument to `libc::ioctl()` ensures code will
-compile correctly regardless of architecture and libc implementation.
-
-Also, because ioctl request numbers are defined to be 32 bits
-(regardless of the fact that `unsigned long` might sometimes take 64
-bits on some architectures), this patch changes the Rust representation
-of the bcachefs ioctl numbers to u32 instead of u64.
-
-Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com>
-Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
----
- bch_bindgen/src/libbcachefs_wrapper.h | 4 ++--
- src/wrappers/handle.rs                | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bch_bindgen/src/libbcachefs_wrapper.h b/bch_bindgen/src/libbcachefs_wrapper.h
-index bc4658fb..128592c3 100644
---- a/bch_bindgen/src/libbcachefs_wrapper.h
-+++ b/bch_bindgen/src/libbcachefs_wrapper.h
-@@ -33,5 +33,5 @@ MARK_FIX_753(blk_mode_t, BLK_OPEN_READ);
- MARK_FIX_753(blk_mode_t, BLK_OPEN_WRITE);
- MARK_FIX_753(blk_mode_t, BLK_OPEN_EXCL);
- 
--MARK_FIX_753(__u64, BCH_IOCTL_SUBVOLUME_CREATE);
--MARK_FIX_753(__u64, BCH_IOCTL_SUBVOLUME_DESTROY);
-+MARK_FIX_753(__u32, BCH_IOCTL_SUBVOLUME_CREATE);
-+MARK_FIX_753(__u32, BCH_IOCTL_SUBVOLUME_DESTROY);
-diff --git a/src/wrappers/handle.rs b/src/wrappers/handle.rs
-index 48148a8f..60bdedb7 100644
---- a/src/wrappers/handle.rs
-+++ b/src/wrappers/handle.rs
-@@ -22,7 +22,7 @@ impl BcachefsHandle {
- 
- /// I/O control commands that can be sent to a bcachefs filesystem
- /// Those are non-exhaustive 
--#[repr(u64)]
-+#[repr(u32)]
- #[non_exhaustive]
- pub enum BcachefsIoctl {
-     SubvolumeCreate = BCH_IOCTL_SUBVOLUME_CREATE,
-@@ -47,7 +47,7 @@ impl BcachefsHandle {
-     /// Type-safe [`libc::ioctl`] for bcachefs filesystems
-     pub fn ioctl(&self, request: BcachefsIoctl, payload: &BcachefsIoctlPayload) -> Result<(), Errno> {
-         let payload_ptr: *const libc::c_void = payload.into();
--        let ret = unsafe { libc::ioctl(self.inner.ioctl_fd, request as u64, payload_ptr) };
-+        let ret = unsafe { libc::ioctl(self.inner.ioctl_fd, request as libc::Ioctl, payload_ptr) };
- 
-         if ret == -1 {
-             Err(errno::errno())
--- 
-2.43.1
-