From 779321506a179a0a96441be3268384ec59614443 Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Sun, 24 Dec 2023 23:07:03 +0800 Subject: [PATCH] net-dns/ddns-go: add 5.7.0, drop 5.6.6 --- net-dns/ddns-go/Manifest | 4 +- ...s-go-5.6.6.ebuild => ddns-go-5.7.0.ebuild} | 2 +- ...0-remove-service-management-support.patch} | 37 ++++++++++--------- 3 files changed, 23 insertions(+), 20 deletions(-) rename net-dns/ddns-go/{ddns-go-5.6.6.ebuild => ddns-go-5.7.0.ebuild} (94%) rename net-dns/ddns-go/files/{ddns-go-5.6.6-remove-service-management-support.patch => ddns-go-5.7.0-remove-service-management-support.patch} (89%) diff --git a/net-dns/ddns-go/Manifest b/net-dns/ddns-go/Manifest index f6db0ec..7bebc1e 100644 --- a/net-dns/ddns-go/Manifest +++ b/net-dns/ddns-go/Manifest @@ -1,2 +1,2 @@ -DIST ddns-go-5.6.6-deps.tar.xz 189936 BLAKE2B 679ace3a66b1fafc1df23557f443fc03445f2a3356dacd5559ab702bb18f10369565733f3ec7860a15246071f36e0aed3be53520cf0b56ca18b35bb3ad21e54a SHA512 42dda58dd1d9fcdc7ebf3875d70c3dc88fa386bae94738a60156931e04cfc62a53d2cbc19145063a1d5fa5b6bc0ef7fad6308dbeab06f9ac03e868b9871cfd59 -DIST ddns-go-5.6.6.tar.gz 144632 BLAKE2B 0ce97235bba555d87fbd429348b9091f30eb82bf03e10704f0f667248f6cda83d170382b050a6bc1de1e62b4124a18cb2faf5dd97ca7bb3b023878e7913a0264 SHA512 6c1ca63fc8729d0be48240209aa01e2cac843afe08e8fa9625d25eb481d9c36fd92f9879e4a7e7a67ce6d5612f8b6ea80e48eb709ab5a03cf94d86eb22605780 +DIST ddns-go-5.7.0-deps.tar.xz 2747980 BLAKE2B 8370823ff1f670b38390547342a7eb2afa1d4767071d1eb840d86462c06d923ffd5afe24d1dc3f8fb306301f5c9b72bf82e9fc1cf8cb11f2ed83dd2073a03fef SHA512 c1b72eca1b3144b2fcd614014be64c1b2ab327063ffb4b8d9f3c0b969429aaf850897dc2fc406c266a0bb07b05b1c67034981e0dc03f03511111691b01adacad +DIST ddns-go-5.7.0.tar.gz 145235 BLAKE2B f315649db37c70da84de6f70647ec291fd1b608747fec64e715d0c8e882987eac9ee37b8087e0bb3e3f97007f0655af88ce01a8d3d33f1855bc822992b8f42c1 SHA512 96421eeaa06f4bac98f76038fc925eaf1fd5fd7cbfad2faa00c85c58e85e71e2ec0b074cd7ae460a12a888a81c53b18ec019e9c72f9e4185b3e9f43edb189895 diff --git a/net-dns/ddns-go/ddns-go-5.6.6.ebuild b/net-dns/ddns-go/ddns-go-5.7.0.ebuild similarity index 94% rename from net-dns/ddns-go/ddns-go-5.6.6.ebuild rename to net-dns/ddns-go/ddns-go-5.7.0.ebuild index 00a2f96..f2d870a 100644 --- a/net-dns/ddns-go/ddns-go-5.6.6.ebuild +++ b/net-dns/ddns-go/ddns-go-5.7.0.ebuild @@ -22,7 +22,7 @@ BDEPEND=">=dev-lang/go-1.20" PATCHES=( "${FILESDIR}/ddns-go-5.6.6-remove-update-support.patch" - "${FILESDIR}/ddns-go-5.6.6-remove-service-management-support.patch" + "${FILESDIR}/ddns-go-5.7.0-remove-service-management-support.patch" ) src_compile() { diff --git a/net-dns/ddns-go/files/ddns-go-5.6.6-remove-service-management-support.patch b/net-dns/ddns-go/files/ddns-go-5.7.0-remove-service-management-support.patch similarity index 89% rename from net-dns/ddns-go/files/ddns-go-5.6.6-remove-service-management-support.patch rename to net-dns/ddns-go/files/ddns-go-5.7.0-remove-service-management-support.patch index 7dec3a2..8ef92d4 100644 --- a/net-dns/ddns-go/files/ddns-go-5.6.6-remove-service-management-support.patch +++ b/net-dns/ddns-go/files/ddns-go-5.7.0-remove-service-management-support.patch @@ -1,6 +1,6 @@ -From adf0886cea3b03c1acff3d78054554ad1df46fa0 Mon Sep 17 00:00:00 2001 +From b19d31496a6031050b91dbd02a66b2ec05ac729d Mon Sep 17 00:00:00 2001 From: Puqns67 -Date: Sun, 3 Dec 2023 11:33:17 +0800 +Date: Sun, 24 Dec 2023 22:21:38 +0800 Subject: [PATCH 2/2] build: remove service management support for this build --- @@ -10,36 +10,39 @@ Subject: [PATCH 2/2] build: remove service management support for this build 3 files changed, 1 insertion(+), 230 deletions(-) diff --git a/go.mod b/go.mod -index a70d477..67459b2 100644 +index 08b144c..61ea627 100644 --- a/go.mod +++ b/go.mod -@@ -3,9 +3,6 @@ module github.com/jeessy2/ddns-go/v5 +@@ -3,10 +3,7 @@ module github.com/jeessy2/ddns-go/v5 go 1.20 require ( - github.com/kardianos/service v1.2.2 github.com/wagslane/go-password-validator v0.3.0 + golang.org/x/net v0.19.0 gopkg.in/yaml.v3 v3.0.1 ) - --require golang.org/x/sys v0.13.0 // indirect +-require golang.org/x/sys v0.15.0 // indirect diff --git a/go.sum b/go.sum -index 36b9ca3..cecce49 100644 +index ff968b0..802389b 100644 --- a/go.sum +++ b/go.sum -@@ -1,10 +1,5 @@ +@@ -1,12 +1,7 @@ -github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60= -github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= github.com/wagslane/go-password-validator v0.3.0 h1:vfxOPzGHkz5S146HDpavl0cw1DSVP061Ry2PX0/ON6I= github.com/wagslane/go-password-validator v0.3.0/go.mod h1:TI1XJ6T5fRdRnHqHt14pvy1tNVnrwe7m3/f1f2fDphQ= + golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= + golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= --golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/main.go b/main.go -index 4896399..78c848f 100644 +index 5b164ba..eae04be 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,6 @@ import ( @@ -49,8 +52,8 @@ index 4896399..78c848f 100644 - "os/exec" "path/filepath" "strconv" - "time" -@@ -17,7 +16,6 @@ import ( + "strings" +@@ -18,7 +17,6 @@ import ( "github.com/jeessy2/ddns-go/v5/dns" "github.com/jeessy2/ddns-go/v5/util" "github.com/jeessy2/ddns-go/v5/web" @@ -58,7 +61,7 @@ index 4896399..78c848f 100644 ) // ddns-go 版本 -@@ -33,9 +31,6 @@ var every = flag.Int("f", 300, "同步间隔时间(秒)") +@@ -34,9 +32,6 @@ var every = flag.Int("f", 300, "同步间隔时间(秒)") // 缓存次数 var ipCacheTimes = flag.Int("cacheTimes", 5, "间隔N次与服务商比对") @@ -68,8 +71,8 @@ index 4896399..78c848f 100644 // 配置文件路径 var configFilePath = flag.String("c", util.GetConfigFilePathDefault(), "自定义配置文件路径") -@@ -78,34 +73,7 @@ func main() { - util.NewDialerResolver(*customDNSServer + ":53") +@@ -83,34 +78,7 @@ func main() { + } } os.Setenv(util.IPCacheTimesENV, strconv.Itoa(*ipCacheTimes)) - switch *serviceType { @@ -104,7 +107,7 @@ index 4896399..78c848f 100644 } func run() { -@@ -163,131 +131,6 @@ func runWebServer() error { +@@ -168,131 +136,6 @@ func runWebServer() error { return http.Serve(l, nil) } @@ -236,7 +239,7 @@ index 4896399..78c848f 100644 // 打开浏览器 func autoOpenExplorer() { _, err := config.GetConfigCached() -@@ -310,67 +153,3 @@ func autoOpenExplorer() { +@@ -315,67 +158,3 @@ func autoOpenExplorer() { } } }