new debian package (#659)

* * new upstream version
* change repository.
* change license.
* standards version change to 3.9.8
* fix #810688: man page references texinfo documents which don't exist

* * merge back thomas's change

* * Fix compatible issue (Closes: #845016)

debian/changelog

@@ -1,3 +1,26 @@
+shadowsocks (2.9.0-2) unstable; urgency=medium
+
+  [ Shell.Xu ]
+  * Fix compatible issue (Closes: #845016)
+
+ -- Shell.Xu <shell909090@gmail.com>  Sun, 20 Nov 2016 14:33:31 +0800
+
+shadowsocks (2.9.0-1) unstable; urgency=medium
+
+  [ Shell Xu ]
+  * Upstream update (Closes: #824640)
+  * Remove reference not exists (Closes: #810688)
+
+  [ Thomas Goirand ]
+  * Added lsb-base as Depends:.
+  * Removed Pre-Depends: dpkg (>= 1.15.6~).
+  * Ran wrap-and-sort -t -a.
+  * Fixed VCS URLs to use https.
+  * Removed useless obsolete version of python-all build-depends.
+  * Fixed debian/copyright ordering.
+
+ -- Shell.Xu <shell909090@gmail.com>  Sat, 01 Oct 2016 16:14:47 +0800
+
 shadowsocks (2.1.0-1) unstable; urgency=low
 
   * Initial release (Closes: #758900)

debian/control

@@ -2,16 +2,21 @@ Source: shadowsocks
 Section: python
 Priority: extra
 Maintainer: Shell.Xu <shell909090@gmail.com>
-Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 8),
-Standards-Version: 3.9.5
+               python-all,
-Homepage: https://github.com/clowwindy/shadowsocks
+               python-setuptools,
-Vcs-Git: git://github.com/shell909090/shadowsocks.git
+Standards-Version: 3.9.8
-Vcs-Browser: http://github.com/shell909090/shadowsocks
+Homepage: https://github.com/shadowsocks/shadowsocks
+Vcs-Git: https://github.com/shell909090/shadowsocks.git
+Vcs-Browser: https://github.com/shell909090/shadowsocks
 
 Package: shadowsocks
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
+Depends: lsb-base (>= 3.0-6),
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-m2crypto
+         python-m2crypto,
+         python-pkg-resources,
+         ${misc:Depends},
+         ${python:Depends},
 Description: Fast tunnel proxy that helps you bypass firewalls
  A secure socks5 proxy, designed to protect your Internet traffic.
  .

debian/copyright

@@ -1,30 +1,27 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: shadowsocks
-Source: https://github.com/clowwindy/shadowsocks
+Source: https://github.com/shadowsocks/shadowsocks
-
-Files: debian/*
-Copyright: 2014 Shell.Xu <shell909090@gmail.com>
-License: Expat
 
 Files: *
 Copyright: 2014 clowwindy <clowwindy42@gmail.com>
-License: Expat
+License: Apache-2.0
 
-License: Expat
+Files: debian/*
- Permission is hereby granted, free of charge, to any person obtaining a copy
+Copyright: 2016 Shell.Xu <shell909090@gmail.com>
- of this software and associated documentation files (the "Software"), to deal
+License: Apache-2.0
- in the Software without restriction, including without limitation the rights
+
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+License: Apache-2.0
- copies of the Software, and to permit persons to whom the Software is
+ Licensed under the Apache License, Version 2.0 (the "License");
- furnished to do so, subject to the following conditions:
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- The above copyright notice and this permission notice shall be included in
+     http://www.apache.org/licenses/LICENSE-2.0
- all copies or substantial portions of the Software.
  .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ Unless required by applicable law or agreed to in writing, software
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ distributed under the License is distributed on an "AS IS" BASIS,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ See the License for the specific language governing permissions and
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ limitations under the License.
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ .
- SOFTWARE.
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"

debian/sslocal.1

@@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors.
 The programs are documented fully by
 .IR "Shell Xu <shell909090@gmail.com>"
 and 
-.IR "Clowwindy <clowwindy42@gmail.com>",
+.IR "Clowwindy <clowwindy42@gmail.com>"
-available via the Info system.
+.

debian/ssserver.1

@@ -55,5 +55,5 @@ Quiet mode, only show warnings/errors.
 The programs are documented fully by
 .IR "Shell Xu <shell909090@gmail.com>"
 and 
-.IR "Clowwindy <clowwindy42@gmail.com>",
+.IR "Clowwindy <clowwindy42@gmail.com>"
-available via the Info system.
+.

shadowsocks/crypto/openssl.py

@@ -32,7 +32,7 @@ buf_size = 2048
 
 
 def load_openssl():
-    global loaded, libcrypto, buf
+    global loaded, libcrypto, buf, ctx_cleanup
 
     libcrypto = util.find_library(('crypto', 'eay32'),
                                   'EVP_get_cipherbyname',
@@ -49,7 +49,12 @@ def load_openssl():
     libcrypto.EVP_CipherUpdate.argtypes = (c_void_p, c_void_p, c_void_p,
                                            c_char_p, c_int)
 
+    try:
         libcrypto.EVP_CIPHER_CTX_cleanup.argtypes = (c_void_p,)
+        ctx_cleanup = libcrypto.EVP_CIPHER_CTX_cleanup
+    except AttributeError:
+        libcrypto.EVP_CIPHER_CTX_reset.argtypes = (c_void_p,)
+        ctx_cleanup = libcrypto.EVP_CIPHER_CTX_reset
     libcrypto.EVP_CIPHER_CTX_free.argtypes = (c_void_p,)
     if hasattr(libcrypto, 'OpenSSL_add_all_ciphers'):
         libcrypto.OpenSSL_add_all_ciphers()
@@ -108,7 +113,7 @@ class OpenSSLCrypto(object):
 
     def clean(self):
         if self._ctx:
-            libcrypto.EVP_CIPHER_CTX_cleanup(self._ctx)
+            ctx_cleanup(self._ctx)
             libcrypto.EVP_CIPHER_CTX_free(self._ctx)