From 44269543ec189942d2fb1ecef4c97320340aed02 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 17 Feb 2022 07:05:59 +0100 Subject: [PATCH] New upstream release 264 Related: rhbz#2017340 --- .gitignore | 3 +++ cockpit.spec | 65 +++++++++++++++++----------------------------- plans/upstream.fmf | 4 ++- sources | 2 +- 4 files changed, 31 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 40eabdc..5e65a7c 100644 --- a/.gitignore +++ b/.gitignore @@ -225,3 +225,6 @@ /cockpit-259.tar.xz /cockpit-260.tar.xz /cockpit-261.tar.xz +/cockpit-262.tar.xz +/cockpit-263.tar.xz +/cockpit-264.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 1ab66e0..dcf4be3 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 261 +Version: 264 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -52,7 +52,7 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Source0: https://github.com/cockpit-project/cockpit/releases/download/261/cockpit-261.tar.xz +Source0: https://github.com/cockpit-project/cockpit/releases/download/264/cockpit-264.tar.xz # 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}) @@ -78,8 +78,7 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/261 # Ship custom SELinux policy (but not for cockpit-appstream) %if "%{name}" == "cockpit" %define selinuxtype targeted -%define with_selinux 1 -%define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}-%{R}" selinux-policy || echo 1) +%define selinux_configure_arg --enable-selinux-policy=%{selinuxtype} %endif BuildRequires: gcc @@ -126,10 +125,8 @@ BuildRequires: gdb # For documentation BuildRequires: xmlto -%if 0%{?with_selinux} BuildRequires: selinux-policy BuildRequires: selinux-policy-devel -%endif # This is the "cockpit" metapackage. It should only # Require, Suggest or Recommend other cockpit-xxx subpackages @@ -156,7 +153,7 @@ Recommends: subscription-manager-cockpit %build %configure \ - --disable-silent-rules \ + %{?selinux_configure_arg} \ --with-cockpit-user=cockpit-ws \ --with-cockpit-ws-instance-user=cockpit-wsinstance \ %if 0%{?suse_version} @@ -167,13 +164,7 @@ Recommends: subscription-manager-cockpit --disable-ssh \ %endif -make -j$(nproc) %{?extra_flags} all - -%if 0%{?with_selinux} - make -f /usr/share/selinux/devel/Makefile cockpit.pp - rm -f cockpit.pp.bz2 - bzip2 -9 cockpit.pp -%endif +%make_build %check exec 2>&1 @@ -199,14 +190,6 @@ install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ -%if 0%{?with_selinux} - install -D -m 644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 - install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_session_selinux.8cockpit - install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_ws_selinux.8cockpit - # create this directory in the build root so that %ghost sees the desired mode - install -d -m 700 %{buildroot}%{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} -%endif - # only ship deprecated PatternFly API for stable releases %if 0%{?rhel} <= 8 ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz @@ -439,10 +422,8 @@ Summary: Cockpit Web Service Requires: glib-networking Requires: openssl Requires: glib2 >= 2.50.0 -%if 0%{?with_selinux} -Requires: (selinux-policy >= %{selinux_policy_version} if selinux-policy-%{selinuxtype}) +Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype}) Requires(post): (policycoreutils if selinux-policy-%{selinuxtype}) -%endif Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos @@ -497,13 +478,10 @@ authentication via sssd/FreeIPA. %{_libexecdir}/cockpit-certificate-helper %attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session %{_datadir}/cockpit/branding - -%if 0%{?with_selinux} - %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 - %{_mandir}/man8/%{name}_session_selinux.8cockpit.* - %{_mandir}/man8/%{name}_ws_selinux.8cockpit.* - %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} -%endif +%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +%{_mandir}/man8/%{name}_session_selinux.8cockpit.* +%{_mandir}/man8/%{name}_ws_selinux.8cockpit.* +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %pre ws getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws @@ -511,19 +489,15 @@ getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting 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 -%if 0%{?with_selinux} if %{_sbindir}/selinuxenabled 2>/dev/null; then %selinux_relabel_pre -s %{selinuxtype} fi -%endif %post ws -%if 0%{?with_selinux} if [ -x %{_sbindir}/selinuxenabled ]; then %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 %selinux_relabel_post -s %{selinuxtype} fi -%endif # set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them if [ "$1" = 1 ]; then @@ -549,12 +523,10 @@ fi %systemd_preun cockpit.socket cockpit.service %postun ws -%if 0%{?with_selinux} if [ -x %{_sbindir}/selinuxenabled ]; then %selinux_modules_uninstall -s %{selinuxtype} %{name} %selinux_relabel_post -s %{selinuxtype} fi -%endif %systemd_postun_with_restart cockpit.socket cockpit.service # ------------------------------------------------------------------------------- @@ -711,9 +683,20 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Tue Jan 25 2022 Matej Marusak - 261-1 -- storage: Unmounting or deleting a busy filesystem is now supported -- shell: Allow adding ssh keys with passphrase +* Fri Feb 25 2022 Cockpit Project - 264-1 +- Update to upstream 264 release + +* Wed Feb 16 2022 Cockpit Project - 263-1 +- Update to upstream 263 release + +* Wed Feb 02 2022 Cockpit Project - 262-1 +- Update to upstream 262 release + +* Mon Jan 24 2022 Cockpit Project - 261-1 +- Update to upstream 261 release + +* Wed Jan 19 2022 Fedora Release Engineering - 260-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Wed Jan 05 2022 Martin Pitt - 260-1 - Certificate login validation: Action required on updates diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 08290ad..9c4e64d 100644 --- a/plans/upstream.fmf +++ b/plans/upstream.fmf @@ -2,6 +2,8 @@ discover: how: fmf repository: https://github.com/cockpit-project/cockpit # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585 - ref: "261" + #ref: "264" + # 264 + skipping of TestPages.testBasic + ref: "d66df49b4350f40cf1bee138c9493b1b2a0c3a80" execute: how: tmt diff --git a/sources b/sources index 0a2d9d3..25fc78f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-261.tar.xz) = 41b31783607cb9c4a6434b5591d66d0556acf97147a87aa95eaf4bba7fea30cf65877ce7ee0f0e3c9115dc225979f45552bd2670786101cd0810be680bef3707 +SHA512 (cockpit-264.tar.xz) = 5e6cb0907e36964908be49eca4d7ea2bc515d40e01ecbd2334d1a54f7ad42ed3b1bec846fe184256074cb9ce6518da13d1d57c89d3feaf146c4682a00e513fa4