update

SPYFF · Jun 22, 2018 · e41db37 · e41db37
1 parent 4f7baeb
commit e41db37
Show file tree

Hide file tree

Showing 45 changed files with 349 additions and 272 deletions.
diff --git a/.copr/Makefile b/.copr/Makefile
@@ -0,0 +1,19 @@
+.PHONY: deps srpm
+.DEFAULT_GOAL := srpm
+
+DOT_COPR := $(dir $(firstword $(MAKEFILE_LIST)))
+TOP_DIR := $(realpath $(DOT_COPR)/../)
+
+RPM_DIR := $(TOP_DIR)/rpm
+outdir ?= $(RPM_DIR)/SRPMS
+
+HAS_GIT := $(shell command -v git 2> /dev/null)
+ifndef HAS_GIT
+deps:
+	dnf -y install git
+else
+deps:
+endif
+
+srpm: deps
+	$(TOP_DIR)/rpm/genrpm.sh -o $(outdir)
diff --git a/.gitignore b/.gitignore
@@ -53,7 +53,6 @@ rpm/BUILDROOT/
 
 # Ignore per-project vim config
 .vimrc
-.vscode/
 
 # Ignore garbage of OS X
 *.DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -53,3 +53,4 @@ script:
 branches:
     only:
         - nocrypto
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.2)
 
 set(PROJECT_NAME shadowsocks-libev)
-set(RELEASE_DATE 2018-1-15)
-set(PROJECT_VERSION "3.1.3")
+set(RELEASE_DATE 2018-5-28)
+set(PROJECT_VERSION "3.2.0")
 set(PROJECT_DESC "a lightweight secured socks5 proxy")
 set(PROJECT_URL "https://shadowsocks.org")
 set(PROJECT_ISSUES_URL "https://github.com/shadowsocks/shadowsocks-libev")

diff --git a/Changes b/Changes
@@ -1,3 +1,12 @@
+shadowsocks-libev (3.2.0-1) unstable; urgency=medium
+
+  * Add MinGW support by @linusyang.
+  * Refine c-ares integration by @xnoreq.
+  * Fix building issues with GCC8 by @FlyingheartCN.
+  * Minor bug fixes.
+
+ -- Max Lv <[email protected]>  Mon, 28 May 2018 19:46:21 -0700
+
 shadowsocks-libev (3.1.3-1) unstable; urgency=medium
 
   * Fix a bug in UDP relay.

diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ The motivation behind this: on router boards with limited CPU resources, the enc
 On my Raspberry Pi 2 device, I measured **15 Mbps** on loopback with `aes-128-gcm` and **285 Mbps** with `none` (no encryption).
 Obviously, turning off the encryption is optional (set encryption method to `none` for that), and only use if you can sure in the security considerations.
 
-
 # shadowsocks-libev
 
 ## Intro
@@ -20,8 +19,9 @@ 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: 3.1.3 | [Changelog](debian/changelog)
+Current version: 3.2.0 | [Changelog](debian/changelog)
 
+Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.svg?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev)
 
 ## Features
 

diff --git a/completions/bash/ss-server b/completions/bash/ss-server
@@ -1,7 +1,7 @@
 _ss_server()
 {
     local cur prev opts ciphers
-    opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -6 -d -v -h --reuse-port --fast-open --acl --manager-address --mtu --mptcp --key --plugin --plugin-opts --help'
+    opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -6 -d -v -h --reuse-port --fast-open --acl --manager-address --mtu --mptcp --no-delay --key --plugin --plugin-opts --help'
     ciphers='none rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf'
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}

diff --git 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], [3.1.3], [[email protected]])
+AC_INIT([shadowsocks-libev], [3.2.0], [[email protected]])
 AC_CONFIG_SRCDIR([src/crypto.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,12 @@
+shadowsocks-libev (3.2.0-1) unstable; urgency=medium
+
+  * Add MinGW support by @linusyang.
+  * Refine c-ares integration by @xnoreq.
+  * Fix building issues with GCC8 by @FlyingheartCN.
+  * Minor bug fixes.
+
+ -- Max Lv <[email protected]>  Mon, 28 May 2018 19:46:21 -0700
+
 shadowsocks-libev (3.1.3-1) unstable; urgency=medium
 
   * Fix a bug in UDP relay.

diff --git a/doc/shadowsocks-libev.asciidoc b/doc/shadowsocks-libev.asciidoc
@@ -66,7 +66,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
 camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
 chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
 +
-The default cipher is 'rc4-md5'.
+The default cipher is 'chacha20-ietf-poly1305'.
 +
 If built with PolarSSL or custom OpenSSL libraries, some of
 these ciphers may not work.

diff --git a/doc/ss-local.asciidoc b/doc/ss-local.asciidoc
@@ -61,7 +61,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
 camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
 chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
 +
-The default cipher is 'rc4-md5'.
+The default cipher is 'chacha20-ietf-poly1305'.
 +
 If built with PolarSSL or custom OpenSSL libraries, some of
 these ciphers may not work.

diff --git a/doc/ss-manager.asciidoc b/doc/ss-manager.asciidoc
@@ -45,6 +45,8 @@ Set the cipher or turn off the encryption.
 +
 To disable encryption use `none` as cipher.
 +
+Set the cipher.
++
 *Shadowsocks-libev* accepts 18 different ciphers:
 +
 aes-128-gcm, aes-192-gcm, aes-256-gcm,
@@ -53,7 +55,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
 camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
 chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
 +
-The default cipher is 'rc4-md5'.
+The default cipher is 'chacha20-ietf-poly1305'.
 +
 If built with PolarSSL or custom OpenSSL libraries, some of
 these ciphers may not work.

diff --git a/doc/ss-redir.asciidoc b/doc/ss-redir.asciidoc
@@ -60,7 +60,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
 camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
 chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
 +
-The default cipher is 'rc4-md5'.
+The default cipher is 'chacha20-ietf-poly1305'.
 +
 If built with PolarSSL or custom OpenSSL libraries, some of
 these ciphers may not work.

diff --git a/doc/ss-tunnel.asciidoc b/doc/ss-tunnel.asciidoc
@@ -60,7 +60,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
 camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
 chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
 +
-The default cipher is 'rc4-md5'.
+The default cipher is 'chacha20-ietf-poly1305'.
 +
 If built with PolarSSL or custom OpenSSL libraries, some of
 these ciphers may not work.

diff --git a/docker/alpine/README.md b/docker/alpine/README.md
@@ -29,7 +29,7 @@ $ docker pull shadowsocks/shadowsocks-libev:edge
 ## Start a container
 
 ```bash
-$ docker run -p8388:8388 -p8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev:latest
+$ docker run -p 8388:8388 -p 8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev:latest
 ```
 This starts a container of the latest release with all the default settings, which is equivalent to
 ```bash
@@ -43,7 +43,7 @@ In most cases you'll want to change a thing or two, for instance the port which
 
 Here's an example to start a container that listens on `28388` (both TCP and UDP):
 ```bash
-$ docker run -p28388:8388 -p28388:8388/udp -d --restart always shadowsocks/shadowsocks-libev
+$ docker run -p 28388:8388 -p 28388:8388/udp -d --restart always shadowsocks/shadowsocks-libev
 ```
 
 ### With custom password
@@ -52,7 +52,7 @@ Another thing you may want to change is the password. To change that, you can pa
 
 Here's an example to start a container with `9MLSpPmNt` as the password:
 ```bash
-$ docker run -e PASSWORD=9MLSpPmNt -p8388:8388 -p8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev
+$ docker run -e PASSWORD=9MLSpPmNt -p 8388:8388 -p 8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev
 ```
 > :warning: Click [here][6] to generate a strong password to protect your server.
 
@@ -65,7 +65,7 @@ Besides `PASSWORD`, the image also defines the following environment variables t
 
 Additional arguments supported by `ss-server` can be passed with the environment variable `ARGS`, for instance to start in verbose mode:
 ```bash
-$ docker run -e ARGS=-v -p8388:8388 -p8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev:latest
+$ docker run -e ARGS=-v -p 8388:8388 -p 8388:8388/udp -d --restart always shadowsocks/shadowsocks-libev:latest
 ```
 
 ## Use docker-compose to manage (optional)

diff --git a/docker/alpine/docker-compose.yml b/docker/alpine/docker-compose.yml
@@ -1,5 +1,5 @@
 shadowsocks:
-  image: shadowsocks-libev
+  image: shadowsocks/shadowsocks-libev
   ports:
     - "8388:8388/tcp"
     - "8388:8388/udp"

diff --git a/docker/mingw/build.sh b/docker/mingw/build.sh
@@ -29,6 +29,7 @@ build_proj() {
     host=$arch-w64-mingw32
     prefix=${DIST}/$arch
     dep=${PREFIX}/$arch
+    cpu="$(nproc --all)"
 
     cd "$SRC"
     if ! [ -d proj ]; then
@@ -49,7 +50,7 @@ build_proj() {
       --with-cares="$dep" \
       CFLAGS="-DCARES_STATICLIB -DPCRE_STATIC"
     make clean
-    make LDFLAGS="-all-static -L${dep}/lib"
+    make -j$cpu LDFLAGS="-all-static -L${dep}/lib"
     make install-strip
 
     # Reference SIP003 plugin (Experimental)
@@ -72,7 +73,7 @@ build_proj() {
       --disable-documentation \
       --with-ev="$dep"
     make clean
-    make LDFLAGS="-all-static -L${dep}/lib"
+    make -j$cpu LDFLAGS="-all-static -L${dep}/lib"
     make install-strip
 }
 

diff --git a/docker/mingw/deps.sh b/docker/mingw/deps.sh
@@ -29,17 +29,18 @@ build_deps() {
     host=$arch-w64-mingw32
     prefix=${PREFIX}/$arch
     args="--host=${host} --prefix=${prefix} --disable-shared --enable-static"
+    cpu="$(nproc --all)"
 
     # libev
     cd "$SRC/$LIBEV_SRC"
     ./configure $args
     make clean
-    make install
+    make -j$cpu install
 
     # mbedtls
     cd "$SRC/$MBEDTLS_SRC"
     make clean
-    make lib WINDOWS=1 CC="${host}-gcc" AR="${host}-ar"
+    make -j$cpu lib WINDOWS=1 CC="${host}-gcc" AR="${host}-ar"
     ## "make install" command from mbedtls
     DESTDIR="${prefix}"
     mkdir -p "${DESTDIR}"/include/mbedtls
@@ -54,21 +55,20 @@ build_deps() {
     cd "$SRC/$SODIUM_SRC"
     ./configure $args
     make clean
-    make install
+    make -j$cpu install
 
     # pcre
     cd "$SRC/$PCRE_SRC"
-    ./configure $args \
-      --enable-jit --disable-cpp \
+    ./configure $args --disable-cpp \
       --enable-unicode-properties
     make clean
-    make install
+    make -j$cpu install
 
     # c-ares
     cd "$SRC/$CARES_SRC"
     ./configure $args
     make clean
-    make install
+    make -j$cpu install
 }
 
 dk_deps() {

diff --git a/rpm/SOURCES/0001-systemd-services.patch b/rpm/SOURCES/0001-systemd-services.patch
diff --git a/rpm/SPECS/shadowsocks-libev.spec.in b/rpm/SPECS/shadowsocks-libev.spec.in
@@ -6,23 +6,23 @@
 %if 0%{?suse_version}
 %global requires   %{?requires} libcap-progs
 %endif
-%global project_desc shadowsocks-libev is a lightweight secured scoks5 proxy for embedded devices and low end boxes.
+%global project_desc shadowsocks-libev is a lightweight secured socks5 proxy for embedded devices and low end boxes.
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >=7 || 0%{?suse_version} >= 1210
 %global use_systemd 1
 %else
 %global use_systemd 0
 %endif
 
-Name:	    	shadowsocks-libev
-Version:	    VERSION
-Release:	    1%{?dist}
+Name:		    @NAME@
+Version:	    @VERSION@
+Release:	    @RELEASE@%{?dist}
 Summary:	    A lightweight and secure socks5 proxy
 
 Group:		    Applications/Internet
 License:	    GPLv3+
 URL:		    https://github.com/shadowsocks/%{name}
-Source0:	    %{url}/archive/v%{version}.tar.gz
+Source0:	    @SOURCE@
 
 BuildRequires:	make gcc pcre-devel asciidoc xmlto automake libtool mbedtls-devel libsodium-devel >= 1.0.4 libev-devel c-ares-devel
 %if 0%{?suse_version}
@@ -48,7 +48,7 @@ BuildRequires:   systemd
 %{?project_desc}
 
 %prep
-%setup -q
+%setup -q -n @NAME_VERSION@
 
 %build
 ./autogen.sh