diff --git a/.cockpit.metadata b/.cockpit.metadata index 5e26b94..3ab1329 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -702718ff1b0f65b3f0f501987ae480604649c054 SOURCES/cockpit-195.1.tar.xz +dd39979c6536708f868b0849973ef6eea8920a07 SOURCES/cockpit-195.5.tar.xz diff --git a/.gitignore b/.gitignore index 93249e3..5df9ece 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-195.1.tar.xz +SOURCES/cockpit-195.5.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index af20350..41ea0bf 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 195.1 -Release: 1%{?dist}.0.1 +Version: 195.5 +Release: 2%{?dist} # # This file is maintained at the following location: # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec @@ -36,8 +36,10 @@ Release: 1%{?dist}.0.1 %define _hardened_build 1 -# define to build the dashboard +# define to build the dashboard; i686 buildroot does not have libssh-devel +%ifarch x86_64 %{arm} aarch64 ppc64le s390x %define build_dashboard 1 +%endif # build basic packages like cockpit-bridge %define build_basic 1 @@ -59,11 +61,11 @@ Release: 1%{?dist}.0.1 %define build_subscriptions 1 %endif -# cockpit-kubernetes is RHEL 7 and Fedora < 30 only, and 64 bit arches only -%if (0%{?fedora} && 0%{?fedora} < 30) || (0%{?rhel} >= 7 && 0%{?rhel} < 8) -%ifarch aarch64 x86_64 ppc64le s390x %{arm} %{ix86} +# cockpit-kubernetes is 64 bit arches only +%ifarch aarch64 x86_64 ppc64le s390x %define build_kubernetes 1 -%endif +# the primary go-toolset-7-golang is too old (unfixed CVEs), use latest one +%global go_scl_prefix go-toolset-1.12- %endif # cockpit-machines-ovirt is RHEL 7 and Fedora < 30 only @@ -72,13 +74,8 @@ Release: 1%{?dist}.0.1 %endif %if 0%{?rhel} >= 7 -%global go_scl_prefix go-toolset-7- -%else -%global go_scl_prefix %{nil} -%endif - -%if 0%{?rhel} >= 7 %define vdo_on_demand 1 +%define insights_client_on_demand 1 %endif Name: cockpit @@ -165,6 +162,7 @@ Suggests: cockpit-selinux exec 2>&1 %configure \ --disable-silent-rules \ + %{!?build_dashboard:--disable-ssh} \ --with-cockpit-user=cockpit-ws \ --with-selinux-config-type=etc_t \ %if 0%{?rhel} >= 7 && 0%{?rhel} < 8 @@ -172,7 +170,8 @@ exec 2>&1 %endif --with-appstream-data-packages='[ "appstream-data" ]' \ --with-nfs-client-package='"nfs-utils"' \ - %{?vdo_on_demand:--with-vdo-package='"vdo"'} + %{?vdo_on_demand:--with-vdo-package='"vdo"'} \ + %{?insights_client_on_demand:--with-insights-client-package='"insights-client"'} make -j4 %{?extra_flags} all %check @@ -208,8 +207,7 @@ echo '%{_libexecdir}/cockpit-ssh' >> base.list echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list %else -rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard -rm -rf %{buildroot}/%{_datadir}/%{name}/ssh +rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard %{buildroot}/%{_datadir}/cockpit/ssh touch dashboard.list %endif @@ -253,9 +251,6 @@ find %{buildroot}%{_datadir}/cockpit/networkmanager -type f >> networkmanager.li echo '%dir %{_datadir}/cockpit/packagekit' >> packagekit.list find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list -echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list -find %{buildroot}%{_datadir}/cockpit/apps -type f >> packagekit.list - echo '%dir %{_datadir}/cockpit/machines' > machines.list find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list @@ -339,6 +334,9 @@ rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machine rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml %endif +# On RHEL 7, apps is not shipped +rm -rf %{buildroot}/%{_datadir}/%{name}/apps + sed -i "s|%{buildroot}||" *.list # Build the package lists for debug package, and move debug files to installed locations @@ -406,12 +404,11 @@ troubleshooting, interactive command-line sessions, and more. %package bridge Summary: Cockpit bridge server-side component Requires: glib-networking -%if 0%{?rhel} != 7 +%if 0%{?rhel} != 7 && 0%{?centos} != 7 +Requires: libssh >= 0.7.1 Provides: cockpit-ssh = %{version}-%{release} # cockpit-ssh moved from dashboard to bridge in 171 Conflicts: cockpit-dashboard < 170.x -# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge -Conflicts: cockpit-ws < 181.x %endif %description bridge @@ -679,7 +676,6 @@ These files are not required for running Cockpit. %{_prefix}/%{__lib}/cockpit-test-assets %package -n cockpit-machines -BuildArch: noarch Summary: Cockpit user interface for virtual machines Requires: cockpit-bridge >= 122 Requires: cockpit-system >= 122 @@ -689,8 +685,10 @@ Requires: libvirt Requires: (libvirt-daemon-kvm or libvirt) %endif Requires: libvirt-client -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?centos} == 0 Requires: libvirt-dbus >= 1.2.0 +%endif +%if 0%{?fedora} || 0%{?rhel} >= 8 # Optional components Recommends: virt-install Recommends: libosinfo @@ -808,7 +806,7 @@ The Cockpit components for visualizing and configuring a Kubernetes cluster. Installed on the Kubernetes master. This package is not yet complete. %if 0%{?rhel} >= 7 -%enable_gotoolset7 +%enable_gotoolset112 %endif %files -n cockpit-kubernetes -f kubernetes.list @@ -818,91 +816,141 @@ cluster. Installed on the Kubernetes master. This package is not yet complete. %endif %package -n cockpit-packagekit -Summary: Cockpit user interface for packages -BuildArch: noarch -Requires: cockpit-bridge >= 138 +Summary: Cockpit user interface for package updates +Requires: cockpit-bridge >= %{required_base} Requires: PackageKit %description -n cockpit-packagekit -The Cockpit components for installing OS updates and Cockpit add-ons, -via PackageKit. +The Cockpit component for installing package updates, via PackageKit. %files -n cockpit-packagekit -f packagekit.list %endif # build optional extension packages %changelog -* Sun Sep 15 2019 Johnny Hughes 195.1-1.el7.centos.0.1 -- Import c7 base os version -- add back in Dashboard and ssh - -* Mon Jun 03 2019 Martin Pitt 195.1-1 -- Update translations rhbz#1688228 - -* Thu Apr 04 2019 Martin Pitt 191-1 -- System: Enable/disable SMT rhbz#1696139 - -* Mon Mar 25 2019 Martin Pitt 190-1 -- kdump: Add NFS and SSH dump targets rhbz#1533366 -- kdump: Fix confusing design of target selector rhbz#1536327 -- firewall: Hide already enabled items from "Add Services" dialog rhbz#1598625 -- networking: Gracefully handle when NetworkManager is not running - rhbz#1551615 -- web server: Mark deleted cookie as "secure", and add X-Content-Type-Options - header rhbz#1677767 -- web server: Mark deleted cookie as "HttpOnly" rhbz#1656339 -- Fix various crashes spotted by coverity rhbz#1644209 -- Fix remotectl crash with inaccessible files rhbz#1644213 -- Fix race condition with fslist1 channels rhbz#1644223 -- Fix crash with parsing invalid bas64 headers rhbz#1663712 - -* Tue Oct 30 2018 Martin Pitt 173.1-1 -- Crash fixes spotted by coverity rhbz#1644345 -- Fix race condition with fslist channels rhbz#1644346 -- Fix remotectl crash on errors rhbz#1644348 - -* Tue Sep 25 2018 Martin Pitt 173-7 -- Build against fixed build root with all architectures again rhbz#1628490 - -* Wed Sep 12 2018 Martin Pitt 173-6 -- Fix remote unauthenticated crash with crafted URLs rhbz#1627631 -- Fix off-by-one error in flow control rhbz#1626846 - -* Tue Aug 21 2018 Martin Pitt 173-5 -- Storage: Fix crash when cancelling package install -- Update translations rhbz#1569423 - -* Thu Jul 26 2018 Martin Pitt 173-1 -- Rebase to version 173 rhbz#1568728 - -* Thu Jul 12 2018 Martin Pitt 172-1 -- Rebase to version 172 rhbz#1568728 - -* Wed Jun 27 2018 Martin Pitt 171-1 -- Rebase to version 171 rhbz#1568728 - -* Tue Jun 05 2018 Martin Pitt 169-3 -- Rebase to version 169, drop all patches rhbz#1568728 -- Fix Subscriptions page hang when accessing as non-admin rhbz#1442540 -- Show an indicator on front page if updates are available rhbz#1495543 -- Properly localize "Log in" rhbz#1541454 -- Improve check for root privilege availability, to e. g. also work for FreeIPA - admins rhbz#1574630 - -* Mon Jan 08 2018 Martin Pitt 154-3 -- Update source po for Japanese translations rhbz#1512923 -- Adjust build system to avoid build failure for the above - -* Mon Dec 11 2017 Martin Pitt 154-2 -- Update Japanese translations rhbz#1512923 - -* Tue Oct 17 2017 Martin Pitt 154-1 -- Rebase to version 154, drop all patches rhbz#1470780 -- This allows ssh keys to be loaded from arbitrary directories - rhbz#1425887 - -* Thu Jun 22 2017 Dominik Perpeet 138-9 -- Add Japanese translation rhbz#1461085 +* Fri Nov 08 2019 Martin Pitt 195.5-2 +- machines: Fix incorrect disk format when attaching existing volume + (rhbz#1765488) +- machines: Limit pool deletion if pool/volumes are used by any VM + (rhbz#1765491) +- machines: When changing installation source, always try to + re-autodetect the OS (rhbz#1765500) + +* Wed Oct 16 2019 Martin Pitt 195.4-2 +- Machines: Disable Create VM button if virt-install command is not + available (rhbz#1704853) +- Machines: Add tooltip next to VCPUs when VM is running (rhbz#1720076) +- Machines: Use libvirt-dbus on RHEL 7 +- Machines: Support storage pool types other than "dir" (rhbz#1719556) +- Update translations (rhbz#1733994) + +* Mon Jun 03 2019 Martin Pitt 195-1 +- Machines: Reset source when changing source type rhbz#1707655 +- Machines: Disallow detaching disks on paused VMs rhbz#1708515 +- Machines: Fix crash with non-existing storage pools rhbz#1712441 +- Machines: Fix issues with NIC edit dialog rhbz#1708976 +- Machines: Always shut off the VMs before deletion rhbz#1706678 +- cockpit-machines: Require libvirt-dbus rhbz#1712911 + +* Thu May 09 2019 Martin Pitt 193-1 +- Storage: Fix fstab entries for VDO volumes rhbz#1669402 +- Storage: Only show NFS mounts in NFS table rhbz#1689235 +- Docker: Include kubernetes containers in CPU/memory graphs rhbz#1525794 + +* Mon Oct 29 2018 Martin Pitt 176-4 +- Switch to ssh SHA256 fingerprints, to fix crash in FIPS mode + rhbz#1585191 + +* Thu Aug 30 2018 Martin Pitt 176-3 +- Storage: Offer installation of VDO on demand +- Machines: Add disks to a virtual machine + +* Tue Aug 14 2018 Martin Pitt 173-3 +- Re-enable cockpit-kubernetes, Go is now available in + extras-rhel-7.6-go-toolset. (RCM-38564) + +* Tue Jul 31 2018 Martin Pitt 173-2 +- Update to 173 release +- Kubernetes: VM detail page +- Realmd: Install on demand +- Temporarily disable cockpit-kubernetes, until Go becomes available + (RCM-38564) + +* Mon Jul 16 2018 Martin Pitt 172-2 +- Update to 172 release +- Software Updates: Layout rework +- Machines: Add virtual CPU configuration +- Docker: Show container volumes + +* Thu Jun 14 2018 Martin Pitt 170-1 +- Update to 170 release +- Software Updates: Layout rework +- oVirt: Use authenticated libvirt connection by default rhbz#1297037 + +* Wed May 30 2018 Martin Pitt 169-1 +- Update to 169 release +- Storage: Offer installation of NFS client support on demand +- Containers: Don't try to manage "overlay2" storage without a volume group +- Machines: Fix "Start VM" checkbox layout +- Software Updates: Fix security update icon rhbz#1582570 +- Drop obsolete cockpit-bashboard SELinux %post hack rhbz#1570833 + +* Tue Apr 17 2018 Martin Pitt 165-3 +- Revert "noarch" change for cockpit-doc as well + +* Tue Apr 17 2018 Martin Pitt 165-2 +- Revert "noarch" changes from 165-1, they cause too much fallout + +* Fri Apr 13 2018 Martin Pitt 165-1 +- Update to 165 release +- New VMs can be created on Machines page +- Improve LVM volume resizing +- Hide Docker storage pool reset button when it cannot work properly +- Move NFS management into new details page +- Show more details of sessions and services that keep NFS busy +- Machines page now shows proper error notifications +- Show virtual machines that are being created +- Detect if libvirtd is not running and offer to start and/or enable it +- Enable building of cockpit-machines-ovirt rhbz#1515796 + +* Mon Feb 26 2018 Martin Pitt 160-3 +- storaged: Drop VDO async option rhbz#1548988 + +* Mon Jan 29 2018 Martin Pitt 160-2 +- Add kubevirt Virtual Machines overview +- Redesign package list on Software Updates page and show RHEL Errata + +* Wed Jan 10 2018 Martin Pitt 159-1 +- Update to 159 release +- Configure data deduplication with VDO devices on Storage page +- Add serial console to virtual Machines page and redesign the Consoles tab +- Show more error message details for failures on virtual Machines page + +* Thu Dec 14 2017 Martin Pitt 158-1 +- Update to 158 release +- New package "cockpit-packagekit", which provides a "Software Updates" page + for installing package updates rhbz#1479836 +- Add NFS client support to the Storage page +- Add checkboxes for common Storage encryption and mount options +- Adjust cockpit-storaged dependencies to storaged → udisks2 rename + rhbz#1510667 + +* Thu Jun 29 2017 Dominik Perpeet 141-4 +- Bump for rebuild on more architectures + +* Thu Jun 29 2017 Dominik Perpeet 141-3 +- Fix dashboard dependency rhbz#1466423 + +* Mon Jun 05 2017 Dominik Perpeet 141-2 +- Build on more architectures + +* Mon Jun 05 2017 Dominik Perpeet 141-1 +- Update to 141 release +- Allow users to change Docker container environment variables +- Allow auth commands to store credentials for future challenges +- Attempt to tear down used partitions when formatting disks +- Show the correct known_hosts path on missing/mismatching host keys +- Set HTML content type when serving login page, for better reverse proxy operation * Wed May 24 2017 Dominik Perpeet 138-8 - Rebuild for new dependencies