diff --git a/.gitignore b/.gitignore index d95da2d..16eca3c 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ /cockpit-205.1.tar.xz /cockpit-206.tar.xz /cockpit-207.tar.xz +/cockpit-208.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 96cf6d0..4a24353 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 207 +Version: 208 Release: 1%{?dist} # # This file is maintained at the following location: @@ -369,6 +369,11 @@ Recommends: setroubleshoot-server >= 3.3.3 Provides: cockpit-selinux = %{version}-%{release} Provides: cockpit-sosreport = %{version}-%{release} %endif +%if 0%{?fedora} >= 29 +# 0.7.0 (actually) supports task cancellation. +# 0.7.1 fixes tasks never announcing completion. +Recommends: (reportd >= 0.7.1 if abrt) +%endif # NPM modules which are also available as packages Provides: bundled(js-jquery) = 3.4.1 Provides: bundled(js-moment) = 2.24.0 @@ -393,6 +398,15 @@ Requires: systemd >= 235 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%if %{defined wip} +# HACK: don't apply selinux %post dependencies to CI builds, it would require refreshing images +%else +%if 0%{?rhel} || 0%{?fedora} +# for SELinux policy adjustment in %post below +Requires(post): /usr/sbin/semanage +Requires(post): policycoreutils +%endif +%endif %description ws The Cockpit Web Service listens on the network, and authenticates users. @@ -445,15 +459,14 @@ getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance # firewalld only partially picks up changes to its services files without this test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true -%if 0%{?rhel} || 0%{?fedora} == 29 +%if 0%{?rhel} # HACK: SELinux policy adjustment for cockpit-tls; see https://github.com/fedora-selinux/selinux-policy-contrib/pull/114 -if type semanage >/dev/null 2>&1; then - set -ex - echo "Applying SELinux policy change for cockpit-tls.." - semanage fcontext -a /usr/libexec/cockpit-tls -t cockpit_ws_exec_t - restorecon /usr/libexec/cockpit-tls - tmp=$(mktemp -d) - cat < $tmp/local.te +set -ex +echo "Applying SELinux policy change for cockpit-tls.." +semanage fcontext -a /usr/libexec/cockpit-tls -t cockpit_ws_exec_t +restorecon /usr/libexec/cockpit-tls +tmp=$(mktemp -d) +cat < $tmp/local.te module local 1.0; require { type cockpit_ws_t; @@ -465,17 +478,17 @@ require { allow cockpit_ws_t cockpit_ws_t:unix_stream_socket { create_stream_socket_perms connectto }; allow cockpit_ws_t cockpit_ws_exec_t:file { execute_no_trans }; EOF - checkmodule -M -m -o $tmp/local.mod $tmp/local.te - semodule_package -o $tmp/local.pp -m $tmp/local.mod - semodule -i $tmp/local.pp - rm -rf "$tmp" -fi +checkmodule -M -m -o $tmp/local.mod $tmp/local.te +semodule_package -o $tmp/local.pp -m $tmp/local.mod +semodule -i $tmp/local.pp +rm -rf "$tmp" %endif + %if 0%{?rhel} || 0%{?fedora} # HACK: SELinux policy adjustment for cockpit-tls; see https://github.com/fedora-selinux/selinux-policy-contrib/pull/161 - echo "Applying SELinux policy change for cockpit-wsinstance-factory..." - semanage fcontext -a /usr/libexec/cockpit-wsinstance-factory -t cockpit_ws_exec_t - restorecon /usr/libexec/cockpit-wsinstance-factory +echo "Applying SELinux policy change for cockpit-wsinstance-factory..." +semanage fcontext -a /usr/libexec/cockpit-wsinstance-factory -t cockpit_ws_exec_t +restorecon /usr/libexec/cockpit-wsinstance-factory %endif %preun ws @@ -686,6 +699,13 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Nov 27 2019 Martin Pitt - 208-1 + +- Storage: Drop “default mount point” concept +- Machines: Support transient virtual networks and storage pools +- Machines: Sliders for disk size and memory in VM creation +- Logs: Improve crash reporting + * Wed Nov 13 2019 Katerina Koukiou - 207-1 - Web server: Accept EC certificates diff --git a/sources b/sources index ec41f38..5be9f6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-207.tar.xz) = 9ceff732ded6010c92ccb6230a8ce81d87b7226f95534fea8a72c5193eb759062f3849494b454996cd3b3678f423cc31c8bb9ce6e7fa5bbd97651a1fe7d3e581 +SHA512 (cockpit-208.tar.xz) = 9f203439118b44ccacc933858c01496001787df076990942086ae8cf710a8169c69715fde5589a0467426d1960d2e330cc4156607b3a1972185393a583830b6a