Bump version

7 years ago · 85a64ae836
41 changed files with 53 additions and 41 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.2)

 set(PROJECT_NAME shadowsocks-libev)
-set(RELEASE_DATE 2017-12-29)
-set(PROJECT_VERSION "3.1.2")
+set(RELEASE_DATE 2018-1-15)
+set(PROJECT_VERSION "3.1.3")
 set(PROJECT_DESC "a lightweight secured socks5 proxy")
 set(PROJECT_URL "https://shadowsocks.org")
 set(PROJECT_ISSUES_URL "https://github.com/shadowsocks/shadowsocks-libev")
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+shadowsocks-libev (3.1.3-1) unstable; urgency=medium
+
+  * Fix a bug in UDP relay.
+
+ -- Max Lv <max.c.lv@gmail.com>  Mon, 15 Jan 2018 17:19:31 -0800
+
 shadowsocks-libev (3.1.2-1) unstable; urgency=medium

  * Fix a bug in DNS resolver.
--- 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: 3.1.2 | [Changelog](debian/changelog)
+Current version: 3.1.3 | [Changelog](debian/changelog)

 Travis CI: [![Travis CI](https://travis-ci.org/shadowsocks/shadowsocks-libev.svg?branch=master)](https://travis-ci.org/shadowsocks/shadowsocks-libev)

@ -491,7 +491,7 @@ setting up your server's firewall rules to limit connections from each user:

 ```
 Copyright: 2013-2015, Clow Windy <clowwindy42@gmail.com>
-           2013-2017, Max Lv <max.c.lv@gmail.com>
+           2013-2018, Max Lv <max.c.lv@gmail.com>
           2014, Linus Yang <linusyang@gmail.com>

 This program is free software: you can redistribute it and/or modify
--- 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.2], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks-libev], [3.1.3], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/crypto.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+shadowsocks-libev (3.1.3-1) unstable; urgency=medium
+
+  * Fix a bug in UDP relay.
+
+ -- Max Lv <max.c.lv@gmail.com>  Mon, 15 Jan 2018 17:19:31 -0800
+
 shadowsocks-libev (3.1.2-1) unstable; urgency=medium

  * Fix a bug in DNS resolver.
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@ -5,7 +5,7 @@
 FROM alpine
 MAINTAINER kev <noreply@datageek.info>

-ARG SS_VER=3.1.2
+ARG SS_VER=3.1.3
 ARG SS_URL=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$SS_VER/shadowsocks-libev-$SS_VER.tar.gz

 ENV SERVER_ADDR 0.0.0.0
--- a/src/acl.c
+++ b/src/acl.c
@ -1,7 +1,7 @@
 /*
 * acl.c - Manage the ACL (Access Control List)
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/acl.h
+++ b/src/acl.h
@ -1,7 +1,7 @@
 /*
 * acl.h - Define the ACL interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/aead.c
+++ b/src/aead.c
@ -1,7 +1,7 @@
 /*
 * aead.c - Manage AEAD ciphers
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/aead.h
+++ b/src/aead.h
@ -1,7 +1,7 @@
 /*
 * aead.h - Define the AEAD interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/android.c
+++ b/src/android.c
@ -1,7 +1,7 @@
 /*
 * android.c - Setup IPC for shadowsocks-android
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/cache.c
+++ b/src/cache.c
@ -1,7 +1,7 @@
 /*
 * cache.c - Manage the connection cache for UDPRELAY
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/cache.h
+++ b/src/cache.h
@ -1,7 +1,7 @@
 /*
 * cache.h - Define the cache manager interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/common.h
+++ b/src/common.h
@ -1,7 +1,7 @@
 /*
 * common.h - Provide global definitions
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 * shadowsocks-libev is free software; you can redistribute it and/or modify
--- a/src/crypto.c
+++ b/src/crypto.c
@ -1,7 +1,7 @@
 /*
 * crypto.c - Manage the global crypto
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/crypto.h
+++ b/src/crypto.h
@ -1,7 +1,7 @@
 /*
 * crypto.h - Define the enryptor's interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/jconf.c
+++ b/src/jconf.c
@ -1,7 +1,7 @@
 /*
 * jconf.c - Parse the JSON format config file
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 * shadowsocks-libev is free software; you can redistribute it and/or modify
--- a/src/jconf.h
+++ b/src/jconf.h
@ -1,7 +1,7 @@
 /*
 * jconf.h - Define the config data structure
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 * shadowsocks-libev is free software; you can redistribute it and/or modify
--- a/src/local.c
+++ b/src/local.c
@ -1,7 +1,7 @@
 /*
 * local.c - Setup a socks5 proxy through remote shadowsocks server
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/local.h
+++ b/src/local.h
@ -1,7 +1,7 @@
 /*
 * local.h - Define the client's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/manager.c
+++ b/src/manager.c
@ -1,7 +1,7 @@
 /*
 * server.c - Provide shadowsocks service
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/manager.h
+++ b/src/manager.h
@ -1,7 +1,7 @@
 /*
 * server.h - Define shadowsocks server's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/netutils.c
+++ b/src/netutils.c
@ -1,7 +1,7 @@
 /*
 * netutils.c - Network utilities
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/netutils.h
+++ b/src/netutils.h
@ -1,7 +1,7 @@
 /*
 * netutils.h - Network utilities
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/plugin.c
+++ b/src/plugin.c
@ -1,7 +1,7 @@
 /*
 * plugin.c - Manage plugins
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/plugin.h
+++ b/src/plugin.h
@ -1,7 +1,7 @@
 /*
 * acl.h - Define the ACL interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/ppbloom.c
+++ b/src/ppbloom.c
@ -1,7 +1,7 @@
 /*
 * ppbloom.c - Ping-Pong Bloom Filter for nonce reuse detection
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/ppbloom.h
+++ b/src/ppbloom.h
@ -1,7 +1,7 @@
 /*
 * ppbloom.h - Define the Ping-Pong Bloom Filter interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/redir.c
+++ b/src/redir.c
@ -2,7 +2,7 @@
 * redir.c - Provide a transparent TCP proxy through remote shadowsocks
 *           server
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/redir.h
+++ b/src/redir.h
@ -1,6 +1,6 @@
 /* * redir.h - Define the redirector's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/server.c
+++ b/src/server.c
@ -1,7 +1,7 @@
 /*
 * server.c - Provide shadowsocks service
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/server.h
+++ b/src/server.h
@ -1,7 +1,7 @@
 /*
 * server.h - Define shadowsocks server's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/shadowsocks.h
+++ b/src/shadowsocks.h
@ -1,7 +1,7 @@
 /*
 * shadowsocks.h - Header files of library interfaces
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 * shadowsocks-libev is free software; you can redistribute it and/or modify
--- a/src/stream.c
+++ b/src/stream.c
@ -1,7 +1,7 @@
 /*
 * stream.c - Manage stream ciphers
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/stream.h
+++ b/src/stream.h
@ -1,7 +1,7 @@
 /*
 * encrypt.h - Define the enryptor's interface
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/tunnel.c
+++ b/src/tunnel.c
@ -1,7 +1,7 @@
 /*
 * tunnel.c - Setup a local port forwarding through remote shadowsocks server
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/tunnel.h
+++ b/src/tunnel.h
@ -1,7 +1,7 @@
 /*
 * tunnel.h - Define tunnel's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/udprelay.c
+++ b/src/udprelay.c
@ -1,7 +1,7 @@
 /*
 * udprelay.c - Setup UDP relay for both client and server
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/udprelay.h
+++ b/src/udprelay.h
@ -1,7 +1,7 @@
 /*
 * udprelay.h - Define UDP relay's buffers and callbacks
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/utils.c
+++ b/src/utils.c
@ -1,7 +1,7 @@
 /*
 * utils.c - Misc utilities
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *
--- a/src/utils.h
+++ b/src/utils.h
@ -1,7 +1,7 @@
 /*
 * utils.h - Misc utilities
 *
- * Copyright (C) 2013 - 2017, Max Lv <max.c.lv@gmail.com>
+ * Copyright (C) 2013 - 2018, Max Lv <max.c.lv@gmail.com>
 *
 * This file is part of the shadowsocks-libev.
 *