From 216679b210e7ea6c5c661f302bdb9a39c566135c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 14:12:03 +0300 Subject: [PATCH] import cockpit-podman-76-1.el9_3 --- .cockpit-podman.metadata | 2 +- .gitignore | 2 +- SPECS/cockpit-podman.spec | 399 ++++++++++++++++++++++++-------------- 3 files changed, 257 insertions(+), 146 deletions(-) diff --git a/.cockpit-podman.metadata b/.cockpit-podman.metadata index b5759c5..75b108c 100644 --- a/.cockpit-podman.metadata +++ b/.cockpit-podman.metadata @@ -1 +1 @@ -7ad348b886cea3e8f212422fe6372156d7ab788f SOURCES/cockpit-podman-63.1.tar.xz +e9e8fbe8aa90c770b353fc0f9310cac5e100ac87 SOURCES/cockpit-podman-76.tar.xz diff --git a/.gitignore b/.gitignore index 3c415f4..1dac615 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-podman-63.1.tar.xz +SOURCES/cockpit-podman-76.tar.xz diff --git a/SPECS/cockpit-podman.spec b/SPECS/cockpit-podman.spec index 6e4913f..85b7465 100644 --- a/SPECS/cockpit-podman.spec +++ b/SPECS/cockpit-podman.spec @@ -1,9 +1,25 @@ +# +# Copyright (C) 2017-2020 Red Hat, Inc. +# +# Cockpit is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# Cockpit is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with Cockpit; If not, see . +# Name: cockpit-podman -Version: 63.1 +Version: 76 Release: 1%{?dist} Summary: Cockpit component for Podman containers -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://github.com/cockpit-project/cockpit-podman Source0: https://github.com/cockpit-project/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -15,8 +31,41 @@ BuildRequires: gettext BuildRequires: libappstream-glib-devel %endif -Requires: cockpit-bridge >= 138 +Requires: cockpit-bridge Requires: podman >= 2.0.4 +# HACK https://github.com/containers/crun/issues/1091 +%if 0%{?fedora} == 36 || 0%{?fedora} == 37 || 0%{?centos} == 9 +Requires: criu-libs +%endif + +Provides: bundled(npm(@babel/runtime)) = 7.22.10 +Provides: bundled(npm(@patternfly/patternfly)) = 5.0.2 +Provides: bundled(npm(@patternfly/react-core)) = 5.0.0 +Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0 +Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0 +Provides: bundled(npm(@patternfly/react-table)) = 5.0.0 +Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0 +Provides: bundled(npm(attr-accept)) = 2.2.2 +Provides: bundled(npm(date-fns)) = 2.30.0 +Provides: bundled(npm(docker-names)) = 1.2.1 +Provides: bundled(npm(file-selector)) = 0.6.0 +Provides: bundled(npm(focus-trap)) = 7.4.3 +Provides: bundled(npm(js-tokens)) = 4.0.0 +Provides: bundled(npm(lodash)) = 4.17.21 +Provides: bundled(npm(loose-envify)) = 1.4.0 +Provides: bundled(npm(object-assign)) = 4.1.1 +Provides: bundled(npm(prop-types)) = 15.8.1 +Provides: bundled(npm(react-dom)) = 18.2.0 +Provides: bundled(npm(react-dropzone)) = 14.2.3 +Provides: bundled(npm(react-is)) = 16.13.1 +Provides: bundled(npm(react)) = 18.2.0 +Provides: bundled(npm(regenerator-runtime)) = 0.14.0 +Provides: bundled(npm(scheduler)) = 0.23.0 +Provides: bundled(npm(tabbable)) = 6.2.0 +Provides: bundled(npm(throttle-debounce)) = 5.0.0 +Provides: bundled(npm(tslib)) = 2.6.2 +Provides: bundled(npm(xterm-addon-canvas)) = 0.4.0 +Provides: bundled(npm(xterm)) = 5.1.0 %description The Cockpit user interface for Podman containers. @@ -28,325 +77,387 @@ The Cockpit user interface for Podman containers. # Nothing to build %install -%make_install +%make_install PREFIX=/usr appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* %files %doc README.md -%license LICENSE dist/index.js.LICENSE.txt.gz +%license LICENSE dist/index.js.LEGAL.txt dist/index.css.LEGAL.txt %{_datadir}/cockpit/* %{_datadir}/metainfo/* %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 53-1 +* Thu Sep 07 2023 Jindrich Novy - 76-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/76 +- Resolves: #2189507 + +* Thu Aug 24 2023 Jindrich Novy - 75-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/75 +- Related: #2176063 + +* Wed Aug 09 2023 Jindrich Novy - 74-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/74 +- Related: #2176063 + +* Tue Aug 01 2023 Jindrich Novy - 73-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/73 +- Related: #2176063 + +* Wed Jul 12 2023 Jindrich Novy - 72-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/72 +- Related: #2176063 + +* Mon Jun 19 2023 Jindrich Novy - 71-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/71 +- Related: #2176063 + +* Mon Jun 05 2023 Jindrich Novy - 70-2 +- add missing prefix +- Related: #2176063 + +* Fri Jun 02 2023 Jindrich Novy - 70-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/70 +- Related: #2176063 + +* Tue May 23 2023 Jindrich Novy - 69-1 +- update to 69 and update Provides from Fedora +- Related: #2176063 + +* Thu May 11 2023 Jindrich Novy - 68-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/68 +- Related: #2176063 + +* Mon Apr 24 2023 Jindrich Novy - 67-1 +- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/67 +- Related: #2176063 + +* Mon Apr 17 2023 Martin Pitt - 66-2 + - Sync with Fedora rawhide to fix tests + +* Tue Apr 11 2023 Packit - 66-1 + - Container list can be sorted + - Custom healthcheck actions + +* Wed Mar 22 2023 Packit - 65-1 +- Show dialog errors at the top of the dialogs +- Build system and documentation improvements + +* Wed Mar 15 2023 MSVSphere Packaging Team - 64-1 - Rebuilt for MSVSphere 9.1. -* Tue Feb 28 2023 Jindrich Novy - 63.1-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/63.1 -- Related: #2124478 +* Wed Mar 08 2023 Packit - 64-1 +- Supports the esbuild bundler +- Stability and performance improvements + +* Wed Feb 22 2023 Packit - 63-1 +- Stability and performance improvements + +* Wed Feb 08 2023 Packit - 62-1 +- Stability and performance improvements -* Mon Feb 27 2023 Jindrich Novy - 63-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/63 -- Related: #2124478 +* Wed Jan 25 2023 Packit - 61-1 +- Use container image's default command +- Fix tabular numbers font -* Wed Feb 08 2023 Jindrich Novy - 62-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/62 -- Related: #2124478 +* Thu Jan 19 2023 Fedora Release Engineering - 60-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Thu Jan 26 2023 Jindrich Novy - 61-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/61 -- Related: #2124478 +* Thu Jan 12 2023 Packit - 60-1 +- Patternfly update and other maintenance -* Wed Jan 18 2023 Jindrich Novy - 60-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/60 -- Related: #2124478 +* Thu Dec 22 2022 Packit - 59-1 +- Start using tabular fonts +- Other UI fixes and improvements -* Mon Jan 02 2023 Jindrich Novy - 59-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/59 -- Related: #2124478 -* Fri Dec 02 2022 Jindrich Novy - 58-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/58 -- Related: #2124478 +* Thu Dec 01 2022 Packit - 58-1 +- Performance and stability improvements -* Wed Nov 16 2022 Jindrich Novy - 57-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/57 -- Related: #2124478 -* Tue Nov 08 2022 Jindrich Novy - 56-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/56 -- Related: #2124478 +* Wed Nov 16 2022 Packit - 57-1 +- Performance and stability improvements -* Wed Oct 19 2022 Jindrich Novy - 55-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/55 -- Related: #2124478 -* Tue Oct 18 2022 Jindrich Novy - 54-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/54 -- Related: #2124478 +* Mon Nov 07 2022 Packit - 56-1 +- Dark theme support -* Fri Sep 16 2022 Jindrich Novy - 53-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/53 -- Related: #2062589 -* Tue Aug 23 2022 Jindrich Novy - 52-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/52 -- Related: #2061316 +* Wed Oct 19 2022 Packit - 55-1 +- Pod CPU, memory, port and volume details +- Create new pod group functionality -* Tue Jul 26 2022 Jindrich Novy - 51.1-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/51.1 -- Related: #2061316 -* Mon Jun 27 2022 Jindrich Novy - 50-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/50 -- Related: #2061316 +* Wed Sep 21 2022 Packit - 54-1 +- Show all containers by default -* Thu Jun 09 2022 Jindrich Novy - 49.1-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/49.1 -- Related: #2061316 -* Wed May 25 2022 Jindrich Novy - 48-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/48 -- Related: #2061316 +* Wed Sep 07 2022 Packit - 53-1 + - Stability and performance improvements -* Fri Apr 29 2022 Jindrich Novy - 47-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/47 -- Related: #2061316 -* Wed Apr 13 2022 Jindrich Novy - 46-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/46 -- Related: #2061316 +* Wed Aug 24 2022 Packit - 52-1 +- Add Volumes and Env Variables to container details +- Show volume permission in container integration tab +- Allow no system users to set restart policy +- Show image history -* Wed Mar 30 2022 Jindrich Novy - 45-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/45 -- Related: #2061316 -* Fri Mar 25 2022 Jindrich Novy - 44-2 -- use spec file from the upstream source -- Related: #2061316 +* Wed Jul 20 2022 Fedora Release Engineering - 51.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Thu Mar 24 2022 Jindrich Novy - 44-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/44 -- Related: #2061316 +* Wed Jul 20 2022 Packit - 51.1-1 +- Fix FMF tests running on release tarball -* Wed Mar 02 2022 Jindrich Novy - 43-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/43 -- Related: #2017345 -* Thu Feb 17 2022 Jindrich Novy - 42-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/42 -- Related: #2000051 +* Thu Jun 23 2022 Packit - 50-1 +- Use NumberInput for Image Run Dialog -* Thu Feb 03 2022 Jindrich Novy - 41-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/41 -- Related: #2000051 -* Mon Jan 24 2022 Jindrich Novy - 40-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/40 -- Related: #2000051 +* Thu Jun 09 2022 Packit - 49.1-1 +- Fix release tarball -* Wed Jan 05 2022 Jindrich Novy - 39-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/39 -- Related: #2000051 -* Fri Dec 10 2021 Jindrich Novy - 38-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/38 -- Related: #2000051 +* Wed Jun 08 2022 Packit - 49-1 +- Show container names in CPU usage overview -* Thu Nov 25 2021 Jindrich Novy - 37-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/37 -- Related: #2000051 -* Wed Nov 10 2021 Jindrich Novy - 36-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/36 -- Related: #2000051 +* Tue May 24 2022 Marius Vollmer - 48-1 +- Podman: Container renaming +- Podman: Health check support -* Wed Sep 15 2021 Jindrich Novy - 35-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/35 -- Related: #2000051 +* Thu Apr 28 2022 Jelle van der Waa - 47-1 +- Translation updates + +* Wed Apr 13 2022 Martin Pitt - 46-1 +- Translation updates +- Test fixes -* Mon Sep 06 2021 Jindrich Novy - 34-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/34 -- Related: #2000051 +* Wed Mar 30 2022 Matej Marusak - 45-1 +- Translation updates -* Mon Aug 09 2021 Mohan Boddu - 33-2 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Wed Mar 16 2022 Simon Kobyda - 44-1 +- Always use base 10 size units +- Move owner option to details tab -* Thu Aug 05 2021 Jindrich Novy - 33-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/33 -- Related: #1970747 +* Wed Mar 02 2022 Martin Pitt - 43-1 +- Translation updates (rhbz#2017345, #2017266) -* Mon Jul 05 2021 Jindrich Novy - 32-1 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/32 -- Related: #1970747 +* Wed Feb 16 2022 Jelle van der Waa - 42-1 +- Tests improvements and stabilization -* Mon Jun 14 2021 Jindrich Novy - 31-2 -- update to https://github.com/cockpit-project/cockpit-podman/releases/tag/31 -- Related: #1970747 +* Wed Feb 02 2022 Martin Pitt - 41-1 +- Adjust for podman 4.0 API break +- Improve page layout on mobile devices -* Thu Apr 15 2021 Mohan Boddu - 29-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Mon Jan 24 2022 Matej Marusak - 40-1 +- Add pause/resume to containers +- Always pull the latest image when creating a new container -* Fri Feb 19 2021 Martin Pitt - 29-1 +* Wed Jan 19 2022 Fedora Release Engineering - 39-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 05 2022 Simon Kobyda - 39-1 +- Create container in pod +- Podman restart policy +- Allow inserting multiple environment variables +* Thu Dec 09 2021 Marius Vollmer - 38-1 +- Updated translations +- Consistent colors for pod and container running status + +* Wed Nov 24 2021 Allison Karlitskaya - 37-1 +- Improved image commit UI +- PatternFly updates and fixes + +* Wed Nov 10 2021 Katerina Koukiou - 36-1 +- Prune unused images +- New “Create container” workflow + +* Wed Sep 15 2021 Katerina Koukiou - 35-1 +- Some nice UI improvements + +* Wed Sep 01 2021 Simon Kobyda - 34-1 +- First iteration of page redesign + +* Wed Aug 04 2021 Martin Pitt - 33-1 +- Add Japanese translations (rhbz#1980212) + +* Wed Jul 21 2021 Fedora Release Engineering - 32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 02 2021 Martin Pitt - 32-1 +- PatternFly and other npm module updates + + +* Wed May 26 2021 Matej Marusak - 31-1 +- Added Korean translation + + +* Wed Apr 14 2021 Matej Marusak - 30-1 +- Translation updates +- PatternFly 4 updates +- Fix crash with "Used Images" links + + +* Fri Feb 19 2021 Martin Pitt - 29-1 - PatternFly 4 updates for a more consistent UI - Accessibility fixes - Add FMF tests for sharing tests with up- and downstream -* Thu Feb 11 2021 Matej Marusak - 28.1-1 +* Thu Feb 11 2021 Matej Marusak - 28.1-1 - Improve tests to be more robust against unstable Podman API -* Thu Feb 04 2021 Matej Marusak - 28-1 +* Thu Feb 04 2021 Matej Marusak - 28-1 - Drop cockpit-system dependency - Correctly show selected option for SELinux labels + * Tue Jan 26 2021 Fedora Release Engineering - 27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Thu Jan 07 2021 Matej Marusak - 27.1-1 - - test: Drop forgotten sit() to make tests work in gating -* Thu Jan 07 2021 Matej Marusak - 27-1 +* Thu Jan 07 2021 Matej Marusak - 27-1 - images: Indicate that force deletion is in progress - images: Fix handling of errors on pull - Use packaged sassc instead of node-sass - tests: Adjust to new Podman versions and robustify them + * Wed Dec 09 2020 Marius Vollmer - 26-1 - run: Make hostPort optional - run: Enable setting up IP address for exposed ports * Wed Oct 14 2020 Sanne Raymaekers - 25-1 - - Listen for image build event -* Wed Sep 30 2020 Marius Vollmer - 24-1 +* Wed Sep 30 2020 Marius Vollmer - 24-1 - Use sentence case in the UI -* Wed Sep 02 2020 Martin Pitt - 23-1 +* Wed Sep 02 2020 Martin Pitt - 23-1 - Translation updates -* Wed Aug 19 2020 Marius Vollmer - 22-1 +* Wed Aug 19 2020 Marius Vollmer - 22-1 - Support for pod group deletion -* Wed Aug 05 2020 Matej Marusak - 21-1 +* Wed Aug 05 2020 Matej Marusak - 21-1 - Support for pod groups - Support checkpoint and restore - Registry selection in "download image" dialog - Selected tag removal during deletion + * Mon Jul 27 2020 Fedora Release Engineering - 20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed Jul 22 2020 Katerina Koukiou - 20-1 - - Show networking information for containers - Enable filtering images and containers by owner - Optionally show intermediate images - Enable setting up SELinux label when mounting volumes -* Wed Jul 15 2020 Matej Marusak - 19-1 +* Wed Jul 15 2020 Matej Marusak - 19-1 - Switch to the new Podman REST API - Improve displaying on small screens -* Mon Jun 15 2020 Matej Marusak - 18-1 +* Mon Jun 15 2020 Matej Marusak - 18-1 - Bump NPM dependencies to their latest versions - Stop importing cockpit's deprecated base1/patternfly.css - Synchronize style with the newest Cockpit -* Thu May 14 2020 Matej Marusak - 17-1 +* Thu May 14 2020 Matej Marusak - 17-1 - Translation updates - Adjust tests to changed Services page in Cockpit 218 -* Wed Apr 29 2020 Martin Pitt - 16-1 +* Wed Apr 29 2020 Martin Pitt - 16-1 - Restyle buttons and dropdowns to be consistent with Cockpit - Disable button and show a spinner while delete operation is in progress - Translation updates -* Thu Apr 16 2020 Martin Pitt - 15-3 +* Thu Apr 16 2020 Martin Pitt - 15-3 - Drop obsolete functionality for Fedora Atomic - Localize dates and times - Make tests non-destructive, to support Fedora gating -* Wed Mar 04 2020 Martin Pitt - 14-1 +* Wed Mar 04 2020 Martin Pitt - 14-1 - Fix crash on filtering anonymous images - Translation updates -* Wed Feb 05 2020 sanne raymaekers - 13-1 +* Wed Feb 05 2020 sanne raymaekers - 13-1 - Show historical logs + * Tue Jan 28 2020 Fedora Release Engineering - 12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild * Wed Jan 08 2020 Katerina Koukiou - 12-1 - - Configure CPU share for system containers -* Wed Nov 27 2019 Martin Pitt - 11-1 +* Wed Nov 27 2019 Martin Pitt - 11-1 - Fix Alert notification in Image Search Modal - Allow more than a single Error Notification for Container action errors - Various Alert cleanups - Translation updates -* Wed Oct 30 2019 Sanne Raymaekers - 10-1 +* Wed Oct 30 2019 Sanne Raymaekers - 10-1 - Support for user containers -* Wed Oct 02 2019 Martin Pitt - 9-1 +* Wed Oct 02 2019 Martin Pitt - 9-1 - Minimize CSS in production builds - Bump NPM dependencies to latest versions -* Wed Sep 04 2019 Martin Pitt - 8-1 +* Wed Sep 04 2019 Martin Pitt - 8-1 - Show list of containers that use given image - Show placeholder while loading containers and images - Fix setting memory limit -* Wed Jul 31 2019 Martin Pitt - 7-1 +* Wed Jul 31 2019 Martin Pitt - 7-1 - Fix AppStream ID - Adjust tests to changed Cockpit Services page + * Wed Jul 24 2019 Fedora Release Engineering - 6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Fri Jul 19 2019 Martin Pitt - 6-1 - - Fix various UI regressions from Cockpit's PatternFly 4 switch - Add packit configuration (https://packit.dev/) -* Wed Jul 10 2019 Martin Pitt - 5-1 +* Wed Jul 10 2019 Martin Pitt - 5-1 - Add container Terminal -* Wed Jun 26 2019 Katerina Koukiou - 4-1 +* Wed Jun 26 2019 Katerina Koukiou - 4-1 - Fix regression in container commit -* Mon Jun 17 2019 Martin Pitt - 3-1 +* Mon Jun 17 2019 Martin Pitt - 3-1 - Enable Commit button for running containers - Fix race condition with container deletion - Stop fetching all containers/images for each container/image event + * Fri May 24 2019 Cockpit Project - 2-1 - Update to upstream 2 release