diff --git a/.gitignore b/.gitignore index 97377bd..49902ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ostree-2015.9.tar.xz +SOURCES/ostree-2016.1.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index fff5265..9866fa3 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -48534712320be35018534158aae4b5502eab6f93 SOURCES/ostree-2015.9.tar.xz +5d21ed6bb5299ce90a98b7697f5e08e6646f3554 SOURCES/ostree-2016.1.tar.xz diff --git a/SOURCES/0001-fetcher-Fix-hung-GTlsInteraction.patch b/SOURCES/0001-fetcher-Fix-hung-GTlsInteraction.patch new file mode 100644 index 0000000..be64038 --- /dev/null +++ b/SOURCES/0001-fetcher-Fix-hung-GTlsInteraction.patch @@ -0,0 +1,41 @@ +From 5adafd767406820cce260c567a1b936610e8d67a Mon Sep 17 00:00:00 2001 +From: Matthew Barnes +Date: Tue, 9 Feb 2016 00:58:17 +0000 +Subject: [PATCH] fetcher: Fix hung GTlsInteraction + +The GTlsInteraction instance must be created in the session thread +so it uses the correct GMainContext. +--- + src/libostree/ostree-fetcher.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c +index 665286c..b922321 100644 +--- a/src/libostree/ostree-fetcher.c ++++ b/src/libostree/ostree-fetcher.c +@@ -277,7 +277,12 @@ static void + session_thread_set_tls_interaction_cb (ThreadClosure *thread_closure, + gpointer data) + { +- GTlsInteraction *interaction = data; ++ GTlsCertificate *cert = data; ++ glnx_unref_object OstreeTlsCertInteraction *interaction = NULL; ++ ++ /* The GTlsInteraction instance must be created in the ++ * session thread so it uses the correct GMainContext. */ ++ interaction = _ostree_tls_cert_interaction_new (cert); + + g_object_set (thread_closure->session, + SOUP_SESSION_TLS_INTERACTION, +@@ -645,7 +650,7 @@ _ostree_fetcher_set_client_cert (OstreeFetcher *self, + #ifdef HAVE_LIBSOUP_CLIENT_CERTS + session_thread_idle_add (self->thread_closure, + session_thread_set_tls_interaction_cb, +- _ostree_tls_cert_interaction_new (cert), ++ g_object_ref (cert), + (GDestroyNotify) g_object_unref); + #else + g_warning ("This version of OSTree is compiled without client side certificate support"); +-- +1.8.3.1 + diff --git a/SOURCES/0001-init-fs-Explicitly-set-tmp-to-01777.patch b/SOURCES/0001-init-fs-Explicitly-set-tmp-to-01777.patch deleted file mode 100644 index 8475030..0000000 --- a/SOURCES/0001-init-fs-Explicitly-set-tmp-to-01777.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7bf138b0364c8922da108e81a649bef1a5ad212b Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Fri, 30 Oct 2015 17:10:23 -0400 -Subject: [PATCH] init-fs: Explicitly set /tmp to 01777 - -I think most people were using tmpfs-on-tmp and so didn't hit this. - -See https://bugzilla.redhat.com/show_bug.cgi?id=1276775 ---- - src/ostree/ot-admin-builtin-init-fs.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/ostree/ot-admin-builtin-init-fs.c b/src/ostree/ot-admin-builtin-init-fs.c -index 71b3b55..0172f01 100644 ---- a/src/ostree/ot-admin-builtin-init-fs.c -+++ b/src/ostree/ot-admin-builtin-init-fs.c -@@ -77,6 +77,16 @@ ot_admin_builtin_init_fs (int argc, char **argv, GCancellable *cancellable, GErr - child = g_file_get_child (dir, "tmp"); - if (!gs_file_ensure_directory_mode (child, 01777, cancellable, error)) - goto out; -+ /* FIXME - we should be using an API that explicitly ignores umask; -+ */ -+ { -+ const char *path = gs_file_get_path_cached (child); -+ if (chmod (path, 01777) == -1) -+ { -+ gs_set_prefix_error_from_errno (error, errno, "chmod"); -+ goto out; -+ } -+ } - g_clear_object (&child); - - if (!ostree_sysroot_ensure_initialized (target_sysroot, cancellable, error)) --- -1.8.3.1 - diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index 4e8014b..3c6a33f 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -1,10 +1,12 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2015.9 -Release: 2.atomic%{?dist}.0.1 +Version: 2016.1 +Release: 2.atomic%{?dist} #VCS: git:git://git.gnome.org/ostree Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/ostree-%{version}.tar.xz Source1: 91-ostree.preset +Patch0: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch +Patch1: 0001-fetcher-Fix-hung-GTlsInteraction.patch License: LGPLv2+ URL: http://live.gnome.org/OSTree @@ -28,15 +30,13 @@ BuildRequires: gpgme-devel BuildRequires: pkgconfig(systemd) BuildRequires: /usr/bin/g-ir-scanner BuildRequires: dracut +BuildRequires: bison # Runtime requirements Requires: libgsystem >= 2015.1 Requires: dracut Requires: systemd-units -Patch1: 0001-init-fs-Explicitly-set-tmp-to-01777.patch -Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch - %description OSTree is a tool for managing bootable, immutable, versioned filesystem trees. While it takes over some of the roles of tradtional @@ -117,6 +117,17 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/ostree/grub2* %changelog +* Tue Feb 09 2016 Colin Walters - 2016.1-2.atomic +- Backport patch to fix GTlsInteraction + +* Tue Jan 12 2016 Colin Walters - 2016.1-1.atomic +- New upstream version +- Apply patch to fix /tmp permission regression: Resolves: #1297745 + +* Tue Dec 08 2015 Colin Walters - 2015.11-2.atomic +- New upstream version +- Continuation of: #1265756 + * Wed Sep 23 2015 Colin Walters - 2015.9-2.atomic - New upstream version