Your message dated Sun, 16 Apr 2017 09:29:00 +0000
with message-id <[email protected]>
and subject line Re: Bug#860398: unblock: shadowsocks-libev/2.6.3+ds-2
has caused the Debian Bug report #860398,
regarding unblock: shadowsocks-libev/2.6.3+ds-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
860398: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860398
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package shadowsocks-libev
We are maintaining a stable version of package shadowsocks-libev for Stretch
and cherry-picking
some important bug fix commits from upstream. This is a maintenance release
that fixes two important bugs.
This version was uploaded into Unstable 11 days before and an unblock should
allow it to enter Testing.
Source debdiff provided here.
diff -Nru shadowsocks-libev-2.6.3+ds/debian/changelog shadowsocks-
libev-2.6.3+ds/debian/changelog
--- shadowsocks-libev-2.6.3+ds/debian/changelog 2017-01-25 18:58:24.000000000
+0800
+++ shadowsocks-libev-2.6.3+ds/debian/changelog 2017-04-04 20:48:26.000000000
+0800
@@ -1,3 +1,16 @@
+shadowsocks-libev (2.6.3+ds-2) unstable; urgency=medium
+
+ * debian/patches:
+ - Backport a few patches from upstream:
+ + Fix Upstream BTS#1148:
+ ss-local doesn't do DNS resolving for acl bypassed domains.
+ (Closes: #859499).
+ + Fix Upstream BTS#1210:
+ Update doc (manpages) to fix typos. Thanks to Simon Shi.
+ (Closes: #859502).
+
+ -- Roger Shimizu <[email protected]> Tue, 04 Apr 2017 21:48:26 +0900
+
shadowsocks-libev (2.6.3+ds-1) unstable; urgency=medium
* New upstream release 2.6.3
diff -Nru shadowsocks-
libev-2.6.3+ds/debian/patches/backport/0009-Fix-1148.patch shadowsocks-
libev-2.6.3+ds/debian/patches/backport/0009-Fix-1148.patch
--- shadowsocks-libev-2.6.3+ds/debian/patches/backport/0009-Fix-1148.patch
1970-01-01 08:00:00.000000000 +0800
+++ shadowsocks-libev-2.6.3+ds/debian/patches/backport/0009-Fix-1148.patch
2017-04-04 20:48:26.000000000 +0800
@@ -0,0 +1,29 @@
+From: Max Lv <[email protected]>
+Date: Mon, 30 Jan 2017 08:41:04 +0800
+Subject: Fix #1148
+
+Upstream BTS#1148
+ss-local doesn't do DNS resolving for acl bypassed domains
+---
+ src/local.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/local.c b/src/local.c
+index 1f200ce..1b0b4ca 100644
+--- a/src/local.c
++++ b/src/local.c
+@@ -667,9 +667,13 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
+ else if (atyp == 4)
+ LOGI("bypass [%s]:%s", ip, port);
+ }
++ int err;
+ struct sockaddr_storage storage;
+ memset(&storage, 0, sizeof(struct sockaddr_storage));
+- int err = get_sockaddr(ip, port, &storage, 0, ipv6first);
++ if (sni_detected || atyp == 3)
++ err = get_sockaddr(host, port, &storage, 0,
ipv6first);
++ else
++ err = get_sockaddr(ip, port, &storage, 0, ipv6first);
+ if (err != -1) {
+ remote = create_remote(server->listener, (struct
sockaddr *)&storage);
+ if (remote != NULL)
diff -Nru shadowsocks-libev-2.6.3+ds/debian/patches/backport/0010-Fix-
typo-1210.patch shadowsocks-libev-2.6.3+ds/debian/patches/backport/0010-Fix-
typo-1210.patch
--- shadowsocks-libev-2.6.3+ds/debian/patches/backport/0010-Fix-typo-1210.patch
1970-01-01 08:00:00.000000000 +0800
+++ shadowsocks-libev-2.6.3+ds/debian/patches/backport/0010-Fix-typo-1210.patch
2017-04-04 20:48:26.000000000 +0800
@@ -0,0 +1,61 @@
+From: Simon Shi <[email protected]>
+Date: Tue, 7 Feb 2017 08:47:34 +0800
+Subject: Fix typo (#1210)
+
+* Fix doc
+
+* Update ss-redir.asciidoc
+
+* Update ss-server.asciidoc
+---
+ doc/ss-local.asciidoc | 4 ++--
+ doc/ss-redir.asciidoc | 2 +-
+ doc/ss-server.asciidoc | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/ss-local.asciidoc b/doc/ss-local.asciidoc
+index a1f2b0f..468d67e 100644
+--- a/doc/ss-local.asciidoc
++++ b/doc/ss-local.asciidoc
+@@ -12,9 +12,9 @@ SYNOPSIS
+ [-s <server_host>] [-p <server_port>] [-l <local_port>]
+ [-k <password>] [-m <encrypt_method>] [-f <pid_file>]
+ [-t <timeout>] [-c <config_file>] [-i <interface>]
+- [-a <user_name>] [-b <local_address] [-n <nofile>]
++ [-a <user_name>] [-b <local_address>] [-n <nofile>]
+ [--fast-open] [--acl <acl_config>] [--mtu <MTU>]
+- [--plugin <plugin_name>] [--plugin_opts <plugin_options]
++ [--plugin <plugin_name>] [--plugin_opts <plugin_options>]
+
+ DESCRIPTION
+ -----------
+diff --git a/doc/ss-redir.asciidoc b/doc/ss-redir.asciidoc
+index 84b9c8b..dbc00f1 100644
+--- a/doc/ss-redir.asciidoc
++++ b/doc/ss-redir.asciidoc
+@@ -13,7 +13,7 @@ SYNOPSIS
+ [-k <password>] [-m <encrypt_method>] [-f <pid_file>]
+ [-t <timeout>] [-c <config_file>] [-b <local_address>]
+ [-a <user_name>] [-n <nofile>] [--mtu <MTU>]
+- [--plugin <plugin_name>] [--plugin_opts <plugin_options]
++ [--plugin <plugin_name>] [--plugin_opts <plugin_options>]
+
+ DESCRIPTION
+ -----------
+diff --git a/doc/ss-server.asciidoc b/doc/ss-server.asciidoc
+index 8c6a246..f09fb07 100644
+--- a/doc/ss-server.asciidoc
++++ b/doc/ss-server.asciidoc
+@@ -13,10 +13,10 @@ SYNOPSIS
+ [-k <password>] [-m <encrypt_method>] [-f <pid_file>]
+ [-t <timeout>] [-c <config_file>] [-i <interface>]
+ [-a <user_name>] [-d <addr>] [-n <nofile>]
+- [-b <local_address] [--fast-open] [--mptcp]
++ [-b <local_address>] [--fast-open] [--mptcp]
+ [--acl <acl_config>] [--mtu <MTU>]
+ [--manager-address <path_to_unix_domain>]
+- [--plugin <plugin_name>] [--plugin_opts <plugin_options]
++ [--plugin <plugin_name>] [--plugin_opts <plugin_options>]
+
+ DESCRIPTION
+ -----------
diff -Nru shadowsocks-libev-2.6.3+ds/debian/patches/series shadowsocks-
libev-2.6.3+ds/debian/patches/series
--- shadowsocks-libev-2.6.3+ds/debian/patches/series 2017-01-25
18:56:51.000000000 +0800
+++ shadowsocks-libev-2.6.3+ds/debian/patches/series 2017-04-04
20:48:26.000000000 +0800
@@ -6,3 +6,5 @@
backport/0006-Fix-array-size-with-old-libsodium.patch
backport/0007-Add-missing-ss-nat.patch
backport/0008-Refine-1133-second-time-1136.patch
+backport/0009-Fix-1148.patch
+backport/0010-Fix-typo-1210.patch
Thanks!
unblock shadowsocks-libev/2.6.3+ds-2
--
Sincerely,
Boyuan Yang
--- End Message ---
--- Begin Message ---
Boyuan Yang:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please unblock package shadowsocks-libev
>
> We are maintaining a stable version of package shadowsocks-libev for Stretch
> and cherry-picking
> some important bug fix commits from upstream. This is a maintenance release
> that fixes two important bugs.
>
> This version was uploaded into Unstable 11 days before and an unblock should
> allow it to enter Testing.
>
> Source debdiff provided here.
>
> [...]
>
> Thanks!
>
> unblock shadowsocks-libev/2.6.3+ds-2
>
> --
> Sincerely,
> Boyuan Yang
>
Unblocked, thanks.
~Niels
--- End Message ---
