void-packages

commit 5c409a3c8ad778a2141654687785d1b57b57f7f6
parent 3ec631c93a150d1339cacc2ef512c034b0e213b4
Author: Dash Eclipse <dash@ezup.dev>
Date:   Mon, 20 Jul 2020 20:02:04 +0000

trojan: update

Diffstat:
M
srcpkgs/trojan/INSTALL
 | 
2
++
M
srcpkgs/trojan/files/trojan/run
 | 
2
+-
M
srcpkgs/trojan/template
 | 
6
++----

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/trojan/INSTALL b/srcpkgs/trojan/INSTALL
@@ -1,5 +1,7 @@
 case "${ACTION}" in
 post)
+	chown trojan:trojan /etc/trojan/config.json
+	chmod 660 /etc/trojan/config.json
         setcap cap_net_bind_service,cap_net_admin+ep usr/bin/trojan
         ;;
 esac
diff --git a/srcpkgs/trojan/files/trojan/run b/srcpkgs/trojan/files/trojan/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u trojan:trojan trojan -l /var/log/trojan/trojan.log -c /etc/trojan/config.json 1>/dev/null
+exec chpst -u trojan:trojan /usr/bin/trojan -c /etc/trojan/config.json 2>&1
diff --git a/srcpkgs/trojan/template b/srcpkgs/trojan/template
@@ -1,7 +1,7 @@
 # Template file for 'trojan'
 pkgname=trojan
 version=1.16.0
-revision=5
+revision=6
 wrksrc="${pkgname}-${version}"
 build_style="cmake"
 configure_args="-DENABLE_MYSQL=OFF -DENABLE_SSL_KEYLOG=OFF -DENABLE_TLS13_CIPHERSUITES=OFF -DSYSTEMD_SERVICE=OFF"
@@ -15,10 +15,8 @@ checksum=86cdb2685bb03a63b62ce06545c41189952f1ec4a0cd9147450312ed70956cbc
 
 system_accounts="${pkgname}"
 
-make_dirs="/etc/${pkgname} 0750 trojan trojan"
+make_dirs="/etc/trojan 0750 trojan trojan"
 
 post_install() {
-	chown trojan:trojan /etc/trojan/config.json
-	chmod 664 /etc/trojan/config.json
 	vsv ${pkgname}
 }