From 9c14693e6df85cfd083a96ef42ed41ed9a78f978 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 2 Aug 2019 23:48:55 +0800 Subject: [PATCH] kcptun: bump to 20190725 --- package/jsda/luci-app-kcptun/.gitignore | 5 - package/jsda/luci-app-kcptun/.travis.yml | 79 --------- package/jsda/luci-app-kcptun/LICENSE | 202 ----------------------- package/jsda/luci-app-kcptun/README.md | 55 ------ package/lean/kcptun/Makefile | 4 +- 5 files changed, 2 insertions(+), 343 deletions(-) delete mode 100755 package/jsda/luci-app-kcptun/.gitignore delete mode 100755 package/jsda/luci-app-kcptun/.travis.yml delete mode 100755 package/jsda/luci-app-kcptun/LICENSE delete mode 100755 package/jsda/luci-app-kcptun/README.md diff --git a/package/jsda/luci-app-kcptun/.gitignore b/package/jsda/luci-app-kcptun/.gitignore deleted file mode 100755 index a8a2baf241..0000000000 --- a/package/jsda/luci-app-kcptun/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.DS_Store -*.bak -*.lmo -*.po~ -*.ipk diff --git a/package/jsda/luci-app-kcptun/.travis.yml b/package/jsda/luci-app-kcptun/.travis.yml deleted file mode 100755 index b639853df1..0000000000 --- a/package/jsda/luci-app-kcptun/.travis.yml +++ /dev/null @@ -1,79 +0,0 @@ -dist: trusty -sudo: false -notifications: - email: false -language: c -compiler: gcc -cache: - bundler: true - directories: - - "${HOME}/dl" - - "${HOME}/files" -git: - depth: 3 - submodules: false -env: - global: - - PACKAGE=luci-app-kcptun - - USER=kuoruan - - REPO=luci-app-kcptun - - CCACHE_VERSION=3.6 - - DOWNLOAD_DIR=${HOME}/files - - SDK_PATH=https://downloads.openwrt.org/releases/18.06.2/targets/x86/generic - - SDK=-sdk-18.06.2-x86-generic_ -install: -- mkdir -p "$DOWNLOAD_DIR" && cd "$DOWNLOAD_DIR" -- wget -c "http://us.archive.ubuntu.com/ubuntu/pool/main/c/ccache/ccache_${CCACHE_VERSION}-1_amd64.deb" -- mkdir -p "${HOME}/local" -- sudo apt-get install -yq dpkg -- dpkg -x "ccache_${CCACHE_VERSION}-1_amd64.deb" "${HOME}/local" -- export PATH="${HOME}/local/usr/bin:$PATH" -- cd "$DOWNLOAD_DIR" -- wget "${SDK_PATH}/sha256sums" -O sha256sums -- | - if ! grep -- "$SDK" sha256sums > sha256sums.small 2>/dev/null ; then - printf "\033[1;31m=== Can not find ${SDK} file in sha256sums.\033[m\n" - exit 1 - fi -- export SDK_FILE="$(cat sha256sums.small | cut -d' ' -f2 | sed 's/*//g')" -- | - if ! sha256sum -c ./sha256sums.small 2>/dev/null ; then - wget "${SDK_PATH}/${SDK_FILE}" -O "$SDK_FILE" - if ! sha256sum -c ./sha256sums.small 2>/dev/null ; then - printf "\033[1;31m=== SDK can not be verified!\033[m\n" - exit 1 - fi - fi -- file "${DOWNLOAD_DIR}/${SDK_FILE}" -- export SDK_HOME="$(mktemp -d)" -- cd "$SDK_HOME" -- tar -Jxf "${DOWNLOAD_DIR}/${SDK_FILE}" --strip=1 -- test -d "${HOME}/dl" || mkdir -p "${HOME}/dl" -- test -d "dl" && rm -rf dl -- ln -s "${HOME}/dl/" dl -- echo "src-git base https://github.com/openwrt/openwrt.git" >feeds.conf -- echo "src-git packages https://github.com/openwrt/packages.git" >>feeds.conf -- echo "src-git luci https://github.com/openwrt/luci.git" >>feeds.conf -- echo "src-git routing https://git.openwrt.org/feed/routing.git" >>feeds.conf -- echo "src-git telephony https://github.com/openwrt/telephony.git" >>feeds.conf -- ln -s "$TRAVIS_BUILD_DIR" "package/${PACKAGE}" -script: -- cd "$SDK_HOME" -- "./scripts/feeds update -a >/dev/null" -- "./scripts/feeds install -a >/dev/null" -- make defconfig -- make package/${PACKAGE}/compile -j2 || make package/${PACKAGE}/{clean,compile} V=s -- find "${SDK_HOME}/bin/" -- find "${SDK_HOME}/bin/" -name luci-*-kcptun*.ipk -exec cp {} "$TRAVIS_BUILD_DIR" - \; -- ls -hl "$TRAVIS_BUILD_DIR" | grep .*\.ipk -deploy: - provider: releases - file_glob: true - file: "${TRAVIS_BUILD_DIR}/*.ipk" - skip_cleanup: true - on: - tags: true - all_branches: true - api_key: - secure: Ym3qbc1AX2x6V+cRzzmvHHuX8WbqQT+Pdo2Gk8E4PqU84gVgPsMA8EEu72NYKowihrnH+0gKw5oAhHMR+kn6AZzzHkKKh0nv0lBxM37AWDW+Zm060yd1+MrbvBmwDqLhEBOjZZ4e7KHUQgukI5Uc0XyRGonnypoGRI4YNbgUeqMfs1Q1vdNB9bICaUwmYKpWGzo4R3mWw6acV2NhT78eNQgVBTWuawFBi70xe6nkM/iEvTLLvNcXKp/inQ/mdiXJ9/Qek0+ZcST6ZjsgDWNjrE8MlP/1ZPMVULd0ncMphX6oaxWXRqM2GQJEpawLJChkUZ1H0vf+1GiD4g+L/qxuBzK33+G4rOZCsIYvx/9cd6m/jFPt/401/0MGs2w10oDUDLbp7Tsa4VA+wrgYWlqj4E+hKUXhB5pGoROPZJXIopY3kRkU4sPUdvxh7o7u9hprRUqwT9Yrhruz0oPYikTjGgtYxRfvFt+X1qwjEXqYsz8zPZ2K1WFlMjps1Jd8Ly04jcuRbwdHg+fWiPbKWbpeJimY8LvrvyCAG4Q7tX31CDQg2f/zDL5YPKKMOfBvAq318XQ/kxVUn09fEwiaHakeV+/fIDV87HGsRfooyHIz2nNA3WlC8vKwbToOQu7KA3H5ZvAM1I4MmztMzFRBxB3Vf92P3FZV5SvHInlz8wK11PM= diff --git a/package/jsda/luci-app-kcptun/LICENSE b/package/jsda/luci-app-kcptun/LICENSE deleted file mode 100755 index d645695673..0000000000 --- a/package/jsda/luci-app-kcptun/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/package/jsda/luci-app-kcptun/README.md b/package/jsda/luci-app-kcptun/README.md deleted file mode 100755 index accf812a80..0000000000 --- a/package/jsda/luci-app-kcptun/README.md +++ /dev/null @@ -1,55 +0,0 @@ -# luci-app-kcptun - -Luci support for kcptun - -OpenWrt/LEDE 上的 Kcptun Luci 支持界面 - -[![Release Version](https://img.shields.io/github/release/kuoruan/luci-app-kcptun.svg)](https://github.com/kuoruan/luci-app-kcptun/releases/latest) [![Latest Release Download](https://img.shields.io/github/downloads/kuoruan/luci-app-kcptun/latest/total.svg)](https://github.com/kuoruan/luci-app-kcptun/releases/latest) - -## 安装说明 - -1. 到 [release](https://github.com/kuoruan/luci-app-kcptun/releases) 页面下载最新版 luci-app-kcptun 和 luci-i18n-kcptun-zh-cn (简体中文翻译文件) -2. 将下载好的 ipk 文件上传到路由器任意目录下, 如 /tmp -3. 先安装 luci-app-kcptun 再安装 luci-i18n-kcptun-zh-cn - -```sh -opkg install luci-app-kcptun_*.ipk -opkg install luci-i18n-kcptun-zh-cn_*.ipk -``` - -安装好 LuCI 之后，进入配置页面，会提示 ```客户端文件配置有误```。 - -若路由器上已经有 Kcptun 客户端，直接配置好路径即可；如果没有，请手动下载后上传到路由器。 - -## 客户端文件下载 - -1. OpenWrt 可用的 Kcptun：[https://github.com/kuoruan/openwrt-kcptun](https://github.com/kuoruan/openwrt-kcptun) - -2. 官方版本: [https://github.com/xtaci/kcptun/releases](https://github.com/xtaci/kcptun/releases) - -## 编译说明 - -下载 OpenWrt SDK 或者完整源码，进入根目录，运行命令下载 ```luci-app-kcptun``` 源码 - -```sh -git clone https://github.com/kuoruan/luci-app-kcptun.git package/luci-app-kcptun -``` - -然后按照正常的编译流程： - -```sh -./scripts/feeds update luci-app-kcptun -./scripts/feeds install luci-app-kcptun - -make menuconfig -make -``` - -## 卸载说明 - -卸载时需要先卸载 luci-i18n-kcptun-zh-cn, 再卸载 luci-app-kcptun - -```sh -opkg remove luci-i18n-kcptun-zh-cn -opkg remove luci-app-kcptun -``` diff --git a/package/lean/kcptun/Makefile b/package/lean/kcptun/Makefile index e8c760e42f..f4b5035e5b 100755 --- a/package/lean/kcptun/Makefile +++ b/package/lean/kcptun/Makefile @@ -32,7 +32,7 @@ ifeq ($(ARCH),aarch64) endif PKG_NAME:=kcptun-client -PKG_VERSION:=20190515 +PKG_VERSION:=20190725 PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=kcptun-linux-$(PKG_ARCH_KCPTUN)-$(PKG_VERSION).tar.gz @@ -68,4 +68,4 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/client_linux_$(PKG_ARCH_KCPTUN) $(1)/usr/bin/kcptun-client endef -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file +$(eval $(call BuildPackage,$(PKG_NAME)))