From 3117857577536815122a8e318a78c8b8e03fc048d8da67cdd938b6e261b9a9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 12 Aug 2025 12:20:46 +0200 Subject: [PATCH 1/2] Import openSUSE:Leap:16.0 modifications --- _service | 2 +- fixup-pdf-build.patch | 95 -------------------- security-fixes.patch | 197 ----------------------------------------- udev-regression.patch | 53 ----------- vendor.tar.xz | 4 +- warewulf-4.6.0.obscpio | 3 - warewulf-4.6.2.obscpio | 3 + warewulf.obsinfo | 6 +- warewulf4.changes | 14 +++ warewulf4.spec | 16 ++-- 10 files changed, 30 insertions(+), 363 deletions(-) delete mode 100644 fixup-pdf-build.patch delete mode 100644 security-fixes.patch delete mode 100644 udev-regression.patch delete mode 100644 warewulf-4.6.0.obscpio create mode 100644 warewulf-4.6.2.obscpio diff --git a/_service b/_service index 14a6a1d..21621dc 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/warewulf/warewulf.git git - v4.6.0 + v4.6.2 @PARENT_TAG@ v(.*) enable diff --git a/fixup-pdf-build.patch b/fixup-pdf-build.patch deleted file mode 100644 index 261c680..0000000 --- a/fixup-pdf-build.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a342c1b832666caed26337e371854e99d1388031 Mon Sep 17 00:00:00 2001 -From: Christian Goll -Date: Mon, 3 Mar 2025 11:58:43 +0100 -Subject: [PATCH] fixup pdf build - -Signed-off-by: Christian Goll ---- - CHANGELOG.md | 5 +++++ - Makefile | 2 +- - internal/app/wwctl/genconf/reference/main.go | 1 + - userdocs/conf.py | 5 +++-- - userdocs/server/bootloaders.rst | 2 +- - 5 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index ffc8755d..fb8104b6 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. - - The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - -+## Unreleased -+ -+### Fixed -+- Removed unreadable >= character and not distro sphinx module for pdf doc build -+ - ## v4.6.0, 2025-03-02 - - ### Added -diff --git a/Makefile b/Makefile -index 67147051..28ee3fec 100644 ---- a/Makefile -+++ b/Makefile -@@ -89,7 +89,7 @@ reference: wwctl - ./wwctl --emptyconf genconfig reference userdocs/reference/ - - latexpdf: reference -- make -C userdocs latexpdf -+ SPHINXOPTS='-t pdf -D release=$(VERSION)' make -C userdocs latexpdf - - ##@ Development - -diff --git a/internal/app/wwctl/genconf/reference/main.go b/internal/app/wwctl/genconf/reference/main.go -index c3cdacaa..9dd5b1d6 100644 ---- a/internal/app/wwctl/genconf/reference/main.go -+++ b/internal/app/wwctl/genconf/reference/main.go -@@ -11,6 +11,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { - linkHandler := func(name, ref string) string { - return fmt.Sprintf(":ref:`%s <%s>`", name, ref) - } -+ cmd.Parent().Parent().DisableAutoGenTag = true - err = doc.GenReSTTreeCustom(cmd.Parent().Parent(), args[0], func(arg string) string { return "" }, linkHandler) - //err = doc.GenReSTTree(cmd.Parent().Parent(), args[0]) - return -diff --git a/userdocs/conf.py b/userdocs/conf.py -index e838c303..d8584a5f 100644 ---- a/userdocs/conf.py -+++ b/userdocs/conf.py -@@ -7,7 +7,7 @@ - # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information - - project = 'Warewulf User Guide' --copyright = '2024, Warewulf Project Contributors' -+copyright = '2025, Warewulf Project Contributors' - author = 'Warewulf Project Contributors' - release = 'main' - -@@ -16,8 +16,9 @@ release = 'main' - - extensions = [ - 'sphinx.ext.graphviz', -- 'sphinx_reredirects', - ] -+if not tags.has('pdf'): -+ extensions.append('sphinx_redirects') - - redirects = { - 'contents/background': '../getting-started/introduction.html', -diff --git a/userdocs/server/bootloaders.rst b/userdocs/server/bootloaders.rst -index 0f5bf5a5..9132e1ec 100644 ---- a/userdocs/server/bootloaders.rst -+++ b/userdocs/server/bootloaders.rst -@@ -158,7 +158,7 @@ For example, the ``imgextract`` command can be `explicitly enabled`_. - This is the case in the default state of ``build-ipxe.sh``, which enables - support for ZLIB and GZIP archive image formats. - --Configuring Warewulf (≥ v4.5.0) -+Configuring Warewulf (>= v4.5.0) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - - In Warewulf v4.5.0, Warewulf can be configured to use these files using the --- -2.43.0 - diff --git a/security-fixes.patch b/security-fixes.patch deleted file mode 100644 index 4577b07..0000000 --- a/security-fixes.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml -index 9bb395a2..179202ce 100644 ---- a/.github/workflows/check.yml -+++ b/.github/workflows/check.yml -@@ -20,7 +20,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -@@ -34,7 +34,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -@@ -48,7 +48,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -@@ -62,7 +62,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -@@ -85,7 +85,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -@@ -99,7 +99,7 @@ jobs: - runs-on: ubuntu-latest - strategy: - matrix: -- go-version: ['1.22', '1.23'] -+ go-version: ['1.23', '1.24'] - steps: - - name: Checkout Warewulf - uses: actions/checkout@v4 -diff --git a/LICENSE_DEPENDENCIES.md b/LICENSE_DEPENDENCIES.md -index 67446789..d0a1e5d7 100644 ---- a/LICENSE_DEPENDENCIES.md -+++ b/LICENSE_DEPENDENCIES.md -@@ -495,7 +495,7 @@ The dependencies and their licenses are as follows: - - **License:** BSD-3-Clause - --**License URL:** -+**License URL:** - - ## golang.org/x/exp/maps - -@@ -507,7 +507,7 @@ The dependencies and their licenses are as follows: - - **License:** BSD-3-Clause - --**License URL:** -+**License URL:** - - ## golang.org/x/sync - -@@ -519,13 +519,13 @@ The dependencies and their licenses are as follows: - - **License:** BSD-3-Clause - --**License URL:** -+**License URL:** - - ## golang.org/x/term - - **License:** BSD-3-Clause - --**License URL:** -+**License URL:** - - ## golang.org/x/text - -diff --git a/Tools.mk b/Tools.mk -index 924bb2f2..16d39158 100644 ---- a/Tools.mk -+++ b/Tools.mk -@@ -5,7 +5,7 @@ GO_TOOLS_BIN := $(addprefix $(TOOLS_BIN)/, $(notdir $(GO_TOOLS))) - GO_TOOLS_VENDOR := $(addprefix vendor/, $(GO_TOOLS)) - - GOLANGCI_LINT := $(TOOLS_BIN)/golangci-lint --GOLANGCI_LINT_VERSION := v1.63.4 -+GOLANGCI_LINT_VERSION := v1.64.8 - - GOLANG_DEADCODE := $(TOOLS_BIN)/deadcode - -@@ -39,7 +39,7 @@ $(GOLANGCI_LINT): - curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION) - - $(GOLANG_DEADCODE): -- GOBIN="$(PWD)/$(TOOLS_BIN)" go install golang.org/x/tools/cmd/deadcode@v0.24.0 -+ GOBIN="$(PWD)/$(TOOLS_BIN)" go install golang.org/x/tools/cmd/deadcode@v0.31.0 - - $(PROTOC): $(TOOLS_DIR) - cd $(TOOLS_DIR) && curl -LO $(PROTOC_URL) && unzip -o $(notdir $(PROTOC_URL)) -diff --git a/go.mod b/go.mod -index 6206cd42..d9e1bafb 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,8 @@ - module github.com/warewulf/warewulf - --go 1.22.0 -+go 1.23.0 - --toolchain go1.22.9 -+toolchain go1.24.1 - - require ( - dario.cat/mergo v1.0.1 -@@ -28,8 +28,8 @@ require ( - github.com/spf13/cobra v1.8.1 - github.com/stretchr/testify v1.10.0 - github.com/talos-systems/go-smbios v0.1.1 -- golang.org/x/sys v0.29.0 -- golang.org/x/term v0.28.0 -+ golang.org/x/sys v0.30.0 -+ golang.org/x/term v0.29.0 - google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 - google.golang.org/grpc v1.70.0 - google.golang.org/protobuf v1.36.5 -@@ -137,9 +137,9 @@ require ( - go.opentelemetry.io/otel v1.32.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/trace v1.32.0 // indirect -- golang.org/x/crypto v0.32.0 // indirect -+ golang.org/x/crypto v0.35.0 // indirect - golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect -- golang.org/x/net v0.33.0 // indirect -+ golang.org/x/net v0.36.0 // indirect - golang.org/x/sync v0.11.0 // indirect - golang.org/x/text v0.22.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect -diff --git a/go.sum b/go.sum -index 4138cb41..feaddc95 100644 ---- a/go.sum -+++ b/go.sum -@@ -418,8 +418,8 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U - golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= - golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= --golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= --golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= -+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= - golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= - golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo= - golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= -@@ -437,8 +437,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= --golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= -+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -@@ -465,10 +465,10 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= --golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= --golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= --golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= -+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= -+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/udev-regression.patch b/udev-regression.patch deleted file mode 100644 index 8854537..0000000 --- a/udev-regression.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/etc/nodes.conf b/etc/nodes.conf -index c5b9487f..94eeb9ee 100644 ---- a/etc/nodes.conf -+++ b/etc/nodes.conf -@@ -23,6 +23,7 @@ nodeprofiles: - args: - - quiet - - crashkernel=no -+ - net.ifnames=1 - init: /sbin/init - root: initramfs - ipxe template: default -diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go -index 3e8fa26f..dbe69b5b 100644 ---- a/internal/pkg/upgrade/node.go -+++ b/internal/pkg/upgrade/node.go -@@ -123,7 +123,7 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul - defaultProfile.RuntimeOverlay, genericSplitOverlays...) - } - if len(defaultProfile.Kernel.Args) < 1 { -- defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no"} -+ defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no", "net.ifnames=1"} - } - if defaultProfile.Init == "" { - defaultProfile.Init = "/sbin/init" -diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go -index 132b109b..d32a5275 100644 ---- a/internal/pkg/upgrade/node_test.go -+++ b/internal/pkg/upgrade/node_test.go -@@ -576,6 +576,7 @@ nodeprofiles: - args: - - quiet - - crashkernel=no -+ - net.ifnames=1 - init: /sbin/init - root: initramfs - resources: -@@ -654,6 +655,7 @@ nodeprofiles: - args: - - quiet - - crashkernel=no -+ - net.ifnames=1 - init: /sbin/init - root: initramfs - resources: -@@ -915,6 +917,7 @@ nodeprofiles: - args: - - quiet - - crashkernel=no -+ - net.ifnames=1 - init: /sbin/init - root: initramfs - resources: diff --git a/vendor.tar.xz b/vendor.tar.xz index 90d5d94..9618996 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fc8ab72c7088a3b029345c3a6cea4048c70490587a412854701fdd6b5c8b8cb -size 5651252 +oid sha256:cb9dcd150f40c388fbea0f33691c33da61f2daeddeecfcb61820340af18d373e +size 6156844 diff --git a/warewulf-4.6.0.obscpio b/warewulf-4.6.0.obscpio deleted file mode 100644 index f3f3b39..0000000 --- a/warewulf-4.6.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3eb2cd8bf87a6e695ca394c39e19cbbfdb307d1ddd8604e89993821906f89c34 -size 4346892 diff --git a/warewulf-4.6.2.obscpio b/warewulf-4.6.2.obscpio new file mode 100644 index 0000000..6169881 --- /dev/null +++ b/warewulf-4.6.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64cfc3c2cfa8c1ef352915726fa55fee85b58f48e583b2acf123d2a09128ee5f +size 4636684 diff --git a/warewulf.obsinfo b/warewulf.obsinfo index a5e2398..39753f7 100644 --- a/warewulf.obsinfo +++ b/warewulf.obsinfo @@ -1,4 +1,4 @@ name: warewulf -version: 4.6.0 -mtime: 1740959213 -commit: a98ec09b36392c372bf319b300c8163ab05de95e +version: 4.6.2 +mtime: 1752075635 +commit: 0cb9354364433a67b610278632cf46e3388f7045 diff --git a/warewulf4.changes b/warewulf4.changes index 600ec64..e85c6a7 100644 --- a/warewulf4.changes +++ b/warewulf4.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jul 10 07:00:04 UTC 2025 - cgoll@suse.com + +- update to 4.6.2 which contains the (preview) support for + provisioning to local disk +- incoperated from 4.6.1 + * rest api which is disabled in the default configuration +- removed following files as fixed upstream: + * fixup-pdf-build.patch + * security-fixes.patch + * udev-regression.patch +- marked slurm as recommeneded in the warewulf4-overlay-slurm + package bsc#124608 + ------------------------------------------------------------------- Fri Mar 28 09:59:27 UTC 2025 - Christian Goll diff --git a/warewulf4.spec b/warewulf4.spec index 0a5bd9a..ffe0010 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -28,23 +28,19 @@ ExclusiveArch: x86_64 aarch64 Name: warewulf4 -Version: 4.6.0 +Version: 4.6.2 Release: 0 Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org Source0: warewulf-%{version}.tar -#Source0: https://github.com/mslacken/warewulf/archive/%{githash}.tar.gz#/warewulf-%{version}.tar.gz Source1: vendor.tar.xz Source5: warewulf4-rpmlintrc Source10: config-ww4.sh Source11: adjust_overlays.sh Source20: README.dnsmasq Source21: README.RKE2.md -Patch0: fixup-pdf-build.patch -Patch1: security-fixes.patch -Patch2: udev-regression.patch BuildRequires: %{python_module Sphinx-latex} BuildRequires: distribution-release @@ -114,7 +110,7 @@ Reference documentation for warewulf4. %package overlay-slurm Summary: Configuration template for slurm Requires: %{name} = %{version} -Requires: slurm +Recommends: slurm BuildArch: noarch Obsoletes: warewulf4-slurm <= 4.4.0 Provides: warewulf4-slurm = %version @@ -245,6 +241,8 @@ mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} mv %{buildroot}/%{_sysconfdir}/warewulf/examples %{buildroot}%{_defaultdocdir}/%{name}/example-templates # fix logrotate name mv %{buildroot}/%{_sysconfdir}/logrotate.d/warewulfd.conf %{buildroot}/%{_sysconfdir}/logrotate.d/warewulf4 +# add version tag to documentation +mv ./userdocs/_build/latex/warewulfuserguide.pdf ./userdocs/_build/latex/warewulfuserguide-%{version}.pdf %pre -f %{name}.pre %service_add_pre warewulfd.service @@ -281,6 +279,7 @@ fi %config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf %config(noreplace) %{_sysconfdir}/warewulf/grub %config(noreplace) %{_sysconfdir}/warewulf/ipxe +%config(noreplace) %{_sysconfdir}/warewulf/auth.conf %config %{_sysconfdir}/logrotate.d/warewulf4 %{_defaultdocdir}/%{name}/example-templates %{_prefix}/lib/firewalld/services/warewulf.xml @@ -331,10 +330,9 @@ fi %files dracut %defattr(-, root, root) -%dir %{_prefix}/lib/dracut/modules.d/90wwinit -%{_prefix}/lib/dracut/modules.d/90wwinit/*.sh +%{_prefix}/lib/dracut/modules.d/90wwinit %files reference-doc -%doc ./userdocs/_build/latex/warewulfuserguide.pdf +%doc ./userdocs/_build/latex/warewulfuserguide-%{version}.pdf %changelog -- 2.51.1 From 38233675a58d79ce4992873089ab5096c12f1064f7437c0379370f49e066884a Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Mon, 29 Sep 2025 15:15:21 +0200 Subject: [PATCH 2/2] Revert "Import openSUSE:Leap:16.0 modifications" This reverts commit 3117857577536815122a8e318a78c8b8e03fc048d8da67cdd938b6e261b9a9de. --- _service | 2 +- fixup-pdf-build.patch | 95 ++++++++++++++++++++ security-fixes.patch | 197 +++++++++++++++++++++++++++++++++++++++++ udev-regression.patch | 53 +++++++++++ vendor.tar.xz | 4 +- warewulf-4.6.0.obscpio | 3 + warewulf-4.6.2.obscpio | 3 - warewulf.obsinfo | 6 +- warewulf4.changes | 14 --- warewulf4.spec | 16 ++-- 10 files changed, 363 insertions(+), 30 deletions(-) create mode 100644 fixup-pdf-build.patch create mode 100644 security-fixes.patch create mode 100644 udev-regression.patch create mode 100644 warewulf-4.6.0.obscpio delete mode 100644 warewulf-4.6.2.obscpio diff --git a/_service b/_service index 21621dc..14a6a1d 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/warewulf/warewulf.git git - v4.6.2 + v4.6.0 @PARENT_TAG@ v(.*) enable diff --git a/fixup-pdf-build.patch b/fixup-pdf-build.patch new file mode 100644 index 0000000..261c680 --- /dev/null +++ b/fixup-pdf-build.patch @@ -0,0 +1,95 @@ +From a342c1b832666caed26337e371854e99d1388031 Mon Sep 17 00:00:00 2001 +From: Christian Goll +Date: Mon, 3 Mar 2025 11:58:43 +0100 +Subject: [PATCH] fixup pdf build + +Signed-off-by: Christian Goll +--- + CHANGELOG.md | 5 +++++ + Makefile | 2 +- + internal/app/wwctl/genconf/reference/main.go | 1 + + userdocs/conf.py | 5 +++-- + userdocs/server/bootloaders.rst | 2 +- + 5 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index ffc8755d..fb8104b6 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. + + The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + ++## Unreleased ++ ++### Fixed ++- Removed unreadable >= character and not distro sphinx module for pdf doc build ++ + ## v4.6.0, 2025-03-02 + + ### Added +diff --git a/Makefile b/Makefile +index 67147051..28ee3fec 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,7 +89,7 @@ reference: wwctl + ./wwctl --emptyconf genconfig reference userdocs/reference/ + + latexpdf: reference +- make -C userdocs latexpdf ++ SPHINXOPTS='-t pdf -D release=$(VERSION)' make -C userdocs latexpdf + + ##@ Development + +diff --git a/internal/app/wwctl/genconf/reference/main.go b/internal/app/wwctl/genconf/reference/main.go +index c3cdacaa..9dd5b1d6 100644 +--- a/internal/app/wwctl/genconf/reference/main.go ++++ b/internal/app/wwctl/genconf/reference/main.go +@@ -11,6 +11,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { + linkHandler := func(name, ref string) string { + return fmt.Sprintf(":ref:`%s <%s>`", name, ref) + } ++ cmd.Parent().Parent().DisableAutoGenTag = true + err = doc.GenReSTTreeCustom(cmd.Parent().Parent(), args[0], func(arg string) string { return "" }, linkHandler) + //err = doc.GenReSTTree(cmd.Parent().Parent(), args[0]) + return +diff --git a/userdocs/conf.py b/userdocs/conf.py +index e838c303..d8584a5f 100644 +--- a/userdocs/conf.py ++++ b/userdocs/conf.py +@@ -7,7 +7,7 @@ + # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information + + project = 'Warewulf User Guide' +-copyright = '2024, Warewulf Project Contributors' ++copyright = '2025, Warewulf Project Contributors' + author = 'Warewulf Project Contributors' + release = 'main' + +@@ -16,8 +16,9 @@ release = 'main' + + extensions = [ + 'sphinx.ext.graphviz', +- 'sphinx_reredirects', + ] ++if not tags.has('pdf'): ++ extensions.append('sphinx_redirects') + + redirects = { + 'contents/background': '../getting-started/introduction.html', +diff --git a/userdocs/server/bootloaders.rst b/userdocs/server/bootloaders.rst +index 0f5bf5a5..9132e1ec 100644 +--- a/userdocs/server/bootloaders.rst ++++ b/userdocs/server/bootloaders.rst +@@ -158,7 +158,7 @@ For example, the ``imgextract`` command can be `explicitly enabled`_. + This is the case in the default state of ``build-ipxe.sh``, which enables + support for ZLIB and GZIP archive image formats. + +-Configuring Warewulf (≥ v4.5.0) ++Configuring Warewulf (>= v4.5.0) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + In Warewulf v4.5.0, Warewulf can be configured to use these files using the +-- +2.43.0 + diff --git a/security-fixes.patch b/security-fixes.patch new file mode 100644 index 0000000..4577b07 --- /dev/null +++ b/security-fixes.patch @@ -0,0 +1,197 @@ +diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml +index 9bb395a2..179202ce 100644 +--- a/.github/workflows/check.yml ++++ b/.github/workflows/check.yml +@@ -20,7 +20,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +@@ -34,7 +34,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +@@ -48,7 +48,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +@@ -62,7 +62,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +@@ -85,7 +85,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +@@ -99,7 +99,7 @@ jobs: + runs-on: ubuntu-latest + strategy: + matrix: +- go-version: ['1.22', '1.23'] ++ go-version: ['1.23', '1.24'] + steps: + - name: Checkout Warewulf + uses: actions/checkout@v4 +diff --git a/LICENSE_DEPENDENCIES.md b/LICENSE_DEPENDENCIES.md +index 67446789..d0a1e5d7 100644 +--- a/LICENSE_DEPENDENCIES.md ++++ b/LICENSE_DEPENDENCIES.md +@@ -495,7 +495,7 @@ The dependencies and their licenses are as follows: + + **License:** BSD-3-Clause + +-**License URL:** ++**License URL:** + + ## golang.org/x/exp/maps + +@@ -507,7 +507,7 @@ The dependencies and their licenses are as follows: + + **License:** BSD-3-Clause + +-**License URL:** ++**License URL:** + + ## golang.org/x/sync + +@@ -519,13 +519,13 @@ The dependencies and their licenses are as follows: + + **License:** BSD-3-Clause + +-**License URL:** ++**License URL:** + + ## golang.org/x/term + + **License:** BSD-3-Clause + +-**License URL:** ++**License URL:** + + ## golang.org/x/text + +diff --git a/Tools.mk b/Tools.mk +index 924bb2f2..16d39158 100644 +--- a/Tools.mk ++++ b/Tools.mk +@@ -5,7 +5,7 @@ GO_TOOLS_BIN := $(addprefix $(TOOLS_BIN)/, $(notdir $(GO_TOOLS))) + GO_TOOLS_VENDOR := $(addprefix vendor/, $(GO_TOOLS)) + + GOLANGCI_LINT := $(TOOLS_BIN)/golangci-lint +-GOLANGCI_LINT_VERSION := v1.63.4 ++GOLANGCI_LINT_VERSION := v1.64.8 + + GOLANG_DEADCODE := $(TOOLS_BIN)/deadcode + +@@ -39,7 +39,7 @@ $(GOLANGCI_LINT): + curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION) + + $(GOLANG_DEADCODE): +- GOBIN="$(PWD)/$(TOOLS_BIN)" go install golang.org/x/tools/cmd/deadcode@v0.24.0 ++ GOBIN="$(PWD)/$(TOOLS_BIN)" go install golang.org/x/tools/cmd/deadcode@v0.31.0 + + $(PROTOC): $(TOOLS_DIR) + cd $(TOOLS_DIR) && curl -LO $(PROTOC_URL) && unzip -o $(notdir $(PROTOC_URL)) +diff --git a/go.mod b/go.mod +index 6206cd42..d9e1bafb 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,8 +1,8 @@ + module github.com/warewulf/warewulf + +-go 1.22.0 ++go 1.23.0 + +-toolchain go1.22.9 ++toolchain go1.24.1 + + require ( + dario.cat/mergo v1.0.1 +@@ -28,8 +28,8 @@ require ( + github.com/spf13/cobra v1.8.1 + github.com/stretchr/testify v1.10.0 + github.com/talos-systems/go-smbios v0.1.1 +- golang.org/x/sys v0.29.0 +- golang.org/x/term v0.28.0 ++ golang.org/x/sys v0.30.0 ++ golang.org/x/term v0.29.0 + google.golang.org/genproto/googleapis/api v0.0.0-20250204164813-702378808489 + google.golang.org/grpc v1.70.0 + google.golang.org/protobuf v1.36.5 +@@ -137,9 +137,9 @@ require ( + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect +- golang.org/x/crypto v0.32.0 // indirect ++ golang.org/x/crypto v0.35.0 // indirect + golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect +- golang.org/x/net v0.33.0 // indirect ++ golang.org/x/net v0.36.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/text v0.22.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250204164813-702378808489 // indirect +diff --git a/go.sum b/go.sum +index 4138cb41..feaddc95 100644 +--- a/go.sum ++++ b/go.sum +@@ -418,8 +418,8 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U + golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= + golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= ++golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= ++golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= + golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= + golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo= + golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +@@ -437,8 +437,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= ++golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= ++golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +@@ -465,10 +465,10 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= ++golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= ++golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= ++golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= ++golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/udev-regression.patch b/udev-regression.patch new file mode 100644 index 0000000..8854537 --- /dev/null +++ b/udev-regression.patch @@ -0,0 +1,53 @@ +diff --git a/etc/nodes.conf b/etc/nodes.conf +index c5b9487f..94eeb9ee 100644 +--- a/etc/nodes.conf ++++ b/etc/nodes.conf +@@ -23,6 +23,7 @@ nodeprofiles: + args: + - quiet + - crashkernel=no ++ - net.ifnames=1 + init: /sbin/init + root: initramfs + ipxe template: default +diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go +index 3e8fa26f..dbe69b5b 100644 +--- a/internal/pkg/upgrade/node.go ++++ b/internal/pkg/upgrade/node.go +@@ -123,7 +123,7 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul + defaultProfile.RuntimeOverlay, genericSplitOverlays...) + } + if len(defaultProfile.Kernel.Args) < 1 { +- defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no"} ++ defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no", "net.ifnames=1"} + } + if defaultProfile.Init == "" { + defaultProfile.Init = "/sbin/init" +diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go +index 132b109b..d32a5275 100644 +--- a/internal/pkg/upgrade/node_test.go ++++ b/internal/pkg/upgrade/node_test.go +@@ -576,6 +576,7 @@ nodeprofiles: + args: + - quiet + - crashkernel=no ++ - net.ifnames=1 + init: /sbin/init + root: initramfs + resources: +@@ -654,6 +655,7 @@ nodeprofiles: + args: + - quiet + - crashkernel=no ++ - net.ifnames=1 + init: /sbin/init + root: initramfs + resources: +@@ -915,6 +917,7 @@ nodeprofiles: + args: + - quiet + - crashkernel=no ++ - net.ifnames=1 + init: /sbin/init + root: initramfs + resources: diff --git a/vendor.tar.xz b/vendor.tar.xz index 9618996..90d5d94 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb9dcd150f40c388fbea0f33691c33da61f2daeddeecfcb61820340af18d373e -size 6156844 +oid sha256:2fc8ab72c7088a3b029345c3a6cea4048c70490587a412854701fdd6b5c8b8cb +size 5651252 diff --git a/warewulf-4.6.0.obscpio b/warewulf-4.6.0.obscpio new file mode 100644 index 0000000..f3f3b39 --- /dev/null +++ b/warewulf-4.6.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eb2cd8bf87a6e695ca394c39e19cbbfdb307d1ddd8604e89993821906f89c34 +size 4346892 diff --git a/warewulf-4.6.2.obscpio b/warewulf-4.6.2.obscpio deleted file mode 100644 index 6169881..0000000 --- a/warewulf-4.6.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64cfc3c2cfa8c1ef352915726fa55fee85b58f48e583b2acf123d2a09128ee5f -size 4636684 diff --git a/warewulf.obsinfo b/warewulf.obsinfo index 39753f7..a5e2398 100644 --- a/warewulf.obsinfo +++ b/warewulf.obsinfo @@ -1,4 +1,4 @@ name: warewulf -version: 4.6.2 -mtime: 1752075635 -commit: 0cb9354364433a67b610278632cf46e3388f7045 +version: 4.6.0 +mtime: 1740959213 +commit: a98ec09b36392c372bf319b300c8163ab05de95e diff --git a/warewulf4.changes b/warewulf4.changes index e85c6a7..600ec64 100644 --- a/warewulf4.changes +++ b/warewulf4.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Thu Jul 10 07:00:04 UTC 2025 - cgoll@suse.com - -- update to 4.6.2 which contains the (preview) support for - provisioning to local disk -- incoperated from 4.6.1 - * rest api which is disabled in the default configuration -- removed following files as fixed upstream: - * fixup-pdf-build.patch - * security-fixes.patch - * udev-regression.patch -- marked slurm as recommeneded in the warewulf4-overlay-slurm - package bsc#124608 - ------------------------------------------------------------------- Fri Mar 28 09:59:27 UTC 2025 - Christian Goll diff --git a/warewulf4.spec b/warewulf4.spec index ffe0010..0a5bd9a 100644 --- a/warewulf4.spec +++ b/warewulf4.spec @@ -28,19 +28,23 @@ ExclusiveArch: x86_64 aarch64 Name: warewulf4 -Version: 4.6.2 +Version: 4.6.0 Release: 0 Summary: A suite of tools for clustering License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://warewulf.org Source0: warewulf-%{version}.tar +#Source0: https://github.com/mslacken/warewulf/archive/%{githash}.tar.gz#/warewulf-%{version}.tar.gz Source1: vendor.tar.xz Source5: warewulf4-rpmlintrc Source10: config-ww4.sh Source11: adjust_overlays.sh Source20: README.dnsmasq Source21: README.RKE2.md +Patch0: fixup-pdf-build.patch +Patch1: security-fixes.patch +Patch2: udev-regression.patch BuildRequires: %{python_module Sphinx-latex} BuildRequires: distribution-release @@ -110,7 +114,7 @@ Reference documentation for warewulf4. %package overlay-slurm Summary: Configuration template for slurm Requires: %{name} = %{version} -Recommends: slurm +Requires: slurm BuildArch: noarch Obsoletes: warewulf4-slurm <= 4.4.0 Provides: warewulf4-slurm = %version @@ -241,8 +245,6 @@ mkdir -p %{buildroot}/%{_defaultdocdir}/%{name} mv %{buildroot}/%{_sysconfdir}/warewulf/examples %{buildroot}%{_defaultdocdir}/%{name}/example-templates # fix logrotate name mv %{buildroot}/%{_sysconfdir}/logrotate.d/warewulfd.conf %{buildroot}/%{_sysconfdir}/logrotate.d/warewulf4 -# add version tag to documentation -mv ./userdocs/_build/latex/warewulfuserguide.pdf ./userdocs/_build/latex/warewulfuserguide-%{version}.pdf %pre -f %{name}.pre %service_add_pre warewulfd.service @@ -279,7 +281,6 @@ fi %config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf %config(noreplace) %{_sysconfdir}/warewulf/grub %config(noreplace) %{_sysconfdir}/warewulf/ipxe -%config(noreplace) %{_sysconfdir}/warewulf/auth.conf %config %{_sysconfdir}/logrotate.d/warewulf4 %{_defaultdocdir}/%{name}/example-templates %{_prefix}/lib/firewalld/services/warewulf.xml @@ -330,9 +331,10 @@ fi %files dracut %defattr(-, root, root) -%{_prefix}/lib/dracut/modules.d/90wwinit +%dir %{_prefix}/lib/dracut/modules.d/90wwinit +%{_prefix}/lib/dracut/modules.d/90wwinit/*.sh %files reference-doc -%doc ./userdocs/_build/latex/warewulfuserguide-%{version}.pdf +%doc ./userdocs/_build/latex/warewulfuserguide.pdf %changelog -- 2.51.1