Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2021-05-10 15:36:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Mon May 10 15:36:14 2021 rev:13 rq:890249 version:243 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2021-03-02 12:27:29.203426208 +0100 +++ /work/SRC/openSUSE:Factory/.cockpit.new.2988/cockpit.changes 2021-05-10 15:38:24.897796936 +0200 @@ -1,0 +2,15 @@ +Mon May 3 14:11:01 UTC 2021 - Ludwig Nussel <[email protected]> + +- install all of pkg/lib in -devel package. Cockpit-machines needs more + +------------------------------------------------------------------- +Fri Apr 30 15:51:43 UTC 2021 - Ludwig Nussel <[email protected]> + +- new version 243 + https://cockpit-project.org/blog/cockpit-243.html + https://cockpit-project.org/blog/cockpit-242.html + https://cockpit-project.org/blog/cockpit-241.html + https://cockpit-project.org/blog/cockpit-240.html + https://cockpit-project.org/blog/cockpit-239.html + +------------------------------------------------------------------- Old: ---- cockpit-238.1.obscpio New: ---- cockpit-243.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.UWlePC/_old 2021-05-10 15:38:30.193775985 +0200 +++ /var/tmp/diff_new_pack.UWlePC/_new 2021-05-10 15:38:30.197775968 +0200 @@ -42,10 +42,6 @@ %define __lib lib -%if 0%{?rhel} -%define vdo_on_demand 1 -%endif - %if 0%{?suse_version} %define pamdir /%{_lib}/security %else @@ -58,9 +54,9 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 238.1 +Version: 243 Release: 0 -Source0: cockpit-%{version}.tar.gz +Source0: cockpit-%{version}.tar Source1: cockpit.pam Source2: cockpit-rpmlintrc Source99: README.packaging @@ -70,7 +66,7 @@ Patch0: cockpit-redhatfont.diff # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) -# and cockpit-appstream (building optional packages like cockpit-{machines,pcp}) +# and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR. # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream %if 0%{?rhel} == 8 && 0%{?epel} == 0 @@ -88,6 +84,13 @@ %define build_optional 1 %endif +# Ship custom SELinux policy only in Fedora and RHEL-9 onward +%if 0%{?rhel} >= 9 || 0%{?fedora} +%define selinuxtype targeted +%define with_selinux 1 +%define selinux_policy_version %(rpm --quiet -q selinux-policy && rpm -q --queryformat "%{V}" selinux-policy || echo 1) +%endif + BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -132,6 +135,11 @@ # For documentation BuildRequires: xmlto +%if 0%{?with_selinux} +BuildRequires: selinux-policy +BuildRequires: selinux-policy-devel +%endif + # for rebuilding nodejs bits BuildRequires: npm BuildRequires: sassc @@ -178,8 +186,6 @@ --with-cockpit-user=cockpit-ws \ --with-cockpit-ws-instance-user=cockpit-wsinstance \ --with-selinux-config-type=etc_t \ - --with-appstream-data-packages='[ "appstream-data" ]' \ - --with-nfs-client-package='"nfs-utils"' \ %if 0%{?suse_version} --docdir=%_defaultdocdir/%{name} \ %endif @@ -187,9 +193,14 @@ %if 0%{?build_basic} == 0 --disable-ssh \ %endif - %{?vdo_on_demand:--with-vdo-package='"vdo"'} + make -j4 %{?extra_flags} all +%if 0%{?with_selinux} + make -f /usr/share/selinux/devel/Makefile cockpit.pp + bzip2 -9 cockpit.pp +%endif + %check # HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909 %if 0%{?fedora} >= 0 @@ -214,6 +225,12 @@ 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.8 + install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_ws_selinux.8 +%endif + # 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 @@ -265,9 +282,6 @@ echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list find %{buildroot}%{_datadir}/cockpit/apps -type f >> packagekit.list -echo '%dir %{_datadir}/cockpit/machines' > machines.list -find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list - echo '%dir %{_datadir}/cockpit/selinux' > selinux.list find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list @@ -275,6 +289,7 @@ find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list echo '%dir %{_datadir}/cockpit/static' > static.list +echo '%dir %{_datadir}/cockpit/static/fonts' >> static.list find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list # when not building basic packages, remove their files @@ -289,7 +304,7 @@ 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 +for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do rm %{buildroot}/%{_libexecdir}/$libexec done rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d @@ -300,15 +315,13 @@ # when not building optional packages, remove their files %if 0%{?build_optional} == 0 -for pkg in apps machines packagekit pcp playground storaged; do +for pkg in apps packagekit pcp playground storaged; do rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg done # files from -tests rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets # files from -pcp rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/ -# files from -machines -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 %endif @@ -346,8 +359,8 @@ rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png %endif -mkdir -p %{buildroot}%{_datadir}/cockpit/devel/lib -cp -a pkg/lib/* %{buildroot}%{_datadir}/cockpit/devel/lib +mkdir -p %{buildroot}%{_datadir}/cockpit/devel +cp -a pkg/lib %{buildroot}%{_datadir}/cockpit/devel %if 0%{?build_basic} %find_lang cockpit @@ -427,10 +440,10 @@ Provides: cockpit-systemd = %{version}-%{release} Provides: cockpit-tuned = %{version}-%{release} Provides: cockpit-users = %{version}-%{release} -Obsoletes: cockpit-dashboard +Obsoletes: cockpit-dashboard < %{version}-%{release} %if 0%{?rhel} Provides: cockpit-networkmanager = %{version}-%{release} -Obsoletes: cockpit-networkmanager +Obsoletes: cockpit-networkmanager < %{version}-%{release} Requires: NetworkManager >= 1.6 Provides: cockpit-kdump = %{version}-%{release} Requires: kexec-tools @@ -464,6 +477,10 @@ 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(post): (policycoreutils if selinux-policy-%{selinuxtype}) +%endif Conflicts: firewalld < 0.6.0-1 Recommends: sscg >= 2.3 Recommends: system-logos @@ -518,31 +535,56 @@ %{_libexecdir}/cockpit-wsinstance-factory %{_libexecdir}/cockpit-tls %{_libexecdir}/cockpit-desktop +%{_libexecdir}/cockpit-certificate-ensure +%{_libexecdir}/cockpit-certificate-helper %{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session -%{_datadir}/cockpit/static %{_datadir}/cockpit/branding +%if 0%{?with_selinux} + %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 + %{_mandir}/man8/%{name}_session_selinux.8.* + %{_mandir}/man8/%{name}_ws_selinux.8.* + %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%endif + %pre ws getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d /nonexisting -s /sbin/nologin -c "User for cockpit web service" cockpit-ws 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 %{_sbindir}/selinuxenabled 2>/dev/null; then + %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 + %selinux_relabel_post -s %{selinuxtype} +fi +%endif %if 0%{?suse_version} %set_permissions %{_libexecdir}/cockpit-session %endif %tmpfiles_create cockpit-tempfiles.conf -%systemd_post cockpit.socket +%systemd_post cockpit.socket cockpit.service # firewalld only partially picks up changes to its services files without this test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true %preun ws -%systemd_preun cockpit.socket +%systemd_preun cockpit.socket cockpit.service %postun ws -%systemd_postun_with_restart cockpit.socket -%systemd_postun_with_restart cockpit.service +%if 0%{?with_selinux} +if %{_sbindir}/selinuxenabled 2>/dev/null; then + %selinux_modules_uninstall -s %{selinuxtype} %{name} + %selinux_relabel_post -s %{selinuxtype} +fi +%endif +%systemd_postun_with_restart cockpit.socket cockpit.service %if 0%{?suse_version} %verifyscript ws @@ -679,34 +721,9 @@ %files devel %{_datadir}/cockpit/devel -%package -n cockpit-machines -BuildArch: noarch -Summary: Cockpit user interface for virtual machines -Requires: cockpit-bridge >= 186 -Requires: cockpit-system >= 186 -%if 0%{?suse_version} -Requires: libvirt-daemon-qemu -%else -Requires: libvirt-daemon-kvm -%endif -Requires: libvirt-client -Requires: libvirt-dbus >= 1.2.0 -# Optional components -Recommends: virt-install -Recommends: libosinfo -Recommends: python3-gobject-base - -%description -n cockpit-machines -The Cockpit components for managing virtual machines. - -If "virt-install" is installed, you can also create new virtual machines. - -%files -n cockpit-machines -f machines.list -%{_datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml - %package -n cockpit-pcp Summary: Cockpit PCP integration -Requires: cockpit-bridge >= 134.x +Requires: cockpit-bridge >= 238.1.1 Requires(post): pcp %description -n cockpit-pcp ++++++ _service ++++++ --- /var/tmp/diff_new_pack.UWlePC/_old 2021-05-10 15:38:30.245775778 +0200 +++ /var/tmp/diff_new_pack.UWlePC/_new 2021-05-10 15:38:30.245775778 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="url">http://github.com/cockpit-project/cockpit.git</param> <param name="scm">git</param> - <param name="revision">238.1</param> + <param name="revision">243</param> </service> <service name="node_modules" mode="manual"> <param name="cpio">node_modules.obscpio</param> @@ -13,10 +13,6 @@ <service mode="buildtime" name="tar"> <param name="obsinfo">cockpit.obsinfo</param> </service> - <service mode="buildtime" name="recompress"> - <param name="file">*.tar</param> - <param name="compression">gz</param> - </service> <service mode="buildtime" name="set_version"> <param name="basename">cockpit</param> </service> ++++++ cockpit-238.1.obscpio -> cockpit-243.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-238.1.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.2988/cockpit-243.obscpio differ: char 19, line 1 ++++++ cockpit-redhatfont.diff ++++++ --- /var/tmp/diff_new_pack.UWlePC/_old 2021-05-10 15:38:30.285775620 +0200 +++ /var/tmp/diff_new_pack.UWlePC/_new 2021-05-10 15:38:30.285775620 +0200 @@ -1,13 +1,25 @@ -Index: cockpit-238.1/package.json -=================================================================== ---- cockpit-238.1.orig/package.json -+++ cockpit-238.1/package.json -@@ -8,7 +8,7 @@ - "@patternfly/react-core": "4.97.2", - "@patternfly/react-styles": "4.8.2", - "@patternfly/react-table": "4.23.2", +From a911add6a66d376e0b9cef306f88a1c8289b4eb6 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel <[email protected]> +Date: Fri, 30 Apr 2021 15:10:59 +0200 +Subject: [PATCH] Need local reference for redhat font + +--- + package.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/package.json b/package.json +index 92c13f112..3f65d2087 100644 +--- a/package.json ++++ b/package.json +@@ -7,7 +7,7 @@ + "@patternfly/react-core": "4.106.2", + "@patternfly/react-styles": "4.9.4", + "@patternfly/react-table": "4.24.1", - "@redhat/redhat-font": "git+https://github.com/RedHatOfficial/RedHatFont.git#2.2.0";, + "@redhat/redhat-font": "2.2.0", "bootstrap": "3.4.1", "bootstrap-datepicker": "1.9.0", - "deep-equal": "2.0.5", + "bootstrap-select": "1.13.18", +-- +2.26.2 + ++++++ cockpit.obsinfo ++++++ --- /var/tmp/diff_new_pack.UWlePC/_old 2021-05-10 15:38:30.313775509 +0200 +++ /var/tmp/diff_new_pack.UWlePC/_new 2021-05-10 15:38:30.317775494 +0200 @@ -1,5 +1,5 @@ name: cockpit -version: 238.1 -mtime: 1613933302 -commit: 58540c0666c61ef7e02c32ff8285caab35eb0754 +version: 243 +mtime: 1619583926 +commit: 6c7b0a0d9e687d626a80b7ec05cc6b135d026d71 ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.2988/node_modules.obscpio differ: char 27, line 1 ++++++ node_modules.spec.inc ++++++ ++++ 2797 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.2988/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 42024 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.2988/package-lock.json
