Update to 228-1
- Accounts: Allow setting weak passwords - Changes to remote host logins - Machines: Add support for reverting and deleting VM snapshots - Drop cockpit-docker code
This commit is contained in:
Cockpit Project
parent
437bc76686
commit
3637c554cd
1
.gitignore
vendored
1
.gitignore
vendored
@ -187,3 +187,4 @@
|
||||
/cockpit-225.tar.xz
|
||||
/cockpit-226.tar.xz
|
||||
/cockpit-227.tar.xz
|
||||
/cockpit-228.tar.xz
|
||||
|
||||
87
cockpit.spec
87
cockpit.spec
@ -1,5 +1,5 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 227
|
||||
Version: 228
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
@ -40,24 +40,11 @@ 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 1
|
||||
# build optional extensions like cockpit-docker
|
||||
# build optional extensions like cockpit-machines
|
||||
%define build_optional 1
|
||||
|
||||
%define __lib lib
|
||||
@ -94,7 +81,7 @@ BuildRequires: autoconf automake
|
||||
BuildRequires: make
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: gettext >= 0.19.7
|
||||
%if %{defined build_dashboard}
|
||||
%if 0%{?build_optional}
|
||||
BuildRequires: libssh-devel >= 0.8.5
|
||||
%endif
|
||||
BuildRequires: openssl-devel
|
||||
@ -105,7 +92,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}
|
||||
@ -189,10 +176,13 @@ 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
|
||||
rm %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css
|
||||
%endif
|
||||
|
||||
# Build the package lists for resource packages
|
||||
echo '%dir %{_datadir}/cockpit/base1' > base.list
|
||||
echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
|
||||
@ -203,13 +193,8 @@ 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
|
||||
@ -253,15 +238,6 @@ 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
|
||||
@ -285,7 +261,7 @@ 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
|
||||
for pkg in apps dashboard machines packagekit pcp playground storaged; do
|
||||
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
|
||||
done
|
||||
# files from -tests
|
||||
@ -296,8 +272,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
|
||||
@ -404,9 +378,7 @@ embed or extend Cockpit.
|
||||
Summary: Cockpit admin interface package for configuring and troubleshooting a system
|
||||
BuildArch: noarch
|
||||
Requires: cockpit-bridge >= %{version}-%{release}
|
||||
%if !0%{?suse_version}
|
||||
Requires: shadow-utils
|
||||
%endif
|
||||
Requires: grep
|
||||
Requires: /usr/bin/pwscore
|
||||
Requires: /usr/bin/date
|
||||
@ -450,15 +422,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.
|
||||
@ -505,7 +473,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
|
||||
|
||||
@ -516,6 +483,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
|
||||
@ -684,12 +652,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
|
||||
@ -701,24 +665,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
|
||||
@ -736,6 +682,13 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Sep 16 2020 Katerina Koukiou <kkoukiou@redhat.com> - 228-1
|
||||
|
||||
- Accounts: Allow setting weak passwords
|
||||
- Changes to remote host logins
|
||||
- Machines: Add support for reverting and deleting VM snapshots
|
||||
- Drop cockpit-docker code
|
||||
|
||||
* Wed Sep 02 2020 Martin Pitt <mpitt@redhat.com> - 227-1
|
||||
|
||||
- Machines: Virtual machine list filtering
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-227.tar.xz) = 24b860fb270363ddffd2cb7ff26f036bd2d635a1f707eb87be0cbdfddfe2e9a8e2f8085adc42844ea91db0a772b9a4a60d256ab2e64fbad07e8ba45455610236
|
||||
SHA512 (cockpit-228.tar.xz) = 8eee63b51415a431b1950a3c25667ad6859e008aa9e26ee0a7901394c0801c56940ee9260f0ec385666a464dc213ad94c411d663d3d47eb7ca60e6d04920f770
|
||||
|
||||
Loading…
Reference in New Issue
Block a user