From f49e3f995d1de7538f5bf1d4d4ff0d0c7d091a25 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 20 Jul 2018 20:47:15 +0000 Subject: [PATCH] https://github.com/ostreedev/ostree/releases/tag/v2018.7 --- .gitignore | 1 + ...-repo-Fix-32-bit-format-string-error.patch | 34 -------------- ...egression-for-separately-mounted-var.patch | 46 ------------------- ostree.spec | 9 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 0001-lib-repo-Fix-32-bit-format-string-error.patch delete mode 100644 0001-switchroot-Fix-regression-for-separately-mounted-var.patch diff --git a/.gitignore b/.gitignore index db712bf..e904cdd 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /libostree-2018.3.tar.xz /libostree-2018.5.tar.xz /libostree-2018.6.tar.xz +/libostree-2018.7.tar.xz diff --git a/0001-lib-repo-Fix-32-bit-format-string-error.patch b/0001-lib-repo-Fix-32-bit-format-string-error.patch deleted file mode 100644 index f208dfe..0000000 --- a/0001-lib-repo-Fix-32-bit-format-string-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c49fed3335e6c5213c851ff7b2f00d92462bc210 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 21 Jun 2018 14:17:28 +0000 -Subject: [PATCH] lib/repo: Fix 32 bit format string error - ---- - src/libostree/ostree-repo-commit.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c -index 37be748b..7e1d707b 100644 ---- a/src/libostree/ostree-repo-commit.c -+++ b/src/libostree/ostree-repo-commit.c -@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self, - return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required", - self->min_free_space_percent, formatted_required); - else -- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required", -+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required", - self->min_free_space_mb, formatted_required); - } - /* This is the main bit that needs mutex protection */ -@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self, - return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available", - self->min_free_space_percent, formatted_free); - else -- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available", -+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available", - self->min_free_space_mb, formatted_free); - } - g_mutex_unlock (&self->txn_lock); --- -2.17.1 - diff --git a/0001-switchroot-Fix-regression-for-separately-mounted-var.patch b/0001-switchroot-Fix-regression-for-separately-mounted-var.patch deleted file mode 100644 index 7e56634..0000000 --- a/0001-switchroot-Fix-regression-for-separately-mounted-var.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 23f3ef275c2cbf8cc3d9f6ff38898c11a5440d75 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Tue, 3 Jul 2018 17:41:45 -0400 -Subject: [PATCH] switchroot: Fix regression for separately mounted /var - -I made a logical error in #1617 which resulted in the exact *opposite* -behaviour we want when `/var` is a separate mount. - -Split this out and lower the number of negations to make it more obvious -that it's correct. - -Closes: #1667 ---- - src/switchroot/ostree-prepare-root.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c -index 53df463c..0131d246 100644 ---- a/src/switchroot/ostree-prepare-root.c -+++ b/src/switchroot/ostree-prepare-root.c -@@ -151,14 +151,17 @@ main(int argc, char *argv[]) - if (chdir (deploy_path) < 0) - err (EXIT_FAILURE, "failed to chdir to deploy_path"); - -+ /* Default to true, but in the systemd case, default to false because it's handled by -+ * ostree-system-generator. */ - bool mount_var = true; -- /* In the systemd case, this is handled by ostree-system-generator by default */ --#ifndef HAVE_SYSTEMD_AND_LIBMOUNT -- /* file in /run can override that behaviour */ -- if (lstat (INITRAMFS_MOUNT_VAR, &stbuf) < 0) -- mount_var = false; -+#ifdef HAVE_SYSTEMD_AND_LIBMOUNT -+ mount_var = false; - #endif - -+ /* file in /run can override the default behaviour so that we definitely mount /var */ -+ if (lstat (INITRAMFS_MOUNT_VAR, &stbuf) == 0) -+ mount_var = true; -+ - /* Link to the deployment's /var */ - if (mount_var && mount ("../../var", "var", NULL, MS_MGC_VAL|MS_BIND, NULL) < 0) - err (EXIT_FAILURE, "failed to bind mount ../../var to var"); --- -2.17.1 - diff --git a/ostree.spec b/ostree.spec index 2301b04..d08a7ae 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,10 +1,8 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2018.6 -Release: 5%{?dist} +Version: 2018.7 +Release: 1%{?dist} Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz -Patch32: 0001-lib-repo-Fix-32-bit-format-string-error.patch -Patch33: 0001-switchroot-Fix-regression-for-separately-mounted-var.patch License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ @@ -155,6 +153,9 @@ find %{buildroot} -name '*.la' -delete %{_libexecdir}/libostree/ostree-trivial-httpd %changelog +* Fri Jul 20 2018 Colin Walters - 2018.7-1 +- https://github.com/ostreedev/ostree/releases/tag/v2018.7 + * Fri Jul 13 2018 Fedora Release Engineering - 2018.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 55569fe..c3792c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libostree-2018.6.tar.xz) = 619ca4987b498f27887fcf48cd10bb1b892ff0c69146dc1a422734d96046f261f16aea052564c9886dc3a0633b5b4cc71764ca68a6a1e5457d677b58d09d6b40 +SHA512 (libostree-2018.7.tar.xz) = edb3f1d6dddd801ad18bbbc30a04f01ac269081ea175bb5cdf90589f4ab9355aa3bb2ead3c2f96fc0892e02ddd5e9809cac52dfb5e85808da6954d82bf63957a