Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump golang.org/x/net from 0.9.0 to 0.23.0 #1

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alignedbuff/alignedbuff.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"unsafe"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
)

// ErrEOF signals trying to read beyond the available payload information.
Expand Down
2 changes: 1 addition & 1 deletion chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"math"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion compat_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package nftables
import (
"fmt"

"github.com/google/nftables/expr"
"github.com/sagernet/nftables/expr"
"golang.org/x/sys/unix"
)

Expand Down
4 changes: 2 additions & 2 deletions compat_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package nftables
import (
"testing"

"github.com/google/nftables/expr"
"github.com/google/nftables/xt"
"github.com/sagernet/nftables/expr"
"github.com/sagernet/nftables/xt"
"golang.org/x/sys/unix"
)

Expand Down
4 changes: 2 additions & 2 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"os"
"sync"

"github.com/google/nftables/binaryutil"
"github.com/google/nftables/expr"
"github.com/sagernet/nftables/binaryutil"
"github.com/sagernet/nftables/expr"
"github.com/mdlayher/netlink"
"github.com/mdlayher/netlink/nltest"
E "github.com/sagernet/sing/common/exceptions"
Expand Down
2 changes: 1 addition & 1 deletion counter.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package nftables

import (
"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/bitwise.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/byteorder.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/connlimit.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/counter.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/ct.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/dup.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
4 changes: 2 additions & 2 deletions expr/dynset.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"encoding/binary"
"time"

"github.com/google/nftables/binaryutil"
"github.com/google/nftables/internal/parseexprfunc"
"github.com/sagernet/nftables/binaryutil"
"github.com/sagernet/nftables/internal/parseexprfunc"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
4 changes: 2 additions & 2 deletions expr/expr.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/google/nftables/internal/parseexprfunc"
"github.com/sagernet/nftables/binaryutil"
"github.com/sagernet/nftables/internal/parseexprfunc"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/exthdr.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/fib.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/immediate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"encoding/binary"
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/limit.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"errors"
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/lookup.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
4 changes: 2 additions & 2 deletions expr/match.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/google/nftables/xt"
"github.com/sagernet/nftables/binaryutil"
"github.com/sagernet/nftables/xt"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/match_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/google/nftables/xt"
"github.com/sagernet/nftables/xt"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/nat.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/numgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"encoding/binary"
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/objref.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/payload.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/range.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/redirect.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/reject.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/rt.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
4 changes: 2 additions & 2 deletions expr/target.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/google/nftables/xt"
"github.com/sagernet/nftables/binaryutil"
"github.com/sagernet/nftables/xt"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/target_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/google/nftables/xt"
"github.com/sagernet/nftables/xt"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/tproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package expr
import (
"encoding/binary"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion expr/verdict.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"encoding/binary"
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
2 changes: 1 addition & 1 deletion flowtable.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"encoding/binary"
"fmt"

"github.com/google/nftables/binaryutil"
"github.com/sagernet/nftables/binaryutil"
"github.com/mdlayher/netlink"
"golang.org/x/sys/unix"
)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/google/nftables
module github.com/sagernet/nftables

go 1.18

Expand All @@ -13,6 +13,6 @@ require (
github.com/google/go-cmp v0.5.9 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.1.0 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ github.com/sagernet/sing v0.4.0 h1:sCLSqLHOptgFvzQO9FfaYMl4PONePZkclMznpeKhdHc=
github.com/sagernet/sing v0.4.0/go.mod h1:Xh4KO9nGdvm4K/LVg9Xn9jSxJdqe9KcXbAzNC1S2qfw=
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
Expand Down
2 changes: 1 addition & 1 deletion internal/nftest/nftest.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/google/nftables"
"github.com/sagernet/nftables"
"github.com/mdlayher/netlink"
)

Expand Down
Loading