Accepting request 1141267 from network:cluster

- make only overlay dir beeing config files - moved to git archive hash as source in order to be reproducible - removed grub-boot.patch as incorporated upstreams (forwarded request 1141266 from mslacken) OBS-URL: https://build.opensuse.org/request/show/1141267 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/warewulf4?expand=0&rev=14
2024-01-25 17:41:04 +00:00 · 2024-01-25 17:41:04 +00:00 · 884bc2592b
commit 884bc2592b
parent 898c33927a 7a696005e9
12 changed files with 531 additions and 1608 deletions
--- a/CreateMt-Targets.patch
+++ b/CreateMt-Targets.patch
--- a/Fix-for-CVE-2022-41723.patch
+++ b/Fix-for-CVE-2022-41723.patch
@ -1,370 +0,0 @@
-From bc2ccefd481066a25257a5f654f20d601491150f Mon Sep 17 00:00:00 2001
-From: Christian Goll <cgoll@suse.com>
-Date: Thu, 16 Feb 2023 11:44:09 +0100
-Subject: [PATCH] Fix for CVE-2022-41723
-
---
- go.mod | 74 +++++++++++++++++++++++++++++++++++++++++++++++++--
- go.sum | 83 ++++++----------------------------------------------------
- 2 files changed, 80 insertions(+), 77 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 6159de0..32debb2 100644
--- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,6 @@
- module github.com/hpcng/warewulf
- 
-go 1.16
-+go 1.19
- 
- require (
- 	github.com/brotherpowers/ipsubnet v0.0.0-20170914094241-30bc98f0a5b1
-@@ -20,10 +20,80 @@ require (
- 	github.com/spf13/cobra v1.1.1
- 	github.com/stretchr/testify v1.7.0
- 	github.com/talos-systems/go-smbios v0.1.1
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-+	golang.org/x/term v0.3.0
- 	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e
- 	google.golang.org/grpc v1.45.0
- 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
- 	google.golang.org/protobuf v1.27.1
- 	gopkg.in/yaml.v2 v2.4.0
- )
-+
-+require (
-+	github.com/BurntSushi/toml v0.3.1 // indirect
-+	github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect
-+	github.com/VividCortex/ewma v1.1.1 // indirect
-+	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
-+	github.com/apex/log v1.4.0 // indirect
-+	github.com/beorn7/perks v1.0.1 // indirect
-+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
-+	github.com/containerd/containerd v1.5.0-beta.4 // indirect
-+	github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect
-+	github.com/containers/ocicrypt v1.1.0 // indirect
-+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-+	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-+	github.com/davecgh/go-spew v1.1.1 // indirect
-+	github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
-+	github.com/docker/distribution v2.7.1+incompatible // indirect
-+	github.com/docker/docker v1.4.2-0.20191219165747-a9416c67da9f // indirect
-+	github.com/docker/docker-credential-helpers v0.6.3 // indirect
-+	github.com/docker/go-connections v0.4.0 // indirect
-+	github.com/docker/go-metrics v0.0.1 // indirect
-+	github.com/docker/go-units v0.4.0 // indirect
-+	github.com/ghodss/yaml v1.0.0 // indirect
-+	github.com/gogo/protobuf v1.3.2 // indirect
-+	github.com/golang/snappy v0.0.3 // indirect
-+	github.com/gorilla/mux v1.7.4 // indirect
-+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-+	github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect
-+	github.com/klauspost/compress v1.12.1 // indirect
-+	github.com/klauspost/pgzip v1.2.5 // indirect
-+	github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a // indirect
-+	github.com/mattn/go-colorable v0.1.9 // indirect
-+	github.com/mattn/go-isatty v0.0.14 // indirect
-+	github.com/mattn/go-runewidth v0.0.9 // indirect
-+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-+	github.com/miekg/pkcs11 v1.0.3 // indirect
-+	github.com/moby/sys/mountinfo v0.4.1 // indirect
-+	github.com/mtrmac/gpgme v0.1.2 // indirect
-+	github.com/opencontainers/go-digest v1.0.0 // indirect
-+	github.com/opencontainers/runc v1.0.0-rc93 // indirect
-+	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
-+	github.com/pmezard/go-difflib v1.0.0 // indirect
-+	github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9 // indirect
-+	github.com/prometheus/client_golang v1.7.1 // indirect
-+	github.com/prometheus/client_model v0.2.0 // indirect
-+	github.com/prometheus/common v0.10.0 // indirect
-+	github.com/prometheus/procfs v0.6.0 // indirect
-+	github.com/rootless-containers/proto v0.1.0 // indirect
-+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-+	github.com/sirupsen/logrus v1.8.1 // indirect
-+	github.com/spf13/pflag v1.0.5 // indirect
-+	github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
-+	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
-+	github.com/ulikunitz/xz v0.5.10 // indirect
-+	github.com/urfave/cli v1.22.4 // indirect
-+	github.com/vbatts/go-mtree v0.5.0 // indirect
-+	github.com/vbauerster/mpb/v5 v5.3.0 // indirect
-+	go.etcd.io/bbolt v1.3.5 // indirect
-+	go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
-+	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
-+	golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d //indirect
-+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
-+	golang.org/x/sys v0.3.0 // indirect
-+	golang.org/x/text v0.5.0 // indirect
-+	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
-+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
-+	sigs.k8s.io/yaml v1.3.0 // indirect
-+)
-diff --git a/go.sum b/go.sum
-index a58cfc2..49bc9a1 100644
--- a/go.sum
-+++ b/go.sum
-@@ -10,28 +10,18 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
- cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
- cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
- cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
- cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
- cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
- cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
- cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
- cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
- cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
- cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
- cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
- cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
- cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
- cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
- cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
- dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
- github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774/go.mod h1:6/0dYRLLXyJjbkIPeeGyoJ/eKOSI0eU6eTlCBYibgd0=
- github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-@@ -112,7 +102,6 @@ github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8n
- github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
- github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
- github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
- github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
- github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
- github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-@@ -337,8 +326,6 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
- github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
- github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
- github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
- github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
- github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
- github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-@@ -364,26 +351,21 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
- github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
- github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
- github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
- github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
- github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
- github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
- github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
- github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
- github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
- github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
- github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
- github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
- github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
- github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
- github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-@@ -405,7 +387,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de
- github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
- github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
- github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
- github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 h1:ESEyqQqXXFIcImj/BE8oKEX37Zsuceb2cZI+EL/zNCY=
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0/go.mod h1:XnLCLFp3tjoZJszVKjfpyAK6J8sYIcQXWQxmqLWF21I=
-@@ -755,9 +736,7 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf
- github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
- github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
- github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
- github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
-@@ -773,7 +752,6 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
- go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
- go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
- go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
- go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
- go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
- go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-@@ -845,7 +823,6 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
- golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-@@ -857,26 +834,20 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
- golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
- golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
- golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
- golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
- golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
- golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
- golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
- golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-+golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d h1:KHU/KRz6+/yWyRHEC24m7T5gou5VSh62duch955ktBY=
-+golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
- 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=
- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-@@ -936,15 +907,9 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
- golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-@@ -959,13 +924,12 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
- golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
-+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
- golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-@@ -973,8 +937,8 @@ 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=
- golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
- golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-@@ -1016,18 +980,8 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK
- golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
- golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
- golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
- golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
- golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
- golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-@@ -1044,19 +998,12 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
- google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
- google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
- google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
- google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
- google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
- google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
- google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
- google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
- google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
- google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk=
- google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
- google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-@@ -1077,19 +1024,9 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx
- google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
- google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
- google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
- google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
- google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
- google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
- google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
- google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e h1:fNKDNuUyC4WH+inqDMpfXDdfvwfYILbsX+oskGZ8hxg=
- google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-@@ -1105,10 +1042,7 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
- google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
- google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
- google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
- google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
- google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
- google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
- google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-@@ -1175,7 +1109,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
- honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
- honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
- honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
- k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
- k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
- k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
-- 
-2.39.1
-
--- a/README.dnsmasq
+++ b/README.dnsmasq
@ -0,0 +1,52 @@
+Replace dhcpd and tftp with dnsmasq
+===================================
+
+The isc `dhcpd` server and `tftp` service can be replaced by `dnsmasq` as 
+singe service, which has also the benefit that dns entries for the 
+wwarewulf cluster will then also be provided.
+
+Installation
+-----------
+
+Before the installation, make sure that `dhcpd` and `tftp` are disabled.
+You can do that with the commands:
+```
+systemctl disable dhcpd
+systemctl stop dhcpd
+systemctl disable tftp
+systemctl stop tftp
+```
+
+Now you can install `dnsmasq` with command 
+```
+zypper install dnsmasq
+```
+
+After the installation you have to instruct `warewulf` to use  `dnsmasq` as
+`dhcpd` and `tftp` service, `dnsmasq` has to be specified in the configuration
+file `/etc/warewulf/warewulf.conf`. There you have to change the two following 
+values:
+```
+tftp:
+  systemd name: dnsmasq
+dhcp:
+  systemd name: dnsmasq
+```
+
+The configuration of `dnsmasq` doesn't need to be changed, as the default configuration
+includes all files with following pattern `/etc/dnsmasq.d/*conf` into its configuration.
+This configuration is created by the template `overlays/host/etc/dnsmasq.d/ww4-hosts.conf.ww`.
+In order to build this template run
+```
+wwctl overlay build -H
+```
+After that the `dnsmasq` service has to be enabled with either
+```
+systemctl enable --now dnsmasq
+```
+or by (re)configuring warewulf with 
+```
+wwctl configure dhcp
+wwctl configure tftp
+```
+
--- a/clean-warewulf-conf.patch
+++ b/clean-warewulf-conf.patch
@ -0,0 +1,238 @@
+diff --git a/Makefile b/Makefile
+index e85ac05b..466faf19 100644
+--- a/Makefile
+++ b/Makefile
+@@ -106,7 +106,8 @@ install: build docs
+ 	install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR)
+ 	install -d -m 0755 $(DESTDIR)$(IPXESOURCE)
+ 	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf
+-	test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || install -m 0644 etc/warewulf.conf $(DESTDIR)$(WWCONFIGDIR)
+	# wwctl genconfig to get the compiled in paths to warewulf.conf
+	test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || ./wwctl --warewulfconf etc/warewulf.conf genconfig warewulfconf print> $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf
+ 	test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 0644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR)
+ 	test -f $(DESTDIR)$(WWCONFIGDIR)/wwapic.conf || install -m 0644 etc/wwapic.conf $(DESTDIR)$(WWCONFIGDIR)
+ 	test -f $(DESTDIR)$(WWCONFIGDIR)/wwapid.conf || install -m 0644 etc/wwapid.conf $(DESTDIR)$(WWCONFIGDIR)
+diff --git a/internal/pkg/config/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in
+index 125f192f..6f761cc1 100644
+--- a/internal/pkg/config/buildconfig.go.in
+++ b/internal/pkg/config/buildconfig.go.in
+@@ -5,17 +5,44 @@ var ConfigFile = "@SYSCONFDIR@/warewulf/warewulf.conf"
+ type BuildConfig struct {
+ 	Bindir         string `default:"@BINDIR@"`
+ 	Sysconfdir     string `default:"@SYSCONFDIR@"`
+-	Datadir        string `default:"@DATADIR@"`
+ 	Localstatedir  string `default:"@LOCALSTATEDIR@"`
+ 	Ipxesource     string `default:"@IPXESOURCE@"`
+ 	Srvdir         string `default:"@SRVDIR@"`
+-	Tftpdir        string `default:"@TFTPDIR@"`
+ 	Firewallddir   string `default:"@FIREWALLDDIR@"`
+ 	Systemddir     string `default:"@SYSTEMDDIR@"`
+ 	WWOverlaydir   string `default:"@WWOVERLAYDIR@"`
+ 	WWChrootdir    string `default:"@WWCHROOTDIR@"`
+ 	WWProvisiondir string `default:"@WWPROVISIONDIR@"`
+-	Version        string `default:"@VERSION@"`
+-	Release        string `default:"@RELEASE@"`
+ 	WWClientdir    string `default:"@WWCLIENTDIR@"`
+	version        string `default:"@VERSION@"`
+	release        string `default:"@RELEASE@"`
+}
+
+func (conf BuildConfig) Version() string {
+	return conf.version
+}
+
+func (conf BuildConfig) Release() string {
+	return conf.release
+}
+
+type TFTPConf struct {
+	Enabled     bool   `yaml:"enabled" default:"true"`
+	TftpRoot    string `yaml:"tftproot" default:"@TFTPDIR@"`
+	SystemdName string `yaml:"systemd name" default:"tftp"`
+
+	IpxeBinaries map[string]string `yaml:"ipxe" default:"{\"00:09\": \"ipxe-snponly-x86_64.efi\",\"00:00\": \"undionly.kpxe\",\"00:0B\": \"arm64-efi/snponly.efi\",\"00:07\":  \"ipxe-snponly-x86_64.efi\"}"`
+}
+
+// WarewulfConf adds additional Warewulf-specific configuration to
+// BaseConf.
+type WarewulfConf struct {
+	Port              int    `yaml:"port" default:"9983"`
+	Secure            bool   `yaml:"secure" default:"true"`
+	UpdateInterval    int    `yaml:"update interval" default:"60"`
+	AutobuildOverlays bool   `yaml:"autobuild overlays" default:"true"`
+	EnableHostOverlay bool   `yaml:"host overlay" default:"true"`
+	Syslog            bool   `yaml:"syslog" default:"false"`
+	DataStore         string `yaml:"datastore" default:"@DATADIR@"`
+	GrubBoot          bool   `yaml:"grubboot" default:"false"`
+ }
+diff --git a/internal/pkg/config/mounts.go b/internal/pkg/config/mounts.go
+index daf38c0a..2eb5060b 100644
+--- a/internal/pkg/config/mounts.go
+++ b/internal/pkg/config/mounts.go
+@@ -3,8 +3,8 @@ package config
+ // A MountEntry represents a bind mount that is applied to a container
+ // during exec and shell.
+ type MountEntry struct {
+-	Source   string `yaml:"source" default:"/etc/resolv.conf"`
+-	Dest     string `yaml:"dest,omitempty" default:"/etc/resolv.conf"`
+-	ReadOnly bool   `yaml:"readonly,omitempty" default:"false"`
+	Source   string `yaml:"source"`
+	Dest     string `yaml:"dest,omitempty"`
+	ReadOnly bool   `yaml:"readonly,omitempty"`
+ 	Options  string `yaml:"options,omitempty"` // ignored at the moment
+ }
+diff --git a/internal/pkg/config/root_test.go b/internal/pkg/config/root_test.go
+index f8c9a697..d57d1557 100644
+--- a/internal/pkg/config/root_test.go
+++ b/internal/pkg/config/root_test.go
+@@ -43,10 +43,9 @@ func TestDefaultRootConf(t *testing.T) {
+ 
+ 	assert.NotEmpty(t, conf.Paths.Bindir)
+ 	assert.NotEmpty(t, conf.Paths.Sysconfdir)
+-	assert.NotEmpty(t, conf.Paths.Datadir)
+	assert.NotEmpty(t, conf.Warewulf.DataStore)
+ 	assert.NotEmpty(t, conf.Paths.Localstatedir)
+ 	assert.NotEmpty(t, conf.Paths.Srvdir)
+-	assert.NotEmpty(t, conf.Paths.Tftpdir)
+ 	assert.NotEmpty(t, conf.Paths.Firewallddir)
+ 	assert.NotEmpty(t, conf.Paths.Systemddir)
+ 	assert.NotEmpty(t, conf.Paths.WWOverlaydir)
+diff --git a/internal/pkg/config/tftp.go b/internal/pkg/config/tftp.go
+deleted file mode 100644
+index cd5260df..00000000
+--- a/internal/pkg/config/tftp.go
+++ /dev/null
+@@ -1,11 +0,0 @@
+-package config
+-
+-// TFTPConf represents that configuration for the TFTP service that
+-// Warewulf will configure.
+-type TFTPConf struct {
+-	Enabled     bool   `yaml:"enabled" default:"true"`
+-	TftpRoot    string `yaml:"tftproot" default:"/var/lib/tftpboot"`
+-	SystemdName string `yaml:"systemd name" default:"tftp"`
+-
+-	IpxeBinaries map[string]string `yaml:"ipxe" default:"{\"00:09\": \"ipxe-snponly-x86_64.efi\",\"00:00\": \"undionly.kpxe\",\"00:0B\": \"arm64-efi/snponly.efi\",\"00:07\":  \"ipxe-snponly-x86_64.efi\"}"`
+-}
+diff --git a/internal/pkg/config/warewulf.go b/internal/pkg/config/warewulf.go
+deleted file mode 100644
+index 9a0dc3f4..00000000
+--- a/internal/pkg/config/warewulf.go
+++ /dev/null
+@@ -1,14 +0,0 @@
+-package config
+-
+-// WarewulfConf adds additional Warewulf-specific configuration to
+-// BaseConf.
+-type WarewulfConf struct {
+-	Port              int    `yaml:"port" default:"9983"`
+-	Secure            bool   `yaml:"secure" default:"true"`
+-	UpdateInterval    int    `yaml:"update interval" default:"60"`
+-	AutobuildOverlays bool   `yaml:"autobuild overlays" default:"true"`
+-	EnableHostOverlay bool   `yaml:"host overlay" default:"true"`
+-	Syslog            bool   `yaml:"syslog" default:"false"`
+-	DataStore         string `yaml:"datastore" default:"/var/lib/warewulf"`
+-	GrubBoot          bool   `yaml:"grubboot" default:"false"`
+-}
+diff --git a/internal/pkg/configure/tftp.go b/internal/pkg/configure/tftp.go
+index 058ca059..ab71429d 100644
+--- a/internal/pkg/configure/tftp.go
+++ b/internal/pkg/configure/tftp.go
+@@ -12,7 +12,7 @@ import (
+ 
+ func TFTP() error {
+ 	controller := warewulfconf.Get()
+-	var tftpdir string = path.Join(controller.Paths.Tftpdir, "warewulf")
+	var tftpdir string = path.Join(controller.TFTP.TftpRoot, "warewulf")
+ 
+ 	err := os.MkdirAll(tftpdir, 0755)
+ 	if err != nil {
+diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go
+index 857f93cf..1ddf9274 100644
+--- a/internal/pkg/node/constructors.go
+++ b/internal/pkg/node/constructors.go
+@@ -49,7 +49,7 @@ func New() (NodeYaml, error) {
+ 		ConfigFile = path.Join(conf.Paths.Sysconfdir, "warewulf/nodes.conf")
+ 	}
+ 	if DefaultConfig == "" {
+-		DefaultConfig = path.Join(conf.Paths.Datadir, "warewulf/defaults.conf")
+		DefaultConfig = path.Join(conf.Warewulf.DataStore, "warewulf/defaults.conf")
+ 	}
+ 	wwlog.Verbose("Opening node configuration file: %s", ConfigFile)
+ 	data, err := os.ReadFile(ConfigFile)
+diff --git a/internal/pkg/testenv/testenv.go b/internal/pkg/testenv/testenv.go
+index 7303d326..6ddbeeca 100644
+--- a/internal/pkg/testenv/testenv.go
+++ b/internal/pkg/testenv/testenv.go
+@@ -68,10 +68,10 @@ func New(t *testing.T) (env *TestEnv) {
+ 
+ 	conf.Paths.Sysconfdir = env.GetPath(Sysconfdir)
+ 	conf.Paths.Bindir = env.GetPath(Bindir)
+-	conf.Paths.Datadir = env.GetPath(Datadir)
+	conf.Warewulf.DataStore = env.GetPath(Datadir)
+ 	conf.Paths.Localstatedir = env.GetPath(Localstatedir)
+ 	conf.Paths.Srvdir = env.GetPath(Srvdir)
+-	conf.Paths.Tftpdir = env.GetPath(Tftpdir)
+	conf.TFTP.TftpRoot = env.GetPath(Tftpdir)
+ 	conf.Paths.Firewallddir = env.GetPath(Firewallddir)
+ 	conf.Paths.Systemddir = env.GetPath(Systemddir)
+ 	conf.Paths.WWOverlaydir = env.GetPath(WWOverlaydir)
+@@ -82,10 +82,10 @@ func New(t *testing.T) (env *TestEnv) {
+ 	for _, confPath := range []string{
+ 		conf.Paths.Sysconfdir,
+ 		conf.Paths.Bindir,
+-		conf.Paths.Datadir,
+		conf.Warewulf.DataStore,
+ 		conf.Paths.Localstatedir,
+ 		conf.Paths.Srvdir,
+-		conf.Paths.Tftpdir,
+		conf.TFTP.TftpRoot,
+ 		conf.Paths.Firewallddir,
+ 		conf.Paths.Systemddir,
+ 		conf.Paths.WWOverlaydir,
+diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go
+index d4b5fb85..6231e4fc 100644
+--- a/internal/pkg/version/version.go
+++ b/internal/pkg/version/version.go
+@@ -12,7 +12,7 @@ Return the version of wwctl
+ */
+ func GetVersion() string {
+ 	conf := warewulfconf.Get()
+-	return fmt.Sprintf("%s-%s", conf.Paths.Version, conf.Paths.Release)
+	return fmt.Sprintf("%s-%s", conf.Paths.Version(), conf.Paths.Release())
+ }
+ 
+ /*
+diff --git a/internal/pkg/warewulfd/copyshim.go b/internal/pkg/warewulfd/copyshim.go
+index 44ea45f4..0b295175 100644
+--- a/internal/pkg/warewulfd/copyshim.go
+++ b/internal/pkg/warewulfd/copyshim.go
+@@ -24,22 +24,22 @@ func CopyShimGrub() (err error) {
+ 	if shimPath == "" {
+ 		return fmt.Errorf("no shim found on the host os")
+ 	}
+-	err = util.CopyFile(shimPath, path.Join(conf.Paths.Tftpdir, "warewulf", "shim.efi"))
+	err = util.CopyFile(shimPath, path.Join(conf.TFTP.TftpRoot, "warewulf", "shim.efi"))
+ 	if err != nil {
+ 		return err
+ 	}
+-	_ = os.Chmod(path.Join(conf.Paths.Tftpdir, "warewulf", "shim.efi"), 0o755)
+	_ = os.Chmod(path.Join(conf.TFTP.TftpRoot, "warewulf", "shim.efi"), 0o755)
+ 	grubPath := container.GrubFind("")
+ 	if grubPath == "" {
+ 		return fmt.Errorf("no grub found on host os")
+ 	}
+-	err = util.CopyFile(grubPath, path.Join(conf.Paths.Tftpdir, "warewulf", "grub.efi"))
+	err = util.CopyFile(grubPath, path.Join(conf.TFTP.TftpRoot, "warewulf", "grub.efi"))
+ 	if err != nil {
+ 		return err
+ 	}
+-	_ = os.Chmod(path.Join(conf.Paths.Tftpdir, "warewulf", "grub.efi"), 0o755)
+-	err = util.CopyFile(grubPath, path.Join(conf.Paths.Tftpdir, "warewulf", "grubx64.efi"))
+-	_ = os.Chmod(path.Join(conf.Paths.Tftpdir, "warewulf", "grubx64.efi"), 0o755)
+	_ = os.Chmod(path.Join(conf.TFTP.TftpRoot, "warewulf", "grub.efi"), 0o755)
+	err = util.CopyFile(grubPath, path.Join(conf.TFTP.TftpRoot, "warewulf", "grubx64.efi"))
+	_ = os.Chmod(path.Join(conf.TFTP.TftpRoot, "warewulf", "grubx64.efi"), 0o755)
+ 
+ 	return
+ }
--- a/config-ww4.sh
+++ b/config-ww4.sh
@ -27,6 +27,21 @@ network_address() {

    echo $( IFS=.; echo "${octets[*]}" )
 }
+# Check if last Octed is in range
+function is_ip_in_range() {
+  # split the ip addresses into their octets.
+  local ip_start_octets=($(echo $DYNSTART | tr "." " "))
+  local ip_end_octets=($(echo $DYNEND | tr "." " "))
+  local ip_address_octets=($(echo $1 | tr "." " "))
+
+  # compare the octets one at a time to see if the ip address is within the range.
+    if [[ ${ip_address_octets[3]} -lt ${ip_start_octets[3]} || ${ip_address_octets[3]} -gt ${ip_end_octets[3]} ]]; then
+      return 1
+    fi 
+  # if we reach this point, the ip address is in the range.
+  return 0
+}
+
 echo "-- WW4 CONFIGURAION $* --"

 # Make sure that a ip address was defined for out network so that 
@ -39,13 +54,21 @@ IP4NET=$(network_address "$IP4/$IP4PREFIX")

 if [ "$IP4PREFIX" -gt 25 ] ; then
  echo "ERROR: warewulf does at least a /25 network for dynamic addresses"
-  exit 1
+  cat << EOF
+ipaddr: $IP4
+netmask: $IP4MASK
+network: $IP4NET
+  range start: $DYNSTART
+  range end: $DYNEND
+EOF
+  exit 0
 fi

 DYNSIZE=20
 DYNSTART=${IP4#*.*.*.}
+DYNSTART=$(( $DYNSTART + 2))
 DYNPRE=${IP4%.*}
-DYNEND=$(( $DYNSTART + $DYNSIZE ))
+DYNEND=$(( $DYNSTART + $DYNSIZE + 1 ))
 if [ $DYNEND -gt 254 ] ; then
  DYNEND=$(( $IPNET + 2 + $DYNSIZE ))
  DYNSTART=$(( $IPNET + 2 ))
@ -53,6 +76,11 @@ fi
 DYNSTART="${DYNPRE}.${DYNSTART}"
 DYNEND="${DYNPRE}.${DYNEND}"

+if is_ip_in_range $IP4 ; then
+   echo "ERROR: ip address is in range for dynamic address, please set this manually"
+   exit 0
+fi
+

 if [ -e $WW4CONF ] ; then
  test -n $IP4 && sed -i 's/^ipaddr:.*/ipaddr: '$IP4'/' $WW4CONF
--- a/dnsmasq-template-move.patch
+++ b/dnsmasq-template-move.patch
@ -0,0 +1,53 @@
+diff --git a/overlays/host/dnsmasq.d/ww4-hosts.conf.ww b/overlays/host/etc/dnsmasq.d/ww4-hosts.conf.ww
+similarity index 57%
+rename from overlays/host/dnsmasq.d/ww4-hosts.conf.ww
+rename to overlays/host/etc/dnsmasq.d/ww4-hosts.conf.ww
+index a9d6d66f..951a1596 100644
+--- a/overlays/host/dnsmasq.d/ww4-hosts.conf.ww
+++ b/overlays/host/etc/dnsmasq.d/ww4-hosts.conf.ww
+@@ -4,14 +4,30 @@
+ # Source  {{.BuildSource}}
+ {{ nobackup }}
+ # select the x86 hosts which will get the iXPE binary
+dhcp-match=set:bios,option:client-arch,0   #legacy boot
+ dhcp-match=set:x86PC,option:client-arch, 7 #EFI x86-64
+ dhcp-match=set:x86PC,option:client-arch, 6 #EFI x86-64
+ dhcp-match=set:x86PC,option:client-arch, 9 #EFI x86-64
+-{{ with (index $.Tftp.IpxeBinaries "00:07" ) }}dhcp-boot=tag:x86PC,"/warewulf/{{ index $.Tftp.IpxeBinaries "00:07"  }}"{{ end }}
+-dhcp-no-override
+-# iPXE binary will get the following configuration file
+dhcp-match=set:aarch64,option:client-arch, 11 #EFI aarch64
+dhcp-match=set:iPXE,77,"iPXE"
+ dhcp-userclass=set:iPXE,iPXE
+dhcp-vendorclass=set:efi-http,HTTPClient:Arch:00016
+dhcp-option-force=tag:efi-http,60,HTTPClient
+# for http boot always use shim/grub
+dhcp-boot=tag:efi-http,"http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/efiboot/shim.efi"
+# iPXE binary will get the following configuration file
+ dhcp-boot=tag:iPXE,"http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/ipxe/${mac:hexhyp}"
+{{- if $.Warewulf.GrubBoot }}
+dhcp-boot=tag:x86PC,"warewulf/shim.efi"
+{{- else }}
+{{- with (index $.Tftp.IpxeBinaries "00:07" ) }}
+dhcp-boot=tag:x86PC,"/warewulf/{{ index $.Tftp.IpxeBinaries "00:07" }}"
+{{- end }}
+{{- with (index $.Tftp.IpxeBinaries "00:0B" ) }}
+dhcp-boot=tag:aarch64,"/warewulf/{{ index $.Tftp.IpxeBinaries "00:0B" }}"
+{{- end }}
+{{- end }}
+dhcp-no-override
+ {{- if $.Tftp.Enabled }}
+ # also act as tftp server
+ tftp-root={{ $.Tftp.TftpRoot }}
+@@ -24,7 +40,7 @@ dhcp-range={{$.Dhcp.RangeStart}},{{$.Dhcp.RangeEnd}},{{$.Netmask}},6h
+ {{- if $netdev.Ipaddr.Defined}}                {{/* if we have an ip address on this network device */}}
+ {{- if $netdev.Hwaddr.Defined }}
+ dhcp-host={{$netdev.Hwaddr.Get}},set:warewulf,{{$node.Id.Get}},{{$netdev.Ipaddr.Get}},infinite
+-{{- end}} {{/* end if Hwaddr */}}
+-{{- end}} {{/* end if ip */}}
+-{{- end}} {{/* end for each network device */}}
+-{{- end}} {{/* end for each node */}}
+{{- end}}{{/* end if Hwaddr */}}
+{{- end}}{{/* end if ip */}}
+{{- end}}{{/* end for each network device */}}
+{{- end}}{{/* end for each node */}}
--- a/make-ipxe-binary-source-configureable.patch
+++ b/make-ipxe-binary-source-configureable.patch
@ -1,163 +0,0 @@
-From 32ab50f299502fce7bf588852a75c63cf3332cf8 Mon Sep 17 00:00:00 2001
-From: Christian Goll <cgoll@suse.de>
-Date: Fri, 20 Jan 2023 15:05:42 +0100
-Subject: [PATCH] make ipxe binary source configureable
-
---
- internal/pkg/buildconfig/defaults.go       |  2 +-
- internal/pkg/configure/tftp.go             | 17 ++++++++++-------
- internal/pkg/overlay/datastructure.go      |  2 ++
- internal/pkg/warewulfconf/constructors.go  | 12 ++++++++++--
- internal/pkg/warewulfconf/datastructure.go |  2 ++
- overlays/host/etc/dhcp/dhcpd.conf.ww       | 14 +++++---------
- 6 files changed, 30 insertions(+), 19 deletions(-)
-
-diff --git a/internal/pkg/buildconfig/defaults.go b/internal/pkg/buildconfig/defaults.go
-index 24cb2d40..17baecba 100644
--- a/internal/pkg/buildconfig/defaults.go
-+++ b/internal/pkg/buildconfig/defaults.go
-@@ -27,7 +27,7 @@ func BINDIR() string {
- }
- 
- func DATADIR() string {
-	wwlog.Debug("DATADIR = '%s'", bindir)
-+	wwlog.Debug("DATADIR = '%s'", datadir)
- 	return datadir
- }
- 
-diff --git a/internal/pkg/configure/tftp.go b/internal/pkg/configure/tftp.go
-index d321f023..842d7fb4 100644
--- a/internal/pkg/configure/tftp.go
-+++ b/internal/pkg/configure/tftp.go
-@@ -11,9 +11,8 @@ import (
- 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
- )
- 
-var tftpdir string = path.Join(buildconfig.TFTPDIR(), "warewulf")
-
- func TFTP() error {
-+	var tftpdir string = path.Join(buildconfig.TFTPDIR(), "warewulf")
- 	controller, err := warewulfconf.New()
- 	if err != nil {
- 		wwlog.Error("%s", err)
-@@ -27,11 +26,15 @@ func TFTP() error {
- 	}
- 
- 	fmt.Printf("Writing PXE files to: %s\n", tftpdir)
-	for _, f := range [4]string{"x86_64.efi", "x86_64.kpxe", "arm64.efi"} {
-		err = util.SafeCopyFile(path.Join(buildconfig.DATADIR(), "warewulf", "ipxe", f), path.Join(tftpdir, f))
-+	copyCheck := make(map[string]bool)
-+	for _, f := range controller.Tftp.IpxeBinaries {
-+		if copyCheck[f] {
-+			continue
-+		}
-+		copyCheck[f] = true
-+		err = util.SafeCopyFile(path.Join(buildconfig.DATADIR(), f), path.Join(tftpdir, f))
- 		if err != nil {
-			wwlog.Error("%s", err)
-			return err
-+			wwlog.Warn("ipxe binary could not be copied, not booting may not work: %s", err)
- 		}
- 	}
- 
-@@ -39,7 +42,7 @@ func TFTP() error {
- 		wwlog.Info("Warewulf does not auto start TFTP services due to disable by warewulf.conf")
- 		os.Exit(0)
- 	}
-	
-+
- 	fmt.Printf("Enabling and restarting the TFTP services\n")
- 	err = util.SystemdStart(controller.Tftp.SystemdName)
- 	if err != nil {
-diff --git a/internal/pkg/overlay/datastructure.go b/internal/pkg/overlay/datastructure.go
-index 2a427bee..eb8004cf 100644
--- a/internal/pkg/overlay/datastructure.go
-+++ b/internal/pkg/overlay/datastructure.go
-@@ -31,6 +31,7 @@ type TemplateStruct struct {
- 	Dhcp          warewulfconf.DhcpConf
- 	Nfs           warewulfconf.NfsConf
- 	Warewulf      warewulfconf.WarewulfConf
-+	Tftp          warewulfconf.TftpConf
- 	AllNodes      []node.NodeInfo
- 	node.NodeConf
- 	// backward compatiblity
-@@ -64,6 +65,7 @@ func InitStruct(nodeInfo node.NodeInfo) TemplateStruct {
- 	tstruct.AllNodes = allNodes
- 	tstruct.Nfs = *controller.Nfs
- 	tstruct.Dhcp = *controller.Dhcp
-+	tstruct.Tftp = *controller.Tftp
- 	tstruct.Warewulf = *controller.Warewulf
- 	tstruct.Ipaddr = controller.Ipaddr
- 	tstruct.Ipaddr6 = controller.Ipaddr6
-diff --git a/internal/pkg/warewulfconf/constructors.go b/internal/pkg/warewulfconf/constructors.go
-index 1d68564a..904d0d31 100644
--- a/internal/pkg/warewulfconf/constructors.go
-+++ b/internal/pkg/warewulfconf/constructors.go
-@@ -36,8 +36,14 @@ func New() (ControllerConf, error) {
- 	ret.Tftp = &tftpconf
- 	ret.Nfs = &nfsConf
- 	err := defaults.Set(&ret)
-+	// ipxe binaries are merged not overwritten, store defaults separate
-+	defIpxe := make(map[string]string)
-+	for k, v := range ret.Tftp.IpxeBinaries {
-+		defIpxe[k] = v
-+		delete(ret.Tftp.IpxeBinaries, k)
-+	}
- 	if err != nil {
-		wwlog.Error("Coult initialize default variables")
-+		wwlog.Error("Could initialize default variables")
- 		return ret, err
- 	}
- 	// Check if cached config is old before re-reading config file
-@@ -53,7 +59,9 @@ func New() (ControllerConf, error) {
- 		if err != nil {
- 			return ret, err
- 		}
-
-+		if len(ret.Tftp.IpxeBinaries) == 0 {
-+			ret.Tftp.IpxeBinaries = defIpxe
-+		}
- 		if ret.Ipaddr == "" || ret.Netmask == "" {
- 			conn, error := net.Dial("udp", "8.8.8.8:80")
- 			if error != nil {
-diff --git a/internal/pkg/warewulfconf/datastructure.go b/internal/pkg/warewulfconf/datastructure.go
-index c3eebf8c..eb195a2e 100644
--- a/internal/pkg/warewulfconf/datastructure.go
-+++ b/internal/pkg/warewulfconf/datastructure.go
-@@ -44,6 +44,8 @@ type TftpConf struct {
- 	Enabled     bool   `yaml:"enabled" default:"true"`
- 	TftpRoot    string `yaml:"tftproot" default:"/var/lib/tftpboot"`
- 	SystemdName string `yaml:"systemd name" default:"tftp"`
-+	// Path is relative to buildconfig.DATADIR()
-+	IpxeBinaries map[string]string `yaml:"ipxe" default:"{\"00:09\": \"x86_64.efi\",\"00:00\": \"x86_64.kpxe\",\"00:0B\": \"arm64.efi\",\"00:07\":  \"x86_64.efi\"}"`
- }
- 
- type NfsConf struct {
-diff --git a/overlays/host/etc/dhcp/dhcpd.conf.ww b/overlays/host/etc/dhcp/dhcpd.conf.ww
-index 82b96cec..66b9d22e 100644
--- a/overlays/host/etc/dhcp/dhcpd.conf.ww
-+++ b/overlays/host/etc/dhcp/dhcpd.conf.ww
-@@ -20,15 +20,11 @@ option architecture-type   code 93  = unsigned integer 16;
- if exists user-class and option user-class = "iPXE" {
-     filename "http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/ipxe/${mac:hexhyp}";
- } else {
-    if option architecture-type = 00:0B {
-        filename "/warewulf/arm64.efi";
-    } elsif option architecture-type = 00:09 {
-        filename "/warewulf/x86_64.efi";
-    } elsif option architecture-type = 00:07 {
-        filename "/warewulf/x86_64.efi";
-    } elsif option architecture-type = 00:00 {
-        filename "/warewulf/x86_64.kpxe";
-    }
-+{{range $type,$name := $.Tftp.IpxeBinaries }}
-+    if option architecture-type = {{ $type }} {
-+        filename "/warewulf/{{ $name }}";
-+    } 
-+{{ end }}
- }
- 
- {{if eq .Dhcp.Template "static" -}}
-- 
-2.39.0
-
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fce8aa6a5c92d1ca8f334a35686e206a6567c1022dc037666366e273fb57dd5c
-size 5488991
+oid sha256:482f13f9cd5bb0193aed6380022341d7ebd35dc6fbe2152cc804b010cf405069
+size 5800023
--- a/warewulf4-v4.4.0.tar.gz
+++ b/warewulf4-v4.4.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1cfe0dddcafdc7ea0fa36b2fcd0105962b8d0bd62870641b7c35efb938aed489
-size 1479705
--- a/warewulf4-v4.5.0~rc0.tar.gz
+++ b/warewulf4-v4.5.0~rc0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b13cd5bcb740391cbb21420ebe54acbd2e0aad627d896d9887018bc3118e7d0
+size 10978414
--- a/warewulf4.changes
+++ b/warewulf4.changes
@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Wed Jan 24 14:31:17 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- make only overlay dir beeing config files
+
+-------------------------------------------------------------------
+Fri Jan 19 13:45:18 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- moved to git archive hash as source in order to be reproducible
+- added vendor.tar.gz as git hash source doesn't have vendoring 
+- removed grub-boot.patch as incorporated upstreams
+
+-------------------------------------------------------------------
+Wed Jan 17 11:16:59 UTC 2024 - Christian Goll <cgoll@suse.com>
+
+- added documentation for replacing dhcpd and tftp with dnsmasq
+  as README.dnsmasq (jira#HPC-65)
+- added following patches:
+  * clean-warewulf-conf.patch
+  * dnsmasq-template-move.patch
+
+-------------------------------------------------------------------
+Thu Dec 21 14:48:08 UTC 2023 - Christian Goll <cgoll@suse.com>
+
+- updated to v4.5.0rc0 pre release with following new features:
+  * disks, partitions and file systems can set in the configration
+    and if ignition is present in the container, changes to the disks will be
+    made
+  * grub can be used as alternative boot method instead of iPXE. The
+    grub binairy is extracted from the container and shim is executed before
+    the grub. This enables secure boot
+  * wwctl has now the genconfig subcommand which will print/create
+    valid configurations
+  * all paths e.g the overlay dir, can now be configured in warewulf.conf
+- notable bug fixes are:
+  * Fixed a bug where profile tags were erroneously overridden by empty node
+    values.
+  * Fixed bug where tags from profiles weren't rendered
+- added grub-boot.patch which includes the not merged grub support
+- removed make-ipxe-binary-source-configureable.patch
+  CreateMt-Targets.patch,
+  Fix-for-CVE-2022-41723.patch as incoperated upstream
+
+
+-------------------------------------------------------------------
+Thu Oct 12 07:43:32 UTC 2023 - Christian Goll <cgoll@suse.com>
+
+- check if automatic configured ip range doesn'y contain ip address
+  of ww4 host (bsc#1215583)
+	
+
 -------------------------------------------------------------------
 Thu Sep 21 09:23:31 UTC 2023 - Christian Goll <cgoll@suse.com>

--- a/warewulf4.spec
+++ b/warewulf4.spec
@ -1,7 +1,7 @@
 #
 # spec file for package warewulf4
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,27 @@
 #


-#%%define rls_cndt rc3
+%define rls_cndt rc0
+%global tftpdir /srv/tftpboot
+%global srvdir %{_sharedstatedir}
+%global githash 5b0de8ea5397ca42584335517fd4959d7ffe3da5

 ExclusiveArch:  x86_64 aarch64

 Name:           warewulf4
-Version:        4.4.0
+Version:        4.5.0~%{?rls_cndt}
 Release:        0
 Summary:        A suite of tools for clustering
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 URL:            https://warewulf.org
-Source0:        https://github.com/hpcng/warewulf/archive/v%{version}%{?rls_cndt}.tar.gz#/warewulf4-v%{version}.tar.gz
+Source0:        https://github.com/hpcng/warewulf/archive/%{githash}.tar.gz#/warewulf4-v%{version}.tar.gz
 Source1:        vendor.tar.gz
-Source3:        warewulf4-rpmlintrc
+Source5:        warewulf4-rpmlintrc
 Source10:       config-ww4.sh
-Patch1:         make-ipxe-binary-source-configureable.patch
-Patch2:         CreateMt-Targets.patch
-Patch10:        Fix-for-CVE-2022-41723.patch
+Source20:       README.dnsmasq
+Patch12:        clean-warewulf-conf.patch
+Patch15:        dnsmasq-template-move.patch

 # no firewalld in sle12
 %if 0%{?sle_version} >= 150000 || 0%{?suse_version} > 1500
@ -41,14 +44,15 @@ BuildRequires:  firewalld
 %endif
 BuildRequires:  distribution-release
 BuildRequires:  dracut
-BuildRequires:  go >= 1.15
+BuildRequires:  go >= 1.20
 BuildRequires:  golang-packaging
-BuildRequires:  libgpgme-devel
+BuildRequires:  libgpg-error-devel
 BuildRequires:  make
 BuildRequires:  munge
 BuildRequires:  sysuser-tools
 BuildRequires:  tftp
 BuildRequires:  yq
+BuildRequires:  pkgconfig(gpgme)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %sysusers_requires
 Requires:       %{name}-overlay = %{version}
@ -56,6 +60,7 @@ Requires:       dhcp-server
 Requires:       ipxe-bootimgs
 Requires:       pigz
 Requires:       tftp
+Recommends:     bash-completion
 Recommends:     ipmitool
 Recommends:     nfs-kernel-server

@ -79,10 +84,19 @@ Includes the default overlays so that they can be updated seprately.

 %package api
 Requires:       %{name}
-Summary:        Contains the service for the warewulf rest API
+Summary:        Contains the services for the warewulf rest API
+Conflicts:      warewulf-provision-x86_64-initramfs

 %description api
-Containts the binaries for the access of warewulf through a rest API and from the commandline from an external host.
+Contains the binaries for the access of warewulf through a rest API and from
+the commandline from an external host.
+
+%package doc
+Requires:       %{name}
+Summary:        Contains the documentation for warewulf
+
+%description doc
+Documention and man pages for warewulf.

 %package slurm
 Summary:        Configuration template for slurm
@ -94,51 +108,70 @@ This package install the necessary configuration files in order to run a slurm
 cluster on the configured warewulf nodes.

 %prep
-%setup -q -n warewulf-%{version}%{?rls_cndt}
-# extract the vendor stuff
-tar xzf %{S:1}
+%setup -q -n warewulf-%{githash}
 %autopatch -p1
+tar xzf %{S:1}

 %build
-%global tftpdir /srv/tftpboot
-make %{?_smp_mflags} genconfig \
+export OFFLINE_BUILD=1
+export IPXESOURCE=%{_datadir}/ipxe
+export GOFLAGS="-buildmode=pie"
+make defaults \
    PREFIX=%{_prefix} \
    BINDIR=%{_bindir} \
    SYSCONFDIR=%{_sysconfdir} \
-    DATADIR=%{_datadir}/ipxe \
-    LOCALSTATEDIR=%{_datadir} \
+    DATADIR=%{_datadir} \
+    LOCALSTATEDIR=%{_sharedstatedir} \
    SHAREDSTATEDIR=%{_sharedstatedir} \
    MANDIR=%{_mandir} \
    INFODIR=%{_infodir} \
    DOCDIR=%{_docdir} \
-    SRVDIR=%{_sharedstatedir} \
+    SRVDIR=%{srvdir} \
    TFTPDIR=%{tftpdir} \
    SYSTEMDDIR=%{_unitdir} \
-    BASHCOMPDIR=%{_datadir}/bash-completion/completions/ \
+    BASHCOMPDIR=/etc/bash_completion.d/ \
+    FIREWALLDDIR=/usr/lib/firewalld/services \
+    WWCLIENTDIR=/warewulf
+make %{?_smp_mflags} build \
+    PREFIX=%{_prefix} \
+    BINDIR=%{_bindir} \
+    SYSCONFDIR=%{_sysconfdir} \
+    DATADIR=%{_datadir} \
+    LOCALSTATEDIR=%{_sharedstatedir} \
+    SHAREDSTATEDIR=%{_sharedstatedir} \
+    MANDIR=%{_mandir} \
+    INFODIR=%{_infodir} \
+    DOCDIR=%{_docdir} \
+    SRVDIR=%{srvdir} \
+    TFTPDIR=%{tftpdir} \
+    SYSTEMDDIR=%{_unitdir} \
+    BASHCOMPDIR=/etc/bash_completion.d/ \
    FIREWALLDDIR=/usr/lib/firewalld/services \
    WWCLIENTDIR=/warewulf

 %install
 # we have a broken symlink for wwclient
 export NO_BRP_STALE_LINK_ERROR=yes
+export IPXESOURCE=%{_datadir}/ipxe
+# overlays will end up here
+export OFFLINE_BUILD=1
+export LOCALSTATEDIR=%{_localstatedir}/lib
 %{makeinstall}

 # cleanup
-mv %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcp/dhcpd.conf.ww \
-  %{buildroot}%{_datadir}//warewulf/overlays/host/etc/dhcpd.conf.ww
-rmdir %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcp
-rm %{buildroot}%{_datadir}/warewulf/overlays/host/etc/dhcpd.conf
 mkdir -p %{buildroot}%{_sbindir}/
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcwarewulfd
+
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-mv -v %{buildroot}%{_sysconfdir}/bash_completion.d/warewulf %{buildroot}%{_datadir}/bash-completion/completions/wwctl
-#cp %{S:2} %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
-#rm -rf  %{buildroot}%{_datadir}/warewulf/ipxe
+mv -v %{buildroot}%{_sysconfdir}/bash_completion.d/wwctl \
+  %{buildroot}%{_datadir}/bash-completion/completions/wwctl
+#rm -r %{buildroot}%{_datadir}/doc/warewulf
+# copy the LICESNSE.md via %%doc
 rm -f %{buildroot}/usr/share/doc/packages/warewulf/LICENSE.md
-rm -rf %{buildroot}%{_localstatedir}/lib/warewulf
-# use ipxe-bootimgs images
+cp %{S:20} .
+
+# use ipxe-bootimgs images from distribution
 yq e '
-  .dhcpd.template = "static" |
  .tftp.ipxe."00:00" = "undionly.kpxe" |
  .tftp.ipxe."00:07" = "ipxe-x86_64.efi" |
  .tftp.ipxe."00:09" = "ipxe-x86_64.efi" |
@ -146,7 +179,10 @@ 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 's@\(^\s*\)\(.*:.*\):@\1"\2":@' %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
+#sed -i -e 's@\(^\s*\)\(.*:.*\):@\1"\2":@' %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf
+# fix dhcp for SUSE
+mv %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcp/dhcpd.conf.ww %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcpd.conf.ww
+rmdir %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/dhcp

 # create systemuser
 echo "u warewulf -" > system-user-%{name}.conf
@ -155,20 +191,18 @@ echo "g warewulf -" >> system-user-%{name}.conf
 install -D -m 644 system-user-%{name}.conf %{buildroot}%{_sysusersdir}/system-user-%{name}.conf
 install -D -m 755 %{S:10} %{buildroot}%{_datadir}/warewulf/scripts/config-warewulf.sh

-# get the slurm package readay
-mkdir -p %{buildroot}%{_datadir}/warewulf/overlays/host/etc/slurm
-mv %{buildroot}%{_sysconfdir}/warewulf/examples/slurm.conf.ww %{buildroot}%{_datadir}/warewulf/overlays/host/etc/slurm
-mkdir -p %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/munge
-cat >  %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/munge/munge.key.ww <<EOF
+# get the slurm package ready
+mkdir -p %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/slurm
+mv %{buildroot}%{_sysconfdir}/warewulf/examples/slurm.conf.ww %{buildroot}%{_localstatedir}/lib/warewulf/overlays/host/etc/slurm
+mkdir -p %{buildroot}%{_localstatedir}/lib/warewulf/overlays/generic/etc/munge
+cat >  %{buildroot}%{_localstatedir}/lib/warewulf/overlays/generic/etc/munge/munge.key.ww <<EOF
 {{ Include "/etc/munge/munge.key" -}}
 EOF
-chmod 600 %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/munge/munge.key.ww
-mkdir -p %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/slurm
-cat >  %{buildroot}%{_datadir}/warewulf/overlays/generic/etc/slurm/slurm.conf.ww <<EOF
+chmod 600 %{buildroot}%{_localstatedir}/lib/warewulf/overlays/generic/etc/munge/munge.key.ww
+mkdir -p %{buildroot}%{_localstatedir}/lib/warewulf/overlays/generic/etc/slurm
+cat >  %{buildroot}%{_localstatedir}/lib/warewulf/overlays/generic/etc/slurm/slurm.conf.ww <<EOF
 {{ Include "/etc/slurm/slurm.conf" }}
 EOF
-# remove upstream ipxe stuff
-rm -r %{buildroot}/%{_datadir}/ipxe

 %pre -f %{name}.pre
 %service_add_pre warewulfd.service
@ -186,15 +220,14 @@ rm -r %{buildroot}/%{_datadir}/ipxe
 %files
 %defattr(-,root,root)
 %doc README.md
+%doc README.dnsmasq
 %license LICENSE.md
+%{_datadir}/bash-completion/completions/wwctl
 %attr(0755, root, warewulf) %dir %{_sysconfdir}/warewulf
 %attr(0755, root, warewulf) %dir %{_sysconfdir}/warewulf/examples
-%{_datadir}/bash-completion/completions/wwctl
-%{_mandir}/man1/wwctl*1.gz
-%{_mandir}/man5/*conf*gz
 %config(noreplace) %{_sysconfdir}/warewulf/nodes.conf
 %config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf
-%config(noreplace) %{_sysconfdir}/warewulf/defaults.conf
+%config(noreplace) %{_sysconfdir}/warewulf/grub
 %config(noreplace) %{_sysconfdir}/warewulf/ipxe
 %{_sysconfdir}/warewulf/examples
 %{_prefix}/lib/firewalld/services/warewulf.xml
@ -203,17 +236,11 @@ rm -r %{buildroot}/%{_datadir}/ipxe
 %{_sbindir}/rcwarewulfd
 %{_unitdir}/warewulfd.service
 %{_sysusersdir}/system-user-%{name}.conf
-%{_datadir}/warewulf/scripts
+%{_datadir}/warewulf

-%files overlay
-# The configuration files in this location are for the compute
-# nodes, so when modified we do not replace them as sensible
-# admin will read the changelog
-%dir %{_datadir}/warewulf/
-%config(noreplace) %{_datadir}/warewulf/overlays
-%exclude  %{_datadir}/warewulf/overlays/host/etc/slurm
-%exclude  %{_datadir}/warewulf/overlays/generic/etc/slurm
-%exclude  %{_datadir}/warewulf/overlays/generic/etc/munge
+%files doc
+%{_mandir}/man1/wwctl*1.gz
+%{_mandir}/man5/*conf*gz

 %files api
 %{_bindir}/wwapic
@ -223,14 +250,25 @@ rm -r %{buildroot}/%{_datadir}/ipxe
 %config(noreplace) %{_sysconfdir}/warewulf/wwapid.conf
 %config(noreplace) %{_sysconfdir}/warewulf/wwapird.conf

+%files overlay
+# The configuration files in this location are for the compute
+# nodes, so when modified we do not replace them as sensible
+# admin will read the changelog
+%{_localstatedir}/lib/warewulf/overlays
+%dir %{_localstatedir}/lib/warewulf
+%config(noreplace) %{_localstatedir}/lib/warewulf/overlays
+%exclude %{_localstatedir}/lib/warewulf/overlays/host/etc/slurm
+%exclude %{_localstatedir}/lib/warewulf/overlays/generic/etc/slurm
+%exclude %{_localstatedir}/lib/warewulf/overlays/generic/etc/munge
+
 %files slurm
-%dir %{_datadir}/warewulf/overlays/host/etc/slurm
-%{_datadir}/warewulf/overlays/host/etc/slurm/slurm.conf.ww
-%dir %{_datadir}/warewulf/overlays/generic/etc/slurm
-%{_datadir}/warewulf/overlays/generic/etc/slurm/slurm.conf.ww
-%dir %{_datadir}/warewulf/overlays/generic/etc/munge
-%{_datadir}/warewulf/overlays/generic/etc/munge/munge.key.ww
-%dir %attr(0700,munge,munge) %{_datadir}/warewulf/overlays/generic/etc/munge
-%attr(0600,munge,munge) %config(noreplace) %{_datadir}/warewulf/overlays/generic/etc/munge/munge.key.ww
+%dir %{_localstatedir}/lib/warewulf/overlays/host/etc/slurm
+%{_localstatedir}/lib/warewulf/overlays/host/etc/slurm/slurm.conf.ww
+%dir %{_localstatedir}/lib/warewulf/overlays/generic/etc/slurm
+%{_localstatedir}/lib/warewulf/overlays/generic/etc/slurm/slurm.conf.ww
+%dir %{_localstatedir}/lib/warewulf/overlays/generic/etc/munge
+%{_localstatedir}/lib/warewulf/overlays/generic/etc/munge/munge.key.ww
+%dir %attr(0700,munge,munge) %{_localstatedir}/lib/warewulf/overlays/generic/etc/munge
+%attr(0600,munge,munge) %config(noreplace) %{_localstatedir}/lib/warewulf/overlays/generic/etc/munge/munge.key.ww

 %changelog