From 328bd0fe6bc18b7d66040c6d9b5c80877ec80a24 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 9 Oct 2024 13:42:56 +0800 Subject: [PATCH] mosdns: bump version --- net/mosdns/Makefile | 7 +-- .../patches/201-compatible-with-go1.20.patch | 50 ------------------- ...for-bad-request-in-ServeHTTP-handler.patch | 6 +-- ...-Fisher-Yates-shuffle-algorithm-to-r.patch | 8 +-- net/mosdns/patches/205-format-logtime.patch | 6 +-- 5 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 net/mosdns/patches/201-compatible-with-go1.20.patch diff --git a/net/mosdns/Makefile b/net/mosdns/Makefile index d0855f78..62d32d19 100644 --- a/net/mosdns/Makefile +++ b/net/mosdns/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mosdns -PKG_VERSION:=5.3.1 +PKG_VERSION:=5.3.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=7c8c795de794df52fd2b51214826aea9ebde0dcd0da78d8dda9cc5e4ab98cd80 +PKG_HASH:=1d7eeaa735cb48ed2d436797d7f2a82541699f74647cd293ee411a72cdc65f5f PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE @@ -19,12 +19,13 @@ PKG_MAINTAINER:=Tianling Shen PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 +PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/IrineSistiana/mosdns GO_PKG_LDFLAGS_X:=main.version=v$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -include ../../lang/golang/golang-package.mk +include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/mosdns SECTION:=net diff --git a/net/mosdns/patches/201-compatible-with-go1.20.patch b/net/mosdns/patches/201-compatible-with-go1.20.patch deleted file mode 100644 index 8f39741e..00000000 --- a/net/mosdns/patches/201-compatible-with-go1.20.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 329ba9ca89d25da58d1b51b8107f164beae816bb Mon Sep 17 00:00:00 2001 -From: sbwml -Date: Tue, 19 Sep 2023 21:15:12 +0800 -Subject: [PATCH 1/5] compatible with go1.20 - ---- - go.mod | 6 ++---- - go.sum | 4 ++-- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/go.mod b/go.mod -index 1839776..1b4cc4b 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,6 @@ - module github.com/IrineSistiana/mosdns/v5 - --go 1.21 -- --toolchain go1.21.1 -+go 1.20 - - require ( - github.com/IrineSistiana/go-bytes-pool v0.0.0-20230918115058-c72bd9761c57 -@@ -45,7 +43,7 @@ require ( - github.com/magiconair/properties v1.8.7 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - github.com/mdlayher/netlink v1.7.2 // indirect -- github.com/mdlayher/socket v0.5.0 // indirect -+ github.com/mdlayher/socket v0.4.1 // indirect - github.com/onsi/ginkgo/v2 v2.13.0 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect -diff --git a/go.sum b/go.sum -index 41a59b2..ad95d6d 100644 ---- a/go.sum -+++ b/go.sum -@@ -173,8 +173,8 @@ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvls - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= - github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= - github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= --github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI= --github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI= -+github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= -+github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= - github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= - github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= - github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= --- -2.42.0 \ No newline at end of file diff --git a/net/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch b/net/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch index bc3078f7..38b7974b 100644 --- a/net/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch +++ b/net/mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch @@ -7,11 +7,9 @@ Subject: [PATCH 3/5] add response for bad request in ServeHTTP handler pkg/server/http_handler.go | 1 + 1 file changed, 1 insertion(+) -diff --git a/pkg/server/http_handler.go b/pkg/server/http_handler.go -index 5a41314..8f33b3f 100644 --- a/pkg/server/http_handler.go +++ b/pkg/server/http_handler.go -@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { +@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.R if err != nil { h.warnErr(req, "invalid request", err) w.WriteHeader(http.StatusBadRequest) @@ -19,5 +17,3 @@ index 5a41314..8f33b3f 100644 return } --- -2.42.0 \ No newline at end of file diff --git a/net/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch b/net/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch index 1de1ddba..fa18e86c 100644 --- a/net/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch +++ b/net/mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch @@ -8,8 +8,6 @@ Subject: [PATCH 4/5] black_hole: apply Fisher-Yates shuffle algorithm to plugin/executable/black_hole/black_hole.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/plugin/executable/black_hole/black_hole.go b/plugin/executable/black_hole/black_hole.go -index 775253d..f955019 100644 --- a/plugin/executable/black_hole/black_hole.go +++ b/plugin/executable/black_hole/black_hole.go @@ -27,6 +27,8 @@ import ( @@ -21,7 +19,7 @@ index 775253d..f955019 100644 ) const PluginType = "black_hole" -@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole)(nil) +@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole) type BlackHole struct { ipv4 []netip.Addr ipv6 []netip.Addr @@ -29,7 +27,7 @@ index 775253d..f955019 100644 } // QuickSetup format: [ipv4|ipv6] ... -@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackHole, error) { +@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackH return b, nil } @@ -51,5 +49,3 @@ index 775253d..f955019 100644 if r := b.Response(qCtx.Q()); r != nil { qCtx.SetResponse(r) } --- -2.42.0 \ No newline at end of file diff --git a/net/mosdns/patches/205-format-logtime.patch b/net/mosdns/patches/205-format-logtime.patch index 72355b44..1628ad04 100644 --- a/net/mosdns/patches/205-format-logtime.patch +++ b/net/mosdns/patches/205-format-logtime.patch @@ -7,8 +7,6 @@ Subject: [PATCH 5/5] format logtime mlog/logger.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) -diff --git a/mlog/logger.go b/mlog/logger.go -index 861f091..1508db0 100644 --- a/mlog/logger.go +++ b/mlog/logger.go @@ -21,9 +21,11 @@ package mlog @@ -24,7 +22,7 @@ index 861f091..1508db0 100644 ) type LogConfig struct { -@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logger, error) { +@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logge out = stderr } @@ -46,5 +44,3 @@ index 861f091..1508db0 100644 } // L is a global logger. --- -2.42.0 \ No newline at end of file