From 48b6a59df4a370b5f4fd388b958fbca0504c33cf Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 8 Jan 2017 16:31:54 +0800 Subject: [PATCH] Bump version --- Changes | 7 +++++++ README.md | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- debian/changelog | 7 +++++++ docker/alpine/Dockerfile | 2 +- rpm/genrpm.sh | 4 ++-- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Changes b/Changes index efa8b1d3..ac6936a8 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,10 @@ +shadowsocks-libev (2.6.1-1) unstable; urgency=medium + + * Deprecate HTTP/TLS obfusacting. + * Add SIP003 plugin support. + + -- Max Lv Sun, 08 Jan 2017 15:14:19 +0800 + shadowsocks-libev (2.6.0-1) unstable; urgency=medium * Add HTTP/TLS obfuscating. diff --git a/README.md b/README.md index fdd7d631..be058f89 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), and maintained by [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). -Current version: 2.6.0 | [Changelog](debian/changelog) +Current version: 2.6.1 | [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 d4bb5830..b901b005 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.6.0. +# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.6.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks-libev' PACKAGE_TARNAME='shadowsocks-libev' -PACKAGE_VERSION='2.6.0' -PACKAGE_STRING='shadowsocks-libev 2.6.0' +PACKAGE_VERSION='2.6.1' +PACKAGE_STRING='shadowsocks-libev 2.6.1' PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_URL='' @@ -1358,7 +1358,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.6.0 to adapt to many kinds of systems. +\`configure' configures shadowsocks-libev 2.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1429,7 +1429,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadowsocks-libev 2.6.0:";; + short | recursive ) echo "Configuration of shadowsocks-libev 2.6.1:";; esac cat <<\_ACEOF @@ -1566,7 +1566,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadowsocks-libev configure 2.6.0 +shadowsocks-libev configure 2.6.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2089,7 +2089,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.6.0, which was +It was created by shadowsocks-libev $as_me 2.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4328,7 +4328,7 @@ fi # Define the identity of the package. PACKAGE='shadowsocks-libev' - VERSION='2.6.0' + VERSION='2.6.1' cat >>confdefs.h <<_ACEOF @@ -16890,7 +16890,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.6.0, which was +This file was extended by shadowsocks-libev $as_me 2.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16956,7 +16956,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.6.0 +shadowsocks-libev config.status 2.6.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index bd9952c8..212b3722 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.6.0], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks-libev], [2.6.1], [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 efa8b1d3..ac6936a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shadowsocks-libev (2.6.1-1) unstable; urgency=medium + + * Deprecate HTTP/TLS obfusacting. + * Add SIP003 plugin support. + + -- Max Lv Sun, 08 Jan 2017 15:14:19 +0800 + shadowsocks-libev (2.6.0-1) unstable; urgency=medium * Add HTTP/TLS obfuscating. diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 6cd06d62..e6836aaa 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -5,7 +5,7 @@ FROM alpine MAINTAINER kev -ARG SS_VER=2.6.0 +ARG SS_VER=2.6.1 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/rpm/genrpm.sh b/rpm/genrpm.sh index e1cf275c..ecbf1b19 100755 --- a/rpm/genrpm.sh +++ b/rpm/genrpm.sh @@ -7,7 +7,7 @@ show_help() echo echo -e "Options:" echo -e " -h show this help." - echo -e " -v with argument version (2.6.0 by default)." + echo -e " -v with argument version (2.6.1 by default)." echo -e " -f with argument format (tar.xz by default) used by git archive." echo echo -e "Examples:" @@ -38,7 +38,7 @@ do esac done -: ${version:=2.6.0} +: ${version:=2.6.1} : ${format:=tar.gz} name="shadowsocks-libev"