release 2.0.0

4 files changed, 43 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dda9a8eda355..b2608ce2506a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = v2raya-bin
 	pkgdesc = A web GUI client of Project V which supports VMess, VLESS, SS, SSR, Trojan and Pingtunnel protocols
-	pkgver = 1.5.9.1698.1
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://github.com/v2rayA/v2rayA
 	install = .INSTALL
@@ -10,28 +10,27 @@ pkgbase = v2raya-bin
 	arch = armv6h
 	arch = aarch64
 	license = AGPL3
-	depends = glibc
-	optdepends = v2ray>=4.37.0-1
-	optdepends = xray>=1.4.2-1
 	provides = v2raya
 	conflicts = v2raya
+	backup = etc/default/v2raya
 	source = v2raya.service
 	source = v2raya-lite.service
 	source = v2raya.png
 	source = v2raya.desktop
-	sha1sums = 7b201c058782a7382c3ec183e80af528c5310a6d
-	sha1sums = 2f3305f5ebd91dbe0ff3d70370f22a0131077794
+	sha1sums = 87e4994a79ab26158376bbfded9c3d52ed17abed
+	sha1sums = 9df9ed4266775403fcb4b655c2bc518bfe68841d
 	sha1sums = 5c51b3e670733d6d1cf22e1cb5fe45305f4b8014
 	sha1sums = f4abf270b2ce588a4e8ab4b5ccdc9168b96791fe
-	source_i686 = v2raya_1.5.9.1698.1::https://apt.v2raya.org/static/v2raya_linux_x86_1.5.9.1698.1
-	sha1sums_i686 = 4c647fb36753a3281d2187cb6d2bf0b05579a4ed
-	source_x86_64 = v2raya_1.5.9.1698.1::https://apt.v2raya.org/static/v2raya_linux_x64_1.5.9.1698.1
-	sha1sums_x86_64 = c9f4a49965feb1f936325f516d47a055b2bfb8bc
-	source_armv7h = v2raya_1.5.9.1698.1::https://apt.v2raya.org/static/v2raya_linux_arm_1.5.9.1698.1
-	sha1sums_armv7h = 1f6d7e011a612147eab7f505c022e37a59e1763d
-	source_armv6h = v2raya_1.5.9.1698.1::https://apt.v2raya.org/static/v2raya_linux_arm_1.5.9.1698.1
-	sha1sums_armv6h = 1f6d7e011a612147eab7f505c022e37a59e1763d
-	source_aarch64 = v2raya_1.5.9.1698.1::https://apt.v2raya.org/static/v2raya_linux_arm64_1.5.9.1698.1
-	sha1sums_aarch64 = 8214014ccc992ecf5ccdd962190ecece03797267
+	source_i686 = v2raya_2.0.0::https://apt.v2raya.org/static/v2raya_linux_x86_2.0.0
+	sha1sums_i686 = 78be5860666df4008b8e4e00e6df6e939ca167ca
+	source_x86_64 = v2raya_2.0.0::https://apt.v2raya.org/static/v2raya_linux_x64_2.0.0
+	sha1sums_x86_64 = f2a0bab66991f325824502b6c6743ac100907484
+	source_armv7h = v2raya_2.0.0::https://apt.v2raya.org/static/v2raya_linux_arm_2.0.0
+	sha1sums_armv7h = 165dace9c74add7faf4190a15ecd1a6d27c3c7b0
+	source_armv6h = v2raya_2.0.0::https://apt.v2raya.org/static/v2raya_linux_arm_2.0.0
+	sha1sums_armv6h = 165dace9c74add7faf4190a15ecd1a6d27c3c7b0
+	source_aarch64 = v2raya_2.0.0::https://apt.v2raya.org/static/v2raya_linux_arm64_2.0.0
+	sha1sums_aarch64 = a7ab110036fcb01ef1208ab38162dbcd51a58b37
 
 pkgname = v2raya-bin
+	depends = v2ray>=5.0.0
diff --git a/PKGBUILD b/PKGBUILD
index fc73cfbb7ecc..ec38cf3d37f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,19 @@
 
 pkgname=v2raya-bin
 _pkgname=v2raya
-pkgver=1.5.9.1698.1
+pkgver=2.0.0
 pkgrel=1
 install=.INSTALL
 pkgdesc="A web GUI client of Project V which supports VMess, VLESS, SS, SSR, Trojan and Pingtunnel protocols"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/v2rayA/v2rayA"
 license=('AGPL3')
-depends=('glibc')
-optdepends=('v2ray>=4.37.0-1' 'xray>=1.4.2-1')
 provides=('v2raya')
 conflicts=('v2raya')
+backup=("etc/default/v2raya")
 
-sha_service=7b201c058782a7382c3ec183e80af528c5310a6d
-sha_service_lite=2f3305f5ebd91dbe0ff3d70370f22a0131077794
+sha_service=87e4994a79ab26158376bbfded9c3d52ed17abed
+sha_service_lite=9df9ed4266775403fcb4b655c2bc518bfe68841d
 sha_png=5c51b3e670733d6d1cf22e1cb5fe45305f4b8014
 sha_desktop=f4abf270b2ce588a4e8ab4b5ccdc9168b96791fe
 
@@ -50,26 +49,42 @@ sha1sums=(
 )
 
 sha1sums_i686=(
-    '4c647fb36753a3281d2187cb6d2bf0b05579a4ed'
+    '78be5860666df4008b8e4e00e6df6e939ca167ca'
 )
 sha1sums_x86_64=(
-    'c9f4a49965feb1f936325f516d47a055b2bfb8bc'
+    'f2a0bab66991f325824502b6c6743ac100907484'
 )
 sha1sums_aarch64=(
-    '8214014ccc992ecf5ccdd962190ecece03797267'
+    'a7ab110036fcb01ef1208ab38162dbcd51a58b37'
 )
 sha1sums_armv6h=(
-    '1f6d7e011a612147eab7f505c022e37a59e1763d'
+    '165dace9c74add7faf4190a15ecd1a6d27c3c7b0'
 )
 sha1sums_armv7h=(
-    '1f6d7e011a612147eab7f505c022e37a59e1763d'
+    '165dace9c74add7faf4190a15ecd1a6d27c3c7b0'
 )
 
+build() {
+    cd "$srcdir"
+
+    # generate default config
+    cat > "$srcdir/v2raya.conf" << EOF
+# v2raya config example
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+EOF
+    ./v2raya_"${pkgver}" --report config | sed '1,6d' | fold -s -w 78 | sed -E 's/^([^#].+)/# \1/'  >> "$srcdir/v2raya.conf"
+}
+
 package() {
+    depends+=('v2ray>=5.0.0')
+
     cd "$srcdir"
     install -Dm 755 v2raya_"${pkgver}" "${pkgdir}"/usr/bin/v2raya
     install -Dm 644 v2raya.desktop -t "${pkgdir}"/usr/share/applications/
     install -Dm 644 v2raya.service -t "${pkgdir}"/usr/lib/systemd/system/
     install -Dm 644 v2raya-lite.service -t "${pkgdir}"/usr/lib/systemd/user/
     install -Dm 644 v2raya.png "${pkgdir}"/usr/share/icons/hicolor/512x512/apps/v2raya.png
+    install -Dm 644 v2raya.conf "${pkgdir}"/etc/default/v2raya
 }
diff --git a/v2raya-lite.service b/v2raya-lite.service
index b45590a7a7a3..b79a3a0390f2 100644
--- a/v2raya-lite.service
+++ b/v2raya-lite.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=v2rayA Lite Service
 Documentation=https://github.com/v2rayA/v2rayA/wiki
-After=network.target nss-lookup.target iptables.service ip6tables.service
+After=network.target nss-lookup.target iptables.service ip6tables.service nftables.service
 Wants=network.target
 
 [Service]
diff --git a/v2raya.service b/v2raya.service
index 55216b2f7283..fe5ae97b716d 100644
--- a/v2raya.service
+++ b/v2raya.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=v2rayA Service
 Documentation=https://github.com/v2rayA/v2rayA/wiki
-After=network.target nss-lookup.target iptables.service ip6tables.service
+After=network.target nss-lookup.target iptables.service ip6tables.service nftables.service
 Wants=network.target
 
 [Service]
@@ -11,6 +11,7 @@ LimitNPROC=500
 LimitNOFILE=1000000
 ExecStart=/usr/bin/v2raya --log-disable-timestamp
 Environment=V2RAYA_LOG_FILE=/var/log/v2raya/v2raya.log
+EnvironmentFile=-/etc/default/v2raya
 Restart=on-failure
 
 [Install]