Update patches

10 files changed, 39 insertions, 125 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f10074409bc..0c50629a16df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,25 +17,21 @@ pkgbase = k3s-git
 	source = k3s.service.env
 	source = k3s-agent.service.env
 	source = config.yaml
-	source = 0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
-	source = 0001-Dockerfile.dapper-set-HOME-properly.patch
-	source = 0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
-	source = 0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
-	source = 0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
-	source = 0005-Dockerfile.dapper-sanitize-cache-configuration.patch
-	source = 0006-.service-update-systemd-service-files.patch
-	source = 0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch
+	source = 0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
+	source = 0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
+	source = 0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
+	source = 0004-Dockerfile.dapper-sanitize-cache-configuration.patch
+	source = 0005-.service-update-systemd-service-files.patch
+	source = 0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
 	sha256sums = SKIP
 	sha256sums = 94b0dd21fa4f075d4db7f6efe7a775de476b278de72f99773ee3de0bb54e7f68
 	sha256sums = 2f6964aed46deb38095801e124a6603f3a29e6886815d52c59c02883f7a37925
 	sha256sums = 6f0500a656ed78c0bb689c12264dbcd79f579edc3b9e17d512be742c1b2c43a4
-	sha256sums = fe667d538cf94bf8f9a62d9812a03bf423204f452aa11f0f2addf0dbe1b95866
-	sha256sums = 9307c9dbec1bdd73a1a3186668e0f5d5c9900474f53a842a133feba62c92b0ac
-	sha256sums = 350438be7abe98eeee60f23e9aa566eba38df5422597ab4e7184cc7a12309ebb
-	sha256sums = 659ee5e6a7c7df532418032e7b115ab7804fd60593e497814cc553504545af3c
-	sha256sums = 6e00974e4ec3ee5999da87c7d1e43fed5b64e84ce6eec3a43ed971f24c5cb820
-	sha256sums = 616063a668d510f163aa684e78fcf89d1b8cc8e1524acdc170608bfbf0e80e47
-	sha256sums = bb721e8850eb736ad9aad4f0a8ef20dac0e06d7731731c3541264f138be28b74
-	sha256sums = f448303dbbefef2645b8c2146d595643c0143c7300eab12a459b85a3b18b3d91
+	sha256sums = a9414087c64788cdca41da004e967e07649a49b1738dc321f5eea0784f659fd2
+	sha256sums = 508567cfcbe586fb37b13597ab6dcc54054c38c545572b4ad430b92fbad42b6d
+	sha256sums = cc821200609eff8ceca746f4ada46e09e32c3d680be411d3bbe52f23a580edb6
+	sha256sums = 5436f98a1058bd7a2f385e42f0ffb23806fa8b5f41bf43b17706a2bf4dd1eaf0
+	sha256sums = 9eb251530ef9bb81b667ce07bc811876dead9d2ae5e748ea7351bcb719bb5c3d
+	sha256sums = 7ea31aab59fc7268dfa1f97daa209d8b94f2f6c9e19248bc80d2c5b9b05bbccf
 
 pkgname = k3s-git
diff --git a/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch b/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
deleted file mode 100644
index fa275bf5d134..000000000000
--- a/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f349e309ed9e06c028e6f3938abbbce246235c60 Mon Sep 17 00:00:00 2001
-From: Linshen Lee <1061696872@qq.com>
-Date: Fri, 15 Dec 2023 22:17:32 +0900
-Subject: [PATCH] Fix: issue #8293. Remove useless log init code Signed-off-by:
- Linshen Lee 1061696872@qq.com
-
----
- pkg/cli/cmds/log.go | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/pkg/cli/cmds/log.go b/pkg/cli/cmds/log.go
-index ea778ac668..7e34b10136 100644
---- a/pkg/cli/cmds/log.go
-+++ b/pkg/cli/cmds/log.go
-@@ -1,9 +1,7 @@
- package cmds
- 
- import (
--	"flag"
- 	"fmt"
--	"strconv"
- 	"sync"
- 	"time"
- 
-@@ -73,10 +71,6 @@ func checkUnixTimestamp() error {
- }
- 
- func setupLogging() {
--	flag.Set("v", strconv.Itoa(LogConfig.VLevel))
--	flag.Set("vmodule", LogConfig.VModule)
--	flag.Set("alsologtostderr", strconv.FormatBool(Debug))
--	flag.Set("logtostderr", strconv.FormatBool(!Debug))
- 	if Debug {
- 		logrus.SetLevel(logrus.DebugLevel)
- 	}
--- 
-2.43.0
-
diff --git a/0001-Dockerfile.dapper-set-HOME-properly.patch b/0001-Dockerfile.dapper-set-HOME-properly.patch
deleted file mode 100644
index 9b6db78c3130..000000000000
--- a/0001-Dockerfile.dapper-set-HOME-properly.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18b1172fb9d59b50ab8473235c8954097b2a2850 Mon Sep 17 00:00:00 2001
-From: Ivan Shapovalov <intelfx@intelfx.name>
-Date: Fri, 22 Dec 2023 22:43:56 +0100
-Subject: [PATCH 1/7] Dockerfile.dapper: set $HOME properly
-
-`$HOME` refers to `$DAPPER_SOURCE`, which is set in the same expression
-and is thus not visible at the time of substitution.
-
-This problem is not immediately visible with Docker, Inc.'s docker
-merely because it resets an unset `$HOME` to `/root` (but still breaking
-the Go cache). Under podman, this problem is immediately visible because
-an unset `$HOME` remains unset and subsequently breaks the `go generate`
-invocation.
-
-Fixes #9089.
-
-Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
----
- Dockerfile.dapper | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Dockerfile.dapper b/Dockerfile.dapper
-index af99d3d35e..2f0cd5e64d 100644
---- a/Dockerfile.dapper
-+++ b/Dockerfile.dapper
-@@ -56,9 +56,10 @@ ENV DAPPER_RUN_ARGS="--privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.ca
-     DAPPER_SOURCE="/go/src/github.com/k3s-io/k3s/" \
-     DAPPER_OUTPUT="./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy" \
-     DAPPER_DOCKER_SOCKET=true \
--    HOME=${DAPPER_SOURCE} \
-     CROSS=true \
-     STATIC_BUILD=true
-+# Set $HOME separately because it refers to $DAPPER_SOURCE, set above
-+ENV HOME=${DAPPER_SOURCE}
- 
- WORKDIR ${DAPPER_SOURCE}
- 
--- 
-2.43.0
-
diff --git a/0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch b/0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
index 8675b37965e8..1323f67a8f3d 100644
--- a/0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
+++ b/0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
@@ -1,7 +1,7 @@
-From 447968ac1d6fc95ad71b93b400ce519ac740d8e3 Mon Sep 17 00:00:00 2001
+From 3f74458162b1e69bd2102b623e5f6338463d5cd2 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:10:59 +0100
-Subject: [PATCH 2/7] main: apply go-fmt to pkg/data/zz_generated_bindata.go
+Subject: [PATCH 1/6] main: apply go-fmt to pkg/data/zz_generated_bindata.go
 
 No reason other than for consistency.
 ---
diff --git a/0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch b/0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
index 60084553a8f3..30481c3ec5bc 100644
--- a/0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
+++ b/0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
@@ -1,7 +1,7 @@
-From 53f939037c313880efcf39c7e6fcbf4cb9a713e2 Mon Sep 17 00:00:00 2001
+From 9eef0195eb032eaa4788661d6d78f8b962848976 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:07:38 +0100
-Subject: [PATCH 3/7] .dockerignore: do not ignore parts of $GITDIR
+Subject: [PATCH 2/6] .dockerignore: do not ignore parts of $GITDIR
 
 ---
  .dockerignore | 1 -
diff --git a/0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch b/0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
index a86b1df96486..7ba1922098aa 100644
--- a/0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
+++ b/0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
@@ -1,7 +1,7 @@
-From fe83fb9745c429ac6ba4bb4aa97f538762be0e11 Mon Sep 17 00:00:00 2001
+From 87e9a03ff45bcdb151e1200cd9ae49cab20ea2d2 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:11:52 +0100
-Subject: [PATCH 4/7] Dockerfile.dapper: sanitize $DAPPER_OUTPUT
+Subject: [PATCH 3/6] Dockerfile.dapper: sanitize $DAPPER_OUTPUT
 
 Existing $DAPPER_OUTPUT is not enough to be able to run build steps
 sequentially (i. e. `make download; make generate; make build;
diff --git a/0005-Dockerfile.dapper-sanitize-cache-configuration.patch b/0004-Dockerfile.dapper-sanitize-cache-configuration.patch
index 3c3af08dd7e4..e5a459b88a06 100644
--- a/0005-Dockerfile.dapper-sanitize-cache-configuration.patch
+++ b/0004-Dockerfile.dapper-sanitize-cache-configuration.patch
@@ -1,7 +1,7 @@
-From 1f17fa5bf080101dddc6ff4100ad38296faa8a4a Mon Sep 17 00:00:00 2001
+From 2e7ba23c8853b7ad86a431bfe588e94385989c94 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:08:37 +0100
-Subject: [PATCH 5/7] Dockerfile.dapper: sanitize cache configuration
+Subject: [PATCH 4/6] Dockerfile.dapper: sanitize cache configuration
 
 - set $HOME to /root because there is no good reason to keep it in $PWD
 - mount volumes to /go/pkg to cache downloaded Go sources (we'd set it
diff --git a/0006-.service-update-systemd-service-files.patch b/0005-.service-update-systemd-service-files.patch
index c8cf9707dd48..32d32a1a7060 100644
--- a/0006-.service-update-systemd-service-files.patch
+++ b/0005-.service-update-systemd-service-files.patch
@@ -1,7 +1,7 @@
-From 3399f01e871f3a87d01f94841a522b9b8aba352e Mon Sep 17 00:00:00 2001
+From 12a02a6d17cc152710956b1ed945f85b3088ab81 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 02:10:11 +0100
-Subject: [PATCH 6/7] *.service: update systemd service files
+Subject: [PATCH 5/6] *.service: update systemd service files
 
 ---
  k3s-agent-rootless.service | 47 ++++++++++++++++++++++++++++++++++++++
@@ -144,7 +144,7 @@ index 5879e2f8f2..916af05c6d 100644
  [Install]
  WantedBy=default.target
 diff --git a/k3s.service b/k3s.service
-index 7f8c9ec89c..c786114ce0 100644
+index 70ce10c1aa..c786114ce0 100644
 --- a/k3s.service
 +++ b/k3s.service
 @@ -1,16 +1,16 @@
@@ -162,7 +162,7 @@ index 7f8c9ec89c..c786114ce0 100644
  EnvironmentFile=-/etc/default/%N
  EnvironmentFile=-/etc/sysconfig/%N
 -EnvironmentFile=-/etc/systemd/system/k3s.service.env
--ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
+-ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service 2>/dev/null'
 -ExecStart=/usr/local/bin/k3s server
 +EnvironmentFile=-/etc/systemd/system/%n.env
 +ExecStart=/usr/bin/k3s server $K3S_EXEC
diff --git a/0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch b/0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
index 969e1c978170..4973a0c92e85 100644
--- a/0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch
+++ b/0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
@@ -1,7 +1,7 @@
-From b5f0aa8933a97aef7f255b8b71bb6bc12c9d06a6 Mon Sep 17 00:00:00 2001
+From f7922fae6727af66515123be1e00cb2d72d0852b Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 02:12:21 +0100
-Subject: [PATCH 7/7] scripts: moar compression, drop pigz and raw tar
+Subject: [PATCH 6/6] scripts: moar compression, drop pigz and raw tar
 
 ---
  scripts/package-airgap | 10 +++++-----
diff --git a/PKGBUILD b/PKGBUILD
index 9d9f7b997080..ca19efa181f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,27 +25,23 @@ source=(
   'k3s.service.env'
   'k3s-agent.service.env'
   'config.yaml'
-  '0000-Fix-issue-8293.-Remove-useless-log-init-code.patch'
-  '0001-Dockerfile.dapper-set-HOME-properly.patch'
-  '0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch'
-  '0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch'
-  '0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch'
-  '0005-Dockerfile.dapper-sanitize-cache-configuration.patch'
-  '0006-.service-update-systemd-service-files.patch'
-  '0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch'
+  '0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch'
+  '0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch'
+  '0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch'
+  '0004-Dockerfile.dapper-sanitize-cache-configuration.patch'
+  '0005-.service-update-systemd-service-files.patch'
+  '0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch'
 )
 sha256sums=('SKIP'
             '94b0dd21fa4f075d4db7f6efe7a775de476b278de72f99773ee3de0bb54e7f68'
             '2f6964aed46deb38095801e124a6603f3a29e6886815d52c59c02883f7a37925'
             '6f0500a656ed78c0bb689c12264dbcd79f579edc3b9e17d512be742c1b2c43a4'
-            'fe667d538cf94bf8f9a62d9812a03bf423204f452aa11f0f2addf0dbe1b95866'
-            '9307c9dbec1bdd73a1a3186668e0f5d5c9900474f53a842a133feba62c92b0ac'
-            '350438be7abe98eeee60f23e9aa566eba38df5422597ab4e7184cc7a12309ebb'
-            '659ee5e6a7c7df532418032e7b115ab7804fd60593e497814cc553504545af3c'
-            '6e00974e4ec3ee5999da87c7d1e43fed5b64e84ce6eec3a43ed971f24c5cb820'
-            '616063a668d510f163aa684e78fcf89d1b8cc8e1524acdc170608bfbf0e80e47'
-            'bb721e8850eb736ad9aad4f0a8ef20dac0e06d7731731c3541264f138be28b74'
-            'f448303dbbefef2645b8c2146d595643c0143c7300eab12a459b85a3b18b3d91')
+            'a9414087c64788cdca41da004e967e07649a49b1738dc321f5eea0784f659fd2'
+            '508567cfcbe586fb37b13597ab6dcc54054c38c545572b4ad430b92fbad42b6d'
+            'cc821200609eff8ceca746f4ada46e09e32c3d680be411d3bbe52f23a580edb6'
+            '5436f98a1058bd7a2f385e42f0ffb23806fa8b5f41bf43b17706a2bf4dd1eaf0'
+            '9eb251530ef9bb81b667ce07bc811876dead9d2ae5e748ea7351bcb719bb5c3d'
+            '7ea31aab59fc7268dfa1f97daa209d8b94f2f6c9e19248bc80d2c5b9b05bbccf')
 
 pkgver() {
   cd k3s
@@ -58,7 +54,7 @@ prepare() {
   # fix #8293, #9089, sanitize buildsystem, moar compression
   for p in "${source[@]}"; do
     if [[ $p == *.patch ]]; then
-      git apply -3 "$srcdir/$p"
+      git am -3 "$srcdir/$p"
     fi
   done
 }