From f403bc7f06c1ee0fc94313788b78ded902a59d43 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 26 Mar 2014 15:35:34 +0800 Subject: [PATCH] bump version --- Changes | 7 +++++++ README.md | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- debian/changelog | 7 +++++++ debian/shadowsocks.init | 2 +- shadowsocks.8 | 2 ++ 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Changes b/Changes index 36507476..055fc8bd 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,10 @@ +shadowsocks (1.4.4-1) unstable; urgency=low + + * Add CommonCrypto support for darwin. + * Fix some config related issues. + + -- Max Lv Wed, 26 Mar 2014 13:29:03 +0800 + shadowsocks (1.4.3-1) unstable; urgency=low * Add tunnel mode with local port forwarding feature. diff --git a/README.md b/README.md index 001f4087..3644cd6a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks) created by [@clowwindy](https://github.com/clowwindy) maintained by [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). -Current version: 1.4.3 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes) +Current version: 1.4.4 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes) Features -------- diff --git a/configure b/configure index 00f4a8c3..86a96d88 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.68 for shadowsocks 1.4.3. +# Generated by GNU Autoconf 2.68 for shadowsocks 1.4.4. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadowsocks' PACKAGE_TARNAME='shadowsocks' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='shadowsocks 1.4.3' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='shadowsocks 1.4.4' PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_URL='' @@ -1307,7 +1307,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 1.4.3 to adapt to many kinds of systems. +\`configure' configures shadowsocks 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1377,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadowsocks 1.4.3:";; + short | recursive ) echo "Configuration of shadowsocks 1.4.4:";; esac cat <<\_ACEOF @@ -1494,7 +1494,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadowsocks configure 1.4.3 +shadowsocks configure 1.4.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2016,7 +2016,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 $as_me 1.4.3, which was +It was created by shadowsocks $as_me 1.4.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2836,7 +2836,7 @@ fi # Define the identity of the package. PACKAGE='shadowsocks' - VERSION='1.4.3' + VERSION='1.4.4' cat >>confdefs.h <<_ACEOF @@ -15499,7 +15499,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 $as_me 1.4.3, which was +This file was extended by shadowsocks $as_me 1.4.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15565,7 +15565,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 config.status 1.4.3 +shadowsocks config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 185929d0..bc76516f 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], [1.4.3], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks], [1.4.4], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/debian/changelog b/debian/changelog index 36507476..055fc8bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shadowsocks (1.4.4-1) unstable; urgency=low + + * Add CommonCrypto support for darwin. + * Fix some config related issues. + + -- Max Lv Wed, 26 Mar 2014 13:29:03 +0800 + shadowsocks (1.4.3-1) unstable; urgency=low * Add tunnel mode with local port forwarding feature. diff --git a/debian/shadowsocks.init b/debian/shadowsocks.init index 8e857958..a1e52a2b 100644 --- a/debian/shadowsocks.init +++ b/debian/shadowsocks.init @@ -56,7 +56,7 @@ do_start() start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid $USER:$GROUP --exec $DAEMON -- \ - -c "$CONFFILE" -a "$USER" -f $PIDFILE $DAEMON_ARGS \ + -c "$CONFFILE" -a "$USER" -u -f $PIDFILE $DAEMON_ARGS \ || return 2 } diff --git a/shadowsocks.8 b/shadowsocks.8 index 39b45b19..ef65c193 100644 --- a/shadowsocks.8 +++ b/shadowsocks.8 @@ -79,6 +79,8 @@ Set the socket timeout in secondes. The default value is 10. .TP .B \-c \fIconfig_file\fP Use a configuration file. +.B \-a \fIuser_name\fP +Run as a specific user. .SH EXAMPLE \*(Re needs to be used with the NAT function. Here is an example: