Sync debian/ folder (#681)

A few itmes deserve to be mentioned:
 - use apg to generate random password when install.
 - generated password won't get updated when upgrading / reinstall.
 - add more to description to make lintian happy.
 - generated Makefile.am don't need to be listed in debian/copyright.
 - the way of installing systemd service is changed. Thanks to advice
   from Boyuan.
 - multi-arch can be archived without specific setting in debian/rules
 - add debian/watch file

debian/control

@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Max Lv <max.c.lv@gmail.com>
 Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), pkg-config, libssl-dev (>= 0.9.8), autotools-dev, mime-support, gawk
 Standards-Version: 3.9.8
-Homepage: http://www.shadowsocks.org
+Homepage: https://www.shadowsocks.org
 Vcs-Git: https://github.com/shadowsocks/shadowsocks-libev.git
 Vcs-Browser: https://github.com/shadowsocks/shadowsocks-libev
 
@@ -12,16 +12,19 @@ Package: shadowsocks-libev
 Replaces: shadowsocks (<< 1.5.3-2)
 Breaks: shadowsocks (<< 1.5.3-2)
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: apg, ${shlibs:Depends}, ${misc:Depends}
 Description: lightweight and secure socks5 proxy
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
+ .
+ Shadowsocks-libev was inspired by Shadowsock (in Python). It's rewritten
+ in pure C and only depends on libev, mbedTLS and a few other tiny
+ libraries.
 
 Package: libshadowsocks-libev1
 Architecture: any
 Multi-Arch: same
 Section: libs
-Priority: extra
 Breaks: shadowsocks-libev (<< 2.4.0)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -29,16 +32,23 @@ Description: lightweight and secure socks5 proxy (shared library)
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
  .
+ Shadowsocks-libev was inspired by Shadowsock (in Python). It's rewritten
+ in pure C and only depends on libev, mbedTLS and a few other tiny
+ libraries.
+ .
  This package provides shared libraries.
 
 Package: libshadowsocks-libev-dev
 Architecture: any
 Section: libdevel
-Priority: extra
 Breaks: shadowsocks-libev (<< 2.4.0)
 Depends: libshadowsocks-libev1 (= ${binary:Version}), ${misc:Depends}
 Description: lightweight and secure socks5 proxy (development files)
  Shadowsocks-libev is a lightweight and secure socks5 proxy for
  embedded devices and low end boxes.
  .
+ Shadowsocks-libev was inspired by Shadowsock (in Python). It's rewritten
+ in pure C and only depends on libev, mbedTLS and a few other tiny
+ libraries.
+ .
  This package provides C header files for the libraries.

debian/copyright

@@ -4,35 +4,17 @@ Upstream-Contact: Max Lv <max.c.lv@gmail.com>
 Source: https://github.com/shadowsocks/shadowsocks-libev
 
 Files: *
-Copyright: 2013-2015 Clow Windy <clowwindy42@gmail.com>
-           2013-2015 Max Lv <max.c.lv@gmail.com>
+Copyright: 2013-2015, Clow Windy <clowwindy42@gmail.com>
+           2013-2016, Max Lv <max.c.lv@gmail.com>
+           2014, Linus Yang <linusyang@gmail.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2013-2015 Max Lv <max.c.lv@gmail.com>
+Copyright: 2013-2015, Max Lv <max.c.lv@gmail.com>
            2015, Boyuan Yang <073plan@gmail.com>
+           2016, Roger Shimizu <rogershimizu@gmail.com>
 License: GPL-3+
 
-Files: libcork/Makefile.am libipset/Makefile.am libipset/bdd/Makefile.am libipset/map/Makefile.am libipset/set/Makefile.am
-Copyright: 2005-2008 Lennart Poettering
-License: LGPL-2.1+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 2.1 of the
- License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with libasyncns. If not, see
- <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
-
 Files: libcork/* libipset/*
 Copyright: 2011-2013, RedJack, LLC.
 License: BSD-3-clause
@@ -64,6 +46,64 @@ License: BSD-3-clause
  (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: src/json.c src/json.h
+Copyright: 2012-2014, James McLaughlin et al.
+License: BSD-2-clause
+
+Files: src/resolv.c src/resolv.h
+Copyright: 2014, Dustin Lundquist <dustin@null-ptr.net>
+License: BSD-2-clause
+
+Files: src/ss-nat
+Copyright: 2015, OpenWrt-dist
+           2015, Jian Chang <aa65535@live.com>
+License: GPL-3+
+
+Files: src/uthash.h
+Copyright: 2003-2013, 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.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

debian/libshadowsocks-libev1.install

@@ -1,3 +1 @@
-usr/lib/*/libshadowsocks-libev.so.1
-usr/lib/*/libshadowsocks-libev.so.1.0.0
-usr/lib/*/libshadowsocks-libev.la
+usr/lib/*/libshadowsocks-libev.so.*

debian/rules

@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
 
 # Security Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -16,30 +9,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# Enable Multi-Arch support.
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-override_dh_strip:
-	dh_strip
-	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+override_dh_auto_install:
+	find src/ -name '*.la' -delete
+	dh_auto_install
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
         --enable-shared
 
-override_dh_installinit:
-	dh_installinit
-	dh_installinit --no-start --name=shadowsocks-libev-server@
-	dh_installinit --no-start --name=shadowsocks-libev-tunnel@
-	dh_installinit --no-start --name=shadowsocks-libev-redir@
-	dh_installinit --no-start --name=shadowsocks-libev-local@
-
 override_dh_installchangelogs:
 	dh_installchangelogs -XChanges
 

debian/shadowsocks-libev.init

@@ -6,9 +6,8 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: lightweight secured socks5 proxy
-# Description:       Shadowsocks-libev is a lightweight secured 
+# Description:       Shadowsocks-libev is a lightweight secured
 #                    socks5 proxy for embedded devices and low end boxes.
-#                    
 ### END INIT INFO
 
 # Author: Max Lv <max.c.lv@gmail.com>

debian/shadowsocks-libev.install

@@ -1,3 +1,4 @@
 usr/bin/
 usr/share/man/
 debian/config.json  etc/shadowsocks-libev
+debian/shadowsocks-libev-*.service lib/systemd/system

debian/shadowsocks-libev.postinst

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	configure|reconfigure)
+		# continue
+		;;
+	abort-upgrade|abort-remove|abort-deconfigure)
+		exit 0
+		;;
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 0
+		;;
+esac
+
+passwd=$(apg -n 1 -M ncl)
+sed -i "s/barfoo!/$passwd/" etc/shadowsocks-libev/config.json
+
+#DEBHELPER#
+
+exit 0

debian/watch

@@ -0,0 +1,6 @@
+version=4
+
+opts=" \
+   filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%shadowsocks-libev-$1.tar.gz%" \
+   https://github.com/shadowsocks/shadowsocks-libev/tags \
+   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate