Sync debian/ folder with debian release 3.1.1+ds-1~exp1

debian/control

@@ -1,19 +1,19 @@
 Source: shadowsocks-libev
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Roger Shimizu <rogershimizu@gmail.com>
 Uploaders: Max Lv <max.c.lv@gmail.com>, Boyuan Yang <073plan@gmail.com>
 Build-Depends:
  asciidoc-base | asciidoc,
  debhelper (>= 10),
+ libc-ares-dev,
  libev-dev,
  libmbedtls-dev,
  libpcre3-dev,
- libsodium-dev (>= 1.0.8~),
- libc-ares-dev,
+ libsodium-dev (>= 1.0.12),
  pkg-config,
  xmlto
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
 Homepage: https://www.shadowsocks.org
 Vcs-Git: https://github.com/shadowsocks/shadowsocks-libev.git
 Vcs-Browser: https://github.com/shadowsocks/shadowsocks-libev
@@ -28,6 +28,10 @@ Depends:
  lsb-base (>= 3.0-6),
  ${misc:Depends},
  ${shlibs:Depends}
+Suggests:
+ haveged,
+ kcptun,
+ simple-obfs
 Description: lightweight and secure socks5 proxy
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.

debian/copyright

@@ -11,7 +11,7 @@ License: GPL-3+
 
 Files: debian/*
 Copyright: 2013-2015, Max Lv <max.c.lv@gmail.com>
-           2015-2016, Boyuan Yang <073plan@gmail.com>
+           2015-2017, Boyuan Yang <073plan@gmail.com>
            2016-2017, Roger Shimizu <rogershimizu@gmail.com>
 License: GPL-3+
 
@@ -64,25 +64,12 @@ Copyright: 2015, OpenWrt-dist
 License: GPL-3+
 
 Files: src/uthash.h
-Copyright: 2003-2013, Troy D. Hanson
+Copyright: 2003-2016, Troy D. Hanson
 License: BSD-1-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: tests/test.py
+Copyright: 2015, Clow Windy <clowwindy42@gmail.com>
+License: Apache-2.0
 
 License: Apache-2.0
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -103,6 +90,25 @@ License: Apache-2.0
  On Debian systems, the complete text of the Apache version 2.0 license
  can be found in "/usr/share/common-licenses/Apache-2.0".
 
+License: BSD-1-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

debian/doc-base

@@ -0,0 +1,9 @@
+Document: shadowsocks-libev
+Title: shadowsocks-libev documentation
+Author: Max Lv <max.c.lv@gmail.com>
+Abstract: This is the documentation of shadowsocks-libev
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/shadowsocks-libev/shadowsocks-libev.html
+Files: /usr/share/doc/shadowsocks-libev/*.html

debian/libshadowsocks-libev2.symbols

@@ -0,0 +1,119 @@
+libshadowsocks-libev.so.2 libshadowsocks-libev2 #MINVER#
+ ERROR@Base 2.4.7
+ FATAL@Base 2.4.7
+ accept_rule_arg@Base 2.5.6
+ acl_add_ip@Base 2.4.8
+ acl_match_host@Base 2.5.6
+ acl_remove_ip@Base 2.4.7
+ add_rule@Base 2.5.6
+ aead_ctx_init@Base 3.0.2
+ aead_ctx_release@Base 3.0.2
+ aead_decrypt@Base 3.0.2
+ aead_decrypt_all@Base 3.0.2
+ aead_encrypt@Base 3.0.2
+ aead_encrypt_all@Base 3.0.2
+ aead_get_cipher_type@Base 3.0.2
+ aead_init@Base 3.0.2
+ aead_key_init@Base 3.0.2
+ balloc@Base 2.4.7
+ base64_decode@Base 3.0.2
+ base64_encode@Base 3.0.2
+ bfree@Base 2.4.7
+ bind_to_address@Base 2.4.7
+ bprepend@Base 3.0.2
+ brealloc@Base 2.4.7
+ cache_clear@Base 2.5.6
+ cache_create@Base 2.4.7
+ cache_delete@Base 2.4.7
+ cache_insert@Base 2.4.7
+ cache_key_exist@Base 2.4.7
+ cache_lookup@Base 2.4.7
+ cache_remove@Base 2.4.7
+ check_block_list@Base 2.5.6
+ cipher_ctx_set_nonce@Base 3.0.2
+ cipher_key_size@Base 2.4.8
+ cipher_nonce_size@Base 3.0.2
+ clear_block_list@Base 2.5.6
+ create_remote_socket@Base 2.4.7
+ create_server_socket@Base 2.4.7
+ crypto_derive_key@Base 3.0.2
+ crypto_hkdf@Base 3.0.2
+ crypto_hkdf_expand@Base 3.0.2
+ crypto_hkdf_extract@Base 3.0.2
+ crypto_init@Base 3.0.2
+ crypto_md5@Base 3.0.2
+ crypto_parse_key@Base 3.0.2
+ daemonize@Base 2.4.7
+ free_acl@Base 2.4.7
+ free_addr@Base 2.4.7
+ free_block_list@Base 2.6.3
+ free_cb@Base 2.4.7
+ free_rules@Base 2.5.6
+ free_udprelay@Base 2.4.7
+ get_acl_mode@Base 2.5.6
+ get_local_port@Base 2.6.3
+ get_sockaddr@Base 2.4.7
+ get_sockaddr_len@Base 2.4.7
+ http_protocol@Base 2.5.6
+ init_acl@Base 2.4.7
+ init_block_list@Base 2.5.6
+ init_rule@Base 2.5.6
+ init_udprelay@Base 2.4.7
+ is_plugin_running@Base 2.6.3
+ json_parse@Base 2.4.7
+ json_parse_ex@Base 2.4.7
+ json_value_free@Base 2.4.7
+ json_value_free_ex@Base 2.4.7
+ json_value_none@Base 2.4.7
+ keep_resolving@Base 2.4.7
+ logfile@Base 2.4.7
+ lookup_rule@Base 2.5.6
+ new_rule@Base 2.5.6
+ new_server_ctx@Base 2.4.7
+ outbound_block_match_host@Base 2.5.6
+ parse_addr@Base 2.4.7
+ plugin_log@Base 2.6.3
+ ppbloom_add@Base 3.0.5
+ ppbloom_check@Base 3.0.5
+ ppbloom_free@Base 3.0.5
+ ppbloom_init@Base 3.0.5
+ rand_bytes@Base 2.4.7
+ read_jconf@Base 2.4.7
+ remove_from_block_list@Base 2.5.6
+ remove_rule@Base 2.5.6
+ reuse_port@Base 3.0.2
+ run_as@Base 2.4.7
+ set_nofile@Base 2.4.7
+ set_reuseport@Base 2.4.7
+ (arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386)setinterface@Base 2.4.7
+ setnonblocking@Base 2.4.7
+ sockaddr_cmp@Base 2.4.7
+ sockaddr_cmp_addr@Base 2.4.7
+ ss_align@Base 3.0.2
+ ss_isnumeric@Base 2.6.3
+ ss_itoa@Base 2.4.7
+ ss_malloc@Base 2.4.7
+ ss_realloc@Base 2.4.7
+ ss_strndup@Base 2.4.7
+ start_plugin@Base 2.6.3
+ start_ss_local_server@Base 2.4.7
+ stop_plugin@Base 2.6.3
+ stream_cipher_ctx_init@Base 3.0.2
+ stream_ctx_init@Base 3.0.2
+ stream_ctx_release@Base 3.0.2
+ stream_decrypt@Base 3.0.2
+ stream_decrypt_all@Base 3.0.2
+ stream_encrypt@Base 3.0.2
+ stream_encrypt_all@Base 3.0.2
+ stream_get_cipher_type@Base 3.0.2
+ stream_init@Base 3.0.2
+ stream_key_init@Base 3.0.2
+ supported_aead_ciphers@Base 3.0.2
+ supported_stream_ciphers@Base 3.0.2
+ tls_protocol@Base 2.5.6
+ trimwhitespace@Base 2.5.6
+ update_block_list@Base 2.6.3
+ usage@Base 2.4.7
+ use_tty@Base 2.4.7
+ validate_hostname@Base 2.5.6
+ verbose@Base 2.4.7

debian/rules

@@ -6,9 +6,6 @@
 # Security Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
 override_dh_auto_install:
 	find src/ -name '*.la' -delete
 	dh_auto_install

debian/source.lintian-overrides

@@ -1,4 +1,2 @@
-# false positive: #505857
-shadowsocks-libev source: debian-watch-file-should-mangle-version
 # false positive: #765166
 shadowsocks-libev source: license-problem-gfdl-invariants

debian/tests/control

@@ -0,0 +1,3 @@
+Test-Command: bash tests/test.sh
+Depends: @, python, curl, dnsutils
+Restrictions: allow-stderr

debian/watch

@@ -2,6 +2,6 @@ version=4
 
 opts="repack,compression=xz, \
    dversionmangle=s/\+ds\d*$//,repacksuffix=+ds, \
-   filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%shadowsocks-libev-$1.tar.gz%" \
+   filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%shadowsocks-libev_$1.orig.tar.gz%" \
    https://github.com/shadowsocks/shadowsocks-libev/tags \
    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate