diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd3c861c..8fafefa2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: fail-fast: false matrix: arch: [x86_64, aarch64] - dist: [el10, el9, el8, suse.lp155] + dist: [el10, el9, el8, suse.lp156] include: - dist: el8 target: rocky+epel-8 @@ -87,8 +87,8 @@ jobs: target: rocky+epel-9 - dist: el10 target: rocky+epel-10 - - dist: suse.lp155 - target: opensuse-leap-15.5 + - dist: suse.lp156 + target: opensuse-leap-15.6 - arch: x86_64 runs-on: ubuntu-24.04 - arch: aarch64 diff --git a/CHANGELOG.md b/CHANGELOG.md index d8159e78..756867e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,10 +49,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix `wwctl image import --update` #2066 - Fix filesystem overwrite/force behavior in mkfs overlay. #2028 - Prevent ignition from running twice in a provision-to-disk configuration. #1981 +- Fix `warewulf.spec.in` to resolve a build break for openSUSE 15.x ### Dependencies - Updated github.com/ulikunitz/xz to 0.5.14 (CVE-2025-58058) #2007 +- Updated github.com/opencontainers/selinux to v1.13.1 (CVE-2025-52881) +- Updated github.com/cyphar/filepath-securejoin to v0.5.1 (indirect via selinux version bump) ## v4.6.4, 2025-09-05 @@ -146,7 +149,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - Removed the gRPC API servers and client. #1876 -- Removed ``wwctl node import --csv``. #1862 +- Removed `wwctl node import --csv`. #1862 ## v4.6.1, 2025-04-04 @@ -155,7 +158,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added `wwctl overlay import --overwrite` to overwrite existing overlay file. - wwclient uses `WW_IPADDR`, if set, to contact the Warewulf server. #1788 - Add `wwctl node import --yes` to assume yes to confirmations. -- Set an IPMI tag ``vlan`` to configure the vlan during ``ipmiwrite``. #1031 +- Set an IPMI tag `vlan` to configure the vlan during `ipmiwrite`. #1031 - Added net.ifnames=1 to default kernel argument list. #1820 - Add a new OpenAPI v3 REST API to warewulfd at /api. #1588 - New sos plugin in `warewulf-sos` subpackage. #1822 @@ -518,7 +521,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix dhcpd.conf static template to include next-server and dhcp-range #1536 - Fix panic when adding tag with existing netdev #1546 - ## v4.5.7, 2024-09-11 ### Added @@ -549,6 +551,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - `wwctl conatiner list --kernel` shows the kernel detected for each container. #1283 - `wwctl container list --size` shows the uncompressed size of each container. `--compressed` shows the compressed size, and `--chroot` shows the size of the container source on the server. #954, #1117 - Add a logrotate config for `warewulfd.log`. #1311 + ### Changed - Refactor URL handling in wwclient to consistently escape arguments. @@ -643,7 +646,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added - Document warewulf.conf:paths. #635 -- New "Overlay" template variable contains the name of the overlay being built. #1052 +- New "Overlay" template variable contains the name of the overlay being built. #1052 - Documented HTTP proxy environment variables for `wwctl container import`. #1214 ### Changed diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 919fd1c8..ddb558cc 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,52 +1,53 @@ # Contributors -* Gregory Kurtzer @gmk -* Christian Goll @mslacken -* Jeremy Siadal @jcsiadal -* Niko Kivel @kivel -* Shannon V. Davidson -* Brian Clemens @brianclemens -* Michael L. Young @ajyounge -* Ian Kaneshiro @ikaneshiro -* Carter Dodd @kcdodd -* MatthewHink @MatthewHink -* WestleyR @WestleyK -* Michael L. Young -* Yong Qin -* Yoshiaki Senda -* Cooper, Trevor -* Masahiko Ohkubo -* John Hanks @griznog -* Rob Jansen -* svdavidson -* David McFarlane @Prepultrue -* Jean-Baptiste Denis -* TerranWorks -* Jonathon Anderson @anderbubble -* Brian Phan -* Jeffrey Frey @jtfrey -* Xu Yang(Jason Yang) @JasonYangShadow -* Matt Jolly @Kangie -* Arnaud LECOMTE -* Ryan Novosielski -* Andreas Skau @buzh -* Dietmar Rieder -* Andreas Henkel -* Timothy Middelkoop -* Shane Nehring -* Tobias Ribizel -* Tobias Poschwatta -* Josh Burks -* Elmar Pruesse @epruesse -* Adam Michel [@elfurbe](https://github.com/elfurbe) -* Brandon Biggs -* Howard Van Der Wal [@metalllinux](https://github.com/metalllinux) -* Nicholas Porter -* Ian Kaufman [@iankgt40](https://github.com/iankgt40) -* Daniele Colombo [@dacolombo](https://github.com/dacolombo) -* Stephen Simpson [@ssimpson89](https://github.com/ssimpson89) -* Rafael Lopez @rafalop -* Arian Cabrera [@acabrera86](https://github.com/acabrera86) -* Dacian Reece-Stremtan [@dacianstremtan](https://github.com/dacianstremtan) -* Adrian Reber -* Karker Said [@kosmolito](https://github.com/kosmolito) +- Gregory Kurtzer @gmk +- Christian Goll @mslacken +- Jeremy Siadal @jcsiadal +- Niko Kivel @kivel +- Shannon V. Davidson +- Brian Clemens @brianclemens +- Michael L. Young @ajyounge +- Ian Kaneshiro @ikaneshiro +- Carter Dodd @kcdodd +- MatthewHink @MatthewHink +- WestleyR @WestleyK +- Michael L. Young +- Yong Qin +- Yoshiaki Senda +- Cooper, Trevor +- Masahiko Ohkubo +- John Hanks @griznog +- Rob Jansen +- svdavidson +- David McFarlane @Prepultrue +- Jean-Baptiste Denis +- TerranWorks +- Jonathon Anderson @anderbubble +- Brian Phan +- Jeffrey Frey @jtfrey +- Xu Yang(Jason Yang) @JasonYangShadow +- Matt Jolly @Kangie +- Arnaud LECOMTE +- Ryan Novosielski +- Andreas Skau @buzh +- Dietmar Rieder +- Andreas Henkel +- Timothy Middelkoop +- Shane Nehring +- Tobias Ribizel +- Tobias Poschwatta +- Josh Burks +- Elmar Pruesse @epruesse +- Adam Michel [@elfurbe](https://github.com/elfurbe) +- Brandon Biggs +- Howard Van Der Wal [@metalllinux](https://github.com/metalllinux) +- Nicholas Porter +- Ian Kaufman [@iankgt40](https://github.com/iankgt40) +- Daniele Colombo [@dacolombo](https://github.com/dacolombo) +- Stephen Simpson [@ssimpson89](https://github.com/ssimpson89) +- Rafael Lopez @rafalop +- Arian Cabrera [@acabrera86](https://github.com/acabrera86) +- Dacian Reece-Stremtan [@dacianstremtan](https://github.com/dacianstremtan) +- Adrian Reber +- Karker Said [@kosmolito](https://github.com/kosmolito) +- Jason Scott @jsco2t diff --git a/warewulf.spec.in b/warewulf.spec.in index b9ac2e7e..b825bc5e 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -77,7 +77,8 @@ Requires: ipxe-bootimgs-aarch64 %if 0%{?is_suse} BuildRequires: tftp Requires: tftp -%elif 0%{?use_dnsmasq} +%else +%if 0%{?use_dnsmasq} Requires: dnsmasq %else # Assume Red Hat/Fedora @@ -88,6 +89,7 @@ Requires: dhcp-server Requires: dhcp %endif %endif +%endif BuildRequires: git BuildRequires: make @@ -140,9 +142,11 @@ make install \ %if 0%{?rhel} >= 10 || 0%{?openEuler} cp -f etc/warewulf.conf-el10 %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf -%elif 0%{?is_suse} +%else +%if 0%{?is_suse} cp -f etc/warewulf.conf-suse %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf %endif +%endif %if ! 0%{?is_suse} make install-sos \