Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2023-01-24 19:41:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Tue Jan 24 19:41:50 2023 rev:26 rq:1059988 version:276.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2022-09-21
14:42:02.157688983 +0200
+++ /work/SRC/openSUSE:Factory/.cockpit.new.32243/cockpit.changes
2023-01-24 20:18:27.371908327 +0100
@@ -1,0 +2,7 @@
+Mon Nov 28 13:34:07 UTC 2022 - Zdenek Kubala <zkub...@suse.cz>
+
+- enable build of cockpit-selinux module
+- changes to keep it sync with sle micro
+ (0002-selinux-temporary-remove-setroubleshoot-section.patch)
+
+-------------------------------------------------------------------
New:
----
0002-selinux-temporary-remove-setroubleshoot-section.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.GNDvtF/_old 2023-01-24 20:18:28.211912661 +0100
+++ /var/tmp/diff_new_pack.GNDvtF/_new 2023-01-24 20:18:28.219912703 +0100
@@ -68,6 +68,7 @@
# SLE Micro specific patches
Patch100: remove-pwscore.patch
Patch101: hide-pcp.patch
+Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch
# 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})
@@ -187,9 +188,11 @@
%patch4 -p1
%patch5 -p1
-%if 0%{?sle_version}
+# SLE Micro specific patches
+%if 0%{?is_smo}
%patch100 -p1
%patch101 -p1
+%patch102 -p1
%endif
cp %SOURCE1 tools/cockpit.pam
@@ -217,6 +220,9 @@
--disable-ssh \
%endif
+make -f /usr/share/selinux/devel/Makefile cockpit.pp
+bzip2 -9 cockpit.pp
+
%make_build
%check
@@ -231,6 +237,14 @@
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
+# 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}
+
+# SUSE branding
mkdir -p %{buildroot}%{_datadir}/cockpit/branding/suse
pushd cockpit-suse-theme
cp src/css-overrides.css %{buildroot}%{_datadir}/cockpit/branding/suse
@@ -332,9 +346,6 @@
sed -i "s|%{buildroot}||" *.list
%if 0%{?suse_version}
-# setroubleshoot not yet in
-rm -r %{buildroot}%{_datadir}/cockpit/selinux
-rm
%{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml
# remove brandings with stale symlinks. Means they don't match
# the distro.
pushd %{buildroot}/%{_datadir}/cockpit/branding
@@ -653,13 +664,17 @@
%endif
-%if 0%{?rhel} == 0 && !0%{?suse_version}
+%if 0%{?rhel} == 0 && ( 0%{?suse_version} >= 1500 || 0%{?is_smo} )
%package selinux
Summary: Cockpit SELinux package
Requires: cockpit-bridge >= %{required_base}
Requires: cockpit-shell >= %{required_base}
+Requires: policycoreutils-python-utils >= 3.1
+# setroubleshoot not yet in SLE Micro
+%if !0%{?is_smo}
Requires: setroubleshoot-server >= 3.3.3
+%endif
BuildArch: noarch
%description selinux
++++++ 0002-selinux-temporary-remove-setroubleshoot-section.patch ++++++
Index: cockpit-251.3/pkg/selinux/setroubleshoot-view.jsx
===================================================================
--- cockpit-251.3.orig/pkg/selinux/setroubleshoot-view.jsx
+++ cockpit-251.3/pkg/selinux/setroubleshoot-view.jsx
@@ -458,7 +458,7 @@ export class SETroubleshootPage extends
<PageSection>
<Stack hasGutter>
<StackItem>{modifications}</StackItem>
- <StackItem>{troubleshooting}</StackItem>
+ <StackItem>{ !this.props.connected ||
troubleshooting}</StackItem>
</Stack>
</PageSection>
</Page>
