From 97b87b8ec76c073727cb4d4f804233ebb07078ff Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 9 Oct 2016 19:43:48 +0800 Subject: [PATCH] Bump version --- Changes | 6 +++ README.md | 2 +- configure | 20 ++++----- configure.ac | 2 +- debian/changelog | 6 +++ docker/alpine/Dockerfile | 2 +- openwrt/Makefile | 82 ---------------------------------- openwrt/files/shadowsocks.init | 16 ------- openwrt/files/shadowsocks.json | 8 ---- src/encrypt.c | 2 +- 10 files changed, 26 insertions(+), 120 deletions(-) delete mode 100644 openwrt/Makefile delete mode 100644 openwrt/files/shadowsocks.init delete mode 100644 openwrt/files/shadowsocks.json diff --git a/Changes b/Changes index 6db7d96c..a44e644e 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +shadowsocks-libev (2.5.4-1) unstable; urgency=medium + + * Fix a bug of auto blocking mechanism. + + -- Max Lv Sun, 09 Oct 2016 19:36:37 +0800 + shadowsocks-libev (2.5.3-1) unstable; urgency=medium * Fix TCP Fast Open on macOS. diff --git a/README.md b/README.md index c987b3a0..6961b599 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It is a port of [Shadowsocks](https://github.com/shadowsocks/shadowsocks) created by [@clowwindy](https://github.com/clowwindy), which is maintained by [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). -Current version: 2.5.3 | [Changelog](debian/changelog) +Current version: 2.5.4 | [Changelog](debian/changelog) Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.svg?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev) diff --git a/configure b/configure index 853a91f2..496c9cfe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.5.3. +# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.5.4. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks-libev' PACKAGE_TARNAME='shadowsocks-libev' -PACKAGE_VERSION='2.5.3' -PACKAGE_STRING='shadowsocks-libev 2.5.3' +PACKAGE_VERSION='2.5.4' +PACKAGE_STRING='shadowsocks-libev 2.5.4' PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_URL='' @@ -1359,7 +1359,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures shadowsocks-libev 2.5.3 to adapt to many kinds of systems. +\`configure' configures shadowsocks-libev 2.5.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadowsocks-libev 2.5.3:";; + short | recursive ) echo "Configuration of shadowsocks-libev 2.5.4:";; esac cat <<\_ACEOF @@ -1567,7 +1567,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadowsocks-libev configure 2.5.3 +shadowsocks-libev configure 2.5.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2090,7 +2090,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by shadowsocks-libev $as_me 2.5.3, which was +It was created by shadowsocks-libev $as_me 2.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4329,7 +4329,7 @@ fi # Define the identity of the package. PACKAGE='shadowsocks-libev' - VERSION='2.5.3' + VERSION='2.5.4' cat >>confdefs.h <<_ACEOF @@ -16778,7 +16778,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by shadowsocks-libev $as_me 2.5.3, which was +This file was extended by shadowsocks-libev $as_me 2.5.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16844,7 +16844,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -shadowsocks-libev config.status 2.5.3 +shadowsocks-libev config.status 2.5.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index aa2d794c..25265482 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl -*- Autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([shadowsocks-libev], [2.5.3], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks-libev], [2.5.4], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(auto) diff --git a/debian/changelog b/debian/changelog index 6db7d96c..a44e644e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shadowsocks-libev (2.5.4-1) unstable; urgency=medium + + * Fix a bug of auto blocking mechanism. + + -- Max Lv Sun, 09 Oct 2016 19:36:37 +0800 + shadowsocks-libev (2.5.3-1) unstable; urgency=medium * Fix TCP Fast Open on macOS. diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index b35dbf9e..f7e1d641 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine MAINTAINER kev -ARG SS_VER=2.5.3 +ARG SS_VER=2.5.4 ARG SS_URL=https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz ENV SERVER_ADDR 0.0.0.0 diff --git a/openwrt/Makefile b/openwrt/Makefile deleted file mode 100644 index 94ed1455..00000000 --- a/openwrt/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=shadowsocks-libev -PKG_VERSION:=2.5.3 -PKG_RELEASE=$(PKG_SOURCE_VERSION) - -PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/archive -PKG_SOURCE:=v$(PKG_VERSION).tar.gz -PKG_MAINTAINER:=Max Lv - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/shadowsocks-libev/Default - SECTION:=net - CATEGORY:=Network - TITLE:=Lightweight Secured Socks5 Proxy - URL:=https://github.com/madeye/shadowsocks-libev -endef - -define Package/shadowsocks-libev - $(call Package/shadowsocks-libev/Default) - TITLE+= (OpenSSL) - VARIANT:=openssl - DEPENDS:=+libopenssl +libpthread +libpcre -endef - -define Package/shadowsocks-libev-polarssl - $(call Package/shadowsocks-libev/Default) - TITLE+= (PolarSSL) - VARIANT:=polarssl - DEPENDS:=+libpolarssl +libpthread +libpcre -endef - -define Package/shadowsocks-libev-mbedtls - $(call Package/shadowsocks-libev/Default) - TITLE+= (mbedTLS) - VARIANT:=mbedtls - DEPENDS:=+libmbedtls +libpthread +libpcre -endef - -define Package/shadowsocks-libev/description -Shadowsocks-libev is a lightweight secured socks5 proxy for embedded devices and low end boxes. -endef - -Package/shadowsocks-libev-polarssl/description=$(Package/shadowsocks-libev/description) -Package/shadowsocks-libev-mbedtls/description=$(Package/shadowsocks-libev/description) - -define Package/shadowsocks-libev/conffiles -/etc/shadowsocks.json -endef - -CONFIGURE_ARGS += --disable-documentation --disable-ssp - -ifeq ($(BUILD_VARIANT),polarssl) - CONFIGURE_ARGS += --with-crypto-library=polarssl -endif - -ifeq ($(BUILD_VARIANT),mbedtls) - CONFIGURE_ARGS += --with-crypto-library=mbedtls -endif - -define Package/shadowsocks-libev/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_CONF) ./files/shadowsocks.json $(1)/etc - $(INSTALL_BIN) ./files/shadowsocks.init $(1)/etc/init.d/shadowsocks - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ss-{local,redir,tunnel} $(1)/usr/bin -endef - -Package/shadowsocks-libev-polarssl/install=$(Package/shadowsocks-libev/install) -Package/shadowsocks-libev-mbedtls/install=$(Package/shadowsocks-libev/install) - -$(eval $(call BuildPackage,shadowsocks-libev)) -$(eval $(call BuildPackage,shadowsocks-libev-polarssl)) -$(eval $(call BuildPackage,shadowsocks-libev-mbedtls)) diff --git a/openwrt/files/shadowsocks.init b/openwrt/files/shadowsocks.init deleted file mode 100644 index 85e71dc9..00000000 --- a/openwrt/files/shadowsocks.init +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -START=95 - -SERVICE_USE_PID=1 -SERVICE_WRITE_PID=1 -SERVICE_DAEMONIZE=1 - -start() { - service_start /usr/bin/ss-local -b 0.0.0.0 -c /etc/shadowsocks.json -} - -stop() { - service_stop /usr/bin/ss-local -} diff --git a/openwrt/files/shadowsocks.json b/openwrt/files/shadowsocks.json deleted file mode 100644 index aba1bf28..00000000 --- a/openwrt/files/shadowsocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "server":"127.0.0.1", - "server_port":8388, - "local_port":1080, - "password":"barfoo!", - "timeout":60, - "method":null -} diff --git a/src/encrypt.c b/src/encrypt.c index ae610260..35dc33ed 100644 --- a/src/encrypt.c +++ b/src/encrypt.c @@ -1496,7 +1496,7 @@ enc_key_init(int method, const char *pass) } // Initialize cache - cache_create(&iv_cache, 256, NULL); + cache_create(&iv_cache, 1024, NULL); #if defined(USE_CRYPTO_OPENSSL) OpenSSL_add_all_algorithms();