From 3121a4ee725ae0bf177978288837ee625448b614 Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Mon, 11 Mar 2024 21:08:41 +0800 Subject: [PATCH] net-dns/ddns-go: add 6.2.1, drop 6.1.1-r2 --- net-dns/ddns-go/Manifest | 4 +- ...o-6.1.1-r2.ebuild => ddns-go-6.2.1.ebuild} | 2 +- ...1-remove-service-management-support.patch} | 48 ++++++++++--------- ...ddns-go-6.2.1-remove-update-support.patch} | 12 ++--- net-dns/ddns-go/metadata.xml | 27 +++++++---- 5 files changed, 53 insertions(+), 40 deletions(-) rename net-dns/ddns-go/{ddns-go-6.1.1-r2.ebuild => ddns-go-6.2.1.ebuild} (88%) rename net-dns/ddns-go/files/{ddns-go-6.1.1-remove-service-management-support.patch => ddns-go-6.2.1-remove-service-management-support.patch} (88%) rename net-dns/ddns-go/files/{ddns-go-6.1.1-remove-update-support.patch => ddns-go-6.2.1-remove-update-support.patch} (84%) diff --git a/net-dns/ddns-go/Manifest b/net-dns/ddns-go/Manifest index 1668b84..7e3bce8 100644 --- a/net-dns/ddns-go/Manifest +++ b/net-dns/ddns-go/Manifest @@ -1,2 +1,2 @@ -DIST ddns-go-6.1.1-deps.tar.xz 14654396 BLAKE2B 185b56b2e0d8c3c468646d045bb25ca58a72bfb98c3b29400585c5ed562d24c3b4cd6ff85c5a3aa797062e5a010b862e333538223fbe42c46825965f36bc5952 SHA512 2265896285a7995f33d4c4c157be24b73af192c924b8623c0544d5cf3920d0dcc3d30493ffbd5284e39cf347bf4b54d0e284188d4829cf3c794e1656ca179aa8 -DIST ddns-go-6.1.1.tar.gz 149525 BLAKE2B 26fba1ee8a54b472ede55beb721ac188462390e29ff9e0699190f0d22624ca3f992ea363224b0bf97d70eb36913f001e0cf8452191fd27d84b44ec9f2b8405c6 SHA512 88378853be34e5be3707429746b98f7d8f3f53e84929c2597f5c6efe6b0c431e52dc07963d5a7bdae1f0e4c0cd851956bdb6e43e38af4b76b5eb9f3cd751fa8b +DIST ddns-go-6.2.1-deps.tar.xz 14673540 BLAKE2B 0ed0fb2d56cbea84c4164d09134c3a16f0d5c010bff948b3fd0e27f5852975eec35af2763f98a25dd6f8e32718dd3d56ce7e6364483468b9bfd7236bdfa51fd3 SHA512 ced5ef7fde26f198f640f058775450aa012cf2a30e5f524d8c072a9a70934f6d0f6a53f931704c978e00d6f327f60eaf9a796dfce469ee6539cd7cfba45dbbcf +DIST ddns-go-6.2.1.tar.gz 150600 BLAKE2B d14f6b0c8d1036d0a035a27106cecb7a6e511f1478bb3d20c5422a2876187c3e9ca5924d4b03a7867b679e4bae03a8600792aa9266f37cdbb5290a63fb4a343e SHA512 9b90defbc395e8e3187e043cb632ebeb68db48267a50b56e90998d1e6d4f838135ba10f40f15fcb1b70b58b99a304ecb4ec229d9850c82820409f547193d4d85 diff --git a/net-dns/ddns-go/ddns-go-6.1.1-r2.ebuild b/net-dns/ddns-go/ddns-go-6.2.1.ebuild similarity index 88% rename from net-dns/ddns-go/ddns-go-6.1.1-r2.ebuild rename to net-dns/ddns-go/ddns-go-6.2.1.ebuild index 2de227d..730d896 100644 --- a/net-dns/ddns-go/ddns-go-6.1.1-r2.ebuild +++ b/net-dns/ddns-go/ddns-go-6.2.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit go-module systemd -DESCRIPTION="简单好用的 DDNS。自动获得你的公网 IPv4 或 IPv6 地址，并解析到对应的域名服务。" +DESCRIPTION="Automatically obtain your public IP address and set to your domain name service." HOMEPAGE="https://github.com/jeessy2/ddns-go" SRC_URI="https://github.com/jeessy2/ddns-go/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-deps.tar.xz" diff --git a/net-dns/ddns-go/files/ddns-go-6.1.1-remove-service-management-support.patch b/net-dns/ddns-go/files/ddns-go-6.2.1-remove-service-management-support.patch similarity index 88% rename from net-dns/ddns-go/files/ddns-go-6.1.1-remove-service-management-support.patch rename to net-dns/ddns-go/files/ddns-go-6.2.1-remove-service-management-support.patch index e8ba277..bab3e04 100644 --- a/net-dns/ddns-go/files/ddns-go-6.1.1-remove-service-management-support.patch +++ b/net-dns/ddns-go/files/ddns-go-6.2.1-remove-service-management-support.patch @@ -1,4 +1,4 @@ -From 12a957f7e34eae070ac759e829038e6b91fda7ab Mon Sep 17 00:00:00 2001 +From 8d827cc9d4c59a4af9df07d88a4d623c7b2018dc Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Sun, 24 Dec 2023 22:21:38 +0800 Subject: [PATCH 2/2] build: remove service management support for this build @@ -6,11 +6,11 @@ Subject: [PATCH 2/2] build: remove service management support for this build --- go.mod | 7 +- go.sum | 5 -- - main.go | 222 +------------------------------------------------------- - 3 files changed, 2 insertions(+), 232 deletions(-) + main.go | 223 -------------------------------------------------------- + 3 files changed, 1 insertion(+), 234 deletions(-) diff --git a/go.mod b/go.mod -index fcc9d3c..5311a1c 100644 +index ae9aceb..7a83d8b 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,8 @@ module github.com/jeessy2/ddns-go/v6 @@ -19,17 +19,17 @@ index fcc9d3c..5311a1c 100644 require ( - github.com/kardianos/service v1.2.2 github.com/wagslane/go-password-validator v0.3.0 - golang.org/x/net v0.20.0 + golang.org/x/net v0.22.0 - gopkg.in/yaml.v3 v3.0.1 -) - -require ( -- golang.org/x/sys v0.16.0 // indirect +- golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 + gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum -index 062bd88..7e61244 100644 +index 6d113ed..23a1c9a 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,7 @@ @@ -37,16 +37,16 @@ index 062bd88..7e61244 100644 -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.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= - golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= + golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= + golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= --golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/main.go b/main.go -index 32eca51..42672df 100644 +index 7617e5c..32c7285 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,6 @@ import ( @@ -56,8 +56,8 @@ index 32eca51..42672df 100644 - "os/exec" "path/filepath" "strconv" - "strings" -@@ -19,7 +18,6 @@ import ( + "time" +@@ -18,7 +17,6 @@ import ( "github.com/jeessy2/ddns-go/v6/dns" "github.com/jeessy2/ddns-go/v6/util" "github.com/jeessy2/ddns-go/v6/web" @@ -65,7 +65,7 @@ index 32eca51..42672df 100644 ) // ddns-go 版本 -@@ -35,9 +33,6 @@ var every = flag.Int("f", 300, "Sync frequency(seconds)") +@@ -34,9 +32,6 @@ var every = flag.Int("f", 300, "Sync frequency(seconds)") // 缓存次数 var ipCacheTimes = flag.Int("cacheTimes", 5, "Interval N times compared with service providers") @@ -75,8 +75,8 @@ index 32eca51..42672df 100644 // 配置文件路径 var configFilePath = flag.String("c", util.GetConfigFilePathDefault(), "config file path") -@@ -84,34 +79,7 @@ func main() { - } +@@ -79,37 +74,7 @@ func main() { + util.SetDNS(*customDNSServer) } os.Setenv(util.IPCacheTimesENV, strconv.Itoa(*ipCacheTimes)) - switch *serviceType { @@ -107,11 +107,13 @@ index 32eca51..42672df 100644 - } - } - } -+ run() - } +-} - func run() { -@@ -169,130 +137,6 @@ func runWebServer() error { +-func run() { + // 兼容v5.0.0之前的配置文件 + conf, _ := config.GetConfigCached() + conf.CompatibleConfig() +@@ -164,130 +129,6 @@ func runWebServer() error { return http.Serve(l, nil) } @@ -242,7 +244,7 @@ index 32eca51..42672df 100644 // 打开浏览器 func autoOpenExplorer() { _, err := config.GetConfigCached() -@@ -315,67 +159,3 @@ func autoOpenExplorer() { +@@ -310,67 +151,3 @@ func autoOpenExplorer() { } } } @@ -311,5 +313,5 @@ index 32eca51..42672df 100644 -} -` -- -2.43.0 +2.44.0 diff --git a/net-dns/ddns-go/files/ddns-go-6.1.1-remove-update-support.patch b/net-dns/ddns-go/files/ddns-go-6.2.1-remove-update-support.patch similarity index 84% rename from net-dns/ddns-go/files/ddns-go-6.1.1-remove-update-support.patch rename to net-dns/ddns-go/files/ddns-go-6.2.1-remove-update-support.patch index 5be1c96..1cbb53d 100644 --- a/net-dns/ddns-go/files/ddns-go-6.1.1-remove-update-support.patch +++ b/net-dns/ddns-go/files/ddns-go-6.2.1-remove-update-support.patch @@ -1,4 +1,4 @@ -From fcc3687222a2d90c6ad05df3c3acfe581d5b3493 Mon Sep 17 00:00:00 2001 +From 23c717798d0bd247c7b8db6c822f134853c1ac43 Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Sun, 3 Dec 2023 17:17:25 +0800 Subject: [PATCH 1/2] build: remove update support for this build @@ -8,10 +8,10 @@ Subject: [PATCH 1/2] build: remove update support for this build 1 file changed, 8 deletions(-) diff --git a/main.go b/main.go -index 4120214..32eca51 100644 +index 3b36dc2..7617e5c 100644 --- a/main.go +++ b/main.go -@@ -18,7 +18,6 @@ import ( +@@ -17,7 +17,6 @@ import ( "github.com/jeessy2/ddns-go/v6/config" "github.com/jeessy2/ddns-go/v6/dns" "github.com/jeessy2/ddns-go/v6/util" @@ -19,7 +19,7 @@ index 4120214..32eca51 100644 "github.com/jeessy2/ddns-go/v6/web" "github.com/kardianos/service" ) -@@ -27,9 +26,6 @@ import ( +@@ -26,9 +25,6 @@ import ( // ddns-go version var versionFlag = flag.Bool("v", false, "ddns-go version") @@ -29,7 +29,7 @@ index 4120214..32eca51 100644 // 监听地址 var listen = flag.String("l", ":9876", "Listen address") -@@ -69,10 +65,6 @@ func main() { +@@ -68,10 +64,6 @@ func main() { fmt.Println(version) return } @@ -41,5 +41,5 @@ index 4120214..32eca51 100644 log.Fatalf("Parse listen address failed! Exception: %s", err) } -- -2.43.0 +2.44.0 diff --git a/net-dns/ddns-go/metadata.xml b/net-dns/ddns-go/metadata.xml index 4b5e8ec..6550b1a 100644 --- a/net-dns/ddns-go/metadata.xml +++ b/net-dns/ddns-go/metadata.xml @@ -1,12 +1,23 @@ - - me@puqns67.icu - Puqns67 - - - https://github.com/jeessy2/ddns-go/issues - jeessy2/ddns-go - + + me@puqns67.icu + Puqns67 + + + https://github.com/jeessy2/ddns-go/issues + jeessy2/ddns-go + + + Simple and easy to use DDNS. Automatically obtain your public IPv4 + or IPv6 address and resolve it to the corresponding domain name service. + Support Aliyun, Tencent Cloud, Dnspod, Cloudflare, Callback, + Huawei Cloud, Baidu Cloud, Porkbun, GoDaddy, Namecheap, NameSilo... + + + 简单好用的 DDNS。自动获得你的公网 IPv4 或 IPv6 地址，并解析到对应的域名服务。 + 支持阿里云 腾讯云 Dnspod Cloudflare 华为云 Callback 百度云 + Porkbun GoDaddy Google Domain Namecheap NameSilo... +