Allow cockpit through the firewall on install

0009-add-test-to-check-for-redhat-links.patch

@@ -1,49 +0,0 @@
-From 00ee76e052cce67006cb794ed6e770a6207fb766 Mon Sep 17 00:00:00 2001
-From: Alice Brooks <alice.brooks@suse.com>
-Date: Tue, 15 Jul 2025 04:15:19 +0100
-Subject: [PATCH] Add test to check for redhat links
-
----
- Makefile.am             |  1 +
- test/common/check-links | 17 +++++++++++++++++
- 2 files changed, 18 insertions(+)
- create mode 100755 test/common/check-links
-
-diff --git a/Makefile.am b/Makefile.am
-index 83f1ee7..97cfc6a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -80,6 +80,7 @@ distcheck-hook::
- 
- TESTS = \
- 	test/common/static-code \
-+	test/common/check-links \
- 	$(NULL)
- 
- clean-local::
-diff --git a/test/common/check-links b/test/common/check-links
-new file mode 100755
-index 0000000..6af98a8
---- /dev/null
-+++ b/test/common/check-links
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+
-+set -u
-+
-+find pkg -type f -name manifest.json | xargs jq -r '.[]?.[]?.docs?.[]?.url' | grep -v "jq: error" | grep redhat
-+
-+if [ $? -eq 0 ]; then
-+  echo "Redhat links exist in manifest.json please update the relevant patches" >&2
-+  exit 1
-+fi
-+
-+find pkg -type f | grep -v manifest.json | xargs grep docs.redhat
-+
-+if [ $? -eq 0 ]; then
-+  echo "Redhat links exist in pkg/ please update the relevant patches" >&2
-+  exit 1
-+fi
--- 
-2.50.0
-

cockpit.changes

@@ -1,16 +1,7 @@
 -------------------------------------------------------------------
-Tue Jul 15 05:13:32 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
+Thu Jul 10 07:18:57 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
 
-- add 0009-add-test-to-check-for-redhat-links.patch so we can check
+- Allow Cockpit through the filewall by default
-  during package build if the user would be accidently shown a redhat
-  link
-
--------------------------------------------------------------------
-Fri Jul 11 06:50:17 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
-
-- add libzypp-plugin-appdata dependency to cockpit-packagekit as
-  this will generate the swcatalog which it depends on for calculating
-  various cockpit packages
 
 -------------------------------------------------------------------
 Thu Jun 19 08:30:49 UTC 2025 - Alice Brooks <alice.brooks@suse.com>

cockpit.spec

@@ -69,7 +69,6 @@ Patch3:         suse-microos-branding.patch
 Patch4:         css-overrides.patch
 Patch5:         storage-btrfs.patch
 Patch6:         kdump-nfs-fixes.patch
-Patch7:         0009-add-test-to-check-for-redhat-links.patch
 # SLE Micro specific patches
 Patch101:       hide-pcp.patch
 Patch102:       0002-selinux-temporary-remove-setroubleshoot-section.patch
@@ -147,7 +146,6 @@ BuildRequires: pkgconfig(krb5) >= 1.11
 BuildRequires: libxslt-devel
 BuildRequires: glib-networking
 BuildRequires: sed
-BuildRequires: jq
 
 BuildRequires: glib2-devel >= 2.50.0
 # this is for runtimedir in the tls proxy ace21c8879
@@ -219,7 +217,6 @@ BuildRequires:  python3-pytest-timeout
 %patch -P 4 -p1
 %patch -P 5 -p1
 %patch -P 6 -p1
-%patch -P 7 -p1
 
 %patch -P 106 -p1
 %patch -P 109 -p1
@@ -687,6 +684,11 @@ if [ "$1" = 1 ]; then
     printf "# List of users which are not allowed to login to Cockpit\n" > /etc/cockpit/disallowed-users
     printf "root\n" >> /etc/cockpit/disallowed-users
     chmod 644 /etc/cockpit/disallowed-users
+
+    # Allow cockpit through the firewall
+    %if 0%{?suse_version} >= 1600
+    test -f %{_bindir}/firewall-cmd && firewall-cmd --quiet --permanent --add-service=cockpit && firewall-cmd --reload --quiet || true
+    %endif
 fi
 
 if [ "$1" = 2 ]; then
@@ -708,8 +710,6 @@ fi
 %endif
 %tmpfiles_create cockpit-ws.conf
 %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
 
 # check for deprecated PAM config
 if test -f %{_sysconfdir}/pam.d/cockpit &&  grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
@@ -901,7 +901,6 @@ Summary: Cockpit user interface for packages
 BuildArch: noarch
 Requires: cockpit-bridge >= %{required_base}
 Requires: PackageKit
-Requires: libzypp-plugin-appdata
 Recommends: python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
 Requires: polkit