Browse Source

Bump version

pull/1085/head v2.6.2
Max Lv 8 years ago
parent
commit
9c94e6792c
8 changed files with 29 additions and 17 deletions
  1. 8
      Changes
  2. 2
      README.md
  3. 20
      configure
  4. 2
      configure.ac
  5. 6
      debian/changelog
  6. 2
      doc/shadowsocks-libev.asciidoc
  7. 2
      docker/alpine/Dockerfile
  8. 4
      rpm/genrpm.sh

8
Changes

@ -1,6 +1,12 @@
shadowsocks-libev (2.6.2-1) unstable; urgency=medium
* Refine SIP003 plugin support.
-- Max Lv <max.c.lv@gmail.com> Mon, 16 Jan 2017 10:16:12 +0800
shadowsocks-libev (2.6.1-1) unstable; urgency=medium
* Deprecate HTTP/TLS obfuscating.
* Deprecate HTTP/TLS obfusacting.
* Add SIP003 plugin support.
-- Max Lv <max.c.lv@gmail.com> Sun, 08 Jan 2017 15:14:19 +0800

2
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.1 | [Changelog](debian/changelog)
Current version: 2.6.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)

20
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.1.
# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.6.2.
#
# Report bugs to <max.c.lv@gmail.com>.
#
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='shadowsocks-libev'
PACKAGE_TARNAME='shadowsocks-libev'
PACKAGE_VERSION='2.6.1'
PACKAGE_STRING='shadowsocks-libev 2.6.1'
PACKAGE_VERSION='2.6.2'
PACKAGE_STRING='shadowsocks-libev 2.6.2'
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.1 to adapt to many kinds of systems.
\`configure' configures shadowsocks-libev 2.6.2 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.1:";;
short | recursive ) echo "Configuration of shadowsocks-libev 2.6.2:";;
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.1
shadowsocks-libev configure 2.6.2
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.1, which was
It was created by shadowsocks-libev $as_me 2.6.2, 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.1'
VERSION='2.6.2'
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.1, which was
This file was extended by shadowsocks-libev $as_me 2.6.2, 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.1
shadowsocks-libev config.status 2.6.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
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.1], [max.c.lv@gmail.com])
AC_INIT([shadowsocks-libev], [2.6.2], [max.c.lv@gmail.com])
AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(auto)

6
debian/changelog

@ -1,3 +1,9 @@
shadowsocks-libev (2.6.2-1) unstable; urgency=medium
* Refine SIP003 plugin support.
-- Max Lv <max.c.lv@gmail.com> Mon, 16 Jan 2017 10:16:12 +0800
shadowsocks-libev (2.6.1-1) unstable; urgency=medium
* Deprecate HTTP/TLS obfusacting.

2
doc/shadowsocks-libev.asciidoc

@ -168,7 +168,7 @@ The config file equivalent of command line options is listed as example below.
| -a nobody | "user": "nobody"
| --fast-open | "fast_open": true
| --plugin "obfs-server" | "plugin": "obfs-server"
| --plugig-opts "obfs=http" | "plugin_opts": "obfs=http"
| --plugin-opts "obfs=http" | "plugin_opts": "obfs=http"
| -6 | "ipv6_first": true
| -A | "auth": true
| -n "/etc/nofile" | "nofile": "/etc/nofile"

2
docker/alpine/Dockerfile

@ -5,7 +5,7 @@
FROM alpine
MAINTAINER kev <noreply@datageek.info>
ARG SS_VER=2.6.1
ARG SS_VER=2.6.2
ARG SS_URL=https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz
ENV SERVER_ADDR 0.0.0.0

4
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.1 by default)."
echo -e " -v with argument version (2.6.2 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.1}
: ${version:=2.6.2}
: ${format:=tar.gz}
name="shadowsocks-libev"

Loading…
Cancel
Save