From aab2405bfcfa6f91e2724d43302fe54f8e97ec86 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Tue, 19 Sep 2023 19:59:04 +0300
Subject: [PATCH] udisks2-2.10.1

---
 hardware/disk/udisks2/actions.py                  |  6 ++++++
 .../disk/udisks2/files/udisks-2.x-ntfs-3g.patch   | 15 ++++++++-------
 hardware/disk/udisks2/pspec.xml                   | 11 +++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/hardware/disk/udisks2/actions.py b/hardware/disk/udisks2/actions.py
index 77688b09fc..c6f6d82477 100644
--- a/hardware/disk/udisks2/actions.py
+++ b/hardware/disk/udisks2/actions.py
@@ -7,10 +7,16 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+
 
 def setup():
+    # Fedora: default to ntfs-3g
+    shelltools.system("sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/'")
     autotools.configure("--disable-static \
                          --enable-fhs-media \
+                         --enable-btrfs \
+                         --enable-lvm2 \
                          --with-systemdsystemunitdir=no \
                          --disable-gtk-doc")
 
diff --git a/hardware/disk/udisks2/files/udisks-2.x-ntfs-3g.patch b/hardware/disk/udisks2/files/udisks-2.x-ntfs-3g.patch
index b40c220c6c..59347a3479 100644
--- a/hardware/disk/udisks2/files/udisks-2.x-ntfs-3g.patch
+++ b/hardware/disk/udisks2/files/udisks-2.x-ntfs-3g.patch
@@ -1,10 +1,11 @@
 diff -Nuar a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
---- a/src/udiskslinuxfilesystem.c	2020-05-26 12:59:20.000000000 +0000
-+++ b/src/udiskslinuxfilesystem.c	2020-07-09 13:47:11.230931796 +0000
-@@ -300,6 +300,7 @@
-   "vfat",
-   "exfat",
+--- a/src/udiskslinuxfilesystem.c	2023-09-07 15:24:35.000000000 +0300
++++ b/src/udiskslinuxfilesystem.c	2023-09-09 21:21:24.344468281 +0300
+@@ -130,6 +130,7 @@
+   "nilfs2",
    "ntfs",
+   "ntfs3",
 +  "ntfs-3g",
-   NULL,
- };
+   "udf",
+   "reiserfs",
+   "reiser4",
diff --git a/hardware/disk/udisks2/pspec.xml b/hardware/disk/udisks2/pspec.xml
index b474fb2e49..cb6a8cb378 100644
--- a/hardware/disk/udisks2/pspec.xml
+++ b/hardware/disk/udisks2/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Disk Management Service</Summary>
         <Description>udisks provides a daemon, API and command line tools for managing disk devices attached to the system.</Description>
-        <Archive sha1sum="e6f21e90456360723d80265c4d3372eb88ef7a6e" type="tarbz2">https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2</Archive>
+        <Archive sha1sum="bb88e0ab6d6a44442d0b5f6eca5a2b683cfe6d27" type="tarbz2">https://github.com/storaged-project/udisks/releases/download/udisks-2.10.1/udisks-2.10.1.tar.bz2</Archive>
         <AdditionalFiles>
 <!--             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> -->
         </AdditionalFiles>
@@ -40,7 +40,7 @@
             <Dependency>ntfs-3g</Dependency>
             <Dependency>gptfdisk</Dependency>
             <Dependency>btrfs-progs-devel</Dependency>
-            <Dependency versionFrom="2.28">libblockdev-devel</Dependency>
+            <Dependency versionFrom="3.0.3">libblockdev-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">udisks-2.0.91-udf-dvd-fix-dmask.patch</Patch-->
@@ -118,6 +118,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2023-09-09</Date>
+            <Version>2.10.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="12">
             <Date>2023-08-01</Date>
             <Version>2.9.4</Version>