summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPuqns672023-08-13 23:51:53 +0800
committerPuqns672023-08-13 23:51:53 +0800
commit59724a4163219ee8066128ce7f1dcf33be77e7f4 (patch)
tree9dd27e6cb6db916af026c8a792cbc5278d7286fa
parent914c823904aa330e4cfffa80a1155efe2908fc88 (diff)
downloadaur-59724a4163219ee8066128ce7f1dcf33be77e7f4.tar.gz
update 0.1.3
-rw-r--r--.SRCINFO10
-rw-r--r--0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch97
-rw-r--r--PKGBUILD14
3 files changed, 8 insertions, 113 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a2090162a952..7c9072e76b58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = juicity
pkgdesc = A quic-based proxy protocol and implementation, inspired by tuic.
- pkgver = 0.1.2
- pkgrel = 2
+ pkgver = 0.1.3
+ pkgrel = 1
url = https://github.com/juicity/juicity
arch = i686
arch = x86_64
@@ -11,10 +11,8 @@ pkgbase = juicity
license = AGPL3
makedepends = go
depends = glibc
- source = juicity-0.1.2-full-src.zip::https://github.com/juicity/juicity/releases/download/v0.1.2/juicity-full-src.zip
- source = 0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch
- sha512sums = e87354656e2c2ac0498d69df73d08d3f4a5e41efcea6f9aa4707680bbbd84f72ccdb81fb5fd9442c88664df3f03d99d67e9fd2bd83dce7e005c978d663d5a09e
- sha512sums = 3d5ccf3dad6e9e0a17763c043921f1d84392ff0e7aae5171d12080ea949cfb934318890910371a4f3c43387b4bd0dd3876af56e4469b5c36197027578845126a
+ source = juicity-0.1.3-full-src.zip::https://github.com/juicity/juicity/releases/download/v0.1.3/juicity-full-src.zip
+ sha512sums = 3a5b2c5c45170e756846c1c74c2840e90f136eb8e61c10faffbacc7e8809d9937c0e5b347c461c8f44afbf3ee081336cc6d4d2ab0daf9b9e2c6e5ffc712998de
pkgname = juicity-client
pkgdesc = A quic-based proxy protocol and implementation, inspired by tuic. (client)
diff --git a/0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch b/0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch
deleted file mode 100644
index 453cc610f6db..000000000000
--- a/0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7eb75ed5a475d5f6fac5e69c34b4884a51d5844c Mon Sep 17 00:00:00 2001
-From: mzz <2017@duck.com>
-Date: Wed, 9 Aug 2023 22:21:29 +0800
-Subject: [PATCH] chore: bump quic-go to v0.37.4 to support go1.21 (#81)
-
----
- .github/workflows/lint.yml | 2 +-
- .github/workflows/seed-build.yml | 2 +-
- .github/workflows/seed-release-build.yml | 2 +-
- go.mod | 4 ++--
- go.sum | 8 ++++----
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
-index a7a2983..ef517d4 100644
---- a/.github/workflows/lint.yml
-+++ b/.github/workflows/lint.yml
-@@ -31,7 +31,7 @@ jobs:
- - name: Set up Go
- uses: actions/setup-go@v4
- with:
-- go-version: '^1.20'
-+ go-version: '^1.21'
- cache: false
-
- - name: golangci-lint
-diff --git a/.github/workflows/seed-build.yml b/.github/workflows/seed-build.yml
-index 40c6300..06a9028 100644
---- a/.github/workflows/seed-build.yml
-+++ b/.github/workflows/seed-build.yml
-@@ -122,7 +122,7 @@ jobs:
- - name: Set up Go
- uses: actions/setup-go@v3
- with:
-- go-version: '^1.20'
-+ go-version: '^1.21'
-
- - name: Get project dependencies
- run: |
-diff --git a/.github/workflows/seed-release-build.yml b/.github/workflows/seed-release-build.yml
-index 25f0cdf..aeff83d 100644
---- a/.github/workflows/seed-release-build.yml
-+++ b/.github/workflows/seed-release-build.yml
-@@ -102,7 +102,7 @@ jobs:
- - name: Set up Go
- uses: actions/setup-go@v3
- with:
-- go-version: '^1.20'
-+ go-version: '^1.21'
-
- - name: Get project dependencies
- run: |
-diff --git a/go.mod b/go.mod
-index 47f2a60..6ce96ba 100644
---- a/go.mod
-+++ b/go.mod
-@@ -3,10 +3,10 @@ module github.com/juicity/juicity
- go 1.20
-
- require (
-- github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922
-+ github.com/daeuniverse/softwind v0.0.0-20230809141237-cbe650b0e27c
- github.com/google/uuid v1.3.0
- github.com/miekg/dns v1.1.55
-- github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac
-+ github.com/mzz2017/quic-go v0.0.0-20230809140948-2ea096492e36
- github.com/nadoo/glider v0.16.3
- github.com/rs/zerolog v1.30.0
- github.com/spf13/cobra v1.7.0
-diff --git a/go.sum b/go.sum
-index 16dc58e..08a4243 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1,7 +1,7 @@
- github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
- github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
--github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922 h1:TQkiCTLMY82prw7vfGqOtSCWOuX9MvnCa3g6ufvPgxg=
--github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922/go.mod h1:hL69hHFjobbgKxTJ5cknnuZT1DCglxdl30uJ3dS8nco=
-+github.com/daeuniverse/softwind v0.0.0-20230809141237-cbe650b0e27c h1:CWSa7Jnmuz8pWjMi31wxbSC+cPDzk9eZ5UClZMC2uIc=
-+github.com/daeuniverse/softwind v0.0.0-20230809141237-cbe650b0e27c/go.mod h1:fL1IT5Qi5oZsrZwq38b4HYQH5AFe8XofpuukHQByTbM=
- github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
- github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
- github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-@@ -32,8 +32,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
- github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
- github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
- github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
--github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac h1:luSUVeRYonUjk7Pxx8zViDj9Vpf42DZmfR/CbQcXKt0=
--github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac/go.mod h1:DBA25b2LoPhrfSzOPE8KcDOicysx00qvvnqe0BpA8DQ=
-+github.com/mzz2017/quic-go v0.0.0-20230809140948-2ea096492e36 h1:ikWpUK6uyLmECHFDL/ZU3KA86l7eqIpDf3L46GA42jI=
-+github.com/mzz2017/quic-go v0.0.0-20230809140948-2ea096492e36/go.mod h1:DBA25b2LoPhrfSzOPE8KcDOicysx00qvvnqe0BpA8DQ=
- github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
- github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
- github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
---
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 5e672944f0c2..5567c36b474b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgbase='juicity'
pkgname=(${pkgbase}-{client,server})
-pkgver=0.1.2
-pkgrel=2
+pkgver=0.1.3
+pkgrel=1
pkgdesc='A quic-based proxy protocol and implementation, inspired by tuic.'
url='https://github.com/juicity/juicity'
license=('AGPL3')
@@ -11,15 +11,9 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'riscv64')
depends=('glibc')
makedepends=('go')
-source=("${pkgbase}-${pkgver}-full-src.zip"::"${url}/releases/download/v${pkgver}/${pkgbase}-full-src.zip"
- '0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch')
+source=("${pkgbase}-${pkgver}-full-src.zip"::"${url}/releases/download/v${pkgver}/${pkgbase}-full-src.zip")
-sha512sums=('e87354656e2c2ac0498d69df73d08d3f4a5e41efcea6f9aa4707680bbbd84f72ccdb81fb5fd9442c88664df3f03d99d67e9fd2bd83dce7e005c978d663d5a09e'
- '3d5ccf3dad6e9e0a17763c043921f1d84392ff0e7aae5171d12080ea949cfb934318890910371a4f3c43387b4bd0dd3876af56e4469b5c36197027578845126a')
-
-prepare() {
- patch --directory="${srcdir}" --forward --strip=1 --input="${srcdir}/0001-chore-bump-quic-go-to-v0.37.4-to-support-go1.21-81.patch"
-}
+sha512sums=('3a5b2c5c45170e756846c1c74c2840e90f136eb8e61c10faffbacc7e8809d9937c0e5b347c461c8f44afbf3ee081336cc6d4d2ab0daf9b9e2c6e5ffc712998de')
build() {
GOFLAGS='-trimpath -modcacherw' GOMODCACHE="${srcdir}/go-mod" VERSION="${pkgver}" make -C "${srcdir}"