From fad0e8acbe132e5381de14342c156794b33dca23 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Fri, 11 Jun 2021 11:20:44 +0300
Subject: [PATCH] udisks2 ver. bump

---
 hardware/disk/libblockdev/actions.py |  8 ++++++--
 hardware/disk/libblockdev/pspec.xml  | 13 +++++++++++--
 hardware/disk/libbytesize/pspec.xml  |  9 ++++++++-
 hardware/disk/udisks2/pspec.xml      | 14 ++++++++++++--
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/hardware/disk/libblockdev/actions.py b/hardware/disk/libblockdev/actions.py
index 81b6a0e819..ec4638f50a 100644
--- a/hardware/disk/libblockdev/actions.py
+++ b/hardware/disk/libblockdev/actions.py
@@ -12,6 +12,10 @@ from pisi.actionsapi import get
 shelltools.export("python2", "/usr/bin/python2.7")
 
 def setup():
+    shelltools.system("sed 's/g_memdup/&2/' -i             \
+                            src/lib/plugin_apis/vdo.{c,api} \
+                            src/plugins/vdo.c")
+
     shelltools.system("sed -i 's|python2-config|python2.7-config|g' configure")
     autotools.configure("--without-gtk-doc \
                          --without-nvdimm \
@@ -25,7 +29,7 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     
-    pisitools.domove("/gi/overrides/BlockDev.py", "/usr/lib/python2.7/site-packages/gi/overrides")
-    pisitools.removeDir("/gi")
+    #pisitools.domove("/gi/overrides/BlockDev.py", "/usr/lib/python2.7/site-packages/gi/overrides")
+    #pisitools.removeDir("/gi")
 
     pisitools.dodoc("LICENSE")
diff --git a/hardware/disk/libblockdev/pspec.xml b/hardware/disk/libblockdev/pspec.xml
index bf633369a5..93b2411ea7 100644
--- a/hardware/disk/libblockdev/pspec.xml
+++ b/hardware/disk/libblockdev/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app</IsA>
         <Summary>A library for manipulating block devices</Summary>
         <Description>Blok cihazlarını değiştirmek için bir kütüphane</Description>
-        <Archive sha1sum="17e84346cae1ba0fa4cedeada2f8aa10b5000bd3" type="targz">https://github.com/storaged-project/libblockdev/releases/download/2.24-1/libblockdev-2.24.tar.gz</Archive>
+        <Archive sha1sum="c16d236f95a7a88b1d0f5309fdc8823999d297d1" type="targz">https://github.com/storaged-project/libblockdev/releases/download/2.25-1/libblockdev-2.25.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>nss-devel</Dependency>
             <Dependency>mdadm</Dependency>
@@ -20,9 +20,10 @@
             <Dependency>glib2-devel</Dependency>
             <Dependency>parted-devel</Dependency>
             <Dependency>libyaml-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
             <Dependency>libkmod-devel</Dependency>
             <Dependency>volume_key-devel</Dependency>
-            <Dependency>libbytesize-devel</Dependency>
+            <Dependency versionFrom="2.5">libbytesize-devel</Dependency>
             <Dependency>libcryptsetup-devel</Dependency>
             <Dependency>libutil-linux-devel</Dependency>
             <Dependency>device-mapper-devel</Dependency>
@@ -61,6 +62,7 @@
         <Summary>Development files for libblockdev</Summary>
         <RuntimeDependencies>
             <Dependency release="current">libblockdev</Dependency>
+            <Dependency>glib2-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -69,6 +71,13 @@
     </Package>
     
     <History>
+        <Update release="5">
+            <Date>2021-06-11</Date>
+            <Version>2.25</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2020-11-07</Date>
             <Version>2.24</Version>
diff --git a/hardware/disk/libbytesize/pspec.xml b/hardware/disk/libbytesize/pspec.xml
index 5215be0ac1..d8059edee7 100644
--- a/hardware/disk/libbytesize/pspec.xml
+++ b/hardware/disk/libbytesize/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app</IsA>
         <Summary>A tiny library providing a C "class" for working with arbitrary big sizes in bytes</Summary>
         <Description>Bayt cinsinden rastgele büyük boyutlarla çalışmak için C sınıfı olan kütüphane</Description>
-        <Archive sha1sum="e178fa995fc61ce32d73b4f2f0ff097d65637ece" type="targz">https://github.com/storaged-project/libbytesize/releases/download/2.2/libbytesize-2.2.tar.gz</Archive>
+        <Archive sha1sum="8e2ed5dacc195e3189f12f3bd23a86bdc7674f9c" type="targz">https://github.com/storaged-project/libbytesize/releases/download/2.5/libbytesize-2.5.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>libpcre2-devel</Dependency>
             <Dependency>python3-devel</Dependency>
@@ -52,6 +52,13 @@
     </Package>
     
     <History>
+        <Update release="3">
+            <Date>2021-06-11</Date>
+            <Version>2.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="2">
             <Date>2020-02-01</Date>
             <Version>2.2</Version>
diff --git a/hardware/disk/udisks2/pspec.xml b/hardware/disk/udisks2/pspec.xml
index 4df4791c3b..a0db4da396 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="5c13eca0d896385ae4a08a0d5276c27b137afc56" type="tarbz2">https://github.com/storaged-project/udisks/releases/download/udisks-2.9.1/udisks-2.9.1.tar.bz2</Archive>
+        <Archive sha1sum="15aaadab7f6ce2ddc4c6ca114019241cd1152f04" type="tarbz2">https://github.com/storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2</Archive>
         <AdditionalFiles>
             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
         </AdditionalFiles>
@@ -22,6 +22,7 @@
             <Dependency>acl-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>polkit-devel</Dependency>
+            <Dependency>elogind-devel</Dependency>
             <Dependency>python-six</Dependency>
             <Dependency>libgudev-devel</Dependency>
             <Dependency>parted-devel</Dependency>
@@ -39,7 +40,7 @@
             <Dependency>ntfs-3g</Dependency>
             <Dependency>gptfdisk</Dependency>
             <Dependency>btrfs-progs-devel</Dependency>
-            <Dependency>libblockdev-devel</Dependency>
+            <Dependency versionFrom="2.25">libblockdev-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">udisks-2.0.91-udf-dvd-fix-dmask.patch</Patch-->
@@ -58,6 +59,7 @@
             <Dependency>lvm2</Dependency>
             <Dependency>mdadm</Dependency>
             <Dependency>parted</Dependency>
+            <Dependency>elogind</Dependency>
             <Dependency>libatasmart</Dependency>
             <Dependency>device-mapper</Dependency>
             <Dependency>ntfsprogs</Dependency>      <!-- For mkntfs -->
@@ -106,6 +108,7 @@
         <Summary>Development files for udisks2</Summary>
         <RuntimeDependencies>
             <Dependency release="current">udisks2</Dependency>
+            <Dependency>glib2-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -114,6 +117,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2021-06-11</Date>
+            <Version>2.9.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="8">
             <Date>2020-12-21</Date>
             <Version>2.9.1</Version>