From a8fa387099b3b898163cf86480f75214d459919a1f5cd5c0151a8124643fa29a Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 14 May 2024 09:07:42 +0000
Subject: [PATCH] Accepting request 1173929 from home:mslacken:pr

- update to 4.5.2 with followin changes:
  * Reorder dnsmasq config to put iPXE last
  * Update a dependency to fix CVE-2024-3727 (bsc#1224124)

OBS-URL: https://build.opensuse.org/request/show/1173929
OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=74
---
 warewulf4-v4.5.1.tar.gz | 3 ---
 warewulf4-v4.5.2.tar.gz | 3 +++
 warewulf4.changes       | 7 +++++++
 warewulf4.spec          | 5 ++---
 4 files changed, 12 insertions(+), 6 deletions(-)
 delete mode 100644 warewulf4-v4.5.1.tar.gz
 create mode 100644 warewulf4-v4.5.2.tar.gz

diff --git a/warewulf4-v4.5.1.tar.gz b/warewulf4-v4.5.1.tar.gz
deleted file mode 100644
index b0ba05e..0000000
--- a/warewulf4-v4.5.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7317429b95e268bda850ebd68fd92c1c5f170cd50b388748003b3e654d02e7b2
-size 10408158
diff --git a/warewulf4-v4.5.2.tar.gz b/warewulf4-v4.5.2.tar.gz
new file mode 100644
index 0000000..065a35e
--- /dev/null
+++ b/warewulf4-v4.5.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1a32c2f108a3a9eb40247c7c84f6a9d5b944a5b1ad2e4014c50acee848bcb3f
+size 10409495
diff --git a/warewulf4.changes b/warewulf4.changes
index 2dfffb8..bafda5e 100644
--- a/warewulf4.changes
+++ b/warewulf4.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 14 09:01:13 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- update to 4.5.2 with followin changes:
+  * Reorder dnsmasq config to put iPXE last
+  * Update a dependency to fix CVE-2024-3727 (bsc#1224124)
+
 -------------------------------------------------------------------
 Mon May 13 07:59:50 UTC 2024 - Christian Goll <cgoll@suse.com>
 
diff --git a/warewulf4.spec b/warewulf4.spec
index d6abc86..c6325f4 100644
--- a/warewulf4.spec
+++ b/warewulf4.spec
@@ -16,7 +16,7 @@
 #
 
 
-%global vers 4.5.1
+%global vers 4.5.2
 %global tftpdir /srv/tftpboot
 %global srvdir %{_sharedstatedir}
 #%%global githash 5b0de8ea5397ca42584335517fd4959d7ffe3da5
@@ -173,9 +173,8 @@ yq e '
   .["container mounts"] += {"source": "/etc/SUSEConnect", "dest": "/etc/SUSEConnect", "readonly": true} |
   .["container mounts"] += {"source": "/etc/zypp/credentials.d/SCCcredentials", "dest": "/etc/zypp/credentials.d/SCCcredentials", "readonly": true}' \
   -i %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
-#sed -i -e 's@\(^\s*\)\(.*:.*\):@\1"\2":@' %%{buildroot}%%{_sysconfdir}/warewulf/warewulf.conf
 # SUSE starts user UIDs at 1000
-sed -i -e 's@\(.* \$_UID \(>\|-ge\) \)500\(.*\)@\11000\3@' %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/profile.d/ssh_setup.*sh
+sed -i -e 's@\(.* \$_UID \(>\|-ge\) \)500\(.*\)@\11000\3@' %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/profile.d/ssh_setup.*sh.ww
 # fix dhcp for SUSE
 mv %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcp/dhcpd.conf.ww %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcpd.conf.ww
 rmdir %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/rootfs/etc/dhcp