From d9695c11a4f8664750325bd1471f574dda8631e6 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 12 Sep 2016 12:58:24 +0800 Subject: [PATCH] Bump version --- Changes | 6 ++++++ README.md | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- debian/changelog | 6 ++++++ openwrt/Makefile | 8 ++++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Changes b/Changes index f7982ba5..d0d6ed4a 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +shadowsocks-libev (2.5.2-1ubuntu1) unstable; urgency=medium + + * Fix a bug of UDP relay mode of ss-local + + -- Max Lv Mon, 12 Sep 2016 12:54:33 +0800 + shadowsocks-libev (2.5.1-1) unstable; urgency=medium * Refine ACL feature with hostname support. diff --git a/README.md b/README.md index fa0305b1..84cec18a 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.1 | [Changelog](debian/changelog) +Current version: 2.5.2 | [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 652534cb..488866f5 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.1. +# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.5.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks-libev' PACKAGE_TARNAME='shadowsocks-libev' -PACKAGE_VERSION='2.5.1' -PACKAGE_STRING='shadowsocks-libev 2.5.1' +PACKAGE_VERSION='2.5.2' +PACKAGE_STRING='shadowsocks-libev 2.5.2' 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.1 to adapt to many kinds of systems. +\`configure' configures shadowsocks-libev 2.5.2 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.1:";; + short | recursive ) echo "Configuration of shadowsocks-libev 2.5.2:";; 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.1 +shadowsocks-libev configure 2.5.2 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.1, which was +It was created by shadowsocks-libev $as_me 2.5.2, 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.1' + VERSION='2.5.2' 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.1, which was +This file was extended by shadowsocks-libev $as_me 2.5.2, 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.1 +shadowsocks-libev config.status 2.5.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e019d0d3..965711fa 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.1], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks-libev], [2.5.2], [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 f7982ba5..d0d6ed4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shadowsocks-libev (2.5.2-1ubuntu1) unstable; urgency=medium + + * Fix a bug of UDP relay mode of ss-local + + -- Max Lv Mon, 12 Sep 2016 12:54:33 +0800 + shadowsocks-libev (2.5.1-1) unstable; urgency=medium * Refine ACL feature with hostname support. diff --git a/openwrt/Makefile b/openwrt/Makefile index ff4ce7d2..2a1a5eb3 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-libev -PKG_VERSION:=2.5.1 +PKG_VERSION:=2.5.2 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/archive @@ -28,21 +28,21 @@ define Package/shadowsocks-libev $(call Package/shadowsocks-libev/Default) TITLE+= (OpenSSL) VARIANT:=openssl - DEPENDS:=+libopenssl +libpthread + DEPENDS:=+libopenssl +libpthread +libpcre endef define Package/shadowsocks-libev-polarssl $(call Package/shadowsocks-libev/Default) TITLE+= (PolarSSL) VARIANT:=polarssl - DEPENDS:=+libpolarssl +libpthread + DEPENDS:=+libpolarssl +libpthread +libpcre endef define Package/shadowsocks-libev-mbedtls $(call Package/shadowsocks-libev/Default) TITLE+= (mbedTLS) VARIANT:=mbedtls - DEPENDS:=+libmbedtls +libpthread + DEPENDS:=+libmbedtls +libpthread +libpcre endef define Package/shadowsocks-libev/description