From 863d1956364a4d75fb5a8f0d68f64b88ee070512 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 22 Nov 2015 10:47:50 -0500 Subject: [PATCH] New upstream version --- .gitignore | 1 + ...-init-fs-Explicitly-set-tmp-to-01777.patch | 36 ------------------- ostree.spec | 6 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 0001-init-fs-Explicitly-set-tmp-to-01777.patch diff --git a/.gitignore b/.gitignore index 70c6add..b01c08a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ostree-2015.7.tar.xz /ostree-2015.8.tar.xz /ostree-2015.9.tar.xz +/ostree-2015.10.tar.xz diff --git a/0001-init-fs-Explicitly-set-tmp-to-01777.patch b/0001-init-fs-Explicitly-set-tmp-to-01777.patch deleted file mode 100644 index 8475030..0000000 --- a/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/ostree.spec b/ostree.spec index 41f401e..6823fbf 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,7 +1,7 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree Version: 2015.9 -Release: 3%{?dist} +Release: 4%{?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 @@ -34,7 +34,6 @@ Requires: dracut Requires: /usr/bin/gpgv2 Requires: systemd-units -Patch1: 0001-init-fs-Explicitly-set-tmp-to-01777.patch Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch %description @@ -121,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Nov 22 2015 Colin Walters - 2015.9-4 +- New upstream version + * Thu Nov 12 2015 Matthew Barnes - 2015.9-3 - Add ostree-tmp-chmod.service to fix /tmp permissions on existing installs. Resolves: #1276775 diff --git a/sources b/sources index 92f9725..87ce1e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f163475a1bf25c263ad60aa449973f95 ostree-2015.9.tar.xz +192d41c52d2f558d075403a1c205f30e ostree-2015.10.tar.xz