From 7729d8c57dcde705d3e8b7194fd4b00e4461c829 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Wed, 15 Jul 2026 14:42:53 +0000 Subject: [PATCH] Pull request 2717: ADG-12585-fix-kardianos-dep Squashed commit of the following: commit f31de6ff45bdb744f616be9c3ae2648b79494d7e Merge: bebd1a053 d9a7219d4 Author: Eugene Burkov Date: Wed Jul 15 16:09:13 2026 +0300 Merge branch 'master' into ADG-12585-fix-kardianos-dep commit bebd1a05393f6391cd51ee4af66a879e41f46a1f Author: Eugene Burkov Date: Wed Jul 15 14:16:48 2026 +0300 all: revert service dep --- go.mod | 5 ++++- go.sum | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6545ac213a4..696cf0fd9ff 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,10 @@ require ( github.com/google/uuid v1.6.0 github.com/gopacket/gopacket v1.7.0 github.com/insomniacslk/dhcp v0.0.0-20260603135910-a415979eb11e - github.com/kardianos/service v1.3.0 + // TODO(e.burkov): Get rid of this dependency. At least, don't update it, + // unless all custom templates will be migrated to the new format, see + // https://github.com/kardianos/service/issues/418. + github.com/kardianos/service v1.2.4 github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 github.com/mdlayher/netlink v1.11.2 github.com/mdlayher/packet v1.1.2 diff --git a/go.sum b/go.sum index 65bb3eb2fa3..be77e45545d 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/jstemmer/go-junit-report/v2 v2.1.0 h1:X3+hPYlSczH9IMIpSC9CQSZA0L+BipYafciZUWHEmsc= github.com/jstemmer/go-junit-report/v2 v2.1.0/go.mod h1:mgHVr7VUo5Tn8OLVr1cKnLuEy0M92wdRntM99h7RkgQ= -github.com/kardianos/service v1.3.0 h1:/LGy+xPP2TM+GLTiCZ2di7cy0Jd/qrawlTUfqKYFdTI= -github.com/kardianos/service v1.3.0/go.mod h1:E4V9ufUuY82F7Ztlu1eN9VXWIQxg8NoLQlmFe0MtrXc= +github.com/kardianos/service v1.2.4 h1:XNlGtZOYNx2u91urOdg/Kfmc+gfmuIo1Dd3rEi2OgBk= +github.com/kardianos/service v1.2.4/go.mod h1:E4V9ufUuY82F7Ztlu1eN9VXWIQxg8NoLQlmFe0MtrXc= github.com/kisielk/errcheck v1.20.0 h1:9rwHBNKzd4wkDWcROy3DvFGNqEPlkxBg305rvk7HabI= github.com/kisielk/errcheck v1.20.0/go.mod h1:O+f80MKNwX8Oor2jwgpeQ9An7uJm+hRSgT+h22knRJU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=