Date: Monday, December 22, 2014 @ 10:13:48 Author: fyan Revision: 124348
upgpkg: shadowsocks 2.6-1 upstream new release Modified: shadowsocks/trunk/PKGBUILD Deleted: shadowsocks/trunk/fix-typeerror.patch ---------------------+ PKGBUILD | 6 +++--- fix-typeerror.patch | 38 -------------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-12-22 08:25:36 UTC (rev 124347) +++ PKGBUILD 2014-12-22 09:13:48 UTC (rev 124348) @@ -2,8 +2,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=shadowsocks -pkgver=2.5 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="A lightweight tunnel proxy" license=("MIT") url="http://pypi.python.org/pypi/shadowsocks"; @@ -15,7 +15,7 @@ "$pkgname-LICENSE::https://raw.github.com/clowwindy/shadowsocks/master/LICENSE"; "[email protected]" "[email protected]") -sha512sums=('013975905d51a2d57fb95a845d88104ab6d1420ded2b3fac6f171a49b799241cb117868b17866bc9737cb529325731786dd523385351952d3ea2aee13426fe4f' +sha512sums=('a5d3df93ac70a897f5b652129f04c4120dbe86e33d37a661fc05d9a888c54c35bda7e2788c1ba7d27426e00edaa09b4d0c735f428da60370c63835e30f824f80' '88abf42d51d7b7baa2b9cef016bfd194373fd178980c2c6f1bbb3ce31d3267dfca71efb013c6596c57c0390fdb95d716ff4acca97bdf960e56e9edf16f770352' '96ecb174a476f64dec3ec086732d93a76d27e9a1cc56b1dc3fa87bf8e00d4b3c44076a01a0d525e42174cacc58fd5c16d5c8af5d4636dae13df549dec8204f7d' 'f2f8240c18a4483bf3e03b3a5ac8822c3deae713224f732bf28f7fddfcc5d0b02aa91652665ff93f05731e162a9407109c18f43d732a3a9b19d9eacfc806a4df') Deleted: fix-typeerror.patch =================================================================== --- fix-typeerror.patch 2014-12-22 08:25:36 UTC (rev 124347) +++ fix-typeerror.patch 2014-12-22 09:13:48 UTC (rev 124348) @@ -1,38 +0,0 @@ -From fb27cf52a9a7b72ef8d3e3693623de43a477ebaf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E5=88=98=E7=BC=99?= <[email protected]> -Date: Wed, 5 Nov 2014 11:04:40 +0800 -Subject: [PATCH] Fix str/byte related TypeError in Python 3.4 - -Traceback (most recent call last): -File "/usr/bin/sslocal", line 9, in <module> -load_entry_point('shadowsocks==2.4', 'console_scripts', 'sslocal')() -File "/usr/lib/python3.4/site-packages/shadowsocks/local.py", line 68, in main -loop.run() -File "/usr/lib/python3.4/site-packages/shadowsocks/eventloop.py", line 230, in run -handler(events) -File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 630, in _handle_events -handler.handle_event(sock, event) -File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 458, in handle_event -self._on_local_read() -File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 377, in _on_local_read -self._handle_stage_reply(data) -File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 212, in _handle_stage_reply -s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server) -TypeError: 'str' does not support the buffer interface ---- - shadowsocks/tcprelay.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py -index 4a30b42..6ccadbe 100644 ---- a/shadowsocks/tcprelay.py -+++ b/shadowsocks/tcprelay.py -@@ -207,7 +207,7 @@ def _handle_stage_reply(self, data): - self._create_remote_socket(self._chosen_server[0], - self._chosen_server[1]) - self._loop.add(remote_sock, eventloop.POLL_ERR) -- data = ''.join(self._data_to_write_to_local) -+ data = b''.join(self._data_to_write_to_local) - l = len(data) - s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server) - if s < l:
