diff options
| -rw-r--r-- | desktop/flatpak/0bea92b.diff | 67 | ||||
| -rw-r--r-- | desktop/flatpak/260f3df.diff | 17 | ||||
| -rw-r--r-- | desktop/flatpak/flatpak.SlackBuild | 5 | ||||
| -rw-r--r-- | desktop/flatpak/flatpak.info | 8 |
4 files changed, 5 insertions, 92 deletions
diff --git a/desktop/flatpak/0bea92b.diff b/desktop/flatpak/0bea92b.diff deleted file mode 100644 index 05fd011cb2..0000000000 --- a/desktop/flatpak/0bea92b.diff +++ /dev/null @@ -1,67 +0,0 @@ -commit 0bea92bd73c680b47482218c09f7987069d23ad8 -Author: Alexander Larsson <alexl@redhat.com> -Date: Mon Jan 23 18:24:21 2017 +0100 - - dbus-proxy: Make it work if XDG_RUNTIME_DIR not set - - The socket directory then ended up in $HOME which was read-only, so - we couldn't create the socket. We solve this by putting the sockets - in a subdirectory and always making this directory writable in the - proxy. - -diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 4fbb033..1774b0c 100644 ---- a/common/flatpak-run.c -+++ b/common/flatpak-run.c -@@ -2021,9 +2021,13 @@ flatpak_run_add_journal_args (GPtrArray *argv_array) - static char * - create_proxy_socket (char *template) - { -- g_autofree char *proxy_socket = g_build_filename (g_get_user_runtime_dir (), template, NULL); -+ g_autofree char *proxy_socket_dir = g_build_filename (g_get_user_runtime_dir (), ".dbus-proxy", NULL); -+ g_autofree char *proxy_socket = g_build_filename (proxy_socket_dir, template, NULL); - int fd; - -+ if (!glnx_shutil_mkdir_p_at (AT_FDCWD, proxy_socket_dir, 0755, NULL, NULL)) -+ return NULL; -+ - fd = g_mkstemp (proxy_socket); - if (fd == -1) - return NULL; -@@ -2061,7 +2065,7 @@ flatpak_run_add_system_dbus_args (FlatpakContext *context, - else if (dbus_proxy_argv && - g_hash_table_size (context->system_bus_policy) > 0) - { -- g_autofree char *proxy_socket = create_proxy_socket (".system-bus-proxy-XXXXXX"); -+ g_autofree char *proxy_socket = create_proxy_socket ("system-bus-proxy-XXXXXX"); - - if (proxy_socket == NULL) - return FALSE; -@@ -2112,7 +2116,7 @@ flatpak_run_add_session_dbus_args (GPtrArray *argv_array, - } - else if (dbus_proxy_argv && dbus_address != NULL) - { -- g_autofree char *proxy_socket = create_proxy_socket (".session-bus-proxy-XXXXXX"); -+ g_autofree char *proxy_socket = create_proxy_socket ("session-bus-proxy-XXXXXX"); - - if (proxy_socket == NULL) - return FALSE; -@@ -3393,6 +3397,7 @@ prepend_bwrap_argv_wrapper (GPtrArray *argv, - gsize bwrap_args_len; - glnx_fd_close int bwrap_args_fd = -1; - g_autofree char *bwrap_args_data = NULL; -+ g_autofree char *proxy_socket_dir = g_build_filename (g_get_user_runtime_dir (), ".dbus-proxy/", NULL); - - if (!glnx_dirfd_iterator_init_at (AT_FDCWD, "/", FALSE, &dir_iter, error)) - return FALSE; -@@ -3438,6 +3443,10 @@ prepend_bwrap_argv_wrapper (GPtrArray *argv, - } - } - -+ g_ptr_array_add (bwrap_args, g_strdup ("--bind")); -+ g_ptr_array_add (bwrap_args, g_strdup (proxy_socket_dir)); -+ g_ptr_array_add (bwrap_args, g_strdup (proxy_socket_dir)); -+ - g_ptr_array_add (bwrap_args, g_strdup ("--ro-bind-data")); - g_ptr_array_add (bwrap_args, g_strdup_printf ("%d", app_info_fd)); - g_ptr_array_add (bwrap_args, g_strdup ("/.flatpak-info")); diff --git a/desktop/flatpak/260f3df.diff b/desktop/flatpak/260f3df.diff deleted file mode 100644 index d0231eda67..0000000000 --- a/desktop/flatpak/260f3df.diff +++ /dev/null @@ -1,17 +0,0 @@ -commit 260f3df91cf3f4c271d3a66f0a3c8db1086e63c2 -Author: Alexander Larsson <alexl@redhat.com> -Date: Mon Jan 23 16:28:48 2017 +0100 - - system-helper: Add User=root to service file - - This is needed for systemd-less activation on the system bus. - -diff --git a/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in -index ed166ee..a6c7715 100644 ---- a/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in -+++ b/system-helper/org.freedesktop.Flatpak.SystemHelper.service.in -@@ -2,3 +2,4 @@ - Name=org.freedesktop.Flatpak.SystemHelper - Exec=@libexecdir@/flatpak-system-helper@extraargs@ - SystemdService=flatpak-system-helper.service -+User=root diff --git a/desktop/flatpak/flatpak.SlackBuild b/desktop/flatpak/flatpak.SlackBuild index 05d0f7749e..d348cbecf1 100644 --- a/desktop/flatpak/flatpak.SlackBuild +++ b/desktop/flatpak/flatpak.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=flatpak -VERSION=${VERSION:-0.8.1} +VERSION=${VERSION:-0.10.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 -b < $CWD/260f3df.diff # fixes the polkit hand-off (will be included in 0.8.2 or 0.9.x) -patch -p1 -b < $CWD/0bea92b.diff # fixes permissions in ~/.cache sandbox (will be included in 0.8.2 or 0.9.x) - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/flatpak/flatpak.info b/desktop/flatpak/flatpak.info index 3178362bef..325ada53cc 100644 --- a/desktop/flatpak/flatpak.info +++ b/desktop/flatpak/flatpak.info @@ -1,10 +1,10 @@ PRGNAM="flatpak" -VERSION="0.8.1" +VERSION="0.10.2" HOMEPAGE="https://flatpak.org/" -DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/0.8.1/flatpak-0.8.1.tar.xz" -MD5SUM="36d756a3cfc0d93fe5804d3cea5eab3b" +DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/0.10.2/flatpak-0.10.2.tar.xz" +MD5SUM="05d61d5f5e938c174555146e1e886d94" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="bubblewrap ostree json-glib libseccomp" +REQUIRES="bubblewrap ostree appstream-glib json-glib libseccomp" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" |