Commit f00647cf authored by OmegaPhil's avatar OmegaPhil

Remove patches no longer in Debian and refresh qemu-testfix

parent bdd01e0b
This diff is collapsed.
From 301855291954c5b7343ca826c478fa80219149a0 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 29 Sep 2014 23:13:33 +0200
Subject: [PATCH] Support building against libsystemd library
In systemd v209, the various libraries were merged into a single
libsystemd library [1].
Add support for building against this new library and fall back to the
old library names if not found.
[1] http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3a39b5a..e3125cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,10 +145,10 @@ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
AC_SUBST(LIBATASMART_CFLAGS)
AC_SUBST(LIBATASMART_LIBS)
-PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
- [libsystemd-login >= 44 libsystemd-daemon],
- have_libsystemd_login=yes,
- have_libsystemd_login=no)
+PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
+ [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
+ [have_libsystemd_login=yes],
+ [have_libsystemd_login=no])])
AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
if test "x$have_libsystemd_login" = "xyes"; then
AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
--
2.1.1
Description: Mount drives in /media, not /run/media/, to stay FHS compatible. As on Debian and Ubuntu /media is not currently a tmpfs, we need to put the "mounted-fs" file to a persistent path as well.
Author: Martin Pitt <martin.pitt@ubuntu.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51709
Bug-Debian: http://bugs.debian.org/680403
Bug-Ubuntu: https://launchpad.net/bugs/1020759
Index: udisks2/src/udiskslinuxfilesystem.c
===================================================================
--- udisks2.orig/src/udiskslinuxfilesystem.c 2013-03-21 07:44:19.320207135 +0100
+++ udisks2/src/udiskslinuxfilesystem.c 2013-03-21 07:44:19.308207134 +0100
@@ -877,26 +877,26 @@
}
/* If we know the user-name and it doesn't have any '/' character in
- * it, mount in /run/media/$USER
+ * it, mount in /media/$USER
*/
if (!fs_shared && (user_name != NULL && strstr (user_name, "/") == NULL))
{
- mount_dir = g_strdup_printf ("/run/media/%s", user_name);
+ mount_dir = g_strdup_printf ("/media/%s", user_name);
if (!g_file_test (mount_dir, G_FILE_TEST_EXISTS))
{
- /* First ensure that /run/media exists */
- if (!g_file_test ("/run/media", G_FILE_TEST_EXISTS))
+ /* First ensure that /media exists */
+ if (!g_file_test ("/media", G_FILE_TEST_EXISTS))
{
- if (g_mkdir ("/run/media", 0755) != 0)
+ if (g_mkdir ("/media", 0755) != 0)
{
g_set_error (error,
UDISKS_ERROR,
UDISKS_ERROR_FAILED,
- "Error creating directory /run/media: %m");
+ "Error creating directory /media: %m");
goto out;
}
}
- /* Then create the per-user /run/media/$USER */
+ /* Then create the per-user /media/$USER */
if (g_mkdir (mount_dir, 0700) != 0)
{
g_set_error (error,
Index: udisks2/src/udisksstate.c
===================================================================
--- udisks2.orig/src/udisksstate.c 2013-03-21 07:44:19.320207135 +0100
+++ udisks2/src/udisksstate.c 2013-03-21 07:44:19.312207135 +0100
@@ -2235,7 +2235,10 @@
* - could also mmap the file
*/
- path = g_strdup_printf ("/run/udisks2/%s", key);
+ if (strcmp (key, "mounted-fs") == 0)
+ path = g_strdup_printf ("/var/lib/udisks2/%s", key);
+ else
+ path = g_strdup_printf ("/run/udisks2/%s", key);
/* see if it's already in the cache */
ret = g_hash_table_lookup (state->cache, path);
@@ -2301,7 +2304,10 @@
data = g_malloc (size);
g_variant_store (normalized, data);
- path = g_strdup_printf ("/run/udisks2/%s", key);
+ if (strcmp (key, "mounted-fs") == 0)
+ path = g_strdup_printf ("/var/lib/udisks2/%s", key);
+ else
+ path = g_strdup_printf ("/run/udisks2/%s", key);
g_hash_table_insert (state->cache, g_strdup (path), g_variant_ref (value));
diff --git a/src/tests/test.c b/src/tests/test.c
index f828ffa..d022474 100644
--- a/src/tests/test.c
+++ b/src/tests/test.c
@@ -24,6 +24,7 @@
......@@ -10,7 +8,7 @@ index f828ffa..d022474 100644
#include <string.h>
#include <udisksdaemontypes.h>
@@ -296,6 +297,7 @@ test_spawned_job_exit_status (void)
@@ -296,6 +297,7 @@
static void
test_spawned_job_abnormal_termination (void)
{
......@@ -18,16 +16,15 @@ index f828ffa..d022474 100644
UDisksSpawnedJob *job;
gchar *s;
@@ -534,6 +536,8 @@ main (int argc,
@@ -533,6 +535,7 @@
char **argv)
{
int ret;
+ char cmdline[14];
+
g_type_init ();
g_test_init (&argc, &argv, NULL);
@@ -550,7 +554,18 @@ main (int argc,
/* Acquire the main context for this thread. No main loop is running; this
* avoids a race condition which can occur when calling
@@ -556,7 +559,18 @@
g_test_add_func ("/udisks/daemon/spawned_job/read_stdout", test_spawned_job_read_stdout);
g_test_add_func ("/udisks/daemon/spawned_job/read_stderr", test_spawned_job_read_stderr);
g_test_add_func ("/udisks/daemon/spawned_job/exit_status", test_spawned_job_exit_status);
......
00git_test_fixes.patch
# Debian patches for udisks
mount_in_media.patch
unsupported_acls.patch
#libsystemd.patch
# Devuan patches for udisks
qemu-testfix.patch
Description: Some file systems, such as ext2/ext3 that were created a few years ago, do not support ACLs. As long as we do not have /media on a tmpfs, ignore failures to set the ACL on /media/<user> and fall back to chowning the directory to the target user.
Bug-Ubuntu: https://launchpad.net/bugs/1048059
Index: udisks2/src/udiskslinuxfilesystem.c
===================================================================
--- udisks2.orig/src/udiskslinuxfilesystem.c 2013-03-21 07:45:01.404209172 +0100
+++ udisks2/src/udiskslinuxfilesystem.c 2013-03-21 07:45:01.400209172 +0100
@@ -802,12 +802,10 @@
acl_calc_mask (&acl) == -1 ||
acl_set_file (path, ACL_TYPE_ACCESS, acl) == -1)
{
- g_set_error (error,
- G_IO_ERROR,
- g_io_error_from_errno (errno),
+ udisks_warning(
"Adding read ACL for uid %d to `%s' failed: %m",
(gint) uid, path);
- goto out;
+ chown(path, uid, -1);
}
ret = TRUE;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment