Update anet library

RIVM-144 Update pkg.yml build script and assign version from contrib/semver/version.sh (#67)

* RIVM-144 Update pkg.yml build script and assign version from contrib/semver/version.sh

* RIVM-144 Build in Ubuntu 22.04

* Anet library update

Author: vikulin

.github/workflows/pkg.yml

@@ -8,11 +8,14 @@ jobs:
   build-libs-android:
 
     name: Build libs (Android)
-    runs-on: self-hosted
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        fetch-tags: true
 
     - name: 🐼 Setup go1.22+
       uses: actions/setup-go@v5
@@ -26,8 +29,10 @@ jobs:
         ./contrib/mobile/build -a
     
     - name: Get version
+      id: get_version
       run: |
-        PKGVERSION=$(sh -c './contrib/semver/version.sh --bare') && echo $PKGVERSION
+        PKGVERSION=$(sh -c './contrib/semver/version.sh --bare') 
+        echo "PKGVERSION=$PKGVERSION" >> $GITHUB_ENV
 
     - name: Upload .aar files
       uses: actions/upload-artifact@v4
@@ -50,4 +55,4 @@ jobs:
         gh_pat: ${{ secrets.MAVEN_PAT }}
         artifact_id: mesh
         group_id: org.rivchain
-        version: 0.4.7.8
+        version: ${{ env.PKGVERSION }}

contrib/msi/msversion.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Get the last tag
-TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
+TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
 
 # Did getting the tag succeed?
 if [ $? != 0 ] || [ -z "$TAG" ]; then
@@ -17,6 +17,6 @@ if [ $? != 0 ] || [ -z "$BRANCH" ]; then
   BRANCH="master"
 fi
 
-STAG=$(echo $TAG | sed 's/v//' | sed 's/[^0123456789.].//')
+STAG=$(echo $TAG | sed 's/^v//' | sed 's/[^0123456789.].//')
 
 printf '%s' "$STAG"

contrib/semver/version.sh

@@ -3,9 +3,9 @@
 case "$*" in
   *--bare*)
     # Remove the "v" prefix
-    git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --abbrev=7 | cut -c 2-
+    git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | sed 's/^v//'
     ;;
   *)
-    git describe --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --abbrev=7
+    git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*"
     ;;
 esac

go.mod

@@ -24,8 +24,8 @@ require gerace.dev/zipfs v0.2.0
 
 require (
 	github.com/slonm/tableprinter v0.0.0-20230107100804-643098716018
+	github.com/vikulin/anet v0.0.6-0.20240829153812-99b8955b2cff
 	github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45
-	github.com/wlynxg/anet v0.0.4
 	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224
 )

go.sum

@@ -68,6 +68,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/vikulin/anet v0.0.6-0.20240829153812-99b8955b2cff h1:iifW98BSWU92RJmWRcnruOihGZphu1YYBlWA0zLG7zs=
+github.com/vikulin/anet v0.0.6-0.20240829153812-99b8955b2cff/go.mod h1:4hyB1C384gHwcoCRaXPrCy90R0JK1AlK/a0kH+BrPyQ=
 github.com/vikulin/sctp v0.0.0-20221009200520-ae0f2830e422 h1:KJn6ovcNlavPTgdK2uKJoonWPP3GTb8x4FyYPIrwpZw=
 github.com/vikulin/sctp v0.0.0-20221009200520-ae0f2830e422/go.mod h1:wbWp47D/qXkQrDuO8qSeUXdLN9qXNZzIgLGDQIoJlJU=
 github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
@@ -77,8 +79,6 @@ github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvV
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45 h1:hB/hkjwf3BQnZE6Wk3SBwMJz0NqnGdwXoNzHVSYb0N0=
 github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45/go.mod h1:dfjQkJsG5auteUbnfLIcU72Y/z8tj7DuW9fik8f2Zn0=
-github.com/wlynxg/anet v0.0.4 h1:0de1OFQxnNqAu+x2FAKKCVIrnfGKQbs7FQz++tB0+Uw=
-github.com/wlynxg/anet v0.0.4/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

src/core/link_tcp.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/wlynxg/anet"
+	"github.com/vikulin/anet"
 
 	"github.com/Arceliar/phony"
 )

src/multicast/multicast.go

@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/wlynxg/anet"
+	"github.com/vikulin/anet"
 
 	"github.com/Arceliar/phony"
 	"github.com/gologme/log"