From 5c05ea80616c0acf99b5ff958af7caf982384b96 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Mon, 4 Jun 2018 15:53:03 +0200 Subject: [PATCH] Update ShadowSocks-libev to 3.2.0 --- shadowsocks-libev/Makefile | 8 +++--- shadowsocks-libev/patches/020-NOCRYPTO.patch | 27 ++------------------ 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/shadowsocks-libev/Makefile b/shadowsocks-libev/Makefile index 76f84565a..96c1ceef9 100644 --- a/shadowsocks-libev/Makefile +++ b/shadowsocks-libev/Makefile @@ -14,14 +14,14 @@ include $(TOPDIR)/rules.mk # - check if default mode has changed from being tcp_only # PKG_NAME:=shadowsocks-libev -PKG_VERSION:=3.1.3 -PKG_RELEASE:=2 +PKG_VERSION:=3.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) -PKG_HASH:=58fb438d2cfe33cfa6ac8c50e587e2138c50e59a4b943f88d22883bf2e192a96 +PKG_HASH:=5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 -PKG_MAINTAINER:=Yousong Zhou +PKG_MAINTAINER:=Ycarus (Yannick Chabanois) PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=LICENSE diff --git a/shadowsocks-libev/patches/020-NOCRYPTO.patch b/shadowsocks-libev/patches/020-NOCRYPTO.patch index 781efa06a..6b83563d3 100644 --- a/shadowsocks-libev/patches/020-NOCRYPTO.patch +++ b/shadowsocks-libev/patches/020-NOCRYPTO.patch @@ -275,10 +275,10 @@ index dcc5fd9b..2e689b7a 100644 @@ -31,7 +31,8 @@ crypto_src = crypto.c \ aead.c \ stream.c \ - ppbloom.c \ + ppbloom.c \ - base64.c + base64.c \ -+ nocrypto.c ++ noencrypt.c plugin_src = plugin.c @@ -504,29 +504,6 @@ index 38057da7..206c18de 100644 +#endif //_NOENCRYPT_H \ No newline at end of file -From bc2e77324ab6e13179c89f59ea270cf7f85a60c5 Mon Sep 17 00:00:00 2001 -From: Fejes Ferenc -Date: Mon, 31 Jul 2017 12:48:26 +0200 -Subject: [PATCH 07/17] fixes - ---- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 2e689b7a..90e2d598 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -32,7 +32,7 @@ crypto_src = crypto.c \ - stream.c \ - ppbloom.c \ - base64.c \ -- nocrypto.c -+ noencrypt.c - - plugin_src = plugin.c - - From 07607127317804319b0cb358080516ee99cf30e0 Mon Sep 17 00:00:00 2001 From: Fejes Ferenc Date: Mon, 31 Jul 2017 12:57:46 +0200