Accepting request 560570 from home:hillwood:branches:server:proxy

- Update to 3.1.2
  * Fix a bug in DNS resolver.
  * Add new TFO API support.
- Drop fix-Command-Execution-in-ss-manager.patch. Merged by upstream. 

- Update to 3.1.0

OBS-URL: https://build.opensuse.org/request/show/560570
OBS-URL: https://build.opensuse.org/package/show/server:proxy/shadowsocks-libev?expand=0&rev=12

fix-Command-Execution-in-ss-manager.patch

@@ -1,65 +0,0 @@
-diff -Nur shadowsocks-libev-3.1.0/src/manager.c shadowsocks-libev-3.1.0-new/src/manager.c
---- shadowsocks-libev-3.1.0/src/manager.c	2017-09-06 09:19:47.000000000 +0800
-+++ shadowsocks-libev-3.1.0-new/src/manager.c	2017-10-31 11:29:51.122235135 +0800
-@@ -92,7 +92,7 @@
- }
- 
- static void
--build_config(char *prefix, struct server *server)
-+build_config(char *prefix, struct manager_ctx *manager, struct server *server)
- {
-     char *path    = NULL;
-     int path_size = strlen(prefix) + strlen(server->port) + 20;
-@@ -110,11 +110,18 @@
-     fprintf(f, "{\n");
-     fprintf(f, "\"server_port\":%d,\n", atoi(server->port));
-     fprintf(f, "\"password\":\"%s\"", server->password);
--    if (server->fast_open[0]) fprintf(f, ",\n\"fast_open\": %s", server->fast_open);
--    if (server->mode)   fprintf(f, ",\n\"mode\":\"%s\"", server->mode);
--    if (server->method) fprintf(f, ",\n\"method\":\"%s\"", server->method);
--    if (server->plugin) fprintf(f, ",\n\"plugin\":\"%s\"", server->plugin);
--    if (server->plugin_opts) fprintf(f, ",\n\"plugin_opts\":\"%s\"", server->plugin_opts);
-+    if (server->method)
-+        fprintf(f, ",\n\"method\":\"%s\"", server->method);
-+    else if (manager->method)
-+        fprintf(f, ",\n\"method\":\"%s\"", manager->method);
-+    if (server->fast_open[0])
-+        fprintf(f, ",\n\"fast_open\": %s", server->fast_open);
-+    if (server->mode)
-+        fprintf(f, ",\n\"mode\":\"%s\"", server->mode);
-+    if (server->plugin)
-+        fprintf(f, ",\n\"plugin\":\"%s\"", server->plugin);
-+    if (server->plugin_opts)
-+        fprintf(f, ",\n\"plugin_opts\":\"%s\"", server->plugin_opts);
-     fprintf(f, "\n}\n");
-     fclose(f);
-     ss_free(path);
-@@ -124,17 +131,17 @@
- construct_command_line(struct manager_ctx *manager, struct server *server)
- {
-     static char cmd[BUF_SIZE];
--    char *method = manager->method;
-     int i;
-+    int port;
- 
--    build_config(working_dir, server);
-+    port = atoi(server->port);
-+
-+    build_config(working_dir, manager, server);
- 
--    if (server->method) method = server->method;
-     memset(cmd, 0, BUF_SIZE);
-     snprintf(cmd, BUF_SIZE,
--             "%s -m %s --manager-address %s -f %s/.shadowsocks_%s.pid -c %s/.shadowsocks_%s.conf",
--             executable, method, manager->manager_address,
--             working_dir, server->port, working_dir, server->port);
-+             "%s --manager-address %s -f %s/.shadowsocks_%d.pid -c %s/.shadowsocks_%d.conf",
-+             executable, manager->manager_address, working_dir, port, working_dir, port);
- 
-     if (manager->acl != NULL) {
-         int len = strlen(cmd);
-@@ -1211,3 +1218,4 @@
- 
-     return 0;
- }
-+

shadowsocks-libev-3.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b6493ebdcfff1eb31faf34d164d57049f7253ff5bffafa6ce2263c9ac123f31
-size 1918641

shadowsocks-libev-3.1.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3611f09793af923d988ecbd15ad89fb66839e51a0059685d8f88c0131658e4a7
+size 1921889

shadowsocks-libev.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec 29 13:39:37 UTC 2017 - hillwood@opensuse.org
+
+- Update to 3.1.2
+  * Fix a bug in DNS resolver.
+  * Add new TFO API support.
+- Drop fix-Command-Execution-in-ss-manager.patch. Merged by upstream. 
+
 -------------------------------------------------------------------
 Tue Oct 31 03:31:56 UTC 2017 - hillwood@opensuse.org
 
@@ -12,7 +20,7 @@ Sat Sep 28 03:03:17 UTC 2017 - hillwood@opensuse.org
 -------------------------------------------------------------------
 Tue Sep 19 02:26:24 UTC 2017 - hillwood@opensuse.org
 
-- Update to 3.0.10
+- Update to 3.1.0
   * Replace libudns with libc-ares.
 - Merge libbloom, libcork and libipset.
 

shadowsocks-libev.spec

@@ -18,15 +18,13 @@
 
 %define libver 2
 Name:           shadowsocks-libev
-Version:        3.1.0
+Version:        3.1.2
 Release:        0
 Summary:        Libev port of Shadowsocks
 License:        GPL-3.0+
 Group:          Productivity/Networking/Web/Proxy
 Url:            https://github.com/shadowsocks/shadowsocks-libev
 Source0:        https://github.com/shadowsocks/shadowsocks-libev/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# PATFH-FIX-SUSE fix-Command-Execution-in-ss-manager.patch hillwood@opensuse.org --Fix boo#1065619 and CVE-2017-15924
-Patch0:         fix-Command-Execution-in-ss-manager.patch
 Source1:        %{name}-config.json
 Source2:        %{name}-client.service
 Source3:        %{name}-server.service
@@ -95,7 +93,6 @@ This package provides development headers for it.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --prefix=%{_prefix} \