From 8d04ffe5da8dab190c31c7650150b1d2fa5fe9d0 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 13 Oct 2020 18:38:24 +0000
Subject: [PATCH] exfat-fuse: remove package to make way for mainline driver

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 config/show_config                          |  1 -
 distributions/LibreELEC/options             |  3 ---
 packages/sysutils/fuse-exfat/package.mk     | 12 ------------
 packages/sysutils/udevil/config/udevil.conf |  6 +++---
 packages/virtual/image/package.mk           |  3 ---
 5 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 packages/sysutils/fuse-exfat/package.mk

diff --git a/config/show_config b/config/show_config
index baa4e50726..5e2e3261b5 100755
--- a/config/show_config
+++ b/config/show_config
@@ -57,7 +57,6 @@ show_config() {
   if [ "$SWAP_SUPPORT" = "yes" ]; then
     config_message+="\n   - Swapfile default size:\t\t $SWAPFILESIZE"
   fi
-  config_message+="\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message+="\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message+="\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index bbcb00d8ac..837e38076c 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -193,9 +193,6 @@
 # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
   INITRAMFS_PARTED_SUPPORT="no"
 
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
 # build and install NTFS-3G fuse support (yes / no)
   NTFS3G="yes"
 
diff --git a/packages/sysutils/fuse-exfat/package.mk b/packages/sysutils/fuse-exfat/package.mk
deleted file mode 100644
index 06a66c3058..0000000000
--- a/packages/sysutils/fuse-exfat/package.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="fuse-exfat"
-PKG_VERSION="1.2.8"
-PKG_SHA256="1f357e7026407cba6617acd2a0109ede8292e5ede4addd918c65a7b700ef96cb"
-PKG_LICENSE="GPLv2+"
-PKG_SITE="https://github.com/relan/exfat"
-PKG_URL="https://github.com/relan/exfat/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain fuse"
-PKG_LONGDESC="This project aims to provide a full-featured exFAT file system implementation for GNU/Linux other Unix-like systems as a FUSE module."
diff --git a/packages/sysutils/udevil/config/udevil.conf b/packages/sysutils/udevil/config/udevil.conf
index d2f653a235..4211a25c2b 100644
--- a/packages/sysutils/udevil/config/udevil.conf
+++ b/packages/sysutils/udevil/config/udevil.conf
@@ -42,7 +42,7 @@ log_keep_days = 10
 # Setting allowed_types = * does NOT allow all types, as this is a security
 # risk, but does allow all recognized types.
 # allowed_types = $KNOWN_FILESYSTEMS, file, cifs, smbfs, nfs, curlftpfs, ftpfs, sshfs, davfs, tmpfs, ramfs
-allowed_types = $KNOWN_FILESYSTEMS, hfsplus, hfs
+allowed_types = $KNOWN_FILESYSTEMS, hfsplus, hfs, exfat
 
 
 # allowed_users is a list of users permitted to mount and unmount with udevil.
@@ -218,7 +218,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, utf8, nonempty
+default_options_exfat     = nosuid, noexec, nodev, noatime
 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, big_writes, fmask=0133, uid=$UID, gid=$GID, utf8
@@ -249,7 +249,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=*, ip=*, root=*, uid=$UID, gid=$GID
-allowed_options_exfat     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, utf8, nonempty
+allowed_options_exfat     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID
 
 
 # mount_point_mode, if present and set to a non-empty value, will cause udevil
diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk
index 935387dff7..1b4b85568f 100644
--- a/packages/virtual/image/package.mk
+++ b/packages/virtual/image/package.mk
@@ -20,9 +20,6 @@ PKG_LONGDESC="Root package used to build and create complete image"
 # Automounter support
 [ "$UDEVIL" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil"
 
-# EXFAT support
-[ "$EXFAT" = "yes" ] && PKG_DEPENDS_TARGET+=" fuse-exfat"
-
 # NTFS 3G support
 [ "$NTFS3G" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs"