Skip to content

Commit 83b3707

Browse files
committed
mosdns: update to 5.3.3
Signed-off-by: sbwml <admin@cooluc.com>
1 parent 36ea52d commit 83b3707

5 files changed

Lines changed: 6 additions & 72 deletions

mosdns/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=mosdns
8-
PKG_VERSION:=5.3.1
8+
PKG_VERSION:=5.3.3
99
PKG_RELEASE:=1
1010

1111
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1212
PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)?
13-
PKG_HASH:=7c8c795de794df52fd2b51214826aea9ebde0dcd0da78d8dda9cc5e4ab98cd80
13+
PKG_HASH:=1d7eeaa735cb48ed2d436797d7f2a82541699f74647cd293ee411a72cdc65f5f
1414

1515
PKG_LICENSE:=GPL-3.0
1616
PKG_LICENSE_FILE:=LICENSE

mosdns/patches/201-compatible-with-go1.20.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

mosdns/patches/203-add-response-for-bad-request-in-ServeHTTP-handler.patch

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@ Subject: [PATCH 3/5] add response for bad request in ServeHTTP handler
77
pkg/server/http_handler.go | 1 +
88
1 file changed, 1 insertion(+)
99

10-
diff --git a/pkg/server/http_handler.go b/pkg/server/http_handler.go
11-
index 5a41314..8f33b3f 100644
1210
--- a/pkg/server/http_handler.go
1311
+++ b/pkg/server/http_handler.go
14-
@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
12+
@@ -93,6 +93,7 @@ func (h *HttpHandler) ServeHTTP(w http.R
1513
if err != nil {
1614
h.warnErr(req, "invalid request", err)
1715
w.WriteHeader(http.StatusBadRequest)
1816
+ w.Write([]byte("Bad Request"))
1917
return
2018
}
2119

22-
--
23-
2.42.0
24-

mosdns/patches/204-black_hole-apply-Fisher-Yates-shuffle-algorithm-to-r.patch

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Subject: [PATCH 4/5] black_hole: apply Fisher-Yates shuffle algorithm to
88
plugin/executable/black_hole/black_hole.go | 15 +++++++++++++++
99
1 file changed, 15 insertions(+)
1010

11-
diff --git a/plugin/executable/black_hole/black_hole.go b/plugin/executable/black_hole/black_hole.go
12-
index 775253d..f955019 100644
1311
--- a/plugin/executable/black_hole/black_hole.go
1412
+++ b/plugin/executable/black_hole/black_hole.go
1513
@@ -27,6 +27,8 @@ import (
@@ -21,15 +19,15 @@ index 775253d..f955019 100644
2119
)
2220

2321
const PluginType = "black_hole"
24-
@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole)(nil)
22+
@@ -40,6 +42,7 @@ var _ sequence.Executable = (*BlackHole)
2523
type BlackHole struct {
2624
ipv4 []netip.Addr
2725
ipv6 []netip.Addr
2826
+ shuffleMutex sync.Mutex
2927
}
3028

3129
// QuickSetup format: [ipv4|ipv6] ...
32-
@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackHole, error) {
30+
@@ -65,9 +68,21 @@ func NewBlackHole(ips []string) (*BlackH
3331
return b, nil
3432
}
3533

@@ -51,6 +49,3 @@ index 775253d..f955019 100644
5149
if r := b.Response(qCtx.Q()); r != nil {
5250
qCtx.SetResponse(r)
5351
}
54-
--
55-
2.42.0
56-

mosdns/patches/205-format-logtime.patch

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Subject: [PATCH 5/5] format logtime
77
mlog/logger.go | 18 ++++++++++++++----
88
1 file changed, 14 insertions(+), 4 deletions(-)
99

10-
diff --git a/mlog/logger.go b/mlog/logger.go
11-
index 861f091..1508db0 100644
1210
--- a/mlog/logger.go
1311
+++ b/mlog/logger.go
1412
@@ -21,9 +21,11 @@ package mlog
@@ -24,7 +22,7 @@ index 861f091..1508db0 100644
2422
)
2523

2624
type LogConfig struct {
27-
@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logger, error) {
25+
@@ -64,10 +66,18 @@ func NewLogger(lc LogConfig) (*zap.Logge
2826
out = stderr
2927
}
3028

@@ -46,6 +44,3 @@ index 861f091..1508db0 100644
4644
}
4745

4846
// L is a global logger.
49-
--
50-
2.42.0
51-

0 commit comments

Comments
 (0)