From 848650953470df43bd56317a1ba97d0026fbb1aabe8023df1327df689e6cb425 Mon Sep 17 00:00:00 2001
From: Artem Chernikov <achernikov@suse.com>
Date: Tue, 10 Apr 2018 08:44:34 +0000
Subject: [PATCH] Accepting request 595111 from
 home:AndreasStieger:branches:server:http

nginx 1.13.11
- Use %license (bsc#1082318)

OBS-URL: https://build.opensuse.org/request/show/595111
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=107
---
 nginx-1.13.11.tar.gz     |  3 +++
 nginx-1.13.11.tar.gz.asc | 10 ++++++++++
 nginx-1.13.9.tar.gz      |  3 ---
 nginx-1.13.9.tar.gz.asc  | 10 ----------
 nginx.changes            | 24 ++++++++++++++++++++++++
 nginx.spec               |  3 ++-
 6 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 nginx-1.13.11.tar.gz
 create mode 100644 nginx-1.13.11.tar.gz.asc
 delete mode 100644 nginx-1.13.9.tar.gz
 delete mode 100644 nginx-1.13.9.tar.gz.asc

diff --git a/nginx-1.13.11.tar.gz b/nginx-1.13.11.tar.gz
new file mode 100644
index 0000000..4f9f0d8
--- /dev/null
+++ b/nginx-1.13.11.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35799c974644d2896b34ba876461dfd142c1b11f06f5aa57d255a77d4da36f05
+size 1016189
diff --git a/nginx-1.13.11.tar.gz.asc b/nginx-1.13.11.tar.gz.asc
new file mode 100644
index 0000000..ae04d17
--- /dev/null
+++ b/nginx-1.13.11.tar.gz.asc
@@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABAgAGBQJaw5MyAAoJEFIKmZOhwFL4+xAIAKbVY1Zd80R2FHa3bbCH8d4O
+dX+QONHfo/HP3ljzNn1/gAn+Wf4K5sL1pxOLF307U35FkruJc7Tg0zCTmcnm6lPk
+WhzaiXQJrKRa/SN7ui6bLDe++GDda1lY7ZG54x48Jj+lpIy1YFeCx/VNeR+9uPHi
+oiiTHRyORfWjGWu4OAkyeyGsh6BSdZfyZEFszYe727tl7ToNxgbAuZK5JlVvZJ2t
+1PGS4icJoNyDqMhH9H8wHF9luCvxg0FY6LZPlpSFJyHmHW+Ff9tnzrEdEinWuTrR
+B/E7pkWnJ7CBz8lyqU4B1xVRjXdjOJ97j24LLEt0LTr8EABGeCfgJdAbKaAsZFE=
+=AR8k
+-----END PGP SIGNATURE-----
diff --git a/nginx-1.13.9.tar.gz b/nginx-1.13.9.tar.gz
deleted file mode 100644
index 7c6c6fe..0000000
--- a/nginx-1.13.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5faea18857516fe68d30be39c3032bd22ed9cf85e1a6fdf32e3721d96ff7fa42
-size 994802
diff --git a/nginx-1.13.9.tar.gz.asc b/nginx-1.13.9.tar.gz.asc
deleted file mode 100644
index e837697..0000000
--- a/nginx-1.13.9.tar.gz.asc
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEcBAABAgAGBQJajCw/AAoJEFIKmZOhwFL44XoH/jRx2DtVS1DQUWqhke0ntVUD
-KC13k63u4OGcf32qk/T7BeUb+09nuQ/K3Z43yN4qxprPby2RimEnOxrzh3bBaPNn
-9m3jLEN84ARq0oWws95L0ITMxWI3KCDjZ16KrRD6HzZ3pNA+/+uwqilkl0+si7iK
-sXbE8FNL+4w+fMz0NBG+l/x1wGdL8vbodbKji3BNYxleSn5t2AwTpYv6xEUEl8aT
-2EnzUC0JAwpiJIgC7ExNX7sN5mG/hha2qfXIVIynEf2bmHN6GT3K4ywSZaQohbJr
-QOp7LrGTDFIGi3SduqgNUMsWb6KXdY0niIrMlL9cE1BHO17fAIsbIWFUVDRVoEE=
-=coXe
------END PGP SIGNATURE-----
diff --git a/nginx.changes b/nginx.changes
index 888402b..0ac5c77 100644
--- a/nginx.changes
+++ b/nginx.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Apr 10 07:40:27 UTC 2018 - astieger@suse.com
+
+- update to 1.13.11:
+  * the "proxy_protocol" parameter of the "listen" directive now
+    supports the PROXY protocol version 2
+  * bugfix in the "http_404", "http_500", etc. parameters of the
+    "proxy_next_upstream" directive
+- includes changes from 1.13.10:
+  * the "set" parameter of the "include" SSI directive now allows
+    writing arbitrary responses to a variable; the
+    "subrequest_output_buffer_size" directive defines maximum
+    response size
+  * now nginx uses clock_gettime(CLOCK_MONOTONIC) if available, to
+    avoid timeouts being incorrectly triggered on system time changes
+  * add the "escape=none" parameter of the "log_format" directive
+  * add the $ssl_preread_alpn_protocols variable in the
+    ngx_stream_ssl_preread_module.
+  * add the ngx_http_grpc_module.
+  * fix memory allocation error handling in the "geo" directive.
+  * when using variables in the "auth_basic_user_file" directive
+    a null character may have appeared in logs
+- Use %license (bsc#1082318)
+
 -------------------------------------------------------------------
 Wed Mar 28 11:18:44 UTC 2018 - achernikov@suse.com
 
diff --git a/nginx.spec b/nginx.spec
index 021ef50..df4bd59 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -70,7 +70,7 @@
 %define ngx_doc_dir    %{_datadir}/doc/packages/%{name}
 #
 Name:           nginx
-Version:        1.13.9
+Version:        1.13.11
 Release:        0
 %define ngx_fancyindex_version 0.4.2
 %define ngx_fancyindex_module_path ngx-fancyindex-%{ngx_fancyindex_version}
@@ -404,6 +404,7 @@ copydocs %{nginx_rtmp_module_path} \
 %{_datadir}/nginx/
 
 %files -n vim-plugin-nginx
+%license LICENSE
 %dir %{vim_data_dir}/ftdetect/
 %{vim_data_dir}/ftdetect/nginx.vim
 %{vim_data_dir}/ftplugin/nginx.vim