Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11054730
D8728.id20951.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
D8728.id20951.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -4,7 +4,6 @@
libbd_utils.so.2
libblockdev.so.2
libc.so.6
-libgcc_s.so.1
libgio-2.0.so.0
libglib-2.0.so.0
libgmodule-2.0.so.0
diff --git a/files/0001-fix-test.patch b/files/0001-fix-test.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-fix-test.patch
@@ -0,0 +1,47 @@
+From 909aeebe5b2c092d22ed32d70e769d17337a8516 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <withnall@endlessm.com>
+Date: Mon, 17 Feb 2020 16:08:28 +0000
+Subject: [PATCH] udisksspawnedjob: Clear encoding of stdout and stderr
+ channels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We want to be able to read binary data from the stderr and stdout of
+spawned processes, so unset the encoding for those channels — otherwise
+it will be validated as UTF-8 and invalid data (particularly embedded
+nuls) will be dropped.
+
+GLib became stricter at validating this with
+https://gitlab.gnome.org/GNOME/glib/merge_requests/967 in GLib 2.63.0,
+but it’s not an API break.
+
+Signed-off-by: Philip Withnall <withnall@endlessm.com>
+
+Fixes: #724
+---
+ src/udisksspawnedjob.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/udisksspawnedjob.c b/src/udisksspawnedjob.c
+index 9d12aa842..7da4976de 100644
+--- a/src/udisksspawnedjob.c
++++ b/src/udisksspawnedjob.c
+@@ -1032,6 +1032,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
+ }
+
+ job->child_stdout_channel = g_io_channel_unix_new (job->child_stdout_fd);
++ // we want to read binary, suppress checking the encoding:
++ g_io_channel_set_encoding (job->child_stdout_channel, NULL, NULL);
+ g_io_channel_set_flags (job->child_stdout_channel, G_IO_FLAG_NONBLOCK, NULL);
+ job->child_stdout_source = g_io_create_watch (job->child_stdout_channel, G_IO_IN);
+ #if __GNUC__ >= 8
+@@ -1050,6 +1052,8 @@ void udisks_spawned_job_start (UDisksSpawnedJob *job)
+ g_source_unref (job->child_stdout_source);
+
+ job->child_stderr_channel = g_io_channel_unix_new (job->child_stderr_fd);
++ // we want to read binary, suppress checking the encoding:
++ g_io_channel_set_encoding (job->child_stderr_channel, NULL, NULL);
+ g_io_channel_set_flags (job->child_stderr_channel, G_IO_FLAG_NONBLOCK, NULL);
+ job->child_stderr_source = g_io_create_watch (job->child_stderr_channel, G_IO_IN);
+ #if __GNUC__ >= 8
diff --git a/files/udisks2.tmpfiles b/files/udisks2.tmpfiles
deleted file mode 100644
--- a/files/udisks2.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/lib/udisks2 0700 root root -
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : udisks
version : 2.8.4
-release : 19
+release : 20
source :
- https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/udisks-2.8.4.tar.bz2 : d28367bdacfa039719327e68300b6118427874f2dc53ff7109dedb70a7289819
license : GPL-2.0-or-later
@@ -19,6 +19,7 @@
- gptfdisk
- mdadm
setup : |
+ %patch -p1 -i $pkgfiles/0001-fix-test.patch
%configure --disable-static \
--enable-introspection \
--with-udevdir=%libdir%/udev \
@@ -32,7 +33,7 @@
%make_install
# support keyfile backend in udisks
install -Dm00644 $pkgfiles/udisks2.keyrules $installdir/usr/share/polkit-1/rules.d/udisks2.keyrules
- install -Dm00644 $pkgfiles/udisks2.tmpfiles $installdir/%libdir%/tmpfiles.d/udisks2.conf
+
# Do not ship /var/lib in package
rm -rfv $installdir/var
check : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>udisks</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>F. von Gellhorn</Name>
+ <Email>flinux@vongellhorn.ch</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>desktop.core</PartOf>
@@ -27,7 +27,6 @@
<Path fileType="library">/usr/lib64/girepository-1.0/UDisks-2.0.typelib</Path>
<Path fileType="library">/usr/lib64/libudisks2.so.0</Path>
<Path fileType="library">/usr/lib64/libudisks2.so.0.0.0</Path>
- <Path fileType="library">/usr/lib64/tmpfiles.d/udisks2.conf</Path>
<Path fileType="library">/usr/lib64/udev/rules.d/80-udisks2.rules</Path>
<Path fileType="library">/usr/lib64/udisks/udisks2/udisksd</Path>
<Path fileType="library">/usr/lib64/udisks2/modules/libudisks2_lvm2.so</Path>
@@ -118,7 +117,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="19">udisks</Dependency>
+ <Dependency release="20">udisks</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/udisks2/udisks/udisks-generated.h</Path>
@@ -285,12 +284,12 @@
</Files>
</Package>
<History>
- <Update release="19">
- <Date>2020-01-13</Date>
+ <Update release="20">
+ <Date>2020-04-23</Date>
<Version>2.8.4</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>F. von Gellhorn</Name>
+ <Email>flinux@vongellhorn.ch</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Aug 12, 1:08 AM (3 h, 19 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5818848
Default Alt Text
D8728.id20951.diff (5 KB)
Attached To
Mode
D8728: Fix udisks eopkg check error and patch the test
Attached
Detach File
Event Timeline
Log In to Comment