diff --git a/_service b/_service
index 57ee244..8f1ed1e 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,8 @@
git
https://evilpiepirate.org/git/bcachefs-tools.git
- v1.4.0
- 1.4.0
+ v1.4.1
+ 1.4.1
*.tar
diff --git a/bcachefs-tools-1.4.0.tar.xz b/bcachefs-tools-1.4.0.tar.xz
deleted file mode 100644
index ed0a282..0000000
--- a/bcachefs-tools-1.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0cd3101496aa6ece69dfe5d7997005256f844a4fa7e777015eeac75d581e06b6
-size 743712
diff --git a/bcachefs-tools-1.4.1.tar.xz b/bcachefs-tools-1.4.1.tar.xz
new file mode 100644
index 0000000..c8ed76f
--- /dev/null
+++ b/bcachefs-tools-1.4.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0313c50d461217fe22593839e576372b0ec25a567749751d82874938aee063f6
+size 749312
diff --git a/bcachefs-tools.changes b/bcachefs-tools.changes
index 0087d76..de7c6f7 100644
--- a/bcachefs-tools.changes
+++ b/bcachefs-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 19 01:54:34 UTC 2024 - Joshua Smith
+
+- Delete use_libexec_not_lib.patch (merged)
+- Update to release v1.4.1
+ * fix cmd_fsck, "bad mount option read-only"
+ * now open block devices with O_EXCL
+
-------------------------------------------------------------------
Tue Jan 9 03:46:53 UTC 2024 - Joshua Smith
diff --git a/bcachefs-tools.spec b/bcachefs-tools.spec
index 8e5b0a7..3d79643 100644
--- a/bcachefs-tools.spec
+++ b/bcachefs-tools.spec
@@ -17,15 +17,14 @@
Name: bcachefs-tools
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Summary: Configuration utilities for bcachefs
License: GPL-2.0-or-later
Group: System/Filesystems
URL: https://bcachefs.org/
Source: %name-%version.tar.xz
-Patch0: use_libexec_not_lib.patch
-BuildRequires: libaio-devel
+BuildRequires: libaio-devel >= 0.3.111
BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: pkgconfig(blkid)
@@ -43,7 +42,7 @@ BuildRequires: pkgconfig(zlib)
Bcachefs is a filesystem for Linux, with an emphasis on reliability
and robustness.
-* Copy on write (COW) - like zfs or btrfs
+* Copy on write (COW) like zfs or btrfs
* Full data and metadata checksumming
* Multiple devices
* Replication
@@ -86,5 +85,6 @@ rm -Rf "%buildroot/etc/initramfs-tools" "%buildroot/%_datadir/initramfs-tools"
%_udevrulesdir/64-bcachefs.rules
%_mandir/man8/*.8*
%license COPYING
+%doc doc/bcachefs-principles-of-operation.tex
%changelog
diff --git a/use_libexec_not_lib.patch b/use_libexec_not_lib.patch
deleted file mode 100644
index 4a29bcc..0000000
--- a/use_libexec_not_lib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 89abdd87271e237141a9d4f44d531f7c53353b83 Mon Sep 17 00:00:00 2001
-From: Neal Gompa
-Date: Sun, 24 Dec 2023 08:34:16 -0500
-Subject: [PATCH] Makefile, fsck: Use libexec instead of lib
-
-These are executables that need to be installed in a non-path location.
-Most distributions now install these into /usr/libexec, and the
-path variable for this is LIBEXECDIR, so use that instead.
----
- Makefile | 12 ++++++------
- fsck/bcachefsck_all_fail.service.in | 2 +-
- fsck/bcachefsck_fail@.service.in | 2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0e5cf6e0..a38f0742 100644
---- a/Makefile
-+++ b/Makefile
-@@ -105,14 +105,14 @@ else
- ROOT_SBINDIR?=$(PREFIX)/sbin
- INITRAMFS_DIR=/etc/initramfs-tools
- endif
--LIBDIR=$(PREFIX)/lib
-+LIBEXECDIR=$(PREFIX)/libexec
-
- PKGCONFIG_SERVICEDIR:=$(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
- ifeq (,$(PKGCONFIG_SERVICEDIR))
- $(warning skipping systemd integration)
- else
- BCACHEFSCK_ARGS=-f -n
--systemd_libfiles=\
-+systemd_libexecfiles=\
- fsck/bcachefsck_fail \
- fsck/bcachefsck_all
-
-@@ -133,14 +133,14 @@ built_scripts+=\
-
- %.service: %.service.in
- @echo " [SED] $@"
-- $(Q)sed -e "s|@libdir@|$(LIBDIR)|g" \
-+ $(Q)sed -e "s|@libexecdir@|$(LIBEXECDIR)|g" \
- -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
-
- fsck/bcachefsck_all: fsck/bcachefsck_all.in
- @echo " [SED] $@"
- $(Q)sed -e "s|@bcachefsck_args@|$(BCACHEFSCK_ARGS)|g" < $< > $@
-
--optional_build+=$(systemd_libfiles) $(systemd_services)
-+optional_build+=$(systemd_libexecfiles) $(systemd_services)
- optional_install+=install_systemd
- endif # PKGCONFIG_SERVICEDIR
-
-@@ -226,8 +226,8 @@ install: bcachefs $(optional_install)
- echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
-
- .PHONY: install_systemd
--install_systemd: $(systemd_services) $(systemd_libfiles)
-- $(INSTALL) -m0755 -D $(systemd_libfiles) -t $(DESTDIR)$(LIBDIR)
-+install_systemd: $(systemd_services) $(systemd_libexecfiles)
-+ $(INSTALL) -m0755 -D $(systemd_libexecfiles) -t $(DESTDIR)$(LIBEXECDIR)
- $(INSTALL) -m0644 -D $(systemd_services) -t $(DESTDIR)$(PKGCONFIG_SERVICEDIR)
-
- .PHONY: clean
-diff --git a/fsck/bcachefsck_all_fail.service.in b/fsck/bcachefsck_all_fail.service.in
-index b79f8196..fe584514 100644
---- a/fsck/bcachefsck_all_fail.service.in
-+++ b/fsck/bcachefsck_all_fail.service.in
-@@ -10,7 +10,7 @@ Documentation=man:bcachefsck_all(8)
- [Service]
- Type=oneshot
- Environment=EMAIL_ADDR=root
--ExecStart=@libdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefsck_all
-+ExecStart=@libexecdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefsck_all
- User=mail
- Group=mail
- SupplementaryGroups=systemd-journal
-diff --git a/fsck/bcachefsck_fail@.service.in b/fsck/bcachefsck_fail@.service.in
-index 369a809a..8d5ed4c6 100644
---- a/fsck/bcachefsck_fail@.service.in
-+++ b/fsck/bcachefsck_fail@.service.in
-@@ -10,7 +10,7 @@ Documentation=man:bcachefs(8)
- [Service]
- Type=oneshot
- Environment=EMAIL_ADDR=root
--ExecStart=@libdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefs %f
-+ExecStart=@libexecdir@/bcachefsck_fail "${EMAIL_ADDR}" bcachefs %f
- User=mail
- Group=mail
- SupplementaryGroups=systemd-journal