From 566a37af2a2d226e3fe0ad0940215d38a00ead1d82d21383e7c9db9eb7ffdcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 12 Nov 2024 15:39:02 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main cockpit-podman revision
 c798d1fbe41e3dd12d72ace79643e9ad

---
 _scmsync.obsinfo               |  4 ++++
 build.specials.obscpio         |  3 +++
 cockpit-podman.changes         | 11 +++++++++++
 cockpit-podman.spec            |  6 ++++++
 correct-container-search.patch | 11 +++++++++++
 5 files changed, 35 insertions(+)
 create mode 100644 _scmsync.obsinfo
 create mode 100644 build.specials.obscpio
 create mode 100644 correct-container-search.patch

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
new file mode 100644
index 0000000..7212f64
--- /dev/null
+++ b/_scmsync.obsinfo
@@ -0,0 +1,4 @@
+mtime: 1730813965
+commit: cad7a00b2d063e504b2379004fa346cf304e0f644342501396b2e7ef4b6c2064
+url: https://src.opensuse.org/cockpit/cockpit-podman.git
+revision: cad7a00b2d063e504b2379004fa346cf304e0f644342501396b2e7ef4b6c2064
diff --git a/build.specials.obscpio b/build.specials.obscpio
new file mode 100644
index 0000000..3144172
--- /dev/null
+++ b/build.specials.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd964fc25914f91a9a999390960228a7a4e4b91409e7ef32f20ca14614e5e5e3
+size 256
diff --git a/cockpit-podman.changes b/cockpit-podman.changes
index 1b81df6..2a11f4a 100644
--- a/cockpit-podman.changes
+++ b/cockpit-podman.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov  5 13:02:39 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
+
+- correct-container-search.patch: Fixes issues searching containers
+  bsc#1232687
+
+-------------------------------------------------------------------
+Fri Aug  9 17:49:45 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de>
+
+- Fix systemd units folder for leap and sle (Similar issue like boo#1226541)
+
 -------------------------------------------------------------------
 Wed Jul 31 12:42:45 UTC 2024 - Adam Majer <adam.majer@suse.de>
 
diff --git a/cockpit-podman.spec b/cockpit-podman.spec
index 900384b..4941dc6 100644
--- a/cockpit-podman.spec
+++ b/cockpit-podman.spec
@@ -28,6 +28,7 @@ Source11:       node_modules.spec.inc
 Source12:       update_version.sh
 %include %_sourcedir/node_modules.spec.inc
 Patch10:        load-css-overrides.patch
+Patch11:        correct-container-search.patch
 BuildArch:      noarch
 BuildRequires:  appstream-glib
 Requires:       cockpit-bridge >= 138
@@ -37,6 +38,7 @@ Requires:       podman >= 2.0.4
 BuildRequires:  cockpit-devel >= 298
 BuildRequires:  local-npm-registry
 BuildRequires:  sassc
+BuildRequires:  sed
 
 %description
 Cockpit component for managing Podman containers
@@ -59,6 +61,10 @@ export PREFIX=%{_prefix}
 %make_install
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 
+%if 0%{?suse_version} == 1500
+sed -i -e 's#"/lib/systemd/system#"%{_unitdir}#' %{buildroot}%{_datadir}/cockpit/podman/manifest.json
+%endif
+
 %files
 %doc README.md
 %license LICENSE
diff --git a/correct-container-search.patch b/correct-container-search.patch
new file mode 100644
index 0000000..0fbae93
--- /dev/null
+++ b/correct-container-search.patch
@@ -0,0 +1,11 @@
+--- a/src/ImageRunModal.jsx
++++ b/src/ImageRunModal.jsx
+@@ -516,7 +516,7 @@ export class ImageRunModal extends React.Component {
+         }
+ 
+         // Strip out all non-allowed container image characters when filtering.
+-        let regexString = searchText.replace(/[^\w_.:-]/g, "");
++        let regexString = searchText.replace(/[^/\w_.:-]/g, "");
+         // Strip image registry option if set for comparing results for docker.io searching for docker.io/fedora
+         // returns docker.io/$username/fedora for example.
+         if (regexString.includes('/')) {