From d6e9ae84305f08a8443f8cd7a7113619d54a9d0a36b17942388be3eb63c79bc2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 13 Mar 2023 10:35:26 +0000
Subject: [PATCH] Accepting request 1071100 from
 home:favogt:branches:openSUSE:Factory:Live

- list-common: Ignore pam_kwallet like gnome-keyring-pam

OBS-URL: https://build.opensuse.org/request/show/1071100
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=143
---
 list-common.sh               | 5 ++++-
 livecd-leap-gnome.kiwi       | 2 ++
 livecd-leap-kde.kiwi         | 2 ++
 livecd-leap-x11.kiwi         | 2 ++
 livecd-leap-xfce.kiwi        | 2 ++
 livecd-openSUSE.changes      | 5 +++++
 livecd-tumbleweed-gnome.kiwi | 2 ++
 livecd-tumbleweed-kde.kiwi   | 2 ++
 livecd-tumbleweed-x11.kiwi   | 2 ++
 livecd-tumbleweed-xfce.kiwi  | 2 ++
 10 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/list-common.sh b/list-common.sh
index f6f0f13..29cd736 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -110,8 +110,11 @@ buildignore usbmuxd
 
 # This would otherwise create a password prompt
 # See also https://bugzilla.opensuse.org/show_bug.cgi?id=544314 and
-# https://bugzilla.opensuse.org/show_bug.cgi?id=537343
+# https://bugzilla.opensuse.org/show_bug.cgi?id=537343 and
+# https://bugzilla.suse.com/show_bug.cgi?id=477488 and
+# http://bugzilla.opensuse.org/show_bug.cgi?id=1209177
 buildignore gnome-keyring-pam
+buildignore pam_kwallet
 
 buildignore apparmor-docs
 buildignore mutt-doc
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 0553b24..fe5f106 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 264d932..62e6a95 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index bcde725..1d7d1d1 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index c3fb3da..d3657cb 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index d46c554..7c53116 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 13 10:34:22 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Ignore pam_kwallet like gnome-keyring-pam
+
 -------------------------------------------------------------------
 Tue Feb 21 15:27:21 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index f12c359..11d09af 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index e785a2d..02a6308 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index c645bf2..b1e9f64 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 43536f7..610a0cd 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="usbmuxd"/>
     <package name="aaa_base" replaces="gnome-keyring-pam"/>
     <ignore name="gnome-keyring-pam"/>
+    <package name="aaa_base" replaces="pam_kwallet"/>
+    <ignore name="pam_kwallet"/>
     <package name="aaa_base" replaces="apparmor-docs"/>
     <ignore name="apparmor-docs"/>
     <package name="aaa_base" replaces="mutt-doc"/>