release v1.5.0

5 files changed, 40 insertions, 41 deletions

diff --git a/.INSTALL b/.INSTALL
index d72871ce70cb..143ecc522d65 100755
--- a/.INSTALL
+++ b/.INSTALL
@@ -2,8 +2,6 @@
 
 post_install() {
     systemctl daemon-reload
-    systemctl enable v2raya
-    systemctl start v2raya
 
     ECHOLEN=$(echo -e|awk '{print length($0)}')
     if [ ${ECHOLEN} = '0' ]
@@ -19,8 +17,7 @@ post_install() {
 
 post_upgrade() {
     systemctl daemon-reload
-    systemctl restart v2raya
-    
+
     ECHOLEN=$(echo -e|awk '{print length($0)}')
     if [ ${ECHOLEN} = '0' ]
     then
@@ -32,13 +29,3 @@ post_upgrade() {
     $ECHO "\033[36m*         Completed!         *\033[0m"
     $ECHO "\033[36m******************************\033[0m"
 }
-
-pre_remove() {
-    systemctl disable v2raya
-    systemctl stop v2raya
-    systemctl stop v2ray
-}
-
-post_remove() {
-    systemctl daemon-reload
-}
diff --git a/.SRCINFO b/.SRCINFO
index 339e64ab9ad8..70dfbbacd950 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.4.4
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://github.com/v2rayA/v2rayA
 	install = .INSTALL
@@ -16,22 +16,22 @@ pkgbase = v2raya-bin
 	provides = v2raya
 	conflicts = v2raya
 	source = v2raya.service
+	source = v2raya@.service
 	source = v2raya.png
 	source = v2raya.desktop
-	source = web_v1.4.4.tar.gz::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/web_v1.4.4.tar.gz
-	sha1sums = ba580b203c1971780d2721a48fbc828d11467d5a
+	sha1sums = 0fcd700dbd5aa409b13bff64e738e566fc996881
+	sha1sums = 3fd341dde6e9a9d5ea828904042f9beb6028b289
 	sha1sums = 5c51b3e670733d6d1cf22e1cb5fe45305f4b8014
 	sha1sums = f4abf270b2ce588a4e8ab4b5ccdc9168b96791fe
-	sha1sums = 279d7ab251d830268555dea07360e6ce7383188a
-	source_i686 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_x86_v1.4.4
-	sha1sums_i686 = 61aa149d526cb230112ef384bc7ce715d5946f10
-	source_x86_64 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_x64_v1.4.4
-	sha1sums_x86_64 = 66a9608096f6edbd4612f198f88a2f13a9d882f4
-	source_armv7h = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm_v1.4.4
-	sha1sums_armv7h = f9e017ebdefc7c57c170659a41ae8f54dadb8a43
-	source_armv6h = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm_v1.4.4
-	sha1sums_armv6h = f9e017ebdefc7c57c170659a41ae8f54dadb8a43
-	source_aarch64 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm64_v1.4.4
-	sha1sums_aarch64 = b2688adfc9e1009985dd1a41f41c15e7d5f1b50e
+	source_i686 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_x86_v1.5.0
+	sha1sums_i686 = 81a8b628dd1bfeda01ba68d57b3359650e12596a
+	source_x86_64 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_x64_v1.5.0
+	sha1sums_x86_64 = 4bec2ae30fa0c5a56bdb79b5eb55f070bdd8326f
+	source_armv7h = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm_v1.5.0
+	sha1sums_armv7h = adf13c5e7c6dde7b91463fe5efbac8bd00d168f4
+	source_armv6h = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm_v1.5.0
+	sha1sums_armv6h = adf13c5e7c6dde7b91463fe5efbac8bd00d168f4
+	source_aarch64 = v2raya::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/v2raya_linux_arm64_v1.5.0
+	sha1sums_aarch64 = 6940f91bc708e0d3c333d31c38cbfe51b3c0d927
 
 pkgname = v2raya-bin
diff --git a/PKGBUILD b/PKGBUILD
index e02282aac6d6..18d7b584a227 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=v2raya-bin
 _pkgname=v2raya
-pkgver=1.4.4
+pkgver=1.5.0
 pkgrel=1
 install=.INSTALL
 pkgdesc="A web GUI client of Project V which supports VMess, VLESS, SS, SSR, Trojan and Pingtunnel protocols"
@@ -14,16 +14,16 @@ optdepends=('v2ray>=4.37.0-1' 'xray>=1.4.2-1')
 provides=('v2raya')
 conflicts=('v2raya')
 
-sha_service=ba580b203c1971780d2721a48fbc828d11467d5a
+sha_service=0fcd700dbd5aa409b13bff64e738e566fc996881
+sha_service_at=3fd341dde6e9a9d5ea828904042f9beb6028b289
 sha_png=5c51b3e670733d6d1cf22e1cb5fe45305f4b8014
 sha_desktop=f4abf270b2ce588a4e8ab4b5ccdc9168b96791fe
-sha_web=279d7ab251d830268555dea07360e6ce7383188a
 
 source=(
     "v2raya.service"
+    "v2raya@.service"
     "v2raya.png"
     "v2raya.desktop"
-    "web_v${pkgver}.tar.gz::https://apt.v2raya.mzz.pub/pool/main/v/v2raya/web_v${pkgver}.tar.gz"
 )
 
 source_i686=(
@@ -44,33 +44,32 @@ source_armv7h=(
 
 sha1sums=(
     "$sha_service"
+    "$sha_service_at"
     "$sha_png"
     "$sha_desktop"
-    "$sha_web"
 )
 
 sha1sums_i686=(
-    '61aa149d526cb230112ef384bc7ce715d5946f10'
+    '81a8b628dd1bfeda01ba68d57b3359650e12596a'
 )
 sha1sums_x86_64=(
-    '66a9608096f6edbd4612f198f88a2f13a9d882f4'
+    '4bec2ae30fa0c5a56bdb79b5eb55f070bdd8326f'
 )
 sha1sums_aarch64=(
-    'b2688adfc9e1009985dd1a41f41c15e7d5f1b50e'
+    '6940f91bc708e0d3c333d31c38cbfe51b3c0d927'
 )
 sha1sums_armv6h=(
-    'f9e017ebdefc7c57c170659a41ae8f54dadb8a43'
+    'adf13c5e7c6dde7b91463fe5efbac8bd00d168f4'
 )
 sha1sums_armv7h=(
-    'f9e017ebdefc7c57c170659a41ae8f54dadb8a43'
+    'adf13c5e7c6dde7b91463fe5efbac8bd00d168f4'
 )
 
 package() {
     cd "$srcdir"
     install -Dm 755 v2raya_v"${pkgver}" "${pkgdir}"/usr/bin/v2raya
-    find web -type d -exec install -vd "${pkgdir}"/etc/v2raya/{} \;
-    find web -type f -exec install -vm 644 {} "${pkgdir}"/etc/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@.service -t "${pkgdir}"/usr/lib/systemd/system/
     install -Dm 644 v2raya.png "${pkgdir}"/usr/share/icons/hicolor/512x512/apps/v2raya.png
 }
diff --git a/v2raya.service b/v2raya.service
index f918af736db7..7933baca6efa 100644
--- a/v2raya.service
+++ b/v2raya.service
@@ -9,7 +9,6 @@ Type=simple
 User=root
 LimitNPROC=500
 LimitNOFILE=1000000
-Environment="GODEBUG=madvdontneed=1"
 ExecStart=/usr/bin/v2raya
 Restart=on-failure
 
diff --git a/v2raya@.service b/v2raya@.service
new file mode 100644
index 000000000000..eb5d55740d70
--- /dev/null
+++ b/v2raya@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=v2rayA Service for %i
+Documentation=https://github.com/v2rayA/v2rayA/wiki
+After=network.target nss-lookup.target iptables.service ip6tables.service
+Wants=network.target
+
+[Service]
+Type=simple
+User=%i
+ExecStart=/usr/bin/v2raya --passcheckroot --config=$HOME/.config/v2raya
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target