Upgrade from 1.13.8 to 1.13.9.

Upgrade third-party modules to their recent version.
Remove needless patches.

<ChangeLog>

*) Feature: HTTP/2 server push support; the "http2_push" and
   "http2_push_preload" directives.

*) Bugfix: "header already sent" alerts might appear in logs when using
   cache; the bug had appeared in 1.9.13.

*) Bugfix: a segmentation fault might occur in a worker process if the
   "ssl_verify_client" directive was used and no SSL certificate was
   specified in a virtual server.

*) Bugfix: in the ngx_http_v2_module.

*) Bugfix: in the ngx_http_dav_module.

</ChangeLog>

6 files changed, 6 insertions, 70 deletions

diff --git a/www/nginx-devel/files/extra-patch-fastdfs-src-config b/www/nginx-devel/files/extra-patch-fastdfs-src-config
index 3726edaf2833..e433705d3fb1 100644
--- a/www/nginx-devel/files/extra-patch-fastdfs-src-config
+++ b/www/nginx-devel/files/extra-patch-fastdfs-src-config
@@ -1,5 +1,5 @@
---- ../fastdfs-nginx-module-5a8110f/src/config.orig	2016-10-12 16:09:34.075804000 +0200
-+++ ../fastdfs-nginx-module-5a8110f/src/config	2016-10-12 16:10:43.916280000 +0200
+--- ../fastdfs-nginx-module-85347be/src/config.orig	2016-10-12 16:09:34.075804000 +0200
++++ ../fastdfs-nginx-module-85347be/src/config	2016-10-12 16:10:43.916280000 +0200
 @@ -3,16 +3,16 @@
  if test -n "${ngx_module_link}"; then
      ngx_module_type=HTTP
diff --git a/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure b/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
index 09a6255f75b5..418fa7fa50c5 100644
--- a/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
+++ b/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
@@ -1,5 +1,5 @@
---- ../modsecurity-2.9.1/configure.orig	2016-02-07 12:45:53.346098000 -0500
-+++ ../modsecurity-2.9.1/configure	2016-02-07 12:47:50.081558000 -0500
+--- ../modsecurity-2.9.2/configure.orig	2016-02-07 12:45:53.346098000 -0500
++++ ../modsecurity-2.9.2/configure	2016-02-07 12:47:50.081558000 -0500
 @@ -14949,7 +14949,7 @@
  LUA_LDADD=""
  LUA_LDFLAGS=""
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c b/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c
deleted file mode 100644
index 614613c9ec8a..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_drizzle_upstream.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c.orig	2016-11-20 15:32:37.264746000 -0500
-+++ ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c	2016-11-20 15:33:20.909836000 -0500
-@@ -1027,12 +1027,14 @@
-             continue;
-         }
- 
-+#if (nginx_version < 1011006)
-         if (uscfp[i]->default_port && url->default_port
-             && uscfp[i]->default_port != url->default_port)
-         {
-             dd("upstream_add: default_port not match");
-             continue;
-         }
-+#endif
- 
-         return uscfp[i];
-     }
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c b/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c
deleted file mode 100644
index cc7849710eb8..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_modsecurity.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c.orig	2017-04-15 10:45:12.886736000 -0400
-+++ ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c	2017-04-15 10:45:59.921529000 -0400
-@@ -528,9 +528,15 @@
- 
-         hc = r->http_connection;
- 
-+#if defined(nginx_version) && nginx_version >= 1011011
-+        if (hc->free && size == cscf->large_client_header_buffers.size) {
-+
-+            buf = hc->free->buf;
-+#else
-         if (hc->nfree && size == cscf->large_client_header_buffers.size) {
- 
-             buf = hc->free[--hc->nfree];
-+#endif
- 
-             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                            "ModSecurity: use http free large header buffer: %p %uz",
diff --git a/www/nginx-devel/files/extra-patch-ngx_inet_slab.c b/www/nginx-devel/files/extra-patch-ngx_inet_slab.c
deleted file mode 100644
index 74855f083e11..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_inet_slab.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c.orig	2016-05-25 19:27:27.204200000 -0400
-+++ ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c	2016-05-25 19:28:07.177622000 -0400
-@@ -250,7 +250,7 @@
-             return NGX_ERROR;
-         }
- 
--        ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in));
-+        ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in));
- 
-         u->addrs[0].sockaddr = (struct sockaddr *) sin;
-         u->addrs[0].socklen = sizeof(struct sockaddr_in);
-@@ -277,7 +277,7 @@
- 
-     u->family = u->addrs[0].sockaddr->sa_family;
-     u->socklen = u->addrs[0].socklen;
--    ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
-+    ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen);
- 
-     switch (u->family) {
- 
-@@ -405,7 +405,7 @@
-         return NGX_ERROR;
-     }
- 
--    ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6));
-+    ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6));
- 
-     u->addrs[0].sockaddr = (struct sockaddr *) sin6;
-     u->addrs[0].socklen = sizeof(struct sockaddr_in6);
diff --git a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
index dd9749e47555..7ef2a4be7016 100644
--- a/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config
@@ -1,5 +1,5 @@
---- ../drizzle-nginx-module-0.1.9/config.orig	2011-12-30 10:26:53.000000000 +0400
-+++ ../drizzle-nginx-module-0.1.9/config	2011-12-30 10:28:20.000000000 +0400
+--- ../drizzle-nginx-module-0.1.10/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../drizzle-nginx-module-0.1.10/config	2011-12-30 10:28:20.000000000 +0400
 @@ -22,12 +22,12 @@
  
      if [ $ngx_found = no ]; then