From 6206a7dd950fcfdafd3f49981a52fc0307e7f8a6 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 22 Sep 2023 16:06:11 +0300 Subject: [PATCH] import cockpit-300.1-1.el9_3 --- .cockpit.metadata | 2 +- .gitignore | 2 +- SPECS/cockpit.spec | 202 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 191 insertions(+), 15 deletions(-) diff --git a/.cockpit.metadata b/.cockpit.metadata index 94e2cb0..8eeb2b9 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -256de4a4ebadbf0c4d1b5b70727e5d9f00674bbe SOURCES/cockpit-286.1.tar.xz +78fe01a3cd76ab45eff8316deec8c0c17f6c6515 SOURCES/cockpit-300.1.tar.xz diff --git a/.gitignore b/.gitignore index 5fa90a8..b99dbc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cockpit-286.1.tar.xz +SOURCES/cockpit-300.1.tar.xz diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index aeeb517..3a45142 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -49,10 +49,18 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 286.1 +Version: 300.1 Release: 1%{?dist} Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz +%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9 +%define cockpit_enable_python 1 +%endif + +%if !%{defined cockpit_enable_python} +%define cockpit_enable_python 0 +%endif + # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR nor packit c8s builds, only to our own @@ -162,6 +170,20 @@ Suggests: cockpit-selinux Requires: subscription-manager-cockpit %endif +%if %{cockpit_enable_python} +BuildRequires: python3-devel +BuildRequires: python3-pip +%if 0%{?rhel} == 0 +# All of these are only required for running pytest (which we only do on Fedora) +BuildRequires: procps-ng +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-pytest-asyncio +BuildRequires: python3-pytest-cov +BuildRequires: python3-pytest-timeout +BuildRequires: python3-tox-current-env +%endif +%endif + %prep %setup -q -n cockpit-%{version} @@ -174,6 +196,9 @@ Requires: subscription-manager-cockpit --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ +%if %{cockpit_enable_python} + --enable-pybridge \ +%endif %if 0%{?build_basic} == 0 --disable-ssh \ %endif @@ -183,6 +208,10 @@ Requires: subscription-manager-cockpit %check make -j$(nproc) check +%if %{cockpit_enable_python} && 0%{?rhel} == 0 +%tox +%endif + %install %make_install make install-tests DESTDIR=%{buildroot} @@ -205,9 +234,6 @@ echo '%{_libexecdir}/cockpit-ssh' >> base.list echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -echo '%dir %{_datadir}/cockpit/tuned' > system.list -find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list - echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -250,7 +276,7 @@ find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list # 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 metrics; do +for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done @@ -259,14 +285,15 @@ for data in doc man pixmaps polkit-1; do done rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete -for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do - rm %{buildroot}/%{_libexecdir}/$libexec +for libexec in cockpit-askpass cockpit-beiboot cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do + rm -f %{buildroot}/%{_libexecdir}/$libexec done rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d rm -f %{buildroot}/%{_libdir}/security/pam_* -rm %{buildroot}/usr/bin/cockpit-bridge +rm -f %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml +rm -rf %{buildroot}%{python3_sitelib}/cockpit* %endif # when not building optional packages, remove their files @@ -347,6 +374,10 @@ system on behalf of the web based user interface. %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass +%if %{cockpit_enable_python} +%{python3_sitelib}/%{name}* +%{_libexecdir}/cockpit-beiboot +%endif %package doc Summary: Cockpit deployment and developer guide @@ -395,6 +426,80 @@ Provides: cockpit-sosreport = %{version}-%{release} Recommends: (reportd if abrt) %endif +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(argparse)) = 1.0.10 +Provides: bundled(npm(attr-accept)) = 2.2.2 +Provides: bundled(npm(autolinker)) = 3.16.2 +Provides: bundled(npm(available-typed-arrays)) = 1.0.5 +Provides: bundled(npm(call-bind)) = 1.0.2 +Provides: bundled(npm(deep-equal)) = 2.0.5 +Provides: bundled(npm(define-properties)) = 1.2.0 +Provides: bundled(npm(es-get-iterator)) = 1.1.3 +Provides: bundled(npm(file-selector)) = 0.6.0 +Provides: bundled(npm(focus-trap)) = 7.4.3 +Provides: bundled(npm(for-each)) = 0.3.3 +Provides: bundled(npm(function-bind)) = 1.1.1 +Provides: bundled(npm(functions-have-names)) = 1.2.3 +Provides: bundled(npm(get-intrinsic)) = 1.2.1 +Provides: bundled(npm(gopd)) = 1.0.1 +Provides: bundled(npm(has-bigints)) = 1.0.2 +Provides: bundled(npm(has-property-descriptors)) = 1.0.0 +Provides: bundled(npm(has-proto)) = 1.0.1 +Provides: bundled(npm(has-symbols)) = 1.0.3 +Provides: bundled(npm(has-tostringtag)) = 1.0.0 +Provides: bundled(npm(has)) = 1.0.3 +Provides: bundled(npm(internal-slot)) = 1.0.5 +Provides: bundled(npm(is-arguments)) = 1.1.1 +Provides: bundled(npm(is-bigint)) = 1.0.4 +Provides: bundled(npm(is-boolean-object)) = 1.1.2 +Provides: bundled(npm(is-callable)) = 1.2.7 +Provides: bundled(npm(is-date-object)) = 1.0.5 +Provides: bundled(npm(is-map)) = 2.0.2 +Provides: bundled(npm(is-number-object)) = 1.0.7 +Provides: bundled(npm(is-regex)) = 1.1.4 +Provides: bundled(npm(is-set)) = 2.0.2 +Provides: bundled(npm(is-string)) = 1.0.7 +Provides: bundled(npm(is-symbol)) = 1.0.4 +Provides: bundled(npm(is-weakmap)) = 2.0.1 +Provides: bundled(npm(is-weakset)) = 2.0.2 +Provides: bundled(npm(isarray)) = 2.0.5 +Provides: bundled(npm(js-sha1)) = 0.6.0 +Provides: bundled(npm(js-sha256)) = 0.9.0 +Provides: bundled(npm(js-tokens)) = 4.0.0 +Provides: bundled(npm(json-stable-stringify-without-jsonify)) = 1.0.1 +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(object-inspect)) = 1.12.3 +Provides: bundled(npm(object-is)) = 1.1.5 +Provides: bundled(npm(object-keys)) = 1.1.1 +Provides: bundled(npm(object.assign)) = 4.1.4 +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(regexp.prototype.flags)) = 1.5.0 +Provides: bundled(npm(remarkable)) = 2.0.1 +Provides: bundled(npm(scheduler)) = 0.23.0 +Provides: bundled(npm(side-channel)) = 1.0.4 +Provides: bundled(npm(sprintf-js)) = 1.0.3 +Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0 +Provides: bundled(npm(tabbable)) = 6.2.0 +Provides: bundled(npm(throttle-debounce)) = 2.3.0 +Provides: bundled(npm(tslib)) = 2.6.2 +Provides: bundled(npm(uuid)) = 7.0.3 +Provides: bundled(npm(which-boxed-primitive)) = 1.0.2 +Provides: bundled(npm(which-collection)) = 1.0.1 +Provides: bundled(npm(which-typed-array)) = 1.1.11 +Provides: bundled(npm(xterm-addon-canvas)) = 0.3.0 +Provides: bundled(npm(xterm)) = 5.1.0 + %description system This package contains the Cockpit shell and system configuration interfaces. @@ -503,7 +608,7 @@ fi test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true # check for deprecated PAM config -if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then +if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then echo '**** WARNING:' echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a' echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.' @@ -677,12 +782,83 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Fri Apr 14 2023 MSVSphere Packaging Team - 286.1-1 +* Thu Sep 07 2023 Martin Pitt - 300.1-1 +- Translation updates (rhbz#2189499) + +* Wed Sep 06 2023 Packit - 300-1 +- Celebrating the Nürnberg life release! +- Storage: Support for growing block devices of a Stratis pool + +* Wed Aug 23 2023 Packit - 299-1 +- Kdump: Show location of kdump to verify the successful configuration test +- Storage: Support for no-overprovisioning with Stratis +- Storage: Cockpit can now add caches to encrypted Stratis pools + +* Wed Jul 26 2023 Packit - 297-1 +- users: allow administrators to change the user shell +- tools: Enable Python bridge on Fedora 38 + +* Wed Jul 19 2023 Fedora Release Engineering - 296-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Packit - 296-1 +- Performance and stability improvements + +* Wed Jun 28 2023 Python Maint - 295-2 +- Rebuilt for Python 3.12 + +* Wed Jun 28 2023 Packit - 295-1 +- Cockpit Client can now connect to servers without Cockpit installed + +* Thu Jun 15 2023 Python Maint - 294.1-2 +- Rebuilt for Python 3.12 + +* Thu Jun 15 2023 Packit - 294.1-1 +- Multiple major fixes for the "remote python bridge" use case + +* Thu Jun 15 2023 Python Maint - 294-2 +- Rebuilt for Python 3.12 + +* Wed Jun 14 2023 Packit - 294-1 +- Introduce Python bridge on Fedora Rawhide and Debian unstable + +* Thu Jun 01 2023 Packit - 293-1 +- Tests and code quality improvements + +* Tue May 16 2023 Packit - 292-1 +- Metrics: Add disk IO per service +- Several right-to-left language fixes + +* Wed May 03 2023 Packit - 291-1 +- Update to PatternFly 5 Alpha + +* Wed Apr 19 2023 Packit - 290-1 +- Login page: Add autocomplete tags +- webserver: Disallow direct URL logins with LoginTo=false + +* Fri Apr 14 2023 MSVSphere Packaging Team - 289-1 - Rebuilt for MSVSphere 9.2 beta -* Thu Feb 23 2023 Packit - 286.1-1 -- Users: Fix broken alignment of the first column in groups table -- Translation updates (rhbz#2139644) +* Wed Apr 05 2023 Packit - 289-1 +- Metrics: Indicate high usage and use colorblind-friendly colors +- Accounts: Improve password validation + +* Fri Mar 24 2023 Packit - 288.1-1 +- Fix broken "SELinux" menu entry + +* Thu Mar 23 2023 Packit - 288-1 +- Accounts: Show shell and home directory on detail page +- Accounts: Custom user ID during account creation +- Overview: Support additional timeservers with chronyd +- Metrics: Show longer time span by default +- Storage: Mounting filesystems at boot time +- Services: Units need to be re-pinned +- API removal: Remove cockpit.dbus.publish() and .meta() +- Development: Cockpit now supports the esbuild bundler + +* Thu Mar 09 2023 Packit - 287-1 +- Metrics: Column visiblity +- Services: Pinned units need to be re-done * Wed Feb 22 2023 Packit - 286-1 - Metrics page: control visibility of the resource usage graphs