Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
madeye committed Oct 9, 2016
1 parent 6577372 commit 97b87b8
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 120 deletions.
6 changes: 6 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
shadowsocks-libev (2.5.4-1) unstable; urgency=medium

* Fix a bug of auto blocking mechanism.

-- Max Lv <[email protected]> Sun, 09 Oct 2016 19:36:37 +0800

shadowsocks-libev (2.5.3-1) unstable; urgency=medium

* Fix TCP Fast Open on macOS.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>.
#
Expand Down Expand Up @@ -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='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [[email protected]])
AC_INIT([shadowsocks-libev], [2.5.4], [[email protected]])
AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(auto)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
shadowsocks-libev (2.5.4-1) unstable; urgency=medium

* Fix a bug of auto blocking mechanism.

-- Max Lv <[email protected]> Sun, 09 Oct 2016 19:36:37 +0800

shadowsocks-libev (2.5.3-1) unstable; urgency=medium

* Fix TCP Fast Open on macOS.
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM alpine
MAINTAINER kev <[email protected]>

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
Expand Down
82 changes: 0 additions & 82 deletions openwrt/Makefile

This file was deleted.

16 changes: 0 additions & 16 deletions openwrt/files/shadowsocks.init

This file was deleted.

8 changes: 0 additions & 8 deletions openwrt/files/shadowsocks.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/encrypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 97b87b8

Please sign in to comment.