From baff4f7d5152ecebf1d2859ede21a21b78e8ee5e Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Wed, 15 May 2019 16:36:25 +0300 Subject: [PATCH] kcptun: 20190515 bump --- net-vpn/kcptun/Manifest | 4 ++-- net-vpn/kcptun/files/kcptun.service | 15 --------------- net-vpn/kcptun/files/{ => man}/kcptun-client.1 | 6 +++--- net-vpn/kcptun/files/{ => man}/kcptun-server.1 | 6 +++--- ...tun-20190428.ebuild => kcptun-20190515.ebuild} | 7 ++++--- 5 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 net-vpn/kcptun/files/kcptun.service rename net-vpn/kcptun/files/{ => man}/kcptun-client.1 (95%) rename net-vpn/kcptun/files/{ => man}/kcptun-server.1 (95%) rename net-vpn/kcptun/{kcptun-20190428.ebuild => kcptun-20190515.ebuild} (91%) diff --git a/net-vpn/kcptun/Manifest b/net-vpn/kcptun/Manifest index 8ca5b36ba..9fb0e707a 100644 --- a/net-vpn/kcptun/Manifest +++ b/net-vpn/kcptun/Manifest @@ -6,5 +6,5 @@ DIST github.com-templexxx-xor-0.1.2.tar.gz 6429 BLAKE2B 3d7f11d03f453e1a7497f356 DIST github.com-tjfoc-gmsm-v1.2.tar.gz 83757 BLAKE2B cf3f0c8a8fc83e60771e001d589dcc47b346539e64acdfb9a217f5a2dfea6e4af3efa874d8f4761279275a0c0b03337a8b8c13c95a716bcfdf8ca90335e2a6be SHA512 5f6ef6a780a338575673d134d2e5b7130ea5a143a7710e0e08e86b4ba711c2e3fd3bda7a2d4ed4dbfb8252718b11ec90590262565af12f164dd9e975a2eba406 DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5 DIST github.com-xtaci-kcp-go-v5.2.7.tar.gz 77924 BLAKE2B ae42d8adbd55c5966ab91471644cd01370cc01e28cb8f26652643d2f22258e83171b892dd0cd631294fe4f98218a4ff86606605811c03257bc6cde30ce0e8576 SHA512 dbaca9c168c8d61cc17148d56fcf2b966f8dc37dbac1bf3da37161a5d2cd4054db4b6c81bcf31868e7e11d0c71ae1e8173840a44f5ea218efeffe092646e19c9 -DIST github.com-xtaci-smux-v1.2.10.tar.gz 132155 BLAKE2B 959656ab82500220c66ed1952d07565e1cc6bc478db53d9307a0e00603b9a0a8d56dd587e18967c87be1d2d2ef5724ea397513141fea70c712175a6a65505a4d SHA512 798468a3dec5f75a3d81252e73548017dd4a9d7b3cdef0c64c45c7f01b0d980f919e5be1b064ba3774f9117eea0dd9488ad02fda68810808b2016456fb104257 -DIST kcptun-20190428.tar.gz 277627 BLAKE2B 4fa2bf4a9587f8070c7a192257b4e94eefaad72257ca35eccbcaa413599417102f3439ebd1d44c3a93f252d1dcb4994a825326c3ee85309545197b92db0a6dd7 SHA512 2843df918f45c5e3ba85b6abebd563a3d55456057bf2ed7617757f160da316ce9c16af1c8dc410625ec1e632f39e596fe772efc84708c7b798e252e73e34b32a +DIST github.com-xtaci-smux-v1.3.2.tar.gz 133766 BLAKE2B f5bc5fb532d22f9641eb0932554eef2d9c97f49fea2cd7b427c89dac1d09e3cc23dcac443c3964af3b16992626bad8317f850ec64393b891ac76bfa9ba86cbbf SHA512 7327de2671ae420b71990d728dc892e7acb75f6146ad2132adb8fce6bd0350d134567c7eb5c79b995e52374c8d417dcf3c1a1ee1b9c44146a8247b140afdd291 +DIST kcptun-20190515.tar.gz 278753 BLAKE2B f02d44ced003caf806d094eb1a9c8183415aa5c3e3198a1900839c85973eae84d6a1aa9f8385a0a7ee6c053b683350c2b9920b79a9b6d124f0851e4121e4b2f5 SHA512 3c5e8d546335abe6d5f07c57ff2b94dceaa0b4cb764dbf32f3dab4f78ae08fc9546945c1753ec51c0ccc777eb036e9ede257c414b6c6afb32ce8b25c250433fb diff --git a/net-vpn/kcptun/files/kcptun.service b/net-vpn/kcptun/files/kcptun.service deleted file mode 100644 index 8225f7a08..000000000 --- a/net-vpn/kcptun/files/kcptun.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Kcptun Client Service (fuck you!) -After=network.target - -[Service] -Type=simple -User=nobody -ExecStart=/usr/bin/kcptun-client -c /root/kcptun/fuck_you.json -Restart=always -RestartSec=5 - -[Install] -WantedBy=multi-user.target - -# fuck you! \ No newline at end of file diff --git a/net-vpn/kcptun/files/kcptun-client.1 b/net-vpn/kcptun/files/man/kcptun-client.1 similarity index 95% rename from net-vpn/kcptun/files/kcptun-client.1 rename to net-vpn/kcptun/files/man/kcptun-client.1 index 5b82851e5..2457b7a3a 100644 --- a/net-vpn/kcptun/files/kcptun-client.1 +++ b/net-vpn/kcptun/files/man/kcptun-client.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH KCPTUN "1" "May 2019" "kcptun version 20190428" "User Commands" +.TH KCPTUN "1" "May 2019" "kcptun version 20190515" "User Commands" .SH NAME -kcptun \- manual page for kcptun version 20190428 +kcptun \- manual page for kcptun version 20190515 .SH DESCRIPTION .SS "NAME:" .IP @@ -11,7 +11,7 @@ kcptun \- client(with SMUX) kcptun\-client [global options] command [command options] [arguments...] .SS "VERSION:" .IP -20190428 +20190515 .SS "COMMANDS:" .TP help, h diff --git a/net-vpn/kcptun/files/kcptun-server.1 b/net-vpn/kcptun/files/man/kcptun-server.1 similarity index 95% rename from net-vpn/kcptun/files/kcptun-server.1 rename to net-vpn/kcptun/files/man/kcptun-server.1 index 47d3ccc41..726e035df 100644 --- a/net-vpn/kcptun/files/kcptun-server.1 +++ b/net-vpn/kcptun/files/man/kcptun-server.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH KCPTUN "1" "May 2019" "kcptun version 20190428" "User Commands" +.TH KCPTUN "1" "May 2019" "kcptun version 20190515" "User Commands" .SH NAME -kcptun \- manual page for kcptun version 20190428 +kcptun \- manual page for kcptun version 20190515 .SH DESCRIPTION .SS "NAME:" .IP @@ -11,7 +11,7 @@ kcptun \- server(with SMUX) kcptun\-server [global options] command [command options] [arguments...] .SS "VERSION:" .IP -20190428 +20190515 .SS "COMMANDS:" .TP help, h diff --git a/net-vpn/kcptun/kcptun-20190428.ebuild b/net-vpn/kcptun/kcptun-20190515.ebuild similarity index 91% rename from net-vpn/kcptun/kcptun-20190428.ebuild rename to net-vpn/kcptun/kcptun-20190515.ebuild index ae7d2e219..9ef7744f4 100644 --- a/net-vpn/kcptun/kcptun-20190428.ebuild +++ b/net-vpn/kcptun/kcptun-20190515.ebuild @@ -12,7 +12,7 @@ EGO_VENDOR=( "github.com/klauspost/reedsolomon v1.9.1" "github.com/klauspost/cpuid v1.2.1" "github.com/templexxx/cpufeat cef66df" # 20180724 - "github.com/xtaci/smux v1.2.10" + "github.com/xtaci/smux v1.3.2" ) inherit golang-vcs-snapshot @@ -42,7 +42,8 @@ DEPEND="${RDEPEND} src_compile() { for x in client $(usev server); do CGO_ENABLED=0 GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go build -v -work -x -ldflags "-X main.VERSION=${PV}" -o "bin/${PN}-${x}" "${EGO_PN}/${x}" + go build -v -work -x -ldflags "-X main.VERSION=${PV} -s -w" \ + -o "bin/${PN}-${x}" "${EGO_PN}/${x}" || die done } @@ -58,7 +59,7 @@ src_install() { newconfd "${FILESDIR}"/kcptun-${x}.confd kcptun-${x} # help2man ./bin/${PN}-* - doman "${FILESDIR}"/${PN}-${x}.1 + doman "${FILESDIR}"/man/${PN}-${x}.1 done }