From 8f80d2182cdd415dda00779ecca8fb4322666658 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 12 2022 04:20:28 +0000 Subject: import ostree-2021.6-2.el8 --- diff --git a/.gitignore b/.gitignore index afe36eb..f065dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libostree-2021.3.tar.xz +SOURCES/libostree-2021.6.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata index 960e2a8..3012683 100644 --- a/.ostree.metadata +++ b/.ostree.metadata @@ -1 +1 @@ -b8a32cd735b2abccb72464ea33806e4944b0440e SOURCES/libostree-2021.3.tar.xz +1de62acde38d5916f5aefbdc2c9b58d1609ac8e7 SOURCES/libostree-2021.6.tar.xz diff --git a/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch b/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch deleted file mode 100644 index 583a482..0000000 --- a/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e6a560b40797324aa8b90e7100c6d50bff91f14d Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 30 Sep 2021 15:53:18 -0400 -Subject: [PATCH] deploy: Ignore sockets, fifos in /etc during merge - -https://bugzilla.redhat.com/show_bug.cgi?id=1945274 is an issue where a privileged -kubernetes daemonset is writing a socket into `/etc`. This makes ostree upgrades barf. - -Now, they should clearly move it to `/run`. However, one option is for us to -just ignore it instead of erroring out. Some brief investigation shows that -e.g. `git add somesocket` is a silent no-op, which is an argument in favor of ignoring it. - -Closes: https://github.com/ostreedev/ostree/issues/2446 ---- - src/libostree/ostree-sysroot-deploy.c | 4 +--- - tests/kolainst/destructive/staged-deploy.sh | 20 +++++++++++++++++++ - .../test-admin-deploy-etcmerge-cornercases.sh | 7 +++++++ - 3 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c -index 6a13a41b..a8bf9f44 100644 ---- a/src/libostree/ostree-sysroot-deploy.c -+++ b/src/libostree/ostree-sysroot-deploy.c -@@ -488,9 +488,7 @@ copy_modified_config_file (int orig_etc_fd, - } - else - { -- return glnx_throw (error, -- "Unsupported non-regular/non-symlink file in /etc '%s'", -- path); -+ ot_journal_print (LOG_INFO, "Ignoring non-regular/non-symlink file found during /etc merge: %s", path); - } - - return TRUE; diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index 5381d79..f2b928c 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -7,17 +7,12 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree -Version: 2021.3 +Version: 2021.6 Release: 2%{?dist} Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ -# https://github.com/ostreedev/ostree/pull/2453/commits/e6a560b40797324aa8b90e7100c6d50bff91f14d -# https://bugzilla.redhat.com/show_bug.cgi?id=2027788 -# https://bugzilla.redhat.com/show_bug.cgi?id=1945274 -Patch0: 0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch - BuildRequires: make BuildRequires: git # We always run autogen.sh @@ -168,6 +163,10 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Wed Dec 15 2021 Colin Walters - 2021.6-2 +- Rebase to 2021.6 + Resolves: rhbz#2032593 + * Tue Nov 30 2021 Colin Walters - 2021.3-2 - Backport https://github.com/ostreedev/ostree/pull/2453/commits/e6a560b40797324aa8b90e7100c6d50bff91f14d