From 1a46956fda07dd00bed5f04f790ed720429b17b0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 08 2020 10:08:47 +0000 Subject: import cockpit-appstream-233.1-1.el8 --- diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata index 8477c07..2246216 100644 --- a/.cockpit-appstream.metadata +++ b/.cockpit-appstream.metadata @@ -1 +1 @@ -803c615a15fddbd11dd15877f09e6357efa3ef9d SOURCES/cockpit-224.2.tar.xz +ff7fe2d588c3fe081aea901320cd8f69b2e08959 SOURCES/cockpit-233.1.tar.xz diff --git a/.gitignore b/.gitignore index fdf33be..4dbc508 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-224.2.tar.xz +SOURCES/cockpit-233.1.tar.xz diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec index 0832553..22cfd80 100644 --- a/SPECS/cockpit-appstream.spec +++ b/SPECS/cockpit-appstream.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 224.2 +Version: 233.1 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -40,26 +40,8 @@ Release: 1%{?dist} %define rhel %{centos} %endif -%if "%{!?__python3:1}" -%define __python3 /usr/bin/python3 -%endif - -# for testing this already gets set in fedora.install, as we want the target -# VERSION_ID, not the mock chroot's one -%if "%{!?os_version_id:1}" -%define os_version_id %(. /etc/os-release; echo $VERSION_ID) -%endif - %define _hardened_build 1 -# define to build the dashboard -%define build_dashboard 1 - -# build basic packages like cockpit-bridge -%define build_basic 0 -# build optional extensions like cockpit-docker -%define build_optional 1 - %define __lib lib %if 0%{?rhel} @@ -84,6 +66,23 @@ Source0: cockpit-%{version}.tar.gz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz %endif +# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) +# and cockpit-appstream (building optional packages like cockpit-{machines,pcp}) +%if 0%{?rhel} + +%if "%{name}" == "cockpit" +%define build_basic 1 +%define build_optional 0 +%else +%define build_basic 0 +%define build_optional 1 +%endif + +%else +%define build_basic 1 +%define build_optional 1 +%endif + BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -94,7 +93,7 @@ BuildRequires: autoconf automake BuildRequires: make BuildRequires: /usr/bin/python3 BuildRequires: gettext >= 0.19.7 -%if %{defined build_dashboard} +%if 0%{?build_basic} BuildRequires: libssh-devel >= 0.8.5 %endif BuildRequires: openssl-devel @@ -105,7 +104,7 @@ BuildRequires: libxslt-devel BuildRequires: glib-networking BuildRequires: sed -BuildRequires: glib2-devel >= 2.37.4 +BuildRequires: glib2-devel >= 2.50.0 # this is for runtimedir in the tls proxy ace21c8879 BuildRequires: systemd-devel >= 235 %if 0%{?suse_version} @@ -140,13 +139,6 @@ Recommends: (cockpit-storaged if udisks2) Recommends: cockpit-packagekit Suggests: cockpit-pcp -%ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x -%if 0%{?fedora} == 31 && 0%{?build_optional} -%define build_docker 1 -Recommends: (cockpit-docker if /usr/bin/docker) -%endif -%endif - %if 0%{?rhel} == 0 Recommends: (cockpit-networkmanager if NetworkManager) Suggests: cockpit-selinux @@ -171,6 +163,9 @@ exec 2>&1 --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ +%if 0%{?build_basic} == 0 + --disable-ssh \ +%endif %{?vdo_on_demand:--with-vdo-package='"vdo"'} make -j4 %{?extra_flags} all @@ -196,27 +191,25 @@ make install-tests DESTDIR=%{buildroot} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so -# shipped in firewalld since 0.6, everywhere in Fedora/RHEL 8 -rm -f %{buildroot}/%{_prefix}/%{__lib}/firewalld/services/cockpit.xml install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ +# only ship deprecated PatternFly API for stable releases +%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8 + ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz +%endif + # Build the package lists for resource packages echo '%dir %{_datadir}/cockpit/base1' > base.list echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list -find %{buildroot}%{_datadir}/cockpit/base1 -type f >> base.list +find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list echo '%dir %{_datadir}/cockpit/ssh' >> base.list find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list echo '%{_libexecdir}/cockpit-ssh' >> base.list -%if %{defined build_dashboard} echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list -%else -rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard -touch dashboard.list -%endif echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list @@ -233,6 +226,9 @@ find %{buildroot}%{_datadir}/cockpit/systemd -type f >> system.list echo '%dir %{_datadir}/cockpit/users' >> system.list find %{buildroot}%{_datadir}/cockpit/users -type f >> system.list +echo '%dir %{_datadir}/cockpit/metrics' >> system.list +find %{buildroot}%{_datadir}/cockpit/metrics -type f >> system.list + echo '%dir %{_datadir}/cockpit/kdump' >> kdump.list find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list @@ -260,25 +256,17 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list echo '%dir %{_datadir}/cockpit/playground' > tests.list find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list -%if 0%{?build_docker} -echo '%dir %{_datadir}/cockpit/docker' > docker.list -find %{buildroot}%{_datadir}/cockpit/docker -type f >> docker.list -%else -rm -rf %{buildroot}/%{_datadir}/cockpit/docker -rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml -touch docker.list -%endif - # when not building basic packages, remove their files %if 0%{?build_basic} == 0 -for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users; do +for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do rm -r %{buildroot}/%{_datadir}/cockpit/$pkg + rm -rf %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done for data in doc locale man pixmaps polkit-1; do rm -r %{buildroot}/%{_datadir}/$data done -for lib in systemd tmpfiles.d firewalld; do +for lib in systemd tmpfiles.d; do rm -r %{buildroot}/%{_prefix}/%{__lib}/$lib done for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop; do @@ -292,8 +280,8 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml # when not building optional packages, remove their files %if 0%{?build_optional} == 0 -for pkg in apps dashboard docker machines packagekit pcp playground storaged; do - rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg +for pkg in apps dashboard machines packagekit pcp playground storaged; do + rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg done # files from -tests rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets @@ -303,8 +291,6 @@ rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml # files from -storaged rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml -# files from -docker -rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml %endif sed -i "s|%{buildroot}||" *.list @@ -442,7 +428,7 @@ Recommends: (reportd >= 0.7.1 if abrt) %endif # NPM modules which are also available as packages Provides: bundled(js-jquery) = 3.5.1 -Provides: bundled(js-moment) = 2.27.0 +Provides: bundled(js-moment) = 2.29.1 Provides: bundled(nodejs-flot) = 0.8.3 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0 Provides: bundled(xstatic-patternfly-common) = 3.59.5 @@ -457,15 +443,11 @@ This package contains the Cockpit shell and system configuration interfaces. Summary: Cockpit Web Service Requires: glib-networking Requires: openssl -Requires: glib2 >= 2.37.4 +Requires: glib2 >= 2.50.0 Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos -Requires: systemd >= 235 Suggests: sssd-dbus -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd %description ws The Cockpit Web Service listens on the network, and authenticates users. @@ -512,7 +494,6 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-desktop %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session -%attr(775, -, wheel) %{_localstatedir}/lib/cockpit %{_datadir}/cockpit/static %{_datadir}/cockpit/branding @@ -523,6 +504,7 @@ getent group cockpit-wsinstance >/dev/null || groupadd -r cockpit-wsinstance getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance %post ws +%tmpfiles_create cockpit-tempfiles.conf %systemd_post cockpit.socket # firewalld only partially picks up changes to its services files without this test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true @@ -691,12 +673,8 @@ Cockpit support for reading PCP metrics and loading PCP archives. %{_localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit %post -n cockpit-pcp -# HACK - https://bugzilla.redhat.com/show_bug.cgi?id=1185764 -# We can't use "systemctl reload-or-try-restart" since systemctl might -# be out of sync with reality. -/usr/share/pcp/lib/pmlogger condrestart +systemctl reload-or-try-restart pmlogger -%if %{defined build_dashboard} %package -n cockpit-dashboard Summary: Cockpit remote server dashboard BuildArch: noarch @@ -708,24 +686,6 @@ Cockpit page for showing performance graphs for up to 20 remote servers. %files -n cockpit-dashboard -f dashboard.list -%endif - -%if 0%{?build_docker} -%package -n cockpit-docker -Summary: Cockpit user interface for Docker containers -Requires: cockpit-bridge >= 122 -Requires: cockpit-shell >= 122 -Requires: (docker or moby-engine or docker-ce) -Requires: %{__python3} - -%description -n cockpit-docker -The Cockpit components for interacting with Docker and user interface. -This package is not yet complete. - -%files -n cockpit-docker -f docker.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml -%endif - %package -n cockpit-packagekit Summary: Cockpit user interface for packages BuildArch: noarch @@ -743,6 +703,19 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Fri Nov 27 2020 Katerina Koukiou - 233.1-1 +- machines: Inline error messages (rhbz#1666829) +- machines: Reimplement the design of the main VMs list (rhbz#1780537, rhbz#1847712, rhbz#1858716, rhbz#1862406, rhbz#1873931) +- storage: List entries from /etc/crypttab that are still locked +- machines: Add support for reverting and deleting VM snapshots +- machines: Add support for VM snapshots (rhbz#1668870, rhbz#1673158) +- machines: Virtual machine list filtering +- storage: Better support for "noauto" LUKS devices +- machines: Fix 'PXE' installed VMs having network first in the boot order even after the installation finishded (rhbz#1859008) +- machines: Fix Desktop Viewer Console tab CSS issues (rhbz#1868584) +- tools: Fix duplicated -debuginfo files (rhbz#1870521) +- machines: Show cdrom details in bootorder dialog (rhbz#1880175) + * Wed Aug 19 2020 Matej Marusak - 224.2-1 - lib: Include current directory in FileAutoComplete option listing (rhbz#1866995) - lib: Make sure that the expandable part of table rows has unique key (rhbz#1865821)