bump SSR-libev:2.5.2; remove server

honwen · Sep 25, 2017 · e87df15 · e87df15
1 parent 12131ed
commit e87df15
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -8,20 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocksr-libev
-PKG_VERSION:=2.5.6
-PKG_RELEASE:=1
+PKG_VERSION:=2.5.2
+PKG_RELEASE:=d4904568c0bd7e0861c0cbfeaa43740f404db214
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/breakwa11/shadowsocks-libev.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d022e3177c4bbcd3a13dbb41aa3c2a7dbf50a672
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev.git
+PKG_SOURCE_VERSION:=$(PKG_RELEASE)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
 
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Max Lv <max.c.lv@gmail.com>
+PKG_MAINTAINER:=chenhw2 <https://github.com/chenhw2/openwrt-shadowsocksr>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
@@ -34,27 +34,21 @@ define Package/shadowsocksr-libev/Default
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=Lightweight Secured Socks5 Proxy $(2)
-	URL:=https://github.com/shadowsocksr/shadowsocksr-libev
+	URL:=https://github.com/shadowsocksrr/shadowsocksr-libev
 	VARIANT:=$(1)
 	DEPENDS:=$(3) +libpcre +libpthread
 endef
 
 Package/shadowsocksr-libev = $(call Package/shadowsocksr-libev/Default,openssl,(OpenSSL),+libopenssl +zlib)
-Package/shadowsocksr-libev-server = $(Package/shadowsocksr-libev)
 Package/shadowsocksr-libev-mbedtls = $(call Package/shadowsocksr-libev/Default,mbedtls,(mbedTLS),+libmbedtls)
-Package/shadowsocksr-libev-server-mbedtls = $(Package/shadowsocksr-libev-mbedtls)
 Package/shadowsocksr-libev-polarssl = $(call Package/shadowsocksr-libev/Default,polarssl,(PolarSSL),+libpolarssl)
-Package/shadowsocksr-libev-server-polarssl = $(Package/shadowsocksr-libev-polarssl)
 
 define Package/shadowsocksr-libev/description
 shadowsocksr-libev is a lightweight secured socks5 proxy for embedded devices and low end boxes.
 endef
 
-Package/shadowsocksr-libev-server/description = $(Package/shadowsocksr-libev/description)
 Package/shadowsocksr-libev-mbedtls/description = $(Package/shadowsocksr-libev/description)
-Package/shadowsocksr-libev-server-mbedtls/description = $(Package/shadowsocksr-libev/description)
 Package/shadowsocksr-libev-polarssl/description = $(Package/shadowsocksr-libev/description)
-Package/shadowsocksr-libev-server-polarssl/description = $(Package/shadowsocksr-libev/description)
 
 CONFIGURE_ARGS += --disable-ssp --disable-documentation --disable-assert
 
@@ -70,23 +64,12 @@ define Package/shadowsocksr-libev/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-local  $(1)/usr/bin/ssr-local
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-redir  $(1)/usr/bin/ssr-redir
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-tunnel $(1)/usr/bin/ssr-tunnel
+	$(LN) ssr-local $(1)/usr/bin/ssr-tunnel
 endef
 
 Package/shadowsocksr-libev-mbedtls/install = $(Package/shadowsocksr-libev/install)
 Package/shadowsocksr-libev-polarssl/install = $(Package/shadowsocksr-libev/install)
 
-define Package/shadowsocksr-libev-server/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-server $(1)/usr/bin
-endef
-
-Package/shadowsocksr-libev-server-mbedtls/install = $(Package/shadowsocksr-libev-server/install)
-Package/shadowsocksr-libev-server-polarssl/install = $(Package/shadowsocksr-libev-server/install)
-
 $(eval $(call BuildPackage,shadowsocksr-libev))
-$(eval $(call BuildPackage,shadowsocksr-libev-server))
 $(eval $(call BuildPackage,shadowsocksr-libev-mbedtls))
-$(eval $(call BuildPackage,shadowsocksr-libev-server-mbedtls))
 $(eval $(call BuildPackage,shadowsocksr-libev-polarssl))
-$(eval $(call BuildPackage,shadowsocksr-libev-server-polarssl))
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 ShadowsocksR-libev for OpenWrt
 ===
 
-[![Download][B]][2]  
-
 简介
 ---
 
@@ -25,15 +23,6 @@ ShadowsocksR-libev for OpenWrt
            └── ssr-tunnel      // 提供端口转发, 可用于 DNS 查询
    ```
 
- - shadowsocks-libev-server
-
-   ```
-   服务端/
-   └── usr/
-       └── bin/
-           └── ss-server      // 服务端可执行文件
-   ```
-
 编译
 ---
 
@@ -43,12 +32,11 @@ ShadowsocksR-libev for OpenWrt
    # 以 ar71xx 平台为例
    tar xjf OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2
    cd OpenWrt-SDK-ar71xx-*
-   # 安装 feeds
-   ./scripts/feeds update packages
-   ./scripts/feeds install libpcre
-   # 获取 Makefile
-   git clone https://github.com/chenhw2/openwrt-shadowsocksr.git package/shadowsocksr-libev
-   # 选择要编译的包 Network -> shadowsocksr-libev
+   # 添加 feeds
+   git clone https://github.com/shadowsocks/openwrt-feeds.git package/feeds
+   # 获取 shadowsocks-libev Makefile
+   git clone https://github.com/chenhw2/openwrt-shadowsocksr.git package/feeds/shadowsocksr-libev
+   # 选择要编译的包 Network -> shadowsocks-libev
    make menuconfig
    # 开始编译
    make package/shadowsocksr-libev/compile V=99
@@ -68,17 +56,15 @@ ShadowsocksR-libev for OpenWrt
    password       | 字符串     | 服务端设置的密码
    method         | 字符串     | 加密方式, [详情参考][E]
    timeout        | 数值       | 超时时间（秒）, 默认 60
-   fast_open      | 布尔值     | 是否启用 [TCP-Fast-Open][F], 只适用于 ss-local
+   fast_open      | 布尔值     | 是否启用 [TCP-Fast-Open][F], 只适用于 ssr-local
    nofile         | 数值       | 设置 Linux ulimit
-   protocol       | 协议插件   | 客户端的协议插件，推荐使用[auth_sha1_v4, auth_aes128_md5, auth_aes128_sha1][P]
-   obfs           | 混淆插件   | 客户端的混淆插件，推荐使用[plain, http_simple, http_post, tls1.2_ticket_auth][P]
+   protocol       | 字符串     | [协议插件][P], 推荐使用 ```orgin, auth_aes128_{md5, sha1}, auth_chain_{a, b, c, d, e, f}```
+   obfs           | 字符串     | [混淆插件][P], 推荐使用 ```plain, http_{simple, post}, tls1.2_ticket_auth```
 
 
-  [1]: https://github.com/breakwa11/shadowsocks-libev
-  [2]: https://bintray.com/aa65535/opkg/shadowsocks-libev/_latestVersion "预编译 IPK 下载"
-  [B]: https://api.bintray.com/packages/aa65535/opkg/shadowsocks-libev/images/download.svg
+  [1]: https://github.com/shadowsocksrr/shadowsocksr-libev/tree/Akkariiin/master
   [3]: https://github.com/chenhw2/luci-app-shadowsocksr
-  [E]: https://github.com/shadowsocks/luci-app-shadowsocks/wiki/Encrypt-method
+  [E]: http://shadowsocks.org/en/spec/Stream-Ciphers.html
   [F]: https://github.com/shadowsocks/shadowsocks/wiki/TCP-Fast-Open
   [S]: https://wiki.openwrt.org/doc/howto/obtain.firmware.sdk
-  [P]: https://github.com/breakwa11/shadowsocks-rss/wiki/obfs
+  [P]: https://github.com/shadowsocksrr/shadowsocks-rss/blob/master/ssr.md