commit:     83d563de55a465698415667f1f393679d72926b1
Author:     Hoël Bézier <hoelbezier <AT> riseup <DOT> net>
AuthorDate: Sat May 17 20:29:46 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 12 12:22:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d563de

sys-apps/udevil: remove invalid exfat mount options

The default /etc/udevil/udevil.conf file provided by upstream is quite
old and references exfat mount options used by the fuse driver. This
fuse driver has since been replaced by a kernel driver which do not
exactly accept the same options.

* nonempty has been removed from the kernel driver
* namecase is marked as deprecated

They are removed from the configuration file, for both allowed and
default mount options.

Signed-off-by: Hoël Bézier <hoelbezier <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/udevil-0.4.4-remove-exfat-options.patch  | 23 ++++++++++++++++++++++
 sys-apps/udevil/udevil-0.4.4-r5.ebuild             |  1 +
 2 files changed, 24 insertions(+)

diff --git a/sys-apps/udevil/files/udevil-0.4.4-remove-exfat-options.patch 
b/sys-apps/udevil/files/udevil-0.4.4-remove-exfat-options.patch
new file mode 100644
index 000000000000..6c53b84b01e8
--- /dev/null
+++ b/sys-apps/udevil/files/udevil-0.4.4-remove-exfat-options.patch
@@ -0,0 +1,23 @@
+diff --git a/etc/udevil.conf b/etc/udevil.conf
+index 75a4c0d..f0dd102 100644
+--- a/etc/udevil.conf
++++ b/etc/udevil.conf
+@@ -221,7 +221,7 @@ default_options_file      = nosuid, noexec, nodev, 
noatime, uid=$UID, gid=$GID,
+ default_options_iso9660   = nosuid, noexec, nodev, noatime, uid=$UID, 
gid=$GID, ro, utf8
+ default_options_udf       = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
+ default_options_vfat      = nosuid, noexec, nodev, noatime, fmask=0133, 
dmask=0022, uid=$UID, gid=$GID, utf8
+-default_options_exfat     = nosuid, noexec, nodev, noatime, umask=0077, 
uid=$UID, gid=$GID, iocharset=utf8, namecase=0, nonempty
++default_options_exfat     = nosuid, noexec, nodev, noatime, umask=0077, 
uid=$UID, gid=$GID, iocharset=utf8
+ default_options_msdos     = nosuid, noexec, nodev, noatime, fmask=0133, 
dmask=0022, uid=$UID, gid=$GID
+ default_options_umsdos    = nosuid, noexec, nodev, noatime, fmask=0133, 
dmask=0022, uid=$UID, gid=$GID
+ default_options_ntfs      = nosuid, noexec, nodev, noatime, fmask=0133, 
uid=$UID, gid=$GID, utf8
+@@ -252,7 +252,7 @@ allowed_options_smbfs     = nosuid, noexec, nodev, ro, rw, 
remount, port=*, user
+ allowed_options_sshfs     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, 
gid=$GID, nonempty, allow_other, idmap=user, BatchMode=yes, port=*
+ allowed_options_curlftpfs = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, 
gid=$GID, nonempty, allow_other, user=*
+ allowed_options_ftpfs     = nosuid, noexec, nodev, noatime, ro, rw, port=*, 
user=*, pass=*, root=*, uid=$UID, gid=$GID
+-allowed_options_exfat     = nosuid, noexec, nodev, noatime, fmask=0133, 
dmask=0022, uid=$UID, gid=$GID, umask=0077, namecase=*, ro, rw, sync, flush, 
iocharset=*, remount, nonempty
++allowed_options_exfat     = nosuid, noexec, nodev, noatime, fmask=0133, 
dmask=0022, uid=$UID, gid=$GID, umask=0077, ro, rw, sync, flush, iocharset=*, 
remount
+ 
+ 
+ # mount_point_mode, if present and set to a non-empty value, will cause udevil
+

diff --git a/sys-apps/udevil/udevil-0.4.4-r5.ebuild 
b/sys-apps/udevil/udevil-0.4.4-r5.ebuild
index cf36585e097f..cf5250bfad0f 100644
--- a/sys-apps/udevil/udevil-0.4.4-r5.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r5.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-0.4.4-no-libtool.patch
        "${FILESDIR}"/${PN}-0.4.4-no-conf.d.patch
        "${FILESDIR}"/${PN}-0.4.4-include-sysstat.patch
+       "${FILESDIR}"/${PN}-0.4.4-remove-exfat-options.patch
 )
 
 src_prepare() {

Reply via email to